bvh ignores instance mesh (#7711)

EtherealEngine · Mar 8, 2023 · a8178f2 · a8178f2
1 parent e63c967
commit a8178f2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/packages/engine/src/scene/components/ModelComponent.ts b/packages/engine/src/scene/components/ModelComponent.ts
@@ -153,7 +153,6 @@ function ModelReactor({ root }: EntityReactorProps) {
     if (model.generateBVH) {
       const bvhDone = [] as Promise<void>[]
       scene.traverse((obj: Mesh) => {
-        if (obj.geometry?.boundsTree) return
         bvhDone.push(generateMeshBVH(obj))
       })
       // trigger group state invalidation when bvh is done

diff --git a/packages/engine/src/scene/functions/bvhWorkerPool.ts b/packages/engine/src/scene/functions/bvhWorkerPool.ts
@@ -1,4 +1,4 @@
-import { Mesh } from 'three'
+import { InstancedMesh, Mesh } from 'three'
 
 import { GenerateMeshBVHWorker } from '../../common/classes/GenerateMeshBVHWorker'
 
@@ -7,8 +7,15 @@ const poolSize = 1
 const bvhWorkers: GenerateMeshBVHWorker[] = []
 const meshQueue: Mesh[] = []
 
-export function generateMeshBVH(mesh: Mesh) {
-  if (!mesh.isMesh || !mesh.geometry || !mesh.geometry.attributes.position) return Promise.resolve()
+export function generateMeshBVH(mesh: Mesh | InstancedMesh) {
+  if (
+    !mesh.isMesh ||
+    (mesh as InstancedMesh).isInstancedMesh ||
+    !mesh.geometry ||
+    !mesh.geometry.attributes.position ||
+    mesh.geometry.boundsTree
+  )
+    return Promise.resolve()
   if (!bvhWorkers.length) {
     for (let i = 0; i < poolSize; i++) {
       bvhWorkers.push(new GenerateMeshBVHWorker())