@inweb/viewer-three 27.1.3 → 27.1.5

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/lib/Viewer/components/CanvasRemoveComponent.d.ts

@@ -0,0 +1,9 @@
+import { IComponent } from "@inweb/viewer-core";
+import type { Viewer } from "../Viewer";
+export declare class CanvasRemoveComponent implements IComponent {
+    protected viewer: Viewer;
+    protected mutationObserver: MutationObserver;
+    constructor(viewer: Viewer);
+    dispose(): void;
+    cleanupViewer: (mutations: MutationRecord[]) => void;
+}

package/lib/Viewer/components/{ResizeCanvasComponent.d.ts → CanvasResizeComponent.d.ts}

@@ -1,6 +1,6 @@
 import { IComponent } from "@inweb/viewer-core";
 import type { Viewer } from "../Viewer";
-export declare class ResizeCanvasComponent implements IComponent {
+export declare class CanvasResizeComponent implements IComponent {
     protected viewer: Viewer;
     protected resizeObserver: ResizeObserver;
     constructor(viewer: Viewer);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-three",
-  "version": "27.1.3",
+  "version": "27.1.5",
   "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,10 +35,10 @@
     "docs": "typedoc"
   },
   "dependencies": {
-    "@inweb/client": "~27.1.3",
-    "@inweb/eventemitter2": "~27.1.3",
-    "@inweb/markup": "~27.1.3",
-    "@inweb/viewer-core": "~27.1.3"
+    "@inweb/client": "~27.1.5",
+    "@inweb/eventemitter2": "~27.1.5",
+    "@inweb/markup": "~27.1.5",
+    "@inweb/viewer-core": "~27.1.5"
   },
   "devDependencies": {
     "@streamparser/json": "^0.0.22",

package/src/Viewer/Viewer.ts

@@ -681,7 +681,7 @@ export class Viewer
         camera.bottom = -orthogonal_camera.field_height / 2;
         camera.left = camera.bottom * aspectRatio;
         camera.right = camera.top * aspectRatio;
-        camera.near = 0;
+        camera.near = -extentsSize * 1000;
         camera.far = extentsSize * 1000;
         camera.zoom = orthogonal_camera.view_to_world_scale;
         camera.updateProjectionMatrix();
@@ -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/components/CameraComponent.ts

@@ -59,7 +59,7 @@ export class CameraComponent implements IComponent {
     if (camera.isOrthographicCamera) {
       camera.left = camera.bottom * aspectRatio;
       camera.right = camera.top * aspectRatio;
-      camera.near = 0;
+      camera.near = -extentsSize * 1000;
       camera.far = extentsSize * 1000;
     }
 

package/src/Viewer/components/CanvasRemoveComponent.ts

@@ -0,0 +1,55 @@
+///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2002-2025, Open Design Alliance (the "Alliance").
+// All rights reserved.
+//
+// This software and its documentation and related materials are owned by
+// the Alliance. The software may only be incorporated into application
+// programs owned by members of the Alliance, subject to a signed
+// Membership Agreement and Supplemental Software License Agreement with the
+// Alliance. The structure and organization of this software are the valuable
+// trade secrets of the Alliance and its suppliers. The software is also
+// protected by copyright law and international treaty provisions. Application
+// programs incorporating this software must include the following statement
+// with their copyright notices:
+//
+//   This application incorporates Open Design Alliance software pursuant to a
+//   license agreement with Open Design Alliance.
+//   Open Design Alliance Copyright (C) 2002-2025 by Open Design Alliance.
+//   All rights reserved.
+//
+// By use of this software, its documentation or related materials, you
+// acknowledge and accept the above terms.
+///////////////////////////////////////////////////////////////////////////////
+
+import { IComponent } from "@inweb/viewer-core";
+import type { Viewer } from "../Viewer";
+
+export class CanvasRemoveComponent implements IComponent {
+  protected viewer: Viewer;
+  protected mutationObserver: MutationObserver;
+
+  constructor(viewer: Viewer) {
+    this.viewer = viewer;
+    this.mutationObserver = new MutationObserver(this.cleanupViewer);
+    this.mutationObserver.observe(document, { childList: true, subtree: true });
+  }
+
+  dispose() {
+    this.mutationObserver.disconnect();
+    this.mutationObserver = undefined;
+  }
+
+  cleanupViewer = (mutations: MutationRecord[]) => {
+    for (const mutation of mutations) {
+      if (mutation.type === "childList" && mutation.removedNodes.length > 0) {
+        for (const node of mutation.removedNodes) {
+          if (node === this.viewer.canvas || node.contains(this.viewer.canvas)) {
+            this.viewer.emitEvent({ type: "canvasremoved" });
+            this.viewer.dispose();
+            return;
+          }
+        }
+      }
+    }
+  };
+}

package/src/Viewer/components/{ResizeCanvasComponent.ts → CanvasResizeComponent.ts}

@@ -24,7 +24,7 @@
 import { IComponent } from "@inweb/viewer-core";
 import type { Viewer } from "../Viewer";
 
-export class ResizeCanvasComponent implements IComponent {
+export class CanvasResizeComponent implements IComponent {
   protected viewer: Viewer;
   protected resizeObserver: ResizeObserver;
 

package/src/Viewer/components/index.ts

@@ -28,8 +28,9 @@ import { CameraComponent } from "./CameraComponent";
 import { ExtentsComponent } from "./ExtentsComponent";
 import { LightComponent } from "./LightComponent";
 import { InfoComponent } from "./InfoComponent";
+import { CanvasResizeComponent } from "./CanvasResizeComponent";
+import { CanvasRemoveComponent } from "./CanvasRemoveComponent";
 import { RenderLoopComponent } from "./RenderLoopComponent";
-import { ResizeCanvasComponent } from "./ResizeCanvasComponent";
 import { HighlighterComponent } from "./HighlighterComponent";
 import { SelectionComponent } from "./SelectionComponent";
 import { WCSHelperComponent } from "./WCSHelperComponent";
@@ -82,7 +83,8 @@ components.registerComponent("CameraComponent", (viewer) => new CameraComponent(
 components.registerComponent("BackgroundComponent", (viewer) => new BackgroundComponent(viewer));
 components.registerComponent("LightComponent", (viewer) => new LightComponent(viewer));
 components.registerComponent("InfoComponent", (viewer) => new InfoComponent(viewer));
-components.registerComponent("ResizeCanvasComponent", (viewer) => new ResizeCanvasComponent(viewer));
+components.registerComponent("CanvasResizeComponent", (viewer) => new CanvasResizeComponent(viewer));
+components.registerComponent("CanvasRemoveComponent", (viewer) => new CanvasRemoveComponent(viewer));
 components.registerComponent("RenderLoopComponent", (viewer) => new RenderLoopComponent(viewer));
 components.registerComponent("HighlighterComponent", (viewer) => new HighlighterComponent(viewer));
 components.registerComponent("SelectionComponent", (viewer) => new SelectionComponent(viewer));

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;