@inweb/viewer-three 25.3.18 → 25.3.20

package/dist/viewer-three.js

@@ -65,54 +65,62 @@
 
     commands("ThreeJS").registerCommand("noop", (() => {}));
 
+    function defaultOptions() {
+        return {
+            showWCS: true,
+            cameraAnimation: true,
+            antialiasing: true,
+            groundShadow: false,
+            shadows: false,
+            cameraAxisXSpeed: 4,
+            cameraAxisYSpeed: 1,
+            ambientOcclusion: false,
+            enableStreamingMode: true,
+            enablePartialMode: false,
+            memoryLimit: 3294967296,
+            cuttingPlaneFillColor: {
+                red: 255,
+                green: 152,
+                blue: 0
+            },
+            edgesColor: {
+                r: 255,
+                g: 152,
+                b: 0
+            },
+            facesColor: {
+                r: 255,
+                g: 152,
+                b: 0
+            },
+            edgesVisibility: true,
+            edgesOverlap: true,
+            facesOverlap: false,
+            facesTransparancy: 200,
+            enableCustomHighlight: true,
+            sceneGraph: false,
+            edgeModel: true,
+            reverseZoomWheel: false,
+            enableZoomWheel: true,
+            enableGestures: true,
+            geometryType: "vsfx"
+        };
+    }
+
     class Options {
         constructor(emitter) {
             this._emitter = emitter;
-            this._data = Options.defaults();
+            this._data = defaultOptions();
             this.loadFromStorage();
         }
         static defaults() {
-            return {
-                showWCS: true,
-                cameraAnimation: true,
-                antialiasing: true,
-                groundShadow: false,
-                shadows: false,
-                cameraAxisXSpeed: 4,
-                cameraAxisYSpeed: 1,
-                ambientOcclusion: false,
-                enableStreamingMode: true,
-                enablePartialMode: false,
-                memoryLimit: 3294967296,
-                cuttingPlaneFillColor: {
-                    red: 255,
-                    green: 152,
-                    blue: 0
-                },
-                edgesColor: {
-                    r: 255,
-                    g: 152,
-                    b: 0
-                },
-                facesColor: {
-                    r: 255,
-                    g: 152,
-                    b: 0
-                },
-                edgesVisibility: true,
-                edgesOverlap: true,
-                facesOverlap: false,
-                facesTransparancy: 200,
-                enableCustomHighlight: true,
-                sceneGraph: false,
-                edgeModel: true,
-                reverseZoomWheel: false,
-                enableZoomWheel: true,
-                enableGestures: true,
-                geometryType: "vsfx"
-            };
+            return defaultOptions();
         }
         notifierChangeEvent() {
+            console.warn("Options.notifierChangeEvent() has been deprecated since 25.3 and will be removed in a future release, use Options.change() instead.");
+            this.change();
+        }
+        change() {
             if (this._emitter !== undefined) {
                 this.saveToStorage();
                 this._emitter.emit({
@@ -163,151 +171,154 @@
             return this._data;
         }
         set data(value) {
-            const sceneGraph = value.enablePartialMode ? false : value.sceneGraph;
+            const enablePartialMode = value.enableStreamingMode ? value.enablePartialMode : false;
+            const sceneGraph = enablePartialMode ? false : value.sceneGraph;
             this._data = {
                 ...Options.defaults(),
                 ...this._data,
                 ...value,
+                enablePartialMode: enablePartialMode,
                 sceneGraph: sceneGraph
             };
-            this.notifierChangeEvent();
+            this.change();
         }
         get showWCS() {
             return this._data.showWCS;
         }
         set showWCS(value) {
             this._data.showWCS = value;
-            this.notifierChangeEvent();
+            this.change();
         }
         get cameraAnimation() {
             return this._data.cameraAnimation;
         }
         set cameraAnimation(value) {
             this._data.cameraAnimation = value;
-            this.notifierChangeEvent();
+            this.change();
         }
         get antialiasing() {
             return this._data.antialiasing;
         }
         set antialiasing(value) {
             this._data.antialiasing = value;
-            this.notifierChangeEvent();
+            this.change();
         }
         get groundShadow() {
             return this._data.groundShadow;
         }
         set groundShadow(value) {
             this._data.groundShadow = value;
-            this.notifierChangeEvent();
+            this.change();
         }
         get shadows() {
             return this._data.shadows;
         }
         set shadows(value) {
             this._data.shadows = value;
-            this.notifierChangeEvent();
+            this.change();
         }
         get cameraAxisXSpeed() {
             return this._data.cameraAxisXSpeed;
         }
         set cameraAxisXSpeed(value) {
             this._data.cameraAxisXSpeed = value;
-            this.notifierChangeEvent();
+            this.change();
         }
         get cameraAxisYSpeed() {
             return this._data.cameraAxisYSpeed;
         }
         set cameraAxisYSpeed(value) {
             this.cameraAxisYSpeed = value;
-            this.notifierChangeEvent();
+            this.change();
         }
         get ambientOcclusion() {
             return this._data.ambientOcclusion;
         }
         set ambientOcclusion(value) {
             this._data.ambientOcclusion = value;
-            this.notifierChangeEvent();
+            this.change();
         }
         get enableStreamingMode() {
             return this._data.enableStreamingMode;
         }
         set enableStreamingMode(value) {
             this._data.enableStreamingMode = value;
-            if (this._data.enableStreamingMode) {
-                this._data.enablePartialMode = false;
-            }
-            this.notifierChangeEvent();
+            if (!value) this._data.enablePartialMode = false;
+            this.change();
         }
         get enablePartialMode() {
             return this._data.enablePartialMode;
         }
         set enablePartialMode(value) {
             this._data.enablePartialMode = value;
-            if (value) this._data.sceneGraph = false;
-            this.notifierChangeEvent();
+            if (value) {
+                this._data.enableStreamingMode = true;
+                this._data.sceneGraph = false;
+            }
+            this.change();
         }
         get memoryLimit() {
             return this._data.memoryLimit;
         }
         set memoryLimit(value) {
             this._data.memoryLimit = value;
-            this.notifierChangeEvent();
+            this.change();
         }
         get cuttingPlaneFillColor() {
             return this._data.cuttingPlaneFillColor;
         }
         set cuttingPlaneFillColor(value) {
             this._data.cuttingPlaneFillColor = value;
-            this.notifierChangeEvent();
+            this.change();
         }
         get edgesColor() {
             return this._data.edgesColor;
         }
         set edgesColor(value) {
             this._data.edgesColor = value;
-            this.notifierChangeEvent();
+            this.change();
         }
         get facesColor() {
             return this._data.facesColor;
         }
         set facesColor(value) {
             this._data.facesColor = value;
-            this.notifierChangeEvent();
+            this.change();
         }
         get edgesVisibility() {
             return this._data.edgesVisibility;
         }
         set edgesVisibility(value) {
             this._data.edgesVisibility = value;
-            this.notifierChangeEvent();
+            this.change();
         }
         get edgesOverlap() {
             return this._data.edgesOverlap;
         }
         set edgesOverlap(value) {
             this._data.edgesOverlap = value;
-            this.notifierChangeEvent();
+            this.change();
         }
         get facesOverlap() {
             return this._data.facesOverlap;
         }
         set facesOverlap(value) {
             this._data.facesOverlap = value;
-            this.notifierChangeEvent();
+            this.change();
         }
         get facesTransparancy() {
             return this._data.facesTransparancy;
         }
         set facesTransparancy(value) {
             this._data.facesTransparancy = value;
-            this.notifierChangeEvent();
+            this.change();
         }
         get enableCustomHighlight() {
             return this._data.enableCustomHighlight;
         }
         set enableCustomHighlight(value) {
             this._data.enableCustomHighlight = value;
-            this.notifierChangeEvent();
+            this.change();
         }
         get sceneGraph() {
             return this._data.sceneGraph;
@@ -315,42 +326,42 @@
         set sceneGraph(value) {
             this._data.sceneGraph = value;
             if (value) this._data.enablePartialMode = false;
-            this.notifierChangeEvent();
+            this.change();
         }
         get edgeModel() {
             return Boolean(this._data.edgeModel);
         }
         set edgeModel(value) {
             this._data.edgeModel = Boolean(value);
-            this.notifierChangeEvent();
+            this.change();
         }
         get reverseZoomWheel() {
             return this._data.reverseZoomWheel;
         }
         set reverseZoomWheel(value) {
             this._data.reverseZoomWheel = !!value;
-            this.notifierChangeEvent();
+            this.change();
         }
         get enableZoomWheel() {
             return this._data.enableZoomWheel;
         }
         set enableZoomWheel(value) {
             this._data.enableZoomWheel = !!value;
-            this.notifierChangeEvent();
+            this.change();
         }
         get enableGestures() {
             return this._data.enableGestures;
         }
         set enableGestures(value) {
             this._data.enableGestures = !!value;
-            this.notifierChangeEvent();
+            this.change();
         }
         get geometryType() {
             return this._data.geometryType;
         }
         set geometryType(value) {
             this._data.geometryType = value;
-            this.notifierChangeEvent();
+            this.change();
         }
     }
 
@@ -358,27 +369,24 @@
 
     class EventEmitter2 {
         constructor() {
-            this._listeners = undefined;
+            this._listeners = {};
         }
         addEventListener(type, listener) {
-            if (this._listeners === undefined) this._listeners = {};
             if (this._listeners[type] === undefined) this._listeners[type] = [];
             this._listeners[type].push(listener);
             return this;
         }
         removeEventListener(type, listener) {
-            if (this._listeners === undefined) return this;
             if (this._listeners[type] === undefined) return this;
             const listeners = this._listeners[type].filter((x => x !== listener));
-            this._listeners[type] = listeners.length === 0 ? undefined : listeners;
+            if (listeners.length !== 0) this._listeners[type] = listeners; else delete this._listeners[type];
             return this;
         }
         removeAllListeners(type) {
-            if (type) this._listeners[type] = undefined; else this._listeners = undefined;
+            if (type) delete this._listeners[type]; else this._listeners = {};
             return this;
         }
         emitEvent(event) {
-            if (this._listeners === undefined) return false;
             if (this._listeners[event.type] === undefined) return false;
             const invoke = this._listeners[event.type].slice();
             invoke.forEach((listener => listener.call(this, event)));
@@ -42593,6 +42601,7 @@
     ///////////////////////////////////////////////////////////////////////////////
     class RenderLoopComponent {
         constructor(viewer) {
+            this.requestID = 0;
             this.animate = (time = 0) => {
                 this.requestID = requestAnimationFrame(this.animate);
                 this.viewer.render(time);
@@ -42610,6 +42619,7 @@
     class Viewer extends EventEmitter2 {
         constructor(client) {
             super();
+            this.renderNeeded = false;
             this._options = new Options(this);
             this.client = client;
             this.canvasEvents = CANVAS_EVENTS;
@@ -42655,7 +42665,7 @@
             this.components.push(new ResizeCanvasComponent(this));
             this.components.push(new RenderLoopComponent(this));
             // this.components.push(new ObjectSelectionComponent(this as any));
-            this.options.notifierChangeEvent();
+            this.syncOptions();
             this.renderTime = performance.now();
             this.render(this.renderTime);
             if (typeof onProgress === "function")
@@ -42688,6 +42698,10 @@
                 return;
             if (!this.renderer)
                 return;
+            if (!this.scene)
+                return;
+            if (!this.camera)
+                return;
             this.renderer.render(this.scene, this.camera);
             this.renderNeeded = false;
             const deltaTime = (time - this.renderTime) / 1000;
@@ -42700,7 +42714,7 @@
                 this.render(performance.now());
             this.emitEvent({ type: "update", data: force });
         }
-        syncOptions(options = this.options.data) {
+        syncOptions(options = this.options) {
             // this.update();
         }
         loadReferences(model) {
@@ -42713,7 +42727,7 @@
             this.cancel();
             this.clear();
             this.emitEvent({ type: "open", file, model: file });
-            let model;
+            let model = undefined;
             if (file) {
                 const models = (await file.getModels()) || [];
                 model = models.find((model) => model.default) || models[0];
@@ -42832,9 +42846,11 @@
         }
     }
 
+    exports.CANVAS_EVENTS = CANVAS_EVENTS;
     exports.Options = Options;
     exports.Viewer = Viewer;
     exports.commands = commands;
+    exports.defaultOptions = defaultOptions;
 
     Object.defineProperty(exports, '__esModule', { value: true });