@inweb/viewer-visualize 25.8.7 → 25.8.9

package/lib/Viewer/Commands/ApplyModelTransform.d.ts

@@ -1 +1 @@
-export declare const composeMatrixFromTransform: (translate: any, rotate: any, scale: any, modelCenter: any, matrix: any) => any;
+export declare const composeMatrixFromTransform: (transform: any, modelCenter: any, visLib: any) => any;

package/lib/Viewer/Commands/AutoTransformAllModelsToCentralPoint.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/Viewer/Commands/index.d.ts

@@ -20,3 +20,4 @@ import "./Unselect";
 import "./ZoomToExtents";
 import "./ZoomToObjects";
 import "./ZoomToSelected";
+import "./AutoTransformAllModelsToCentralPoint";

package/lib/Viewer/Draggers/MeasureLineDragger/index.d.ts

@@ -16,6 +16,7 @@ export declare class MeasureLineDragger extends OdBaseDragger {
     updatePreview(): void;
     resize(): void;
     getSnapPointRadius(): number;
+    start(x: number, y: number): void;
     drag(x: number, y: number): void;
     end(): void;
     createNewMeasureIfNeed(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-visualize",
-  "version": "25.8.7",
+  "version": "25.8.9",
   "description": "3D CAD and BIM data Viewer powered by Visualize",
   "homepage": "https://cloud.opendesign.com/docs/index.html",
   "license": "SEE LICENSE IN LICENSE",
@@ -29,10 +29,10 @@
     "docs": "typedoc"
   },
   "dependencies": {
-    "@inweb/client": "~25.8.7",
-    "@inweb/eventemitter2": "~25.8.7",
-    "@inweb/markup": "~25.8.7",
-    "@inweb/viewer-core": "~25.8.7"
+    "@inweb/client": "~25.8.9",
+    "@inweb/eventemitter2": "~25.8.9",
+    "@inweb/markup": "~25.8.9",
+    "@inweb/viewer-core": "~25.8.9"
   },
   "visualizeJS": "https://opencloud.azureedge.net/libs/visualizejs/master/Visualize.js"
 }

package/src/Viewer/Commands/ApplyModelTransform.ts

@@ -25,11 +25,19 @@ import { Model, File, Assembly } from "@inweb/client";
 import { commands } from "@inweb/viewer-core";
 import { Viewer } from "../Viewer";
 
-export const composeMatrixFromTransform = (translate, rotate, scale, modelCenter, matrix) => {
-  const translateMatrix = matrix.setTranslation([translate.x, translate.y, translate.z]);
-  const rotateMatrix = matrix.setToRotation(rotate.angle, [rotate.x, rotate.y, rotate.z], modelCenter);
-  const scaleMatrix = matrix.setToScaling(scale, modelCenter);
-  return translateMatrix.postMultBy(rotateMatrix).postMultBy(scaleMatrix);
+export const composeMatrixFromTransform = (transform, modelCenter, visLib) => {
+  const { translate, scale, rotation } = transform;
+
+  const translateMatrix = new visLib.Matrix3d();
+  translateMatrix.setTranslation([translate.x, translate.y, translate.z]);
+
+  const rotateMatrix = new visLib.Matrix3d();
+  rotateMatrix.setToRotation(rotation.angle, [rotation.x, rotation.y, rotation.z], modelCenter);
+
+  const scaleMatrix = new visLib.Matrix3d();
+  scaleMatrix.setToScaling(scale, modelCenter);
+
+  return rotateMatrix.postMultBy(translateMatrix).postMultBy(scaleMatrix);
 };
 
 function applyModelTransform(viewer: Viewer, model: Model | File | Assembly) {
@@ -46,13 +54,9 @@ function applyModelTransform(viewer: Viewer, model: Model | File | Assembly) {
     const transform = model.getModelTransformMatrix(modelPtr.getDatabaseHandle());
     if (transform) {
       const extents = modelPtr.getExtents();
-      const matrix = composeMatrixFromTransform(
-        transform.translate,
-        transform.rotation,
-        transform.scale,
-        extents.center(),
-        new visLib.Matrix3d()
-      );
+      extents.transformBy(modelPtr.getUnitsMatrix());
+
+      const matrix = composeMatrixFromTransform(transform, extents.center(), visLib);
 
       modelPtr.setModelingMatrix(matrix, true);
     }

package/src/Viewer/Commands/AutoTransformAllModelsToCentralPoint.ts

@@ -0,0 +1,102 @@
+///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2002-2024, 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-2024 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 { Model, File, Assembly, version } from "@inweb/client";
+import { commands } from "@inweb/viewer-core";
+import { Viewer } from "../Viewer";
+
+import { composeMatrixFromTransform } from "./ApplyModelTransform";
+
+function isTemplateModel(modelPtr) {
+  return modelPtr.getName()[0] === "$";
+}
+
+async function autoTransformAllModelsToCentralPoint(viewer: Viewer, model: Model | File | Assembly): Promise<void> {
+  if (!viewer.visualizeJs) return;
+  if (!model.getModelTransformMatrix) return; // Model.getModelTransformMatrix() since 24.3.14
+
+  const visLib = viewer.visLib();
+  const visViewer = visLib.getViewer();
+
+  const viewExt = visViewer.getActiveExtents();
+  const centralPoint = viewExt.center();
+
+  const modelItr = visViewer.getModelIterator();
+  for (; !modelItr.done(); modelItr.step()) {
+    const modelPtr = modelItr.getModel();
+
+    if (!isTemplateModel(modelPtr)) {
+      let ext = modelPtr.getExtents();
+
+      const unitsMatrix = modelPtr.getUnitsMatrix();
+      ext.transformBy(modelPtr.getUnitsMatrix()); // ext in wcs
+
+      const unitsMatrixInvert = modelPtr.getUnitsMatrix().invert();
+
+      const center = ext.center();
+      const scale = 1.0;
+
+      const scaleMatrix = new visLib.Matrix3d();
+      const translateMatrix = new visLib.Matrix3d();
+
+      translateMatrix.setTranslation([
+        centralPoint[0] - center[0],
+        centralPoint[1] - center[1],
+        centralPoint[2] - center[2],
+      ]);
+      scaleMatrix.setToScaling(scale, centralPoint);
+
+      const resMatrixWithUnits = unitsMatrixInvert
+        .postMultBy(scaleMatrix)
+        .postMultBy(translateMatrix)
+        .postMultBy(unitsMatrix);
+
+      const resScale = resMatrixWithUnits.scale();
+      const transform = {
+        translate: {
+          x: resMatrixWithUnits.get(0, 3) - (1 - resScale) * center[0],
+          y: resMatrixWithUnits.get(1, 3) - (1 - resScale) * center[1],
+          z: resMatrixWithUnits.get(2, 3) - (1 - resScale) * center[2],
+        },
+        rotation: { x: 0, y: 0, z: 1, angle: 0.0 },
+        scale: resScale,
+      };
+
+      const matrix = composeMatrixFromTransform(transform, center, visLib);
+      modelPtr.setModelingMatrix(matrix, true);
+
+      centralPoint[0] += Math.abs(ext.max()[0] - ext.min()[0]) * resScale;
+
+      await model.setModelTransformMatrix(modelPtr.getDatabaseHandle(), transform);
+    }
+
+    modelPtr.delete();
+  }
+  modelItr.delete();
+
+  visViewer.clearViewExtentsCache?.();
+
+  viewer.update();
+}
+
+commands("VisualizeJS").registerCommand("autoTransformAllModelsToCentralPoint", autoTransformAllModelsToCentralPoint);

package/src/Viewer/Commands/index.ts

@@ -43,3 +43,4 @@ import "./Unselect";
 import "./ZoomToExtents";
 import "./ZoomToObjects";
 import "./ZoomToSelected";
+import "./AutoTransformAllModelsToCentralPoint";

package/src/Viewer/Draggers/MeasureLineDragger/index.ts

@@ -109,6 +109,16 @@ export class MeasureLineDragger extends OdBaseDragger {
     return Math.min(pt2[0], pt2[1]) / 120;
   }
 
+  override start(x: number, y: number): void {
+    this.createNewMeasureIfNeed();
+    const point = this.getViewer().getSnapPoint(x, y, this.gripingRadius);
+
+    if (point) {
+      this.firstPoint = point;
+      this.previewMeasureLine.setStartPoint(this.firstPoint);
+    }
+  }
+
   override drag(x: number, y: number): void {
     this.createNewMeasureIfNeed();
     const point = this.getViewer().getSnapPoint(x, y, this.gripingRadius);

package/src/Viewer/Viewer.ts

@@ -741,11 +741,19 @@ export class Viewer
   }
 
   screenToWorld(position: { x: number; y: number }): { x: number; y: number; z: number } {
-    return this.visViewer().screenToWorld(position.x * window.devicePixelRatio, position.y * window.devicePixelRatio);
+    if (!this.visualizeJs) return { x: position.x, y: position.y, z: 0 };
+
+    const worldPoint = this.visViewer().screenToWorld(
+      position.x * window.devicePixelRatio,
+      position.y * window.devicePixelRatio
+    );
+    const result = { x: worldPoint[0], y: worldPoint[1], z: worldPoint[2] };
+
+    return result;
   }
 
   worldToScreen(position: { x: number; y: number; z: number }): { x: number; y: number } {
-    if (!this.visualizeJs) return position;
+    if (!this.visualizeJs) return { x: position.x, y: position.y };
 
     const activeView = this.visViewer().activeView;
     const worldMatrix = activeView.worldToDeviceMatrix;
@@ -768,14 +776,14 @@ export class Viewer
     const projMatrix = this.visViewer().activeView.projectionMatrix;
     const tolerance = 1.0e-6;
 
-    const x = projMatrix.get(1, 1);
-    if (x > tolerance || x < -tolerance) result.x = 1 / result.x;
+    const x = projMatrix.get(0, 0);
+    if (x > tolerance || x < -tolerance) result.x = 1 / x;
 
     const y = projMatrix.get(1, 1);
-    if (y > tolerance || y < -tolerance) result.y = 1 / result.y;
+    if (y > tolerance || y < -tolerance) result.y = 1 / y;
 
     const z = projMatrix.get(2, 2);
-    if (z > tolerance || z < -tolerance) result.z = 1 / result.z;
+    if (z > tolerance || z < -tolerance) result.z = 1 / z;
 
     return result;
   }