@inweb/viewer-three 26.10.4 → 26.10.6

package/lib/Viewer/draggers/OrbitDragger.d.ts

@@ -10,6 +10,9 @@ export declare class OrbitDragger implements IDragger {
     dispose(): void;
     updateControls: () => void;
     updateControlsCamera: () => void;
+    optionsChange: ({ data: options }: {
+        data: any;
+    }) => void;
     controlsStart: () => void;
     controlsChange: () => void;
     stopContextMenu: (event: PointerEvent) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-three",
-  "version": "26.10.4",
+  "version": "26.10.6",
   "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,18 +35,18 @@
     "docs": "typedoc"
   },
   "dependencies": {
-    "@inweb/client": "~26.10.4",
-    "@inweb/eventemitter2": "~26.10.4",
-    "@inweb/markup": "~26.10.4",
-    "@inweb/viewer-core": "~26.10.4"
+    "@inweb/client": "~26.10.6",
+    "@inweb/eventemitter2": "~26.10.6",
+    "@inweb/markup": "~26.10.6",
+    "@inweb/viewer-core": "~26.10.6"
   },
   "devDependencies": {
-    "@types/three": "^0.179.0",
+    "@types/three": "^0.180.0",
     "potree-core": "^2.0.11",
-    "three": "^0.179.1"
+    "three": "^0.180.0"
   },
   "peerDependencies": {
-    "@types/three": "^0.179.0",
-    "three": "^0.179.1"
+    "@types/three": "^0.180.0",
+    "three": "^0.180.0"
   }
 }

package/plugins/loaders/IFCX/render.js

@@ -30,7 +30,7 @@
 // published under MIT license
 
 /* eslint-disable lines-between-class-members */
-/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable no-unused-vars */
 /* eslint-disable prefer-const */
 /* eslint-disable no-useless-catch */
 

package/src/Viewer/components/HighlighterComponent.ts

@@ -35,7 +35,7 @@ import { LineSegmentsGeometry } from "three/examples/jsm/lines/LineSegmentsGeome
 import { Wireframe } from "three/examples/jsm/lines/Wireframe.js";
 import { LineMaterial } from "three/examples/jsm/lines/LineMaterial.js";
 
-import { IComponent, ResizeEvent } from "@inweb/viewer-core";
+import { IComponent, Options, ResizeEvent } from "@inweb/viewer-core";
 import { Viewer } from "../Viewer";
 import { HighlighterUtils } from "./HighlighterUtils";
 
@@ -178,8 +178,10 @@ export class HighlighterComponent implements IComponent {
   };
 
   syncHighlightColors() {
-    const { facesColor, facesTransparancy, facesOverlap } = this.viewer.options;
-    const { edgesColor, edgesVisibility, edgesOverlap } = this.viewer.options;
+    const options = this.viewer.options.enableCustomHighlight ? this.viewer.options : Options.defaults();
+
+    const { facesColor, facesTransparancy, facesOverlap } = options;
+    const { edgesColor, edgesVisibility, edgesOverlap } = options;
 
     this.facesMaterial.color.setRGB(facesColor.r / 255, facesColor.g / 255, facesColor.b / 255);
     this.facesMaterial.opacity = (255 - facesTransparancy) / 255;

package/src/Viewer/controls/OrbitControls.js

@@ -285,7 +285,6 @@ class OrbitControls extends EventDispatcher {
     // internals
     //
 
-    // eslint-disable-next-line @typescript-eslint/no-this-alias
     const scope = this;
 
     scope.state = STATE.NONE;

package/src/Viewer/draggers/MeasureLineDragger.ts

@@ -367,7 +367,7 @@ class MeasureOverlay {
     if (!this.canvas.parentElement) return;
 
     this.canvas.parentElement.appendChild(this.container);
-    this.resizeObserver.observe(this.canvas.parentElement);
+    this.resizeObserver.observe(this.canvas);
   }
 
   dispose() {
@@ -403,13 +403,16 @@ class MeasureOverlay {
     this.lines = this.lines.filter((x) => x !== line);
   }
 
-  resizeContainer = (entries: ResizeObserverEntry[]) => {
-    const { width, height } = entries[0].contentRect;
+  resizeContainer = () => {
+    const { offsetLeft, offsetTop, offsetWidth, offsetHeight } = this.canvas;
 
-    if (!width || !height) return; // <- invisible canvas, or canvas with parent removed
+    if (!offsetWidth || !offsetHeight) return; // <- invisible canvas, or canvas with parent removed
 
-    this.container.style.width = `${width}px`;
-    this.container.style.height = `${height}px`;
+    this.container.style.left = `${offsetLeft}px`;
+    this.container.style.top = `${offsetTop}px`;
+
+    this.container.style.width = `${offsetWidth}px`;
+    this.container.style.height = `${offsetHeight}px`;
   };
 }
 

package/src/Viewer/draggers/OrbitDragger.ts

@@ -47,6 +47,7 @@ export class OrbitDragger implements IDragger {
     this.viewer.addEventListener("zoom", this.updateControls);
     this.viewer.addEventListener("drawviewpoint", this.updateControls);
     this.viewer.addEventListener("changecameramode", this.updateControlsCamera);
+    this.viewer.addEventListener("optionschange", this.optionsChange);
     this.viewer.addEventListener("contextmenu", this.stopContextMenu);
     this.updateControls();
   }
@@ -59,6 +60,7 @@ export class OrbitDragger implements IDragger {
     this.viewer.removeEventListener("zoom", this.updateControls);
     this.viewer.removeEventListener("drawviewpoint", this.updateControls);
     this.viewer.removeEventListener("changecameramode", this.updateControlsCamera);
+    this.viewer.removeEventListener("optionschange", this.optionsChange);
     this.viewer.removeEventListener("contextmenu", this.stopContextMenu);
 
     this.orbit.removeEventListener("start", this.controlsStart);
@@ -78,6 +80,10 @@ export class OrbitDragger implements IDragger {
     this.orbit.update();
   };
 
+  optionsChange = ({ data: options }) => {
+    this.orbit.zoomSpeed = Math.abs(this.orbit.zoomSpeed) * (options.reverseZoomWheel ? -1 : 1);
+  };
+
   controlsStart = () => {
     this.changed = false;
   };