viral-viewer-2 3.0.4 → 3.0.5

package/dist/components/worker-script/threejs.types.js

@@ -34041,7 +34041,7 @@ function workerFunction() {
     //////////////////
     const maxPolygonPerObject = 1000;
     const maxPolygonForEdge = 1000;
-    function addMesh(indices, vertices, transform = null, callback = (buffer) => { }) {
+    function addMesh(indices, vertices, transform = null) {
         let verticePoints = [];
         if (transform == null) {
             for (let i = 0; i < indices.length; i++) {
@@ -34052,8 +34052,7 @@ function workerFunction() {
                 verticePoints.push(point.Y);
             }
             const buffer = new Float32Array(verticePoints);
-            callback(buffer);
-            return;
+            return buffer;
         }
         let numbers = [
             transform.BasisX.X,
@@ -34091,109 +34090,107 @@ function workerFunction() {
             verticePoints.push(point.z);
         }
         const buffer = new Float32Array(verticePoints);
-        callback(buffer);
+        return buffer;
     }
-    function progressGeometries(json, callback = (buffer) => { }) {
-        addMesh(json.Indices, json.Vertices, json.Transform, (buffer) => {
-            callback(buffer);
-        });
+    function progressGeometries(json) {
+        let buffer = addMesh(json.Indices, json.Vertices, json.Transform);
+        return buffer;
     }
     self.addEventListener("message", (event) => {
-        progressGeometries(event.data, (buffer) => {
-            const dummyGeometry = new BufferGeometry();
-            dummyGeometry.setAttribute("position", new BufferAttribute(buffer, 3));
-            dummyGeometry.computeVertexNormals();
-            if (event.data.Instances > 0) {
-                let geometry = new BufferGeometry();
-                // In case number of polygon larger than expect, merge them to reduce polygon first, for optimize purpose
-                if (dummyGeometry.attributes.position.count > maxPolygonPerObject) {
-                    const modifier = new SimplifyModifier();
-                    const ratio = maxPolygonPerObject / dummyGeometry.attributes.position.count;
-                    const count = Math.floor(dummyGeometry.attributes.position.count * ratio); // number of polygon to remove
-                    geometry = modifier.modify(dummyGeometry, count);
-                    console.log(dummyGeometry.attributes.position.count, geometry.attributes.position.count);
-                }
-                else {
-                    geometry = dummyGeometry;
-                }
-                const childMesh = new InstancedMesh(geometry, null, event.data.Instances.length);
-                childMesh.castShadow = true;
-                childMesh.receiveShadow = true;
-                for (let index = 0; index < event.data.Instances.length; index++) {
-                    const transform = event.data.Instances[index];
-                    let numbers = [
-                        transform.BasisX.X,
-                        -transform.BasisX.Z,
-                        -transform.BasisX.Y,
-                        0,
-                        -transform.BasisZ.X,
-                        transform.BasisZ.Z,
-                        transform.BasisZ.Y,
-                        0,
-                        -transform.BasisY.X,
-                        transform.BasisY.Z,
-                        transform.BasisY.Y,
-                        0,
-                        -transform.Offset.X,
-                        transform.Offset.Z,
-                        transform.Offset.Y,
-                        1,
-                    ];
-                    //transform first
-                    let matrix4 = new Matrix4();
-                    matrix4.fromArray(numbers);
-                    childMesh.setMatrixAt(index, matrix4);
-                    //if number of polygon smaller than expect, generate edges
-                    if (geometry.attributes.position.count < maxPolygonForEdge) {
-                        const edges = new EdgesGeometry(geometry, 90);
-                        const positions = edges.attributes.position.array;
-                        const indices = [];
-                        for (let i = 0; i < positions.length / 3; i += 2) {
-                            indices.push(i, i + 1);
-                        }
-                        const bufferGeometry = new BufferGeometry();
-                        // Set the position attribute
-                        bufferGeometry.setAttribute("position", new BufferAttribute(new Float32Array(positions), 3));
-                        // Set the index attribute
-                        bufferGeometry.setIndex(indices);
-                        const line = new LineSegments(bufferGeometry, new LineBasicMaterial({ color: "#666", linewidth: 0.5 }));
-                        line.applyMatrix4(matrix4);
-                        line.updateMatrix();
-                        childMesh.add(line);
-                    }
-                }
-                // childMesh.instanceMatrix.needsUpdate = true;
-                childMesh.updateMatrix();
-                let jsonData = childMesh.toJSON();
-                // jsonData.object.type = "InstancedMesh";
-                // jsonData.object.count = childMesh.count;
-                // jsonData.object.instanceMatrix = childMesh.instanceMatrix.toJSON();
-                // if (this.instanceColor !== null)
-                // jsonData.object.instanceColor = childMesh.instanceColor.toJSON();
-                console.log(jsonData);
-                self.postMessage(jsonData);
+        let buffer = progressGeometries(event.data);
+        const dummyGeometry = new BufferGeometry();
+        dummyGeometry.setAttribute("position", new BufferAttribute(buffer, 3));
+        dummyGeometry.computeVertexNormals();
+        if (event.data.Instances > 0) {
+            let geometry = new BufferGeometry();
+            // In case number of polygon larger than expect, merge them to reduce polygon first, for optimize purpose
+            if (dummyGeometry.attributes.position.count > maxPolygonPerObject) {
+                const modifier = new SimplifyModifier();
+                const ratio = maxPolygonPerObject / dummyGeometry.attributes.position.count;
+                const count = Math.floor(dummyGeometry.attributes.position.count * ratio); // number of polygon to remove
+                geometry = modifier.modify(dummyGeometry, count);
+                console.log(dummyGeometry.attributes.position.count, geometry.attributes.position.count);
             }
             else {
-                const edges = new EdgesGeometry(dummyGeometry, 90);
-                const positions = edges.attributes.position.array;
-                const indices = [];
-                for (let i = 0; i < positions.length / 3; i += 2) {
-                    indices.push(i, i + 1);
-                }
-                const bufferGeometry = new BufferGeometry();
-                // Set the position attribute
-                bufferGeometry.setAttribute("position", new BufferAttribute(new Float32Array(positions), 3));
-                // Set the index attribute
-                bufferGeometry.setIndex(indices);
-                const line = new LineSegments(bufferGeometry, new LineBasicMaterial({ color: "#202020", linewidth: 0.5 }));
-                const childMesh = new Mesh(dummyGeometry);
-                childMesh.add(line);
-                childMesh.castShadow = true;
-                childMesh.receiveShadow = true;
-                let jsonData = childMesh.toJSON();
-                self.postMessage(jsonData);
-            }
-        });
+                geometry = dummyGeometry;
+            }
+            const childMesh = new InstancedMesh(geometry, null, event.data.Instances.length);
+            childMesh.castShadow = true;
+            childMesh.receiveShadow = true;
+            for (let index = 0; index < event.data.Instances.length; index++) {
+                const transform = event.data.Instances[index];
+                let numbers = [
+                    transform.BasisX.X,
+                    -transform.BasisX.Z,
+                    -transform.BasisX.Y,
+                    0,
+                    -transform.BasisZ.X,
+                    transform.BasisZ.Z,
+                    transform.BasisZ.Y,
+                    0,
+                    -transform.BasisY.X,
+                    transform.BasisY.Z,
+                    transform.BasisY.Y,
+                    0,
+                    -transform.Offset.X,
+                    transform.Offset.Z,
+                    transform.Offset.Y,
+                    1,
+                ];
+                //transform first
+                let matrix4 = new Matrix4();
+                matrix4.fromArray(numbers);
+                childMesh.setMatrixAt(index, matrix4);
+                //if number of polygon smaller than expect, generate edges
+                if (geometry.attributes.position.count < maxPolygonForEdge) {
+                    const edges = new EdgesGeometry(geometry, 90);
+                    const positions = edges.attributes.position.array;
+                    const indices = [];
+                    for (let i = 0; i < positions.length / 3; i += 2) {
+                        indices.push(i, i + 1);
+                    }
+                    const bufferGeometry = new BufferGeometry();
+                    // Set the position attribute
+                    bufferGeometry.setAttribute("position", new BufferAttribute(new Float32Array(positions), 3));
+                    // Set the index attribute
+                    bufferGeometry.setIndex(indices);
+                    const line = new LineSegments(bufferGeometry, new LineBasicMaterial({ color: "#666", linewidth: 0.5 }));
+                    line.applyMatrix4(matrix4);
+                    line.updateMatrix();
+                    childMesh.add(line);
+                }
+            }
+            // childMesh.instanceMatrix.needsUpdate = true;
+            childMesh.updateMatrix();
+            let jsonData = childMesh.toJSON();
+            // jsonData.object.type = "InstancedMesh";
+            // jsonData.object.count = childMesh.count;
+            // jsonData.object.instanceMatrix = childMesh.instanceMatrix.toJSON();
+            // if (this.instanceColor !== null)
+            // jsonData.object.instanceColor = childMesh.instanceColor.toJSON();
+            console.log(jsonData);
+            self.postMessage(jsonData);
+        }
+        else {
+            const edges = new EdgesGeometry(dummyGeometry, 90);
+            const positions = edges.attributes.position.array;
+            const indices = [];
+            for (let i = 0; i < positions.length / 3; i += 2) {
+                indices.push(i, i + 1);
+            }
+            const bufferGeometry = new BufferGeometry();
+            // Set the position attribute
+            bufferGeometry.setAttribute("position", new BufferAttribute(new Float32Array(positions), 3));
+            // Set the index attribute
+            bufferGeometry.setIndex(indices);
+            const line = new LineSegments(bufferGeometry, new LineBasicMaterial({ color: "#202020", linewidth: 0.5 }));
+            const childMesh = new Mesh(dummyGeometry);
+            childMesh.add(line);
+            childMesh.castShadow = true;
+            childMesh.receiveShadow = true;
+            let jsonData = childMesh.toJSON();
+            self.postMessage(jsonData);
+        }
     }, false);
     class ViralViewerRevitNoneStructuralGeometry {
         constructor() {