Merge pull request #5 from aka-blackboots/bim-tiles-utility-fixes

Get Mesh and Sphere for Streamer + Transformation Fix

resources/openbim-components.js

@@ -109626,6 +109626,23 @@ class BoundingBoxes {
             parent.add(newBoundingBox);
         }
     }
+    getMesh() {
+        this.mesh.computeBoundingBox();
+        const { min, max } = this.mesh.boundingBox;
+        const width = Math.abs(max.x - min.x);
+        const height = Math.abs(max.y - min.y);
+        const depth = Math.abs(max.z - min.z);
+        const center = new THREE$1.Vector3();
+        center.subVectors(max, min).divideScalar(2).add(min);
+        const box = new THREE$1.BoxGeometry(width, height, depth);
+        const boxMesh = new THREE$1.Mesh(box);
+        boxMesh.position.copy(center);
+        return boxMesh;
+    }
+    getSphere() {
+        this.mesh.computeBoundingSphere();
+        return this.mesh.boundingSphere;
+    }
     initializeBoundingBoxes() {
         const geometry = new THREE$1.BoxGeometry(1, 1, 1);
         geometry.deleteAttribute("uv");
@@ -109917,6 +109934,7 @@ class FragmentStreamLoader extends Component {
             transparent: true,
             opacity: 0.5,
         });
+        this.transformation = new THREE$1.Matrix4();
         this.notifyFragmentsFound = async (frags) => {
             if (!this._isEventFree) {
                 setTimeout(() => this.notifyFragmentsFound(frags), this._eventDelay);
@@ -109968,9 +109986,20 @@ class FragmentStreamLoader extends Component {
             }
         }
         this._geometryInstances[group.uuid] = instances;
+        // Move it to DT
+        this.culler.needsUpdate = true;
+        // console.log("----Group----");
+        // console.log(group);
     }
     get() { }
     update() { }
+    getMesh() {
+        const box = this.culler.boxes.getMesh();
+        return box;
+    }
+    getSphere() {
+        return this.culler.boxes.getSphere();
+    }
     applyTransformation(modelID, transform) {
         if (!this.models[modelID]) {
             throw new Error(`Model ${modelID} not found!`);
@@ -109980,6 +110009,7 @@ class FragmentStreamLoader extends Component {
             this.culler.applyTransformation(modelID, asset.id, transform);
         }
         this.culler.boxes.update();
+        this.transformation.fromArray(transform.elements);
     }
     async handleSeenGeometries(seen) {
         for (const modelID in seen) {
@@ -110109,6 +110139,8 @@ class FragmentStreamLoader extends Component {
             fragment.mesh.setColorAt(i, col);
         }
         fragment.mesh.instanceColor.needsUpdate = true;
+        fragment.mesh.applyMatrix4(this.transformation);
+        fragment.mesh.updateMatrix();
         result.push(fragment);
     }
 }

src/fragments/FragmentIfcStreamer/index.html

@@ -123,22 +123,28 @@
         }
     })
 
-    // await loadModel("test.json");
-    await loadModel("test-2.json");
+    await loadModel("test.json");
+    // await loadModel("test-2.json");
     // await loadModel("dm1_riv.json");
 
     fragments.baseCoordinationModel = fragments.groups[0].uuid;
     fragments.coordinate();
     for(const group of fragments.groups) {
         const {uuid, matrix} = group;
-        loader.applyTransformation(uuid, matrix);
+        const matrixe = new THREE.Matrix4();
+        matrixe.setPosition(0, 5, 0);
+        loader.applyTransformation(uuid, matrixe);
     }
 
+    console.log(fragments);
+
     components.camera.controls.addEventListener("controlend", () => {
         loader.culler.needsUpdate = true;
         culler.needsUpdate = true;
     });
 
+    components.camera.controls.fitToSphere(loader.getSphere(), false);
+    loader.getMesh();
     // loader.culler.renderDebugFrame = true;
     // const debugFrame = loader.culler.get().domElement;
     // document.body.appendChild(debugFrame);

src/fragments/FragmentIfcStreamer/src/bounding-boxes.ts

@@ -89,6 +89,25 @@ export class BoundingBoxes {
     }
   }
 
+  getMesh() {
+    this.mesh.computeBoundingBox();
+    const { min, max } = this.mesh.boundingBox as THREE.Box3;
+    const width = Math.abs(max.x - min.x);
+    const height = Math.abs(max.y - min.y);
+    const depth = Math.abs(max.z - min.z);
+    const center = new THREE.Vector3();
+    center.subVectors(max, min).divideScalar(2).add(min);
+    const box = new THREE.BoxGeometry(width, height, depth);
+    const boxMesh = new THREE.Mesh(box);
+    boxMesh.position.copy(center);
+    return boxMesh;
+  }
+
+  getSphere() {
+    this.mesh.computeBoundingSphere();
+    return this.mesh.boundingSphere;
+  }
+
   private initializeBoundingBoxes() {
     const geometry = new THREE.BoxGeometry(1, 1, 1);
     geometry.deleteAttribute("uv");

src/fragments/FragmentIfcStreamer/src/fragment-stream-loader.ts

@@ -63,6 +63,8 @@ export class FragmentStreamLoader extends Component<any> {
     opacity: 0.5,
   });
 
+  private transformation = new THREE.Matrix4();
+
   constructor(components: Components) {
     super(components);
     this.components.tools.add(FragmentStreamLoader.uuid, this);
@@ -93,7 +95,6 @@ export class FragmentStreamLoader extends Component<any> {
 
     this.culler.add(group.uuid, assets, geometries);
     this.models[group.uuid] = { assets, geometries };
-
     const instances: StreamedInstances = {};
 
     for (const asset of assets) {
@@ -107,12 +108,33 @@ export class FragmentStreamLoader extends Component<any> {
     }
 
     this._geometryInstances[group.uuid] = instances;
+
+    // Move it to DT
+    this.culler.needsUpdate = true;
+
+    // console.log("----Group----");
+    // console.log(group);
   }
 
   get() {}
 
   update() {}
 
+  getMesh(): THREE.Mesh {
+    const box = this.culler.boxes.getMesh();
+    if (box) {
+      // this.components.scene.get().add(box);
+      // const boundingBox = new THREE.Box3().setFromObject(box);
+      // // @ts-ignore
+      // const bHelper = new THREE.Box3Helper(boundingBox, 0xff0000);
+      // this.components.scene.get().add(bHelper);
+    }
+    return box;
+  }
+  getSphere() {
+    return this.culler.boxes.getSphere();
+  }
+
   applyTransformation(modelID: string, transform: THREE.Matrix4) {
     if (!this.models[modelID]) {
       throw new Error(`Model ${modelID} not found!`);
@@ -122,6 +144,8 @@ export class FragmentStreamLoader extends Component<any> {
       this.culler.applyTransformation(modelID, asset.id, transform);
     }
     this.culler.boxes.update();
+
+    this.transformation.fromArray(transform.elements);
   }
 
   private async handleSeenGeometries(seen: { [modelID: string]: number[] }) {
@@ -264,7 +288,6 @@ export class FragmentStreamLoader extends Component<any> {
 
     const material = transparent ? this._baseMaterialT : this._baseMaterial;
     const fragment = new FRAG.Fragment(geometry, material, instances.length);
-
     group.add(fragment.mesh);
     group.items.push(fragment);
 
@@ -288,6 +311,9 @@ export class FragmentStreamLoader extends Component<any> {
 
     fragment.mesh.instanceColor!.needsUpdate = true;
 
+    fragment.mesh.applyMatrix4(this.transformation);
+    fragment.mesh.updateMatrix();
+
     result.push(fragment);
   }
 

src/fragments/FragmentManager/index.html

@@ -121,7 +121,8 @@
         const file = await fetch("../../../resources/small.frag");
         const data = await file.arrayBuffer();
         const buffer = new Uint8Array(data);
-       fragments.load(buffer);
+       const group = await fragments.load(buffer);
+       console.log(group)
         // const scene = components.scene.get();
         // scene.add(model);
     }