@inweb/viewer-three 26.12.7 → 27.1.1

package/dist/viewer-three.module.js

@@ -1910,11 +1910,13 @@ class WalkDragger {
         };
         this.viewerRender = () => {
             this.joyStickControls.update();
-            this.controls.update();
         };
         this.viewerZoom = () => {
             this.controls.rotateDelta.set(0, 0);
         };
+        this.animate = () => {
+            this.controls.update();
+        };
         const meshOnlyGround = [];
         viewer.models.forEach((model) => model.getVisibleObjects().forEach((obj) => {
             if (obj instanceof Mesh) {
@@ -1927,12 +1929,14 @@ class WalkDragger {
         this.joyStickControls = new JoyStickControls(viewer.camera, viewer.canvas, viewer.canvas, meshOnlyGround);
         this.joyStickControls.addEventListener("change", this.controlsChange);
         this.viewer = viewer;
+        this.viewer.addEventListener("animate", this.animate);
         this.viewer.addEventListener("render", this.viewerRender);
         this.viewer.addEventListener("zoom", this.viewerZoom);
         this.viewer.addEventListener("changecameramode", this.updateControlsCamera);
         this.updateControls();
     }
     dispose() {
+        this.viewer.removeEventListener("animate", this.animate);
         this.viewer.removeEventListener("render", this.viewerRender);
         this.viewer.removeEventListener("zoom", this.viewerZoom);
         this.viewer.removeEventListener("changecameramode", this.updateControlsCamera);
@@ -2112,23 +2116,27 @@ class FlyDragger {
         };
         this.viewerRender = () => {
             this.joyStickControls.update();
-            this.controls.update();
         };
         this.viewerZoom = () => {
             this.controls.rotateDelta.set(0, 0);
         };
+        this.animate = () => {
+            this.controls.update();
+        };
         this.controls = new FlyControls(viewer.camera, viewer.canvas);
         this.controls.addEventListener("change", this.controlsChange);
         this.controls.addEventListener("flyspeedchange", this.flyspeedChange);
         this.joyStickControls = new JoyStickControls(viewer.camera, viewer.canvas, viewer.canvas, []);
         this.joyStickControls.addEventListener("change", this.controlsChange);
         this.viewer = viewer;
+        this.viewer.addEventListener("animate", this.animate);
         this.viewer.addEventListener("render", this.viewerRender);
         this.viewer.addEventListener("zoom", this.viewerZoom);
         this.viewer.addEventListener("changecameramode", this.updateControlsCamera);
         this.updateControls();
     }
     dispose() {
+        this.viewer.removeEventListener("animate", this.animate);
         this.viewer.removeEventListener("render", this.viewerRender);
         this.viewer.removeEventListener("zoom", this.viewerZoom);
         this.viewer.removeEventListener("changecameramode", this.updateControlsCamera);
@@ -2178,9 +2186,9 @@ function clearSlices(viewer) {
     viewer.clearSlices();
 }
 
-function createPreview(viewer, type = "image/jpeg", encoderOptions = 0.25) {
+function createPreview(viewer, type = "image/jpeg", quality = 0.25) {
     viewer.update(true);
-    return viewer.canvas.toDataURL(type, encoderOptions);
+    return viewer.canvas.toDataURL(type, quality);
 }
 
 function explode(viewer, index = 0) {
@@ -2727,9 +2735,9 @@ class InfoComponent {
             console.log("File load time:", this.viewer.info.performance.loadTime, "ms");
         };
         this.resize = () => {
-            const rendererSize = this.viewer.renderer.getSize(new Vector2());
-            this.viewer.info.render.viewport.width = rendererSize.x;
-            this.viewer.info.render.viewport.height = rendererSize.y;
+            const { width, height } = this.viewer.canvas;
+            this.viewer.info.render.viewport.width = width;
+            this.viewer.info.render.viewport.height = height;
         };
         this.render = () => {
             this.viewer.info.render.drawCalls = this.viewer.renderer.info.render.calls;
@@ -2778,13 +2786,13 @@ class InfoComponent {
 
 class RenderLoopComponent {
     constructor(viewer) {
-        this.animate = (time = 0) => {
+        this.animate = (time) => {
             this.requestId = requestAnimationFrame(this.animate);
             this.viewer.render(time);
             this.viewer.emitEvent({ type: "animate", time });
         };
         this.viewer = viewer;
-        this.animate();
+        this.requestId = requestAnimationFrame(this.animate);
     }
     dispose() {
         cancelAnimationFrame(this.requestId);
@@ -4285,8 +4293,6 @@ class DynamicGltfLoader {
     this.frameDelay = 0;
     this.graphicsObjectLimit = 10000;
     this.totalLoadedObjects = 0;
-    this.lastUpdateTime = 0;
-    this.updateInterval = 1000;
     this.handleToObjects = new Map();
     this.originalObjects = new Set();
     this.originalObjectsToSelection = new Set();
@@ -4962,11 +4968,7 @@ class DynamicGltfLoader {
           loaded: loadedCount,
           total: totalNodes,
         });
-        const currentTime = Date.now();
-        if (currentTime - this.lastUpdateTime >= this.updateInterval) {
-          this.dispatchEvent("update");
-          this.lastUpdateTime = currentTime;
-        }
+        this.dispatchEvent("update");
         await new Promise((resolve) => {
           setTimeout(resolve, 0);
         });
@@ -5306,7 +5308,6 @@ class DynamicGltfLoader {
     this.objectTransforms.clear();
     this.transformedGeometries.clear();
     this.totalLoadedObjects = 0;
-    this.lastUpdateTime = 0;
     this.currentMemoryUsage = 0;
     this.loadedGeometrySize = 0;
     this.abortController = new AbortController();
@@ -5417,9 +5418,7 @@ class DynamicGltfLoader {
   }
   yieldToUI() {
     return new Promise((resolve) => {
-      requestAnimationFrame(() => {
-        setTimeout(resolve, 0);
-      });
+      setTimeout(resolve, 0);
     });
   }
   async optimizeScene() {
@@ -6422,13 +6421,13 @@ class GLTFFileDynamicLoader extends Loader {
             this.viewer.models.push(modelImpl);
             this.viewer.syncOptions();
             this.viewer.syncOverlay();
-            this.viewer.update();
             this.viewer.emitEvent({ type: "databasechunk", data: scene, file });
+            this.viewer.update(true);
         });
         this.gltfLoader.addEventListener("geometryerror", (data) => {
             this.viewer.emitEvent({ type: "geometryerror", data, file });
         });
-        this.gltfLoader.addEventListener("update", (data) => {
+        this.gltfLoader.addEventListener("update", () => {
             this.viewer.update();
         });
         const loadController = {
@@ -6510,13 +6509,13 @@ class GLTFCloudDynamicLoader extends Loader {
             this.viewer.models.push(modelImpl);
             this.viewer.syncOptions();
             this.viewer.syncOverlay();
-            this.viewer.update();
             this.viewer.emitEvent({ type: "databasechunk", data: scene, file: model.file, model });
+            this.viewer.update(true);
         });
         this.gltfLoader.addEventListener("geometryerror", (data) => {
             this.viewer.emitEvent({ type: "geometryerror", data, file: model.file, model });
         });
-        this.gltfLoader.addEventListener("update", (data) => {
+        this.gltfLoader.addEventListener("update", () => {
             this.viewer.update();
         });
         const loadController = {
@@ -6774,6 +6773,7 @@ class Viewer extends EventEmitter2 {
         this.target = new Vector3(0, 0, 0);
         this._activeDragger = null;
         this._components = [];
+        this._updateDelay = 1000;
         this._renderNeeded = false;
         this._renderTime = 0;
         this.render = this.render.bind(this);
@@ -6839,11 +6839,13 @@ class Viewer extends EventEmitter2 {
         this.syncOptions();
         this.syncOverlay();
         this._renderTime = performance.now();
-        this.render(this._renderTime);
-        if (typeof onProgress === "function")
-            onProgress(new ProgressEvent("progress", { lengthComputable: true, loaded: 1, total: 1 }));
+        if (typeof onProgress === "function") {
+            const event = new ProgressEvent("progress", { lengthComputable: true, loaded: 1, total: 1 });
+            onProgress(event);
+        }
         this.emitEvent({ type: "initializeprogress", data: 1, loaded: 1, total: 1 });
         this.emitEvent({ type: "initialize" });
+        this.update(true);
         return Promise.resolve(this);
     }
     dispose() {
@@ -6907,14 +6909,16 @@ class Viewer extends EventEmitter2 {
         }
         this.renderer.setSize(width, height, updateStyle);
         this.composer.setSize(width, height);
-        this.update(true);
         this.emitEvent({ type: "resize", width, height });
+        this.update(true);
     }
     update(force = false) {
+        const time = performance.now();
+        force = force || time - this._renderTime >= this._updateDelay;
         this._renderNeeded = true;
         if (force)
-            this.render();
-        this.emitEvent({ type: "update", data: force });
+            this.render(time);
+        this.emitEvent({ type: "update", force });
     }
     render(time, force = false) {
         var _a, _b;
@@ -6982,6 +6986,7 @@ class Viewer extends EventEmitter2 {
             throw error;
         }
         this.emitEvent({ type: "geometryend", file, model });
+        this.update(true);
         return this;
     }
     openGltfFile(file, externalFiles, params = {}) {
@@ -7014,8 +7019,8 @@ class Viewer extends EventEmitter2 {
         this.target.set(0, 0, 0);
         this.syncOptions();
         this.syncOverlay();
-        this.update(true);
         this.emitEvent({ type: "clear" });
+        this.update(true);
         return this;
     }
     is3D() {
@@ -7203,7 +7208,7 @@ class Viewer extends EventEmitter2 {
         this.syncOverlay();
         this.setActiveDragger(draggerName);
         this.emitEvent({ type: "drawviewpoint", data: viewpoint });
-        this.update();
+        this.update(true);
     }
     createViewpoint() {
         if (!this.renderer)
@@ -7284,11 +7289,9 @@ class Viewer extends EventEmitter2 {
             }
             return { x: intersectionPoint.x, y: intersectionPoint.y, z: intersectionPoint.z };
         }
-        else {
-            const point = new Vector3(x, y, -1);
-            point.unproject(this.camera);
-            return { x: point.x, y: point.y, z: point.z };
-        }
+        const point = new Vector3(x, y, -1);
+        point.unproject(this.camera);
+        return { x: point.x, y: point.y, z: point.z };
     }
     worldToScreen(position) {
         if (!this.renderer)