@inweb/viewer-three 27.1.2 → 27.1.3

package/dist/viewer-three.module.js

@@ -5078,16 +5078,14 @@ class DynamicGltfLoader {
       const transformedBox = node.geometryExtents.clone();
       const structureRoot = node.structure ? this.structureRoots.get(node.structure.id) : null;
       if (node.group) {
-        const matrices = [];
-        let currentGroup = node.group;
-        while (currentGroup && currentGroup !== structureRoot) {
-          if (currentGroup.matrix && currentGroup.matrixAutoUpdate === false) {
-            matrices.unshift(currentGroup.matrix);
-          }
-          currentGroup = currentGroup.parent;
+        const relativeMatrix = new Matrix4();
+        let currentObject = node.group;
+        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);
         }
       }
       if (structureRoot && structureRoot.matrix) {
@@ -5540,6 +5538,15 @@ class DynamicGltfLoader {
         let currentVertexOffset = 0;
         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++);
@@ -5634,7 +5641,16 @@ 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;
         const handle = line.userData.handle;
@@ -5657,6 +5673,7 @@ class DynamicGltfLoader {
           indices.push(vertexOffset + i, vertexOffset + i + 1);
         }
         vertexOffset += vertexCount;
+        geometry.dispose();
       });
       const geometry = new BufferGeometry();
       geometry.setAttribute("position", new BufferAttribute(positions, 3));
@@ -5728,6 +5745,15 @@ class DynamicGltfLoader {
         for (const line of group.objects) {
           isEdge = line.userData.isEdge;
           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 handle = line.userData.handle;
           if (!this.objectIdToIndex.has(handle)) {
             this.objectIdToIndex.set(handle, this.maxObjectId++);
@@ -5813,6 +5839,15 @@ class DynamicGltfLoader {
         const handles = new Set();
         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);