fix(review): address audit findings before merge
🔍 Lint / 🪄 Check lint (pull_request) Has been cancelled
🔍 Lint / 🎨 Check format (pull_request) Has been cancelled
🔍 Lint / 🔎 Typecheck (pull_request) Has been cancelled
📊 Quality / 🔒 Security Audit (pull_request) Has been cancelled
📊 Quality / 📋 Dependency Freshness (pull_request) Has been cancelled
📊 Quality / 📦 Bundle Size (pull_request) Has been cancelled
🔍 Lint / 🏗 Build (pull_request) Has been cancelled
🔍 Lint / 🪄 Check lint (pull_request) Has been cancelled
🔍 Lint / 🎨 Check format (pull_request) Has been cancelled
🔍 Lint / 🔎 Typecheck (pull_request) Has been cancelled
📊 Quality / 🔒 Security Audit (pull_request) Has been cancelled
📊 Quality / 📋 Dependency Freshness (pull_request) Has been cancelled
📊 Quality / 📦 Bundle Size (pull_request) Has been cancelled
🔍 Lint / 🏗 Build (pull_request) Has been cancelled
This commit is contained in:
@@ -2,29 +2,53 @@ import { useEffect, useMemo } from "react";
|
||||
import * as THREE from "three";
|
||||
import { disposeObject3D } from "@/utils/three/dispose";
|
||||
|
||||
function cloneObjectWithOwnedResources<T extends THREE.Object3D>(object: T): T {
|
||||
interface UseClonedObjectOptions {
|
||||
cloneResources?: boolean;
|
||||
}
|
||||
|
||||
function cloneMaterial(
|
||||
material: THREE.Material | THREE.Material[],
|
||||
): THREE.Material | THREE.Material[] {
|
||||
return Array.isArray(material)
|
||||
? material.map((item) => item.clone())
|
||||
: material.clone();
|
||||
}
|
||||
|
||||
function cloneObject<T extends THREE.Object3D>(
|
||||
object: T,
|
||||
cloneResources: boolean,
|
||||
): T {
|
||||
const clone = object.clone(true) as T;
|
||||
|
||||
if (!cloneResources) return clone;
|
||||
|
||||
clone.traverse((child) => {
|
||||
if (!(child instanceof THREE.Mesh)) return;
|
||||
|
||||
child.geometry = child.geometry.clone();
|
||||
child.material = Array.isArray(child.material)
|
||||
? child.material.map((material) => material.clone())
|
||||
: child.material.clone();
|
||||
child.material = cloneMaterial(child.material);
|
||||
});
|
||||
|
||||
return clone;
|
||||
}
|
||||
|
||||
export function useClonedObject<T extends THREE.Object3D>(object: T): T {
|
||||
const clone = useMemo(() => cloneObjectWithOwnedResources(object), [object]);
|
||||
export function useClonedObject<T extends THREE.Object3D>(
|
||||
object: T,
|
||||
options: UseClonedObjectOptions = {},
|
||||
): T {
|
||||
const cloneResources = options.cloneResources ?? false;
|
||||
const clone = useMemo(
|
||||
() => cloneObject(object, cloneResources),
|
||||
[cloneResources, object],
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
if (!cloneResources) return undefined;
|
||||
|
||||
return () => {
|
||||
disposeObject3D(clone);
|
||||
};
|
||||
}, [clone]);
|
||||
}, [clone, cloneResources]);
|
||||
|
||||
return clone;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { useEffect, useRef } from "react";
|
||||
import type { RefObject } from "react";
|
||||
import type { Object3D } from "three";
|
||||
import { Octree } from "three/addons/math/Octree.js";
|
||||
import { Octree } from "three-stdlib";
|
||||
import type { OctreeReadyHandler } from "@/types/three/three";
|
||||
|
||||
export function useOctreeGraphNode(
|
||||
|
||||
@@ -47,6 +47,9 @@ function createTerrainHeightSampler(
|
||||
new THREE.Vector3(...scale),
|
||||
);
|
||||
const inverseTerrainMatrix = terrainMatrix.clone().invert();
|
||||
const localOrigin = new THREE.Vector3();
|
||||
const localDirection = DOWN.clone().transformDirection(inverseTerrainMatrix);
|
||||
const hits: THREE.Intersection[] = [];
|
||||
const raycaster = new THREE.Raycaster(
|
||||
new THREE.Vector3(),
|
||||
DOWN,
|
||||
@@ -63,13 +66,11 @@ function createTerrainHeightSampler(
|
||||
|
||||
return {
|
||||
getHeight: (x, z) => {
|
||||
const localOrigin = new THREE.Vector3(x, RAYCAST_Y, z).applyMatrix4(
|
||||
inverseTerrainMatrix,
|
||||
);
|
||||
const localDirection =
|
||||
DOWN.clone().transformDirection(inverseTerrainMatrix);
|
||||
localOrigin.set(x, RAYCAST_Y, z).applyMatrix4(inverseTerrainMatrix);
|
||||
raycaster.set(localOrigin, localDirection);
|
||||
const hit = raycaster.intersectObjects(meshes, false)[0];
|
||||
hits.length = 0;
|
||||
raycaster.intersectObjects(meshes, false, hits);
|
||||
const hit = hits[0];
|
||||
return hit?.point.applyMatrix4(terrainMatrix).y ?? null;
|
||||
},
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user