@inweb/viewer-three 27.1.2 → 27.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-three",
-  "version": "27.1.2",
+  "version": "27.1.3",
   "description": "JavaScript library for rendering CAD and BIM files in a browser using Three.js",
   "homepage": "https://cloud.opendesign.com/docs/index.html",
   "license": "SEE LICENSE IN LICENSE",
@@ -35,20 +35,20 @@
     "docs": "typedoc"
   },
   "dependencies": {
-    "@inweb/client": "~27.1.2",
-    "@inweb/eventemitter2": "~27.1.2",
-    "@inweb/markup": "~27.1.2",
-    "@inweb/viewer-core": "~27.1.2"
+    "@inweb/client": "~27.1.3",
+    "@inweb/eventemitter2": "~27.1.3",
+    "@inweb/markup": "~27.1.3",
+    "@inweb/viewer-core": "~27.1.3"
   },
   "devDependencies": {
     "@streamparser/json": "^0.0.22",
-    "@types/three": "^0.180.0",
+    "@types/three": "^0.182.0",
     "potree-core": "^2.0.11",
-    "three": "^0.180.0"
+    "three": "^0.182.0"
   },
   "peerDependencies": {
     "@streamparser/json": "^0.0.22",
-    "@types/three": "^0.180.0",
-    "three": "^0.180.0"
+    "@types/three": "^0.182.0",
+    "three": "^0.182.0"
   }
 }

package/src/Viewer/loaders/DynamicGltfLoader/DynamicGltfLoader.js

@@ -1004,19 +1004,19 @@ export class DynamicGltfLoader {
       const transformedBox = node.geometryExtents.clone();
       const structureRoot = node.structure ? this.structureRoots.get(node.structure.id) : null;
 
+      // Calculate relative transformation from node.group to structureRoot
+      // This matches the logic used in merge methods
       if (node.group) {
-        const matrices = [];
-        let currentGroup = node.group;
+        const relativeMatrix = new Matrix4();
+        let currentObject = node.group;
 
-        while (currentGroup && currentGroup !== structureRoot) {
-          if (currentGroup.matrix && currentGroup.matrixAutoUpdate === false) {
-            matrices.unshift(currentGroup.matrix);
-          }
-          currentGroup = currentGroup.parent;
+        while (currentObject && currentObject !== structureRoot) {
+          relativeMatrix.premultiply(currentObject.matrix);
+          currentObject = currentObject.parent;
         }
 
-        for (const matrix of matrices) {
-          transformedBox.applyMatrix4(matrix);
+        if (!relativeMatrix.equals(new Matrix4())) {
+          transformedBox.applyMatrix4(relativeMatrix);
         }
       }
 
@@ -1548,6 +1548,18 @@ export class DynamicGltfLoader {
         for (const mesh of group.objects) {
           const geometry = mesh.geometry.clone();
 
+          const relativeMatrix = new Matrix4();
+          let currentObject = mesh;
+
+          while (currentObject && currentObject !== rootGroup) {
+            relativeMatrix.premultiply(currentObject.matrix);
+            currentObject = currentObject.parent;
+          }
+
+          if (!relativeMatrix.equals(new Matrix4())) {
+            geometry.applyMatrix4(relativeMatrix);
+          }
+
           const handle = mesh.userData.handle;
           if (!this.objectIdToIndex.has(handle)) {
             this.objectIdToIndex.set(handle, this.maxObjectId++);
@@ -1673,7 +1685,20 @@ export class DynamicGltfLoader {
       let isEdge = false;
       group.objects.forEach((line) => {
         isEdge = line.userData.isEdge;
-        const geometry = line.geometry;
+        const geometry = line.geometry.clone();
+
+        const relativeMatrix = new Matrix4();
+        let currentObject = line;
+
+        while (currentObject && currentObject !== rootGroup) {
+          relativeMatrix.premultiply(currentObject.matrix);
+          currentObject = currentObject.parent;
+        }
+
+        if (!relativeMatrix.equals(new Matrix4())) {
+          geometry.applyMatrix4(relativeMatrix);
+        }
+
         const positionAttr = geometry.attributes.position;
         const vertexCount = positionAttr.count;
 
@@ -1701,6 +1726,7 @@ export class DynamicGltfLoader {
         }
 
         vertexOffset += vertexCount;
+        geometry.dispose();
       });
 
       const geometry = new BufferGeometry();
@@ -1787,6 +1813,20 @@ export class DynamicGltfLoader {
           isEdge = line.userData.isEdge;
           const geometry = line.geometry.clone();
 
+          // Calculate transformation matrix relative to rootGroup
+          const relativeMatrix = new Matrix4();
+          let currentObject = line;
+
+          while (currentObject && currentObject !== rootGroup) {
+            relativeMatrix.premultiply(currentObject.matrix);
+            currentObject = currentObject.parent;
+          }
+
+          // Apply the relative transformation
+          if (!relativeMatrix.equals(new Matrix4())) {
+            geometry.applyMatrix4(relativeMatrix);
+          }
+
           const handle = line.userData.handle;
           if (!this.objectIdToIndex.has(handle)) {
             this.objectIdToIndex.set(handle, this.maxObjectId++);
@@ -1892,6 +1932,19 @@ export class DynamicGltfLoader {
 
         for (const points of group.objects) {
           const geometry = points.geometry.clone();
+
+          const relativeMatrix = new Matrix4();
+          let currentObject = points;
+
+          while (currentObject && currentObject !== rootGroup) {
+            relativeMatrix.premultiply(currentObject.matrix);
+            currentObject = currentObject.parent;
+          }
+
+          if (!relativeMatrix.equals(new Matrix4())) {
+            geometry.applyMatrix4(relativeMatrix);
+          }
+
           geometries.push(geometry);
           optimizedObjects.push(points);
           handles.add(points.userData.handle);