viral-viewer-2 4.2.3 → 4.2.5

package/dist/components/worker/viral-viewer-4.worker.js

@@ -36,19 +36,28 @@ class ViralViewerWorker4 {
     }
     loadElement(element, callbackOnSuccess = () => { }) {
         this.workerPool.Enqueue(element, (data) => {
+            var _a, _b;
             let dummyMesh = this.viralViewerApi.viralLoader.threeLoader.parseObject(data);
             console.log(dummyMesh);
             if (dummyMesh.children.length > 0) {
                 for (let index = 0; index < dummyMesh.children.length; index++) {
                     const child = dummyMesh.children[index];
+                    if ((_a = dummyMesh.userData) === null || _a === void 0 ? void 0 : _a.IsInstancedMesh) {
+                        for (let j = 0; j < child.children.length; j++) {
+                            const element = child.children[index];
+                            element.material = this.viralViewerApi.viralScene.materials.get(element.userData.MaterialId);
+                            element.userData.type = "Revit Element";
+                            this.viralViewerApi.viralBVH.applyThreeMeshBVH(element.geometry);
+                        }
+                        continue;
+                    }
                     child.material = this.viralViewerApi.viralScene.materials.get(child.userData.MaterialId);
                     this.viralViewerApi.viralBVH.applyThreeMeshBVH(child.geometry);
                 }
             }
-            dummyMesh.userData.type = "Revit Element";
-            //   if (dummyMesh.userData?.IsInstancedMesh) {
-            //     mesh = dummyMesh as InstancedMesh;
-            //   }
+            if (!((_b = dummyMesh.userData) === null || _b === void 0 ? void 0 : _b.IsInstancedMesh)) {
+                dummyMesh.userData.type = "Revit Element";
+            }
             if (this.mainModel)
                 this.mainModel.add(dummyMesh);
             this.viralViewerApi.viralRenderer.render();

package/dist/components/worker/viral-viewer-4.worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"viral-viewer-4.worker.js","sourceRoot":"","sources":["../../../src/components/worker/viral-viewer-4.worker.ts"],"names":[],"mappings":";;;AASA,iCAQe;AACf,4FAAyE;AACzE,oDAAsD;AACtD,iDAAwD;AAExD,MAAa,kBAAkB;IAI7B,YACS,cAA8B,EACrC,YAAoB,gDAAgD;QAD7D,mBAAc,GAAd,cAAc,CAAgB;QAHhC,cAAS,GAAqB,EAAE,CAAC;QACjC,cAAS,GAAgB,IAAI,CAAC;QAKnC,+CAA+C;QAC/C,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,IAAI,uCAAU,KAAK,CAAC,CAAC,CAAC;QAC7C,MAAM,UAAU,GAAG,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC7C,oCAAoC;QACpC,IAAI,CAAC,UAAU,GAAG,IAAI,8BAAgB,CACpC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,cAAc,EAC1C,UAAU,CACX,CAAC;IACJ,CAAC;IACM,OAAO,CAAC,SAA2B;QACxC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAE3B,IAAI,CAAC,SAAS,GAAG,IAAI,YAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YACrD,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;YAClC,IAAI,WAAW,GAAG,IAAA,2BAAiB,EACjC,QAAQ,CAAC,GAAG,EACZ,QAAQ,CAAC,KAAK,EACd,QAAQ,CAAC,IAAI,CACd,CAAC;YAEF,IAAI,cAAc,GAAG,IAAI,yBAAiB,CAAC;gBACzC,KAAK,EAAE,WAAW;gBAClB,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,WAAW,EAAE,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;gBACjD,WAAW,EAAE,IAAI;gBACjB,IAAI,EAAE,QAAQ,CAAC,IAAI;aACpB,CAAC,CAAC;YACH,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;SACrE;IACH,CAAC;IACM,WAAW,CAAC,OAA0B,EAAE,iBAAiB,GAAG,GAAG,EAAE,GAAE,CAAC;QACzE,IAAI,CAAC,UAAU,CAAC,OAAO,CAAyB,OAAO,EAAE,CAAC,IAAS,EAAE,EAAE;YACrE,IAAI,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,WAAW,CAAC,WAAW,CACrE,IAAI,CACL,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;YACtB,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBACjC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;oBAC9D,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAS,CAAC;oBAChD,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAC3D,KAAK,CAAC,QAAQ,CAAC,UAAU,CACzB,CAAC;oBACH,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;iBAChE;aACF;YACD,SAAS,CAAC,QAAQ,CAAC,IAAI,GAAG,eAAe,CAAC;YAC5C,+CAA+C;YAC/C,yCAAyC;YACzC,MAAM;YACJ,IAAI,IAAI,CAAC,SAAS;gBAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAClD,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;YAC3C,iBAAiB,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAjED,gDAiEC"}
+{"version":3,"file":"viral-viewer-4.worker.js","sourceRoot":"","sources":["../../../src/components/worker/viral-viewer-4.worker.ts"],"names":[],"mappings":"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"}

package/dist/components/worker-script/load-model-worker-3.script.js

@@ -34060,7 +34060,8 @@ which can be placed in CurveUtils.
     self.addEventListener("message", (event) => {
         const meshes = progressGeometries(event.data);
         if (event.data.Instances && event.data.Instances.length > 0) {
-            const mesh = new InstancedMesh(new BufferGeometry(), new MeshBasicMaterial(), event.data.Instances.length);
+            const instanceGroup = new Mesh();
+            const mesh = new Mesh();
             for (let index = 0; index < meshes.length; index++) {
                 const element = meshes[index];
                 mesh.add(element);
@@ -34085,13 +34086,16 @@ which can be placed in CurveUtils.
                 //transform first
                 let matrix4 = new Matrix4();
                 matrix4.fromArray(numbers);
-                mesh.setMatrixAt(index, matrix4);
-                mesh.setColorAt(index, new Color());
+                let cloneMesh = mesh.clone();
+                cloneMesh.applyMatrix4(matrix4);
+                // cloneMesh.setMatrixAt(index, matrix4);
+                // cloneMesh.setColorAt(index, new Color());
+                cloneMesh.updateMatrix();
+                instanceGroup.add(cloneMesh);
             }
             // childMesh.instanceMatrix.needsUpdate = true;
-            mesh.userData.IsInstancedMesh = true;
-            mesh.updateMatrix();
-            let jsonData = mesh.toJSON();
+            instanceGroup.userData.IsInstancedMesh = true;
+            let jsonData = instanceGroup.toJSON();
             self.postMessage(jsonData);
         }
         else {