@inweb/viewer-three 27.1.2 → 27.1.4

package/lib/Viewer/Viewer.d.ts

@@ -178,6 +178,7 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
     getComponent(name: string): IComponent;
     drawViewpoint(viewpoint: IViewpoint): void;
     createViewpoint(): IViewpoint;
+    getSnapshot(type?: string, quality?: number): string;
     screenToWorld(position: {
         x: number;
         y: number;

package/lib/Viewer/commands/GetSnapshot.d.ts

@@ -0,0 +1,2 @@
+import type { Viewer } from "../Viewer";
+export declare function getSnapshot(viewer: Viewer, type?: string, quality?: number): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-three",
-  "version": "27.1.2",
+  "version": "27.1.4",
   "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.4",
+    "@inweb/eventemitter2": "~27.1.4",
+    "@inweb/markup": "~27.1.4",
+    "@inweb/viewer-core": "~27.1.4"
   },
   "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/Viewer.ts

@@ -761,6 +761,7 @@ export class Viewer
     setPerspectiveCamera(viewpoint.perspective_camera);
     setClippingPlanes(viewpoint.clipping_planes);
     setSelection(viewpoint.custom_fields?.selection2 || viewpoint.selection);
+
     this._markup.setViewpoint(viewpoint);
 
     this.target.copy(getVector3FromPoint3d(viewpoint.custom_fields?.camera_target ?? this.target));
@@ -828,6 +829,8 @@ export class Viewer
     viewpoint.clipping_planes = getClippingPlanes();
     viewpoint.selection = getSelection();
     viewpoint.description = new Date().toDateString();
+    viewpoint.snapshot = { data: this.getSnapshot() };
+
     this._markup.getViewpoint(viewpoint);
 
     viewpoint.custom_fields.camera_target = getPoint3dFromVector3(this.target);
@@ -838,6 +841,10 @@ export class Viewer
     return viewpoint;
   }
 
+  getSnapshot(type?: string, quality?: number): string {
+    return this.executeCommand("getSnapshot", type, quality);
+  }
+
   // IWorldTransform
 
   screenToWorld(position: { x: number; y: number }): { x: number; y: number; z: number } {

package/src/Viewer/commands/{CreatePreview.ts → GetSnapshot.ts}

@@ -23,7 +23,15 @@
 
 import type { Viewer } from "../Viewer";
 
-export function createPreview(viewer: Viewer, type = "image/jpeg", quality = 0.25): string {
+export function getSnapshot(viewer: Viewer, type?: string, quality?: number): string {
   viewer.update(true);
-  return viewer.canvas.toDataURL(type, quality);
+
+  const mimeType = type ?? viewer.options.snapshotMimeType ?? "image/jpeg";
+  const imageQuality = quality ?? viewer.options.snapshotQuality ?? 0.25;
+
+  if (viewer.markup) {
+    return viewer.markup.getSnapshot(mimeType, imageQuality);
+  }
+
+  return viewer.canvas.toDataURL(mimeType, imageQuality);
 }

package/src/Viewer/commands/index.ts

@@ -27,7 +27,7 @@ import { applyModelTransform } from "./ApplyModelTransform";
 import { clearMarkup } from "./ClearMarkup";
 import { clearSelected } from "./ClearSelected";
 import { clearSlices } from "./ClearSlices";
-import { createPreview } from "./CreatePreview";
+import { getSnapshot } from "./GetSnapshot";
 import { explode, collect } from "./Explode";
 import { getDefaultViewPositions } from "./GetDefaultViewPositions";
 import { getModels } from "./GetModels";
@@ -83,7 +83,7 @@ commands.registerCommand("clearMarkup", clearMarkup);
 commands.registerCommand("clearSelected", clearSelected);
 commands.registerCommand("clearSlices", clearSlices);
 commands.registerCommand("collect", collect);
-commands.registerCommand("createPreview", createPreview);
+commands.registerCommand("getSnapshot", getSnapshot);
 commands.registerCommand("explode", explode);
 commands.registerCommand("getDefaultViewPositions", getDefaultViewPositions);
 commands.registerCommand("getModels", getModels);
@@ -117,6 +117,7 @@ commands.registerCommand("nw", (viewer) => setDefaultViewPosition(viewer, "nw"))
 
 commands.registerCommandAlias("clearMarkup", "clearOverlay");
 commands.registerCommandAlias("clearSelected", "unselect");
+commands.registerCommandAlias("getSnapshot", "createPreview");
 commands.registerCommandAlias("zoomToExtents", "zoomExtents");
 
 commands.registerCommandAlias("top", "k3DViewTop");

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);

package/lib/Viewer/commands/CreatePreview.d.ts

@@ -1,2 +0,0 @@
-import type { Viewer } from "../Viewer";
-export declare function createPreview(viewer: Viewer, type?: string, quality?: number): string;