@inweb/viewer-core 27.6.0 → 27.6.1

package/dist/viewer-core.js

@@ -271,21 +271,44 @@
         };
     }
 
+    function isColorRGB(value) {
+        return (typeof value === "object" &&
+            value !== null &&
+            typeof value.r === "number" &&
+            typeof value.g === "number" &&
+            typeof value.b === "number");
+    }
+    function isLegacyRGB(value) {
+        return (typeof value === "object" &&
+            value !== null &&
+            typeof value.red === "number" &&
+            typeof value.green === "number" &&
+            typeof value.blue === "number");
+    }
     class Options {
         constructor(emitter) {
+            this._updateCount = 0;
             this._emitter = emitter;
-            this._data = defaultOptions();
+            this._data = Options.defaults();
+            this._defaults = Options.defaults();
             this.loadFromStorage();
         }
         static defaults() {
             return defaultOptions();
         }
         change() {
-            if (this._emitter !== undefined) {
+            if (this._emitter !== undefined && this._updateCount === 0) {
                 this.saveToStorage();
                 this._emitter.emit({ type: "optionschange", data: this });
             }
         }
+        beginUpdate() {
+            this._updateCount++;
+        }
+        endUpdate() {
+            this._updateCount--;
+            this.change();
+        }
         saveToStorage() {
             if (typeof window !== "undefined")
                 try {
@@ -299,18 +322,15 @@
             if (typeof window !== "undefined")
                 try {
                     const item = localStorage.getItem("od-client-settings");
-                    if (item) {
-                        const data = JSON.parse(item);
-                        this.data = { ...data };
-                    }
+                    if (item)
+                        this.data = JSON.parse(item);
                 }
                 catch (error) {
                     console.error("Cannot load client settings.", error);
                 }
         }
-        resetToDefaults(fields) {
-            const defaults = Options.defaults();
-            if (fields !== undefined) {
+        resetToDefaults(fields, defaults = this._defaults) {
+            if (Array.isArray(fields)) {
                 const resetData = {};
                 for (const field of fields) {
                     if (field in defaults)
@@ -322,34 +342,41 @@
                 this.data = defaults;
             }
         }
-        setProperty(key, value = Options.defaults()[key]) {
+        setProperty(key, value = this._defaults[key], accept = this.isValidValue(key, value)) {
+            if (!accept) {
+                console.warn(`Options.${key}: Invalid value`, value);
+                return;
+            }
             if (this._data[key] !== value) {
                 this._data[key] = value;
                 this.change();
             }
         }
+        isValidValue(key, value) {
+            return typeof value === typeof this._defaults[key];
+        }
         get data() {
             return this._data;
         }
         set data(value) {
-            const defaults = Options.defaults();
-            const merged = { ...defaults, ...this._data, ...value };
-            for (const key of Object.keys(defaults)) {
-                if (merged[key] === undefined)
-                    merged[key] = defaults[key];
+            this.beginUpdate();
+            try {
+                for (const key of Object.keys(value)) {
+                    if (key in this._defaults)
+                        this[key] = value[key];
+                    else
+                        this._data[key] = value[key];
+                }
+                if ("enablePartialMode" in value) {
+                    this.enablePartialMode = value.enablePartialMode;
+                }
+                if ("sectionFillColor" in value) {
+                    this.sectionFillColor = value.sectionFillColor;
+                }
             }
-            this._data = merged;
-            if (this._data.enablePartialMode) {
-                this._data.enableStreamingMode = true;
-                this._data.sceneGraph = false;
+            finally {
+                this.endUpdate();
             }
-            if (!value.sectionFillColor && value.cuttingPlaneFillColor)
-                this._data.sectionFillColor = {
-                    r: value.cuttingPlaneFillColor.red,
-                    g: value.cuttingPlaneFillColor.green,
-                    b: value.cuttingPlaneFillColor.blue,
-                };
-            this.change();
         }
         get showWCS() {
             return this._data.showWCS;
@@ -367,7 +394,7 @@
             return this._data.antialiasing;
         }
         set antialiasing(value) {
-            this.setProperty("antialiasing", value);
+            this.setProperty("antialiasing", value, typeof value === "boolean" || typeof value === "string");
         }
         get groundShadow() {
             return this._data.groundShadow;
@@ -404,19 +431,15 @@
         }
         set enableStreamingMode(value) {
             this.setProperty("enableStreamingMode", value);
-            if (!value) {
-                this.setProperty("enablePartialMode", false);
-            }
+            this.setProperty("enablePartialMode", this.enablePartialMode && this.enableStreamingMode);
         }
         get enablePartialMode() {
             return this._data.enablePartialMode;
         }
         set enablePartialMode(value) {
             this.setProperty("enablePartialMode", value);
-            if (value) {
-                this.setProperty("enableStreamingMode", true);
-                this.setProperty("sceneGraph", false);
-            }
+            this.setProperty("enableStreamingMode", this.enableStreamingMode || this.enablePartialMode);
+            this.setProperty("sceneGraph", this.sceneGraph && !this.enablePartialMode);
         }
         get memoryLimit() {
             return this._data.memoryLimit;
@@ -425,20 +448,18 @@
             this.setProperty("memoryLimit", value);
         }
         get cuttingPlaneFillColor() {
-            console.warn("Options.cuttingPlaneFillColor has been deprecated since 27.5 and will be removed in a future release, use sectionFillColor instead");
-            return {
-                red: this._data.sectionFillColor.r,
-                green: this._data.sectionFillColor.g,
-                blue: this._data.sectionFillColor.b,
-            };
+            return this._data.cuttingPlaneFillColor;
         }
         set cuttingPlaneFillColor(value) {
-            console.warn("Options.cuttingPlaneFillColor has been deprecated since 27.5 and will be removed in a future release, use sectionFillColor instead");
+            if (this._updateCount === 0) {
+                console.warn("Options.cuttingPlaneFillColor has been deprecated since 27.5 and will be removed in a future release, use sectionFillColor instead");
+            }
+            this.setProperty("cuttingPlaneFillColor", value, isLegacyRGB(value));
             this.setProperty("sectionFillColor", {
-                r: value.red,
-                g: value.green,
-                b: value.blue,
-            });
+                r: this._data.cuttingPlaneFillColor.red,
+                g: this._data.cuttingPlaneFillColor.green,
+                b: this._data.cuttingPlaneFillColor.blue,
+            }, true);
         }
         get enableSectionFill() {
             return this._data.enableSectionFill;
@@ -450,7 +471,12 @@
             return this._data.sectionFillColor;
         }
         set sectionFillColor(value) {
-            this.setProperty("sectionFillColor", value);
+            this.setProperty("sectionFillColor", value, isColorRGB(value));
+            this.setProperty("cuttingPlaneFillColor", {
+                red: this._data.sectionFillColor.r,
+                green: this._data.sectionFillColor.g,
+                blue: this._data.sectionFillColor.b,
+            }, true);
         }
         get sectionUseObjectColor() {
             return this._data.sectionUseObjectColor;
@@ -468,7 +494,7 @@
             return this._data.sectionHatchColor;
         }
         set sectionHatchColor(value) {
-            this.setProperty("sectionHatchColor", value);
+            this.setProperty("sectionHatchColor", value, isColorRGB(value));
         }
         get sectionHatchScale() {
             return this._data.sectionHatchScale;
@@ -486,7 +512,7 @@
             return this._data.sectionOutlineColor;
         }
         set sectionOutlineColor(value) {
-            this.setProperty("sectionOutlineColor", value);
+            this.setProperty("sectionOutlineColor", value, isColorRGB(value));
         }
         get sectionOutlineWidth() {
             return this._data.sectionOutlineWidth;
@@ -498,13 +524,13 @@
             return this._data.edgesColor;
         }
         set edgesColor(value) {
-            this.setProperty("edgesColor", value);
+            this.setProperty("edgesColor", value, isColorRGB(value));
         }
         get facesColor() {
             return this._data.facesColor;
         }
         set facesColor(value) {
-            this.setProperty("facesColor", value);
+            this.setProperty("facesColor", value, isColorRGB(value));
         }
         get edgesVisibility() {
             return this._data.edgesVisibility;
@@ -541,9 +567,7 @@
         }
         set sceneGraph(value) {
             this.setProperty("sceneGraph", value);
-            if (value) {
-                this.setProperty("enablePartialMode", false);
-            }
+            this.setProperty("enablePartialMode", this.enablePartialMode && !this.sceneGraph);
         }
         get edgeModel() {
             return Boolean(this._data.edgeModel);
@@ -585,13 +609,13 @@
             return this._data.rulerPrecision;
         }
         set rulerPrecision(value) {
-            this.setProperty("rulerPrecision", value);
+            this.setProperty("rulerPrecision", value, typeof value === "number" || value === "Default" || value === "Auto");
         }
         get cameraMode() {
-            return this._data.cameraMode || "perspective";
+            return this._data.cameraMode;
         }
         set cameraMode(value) {
-            this.setProperty("cameraMode", value);
+            this.setProperty("cameraMode", value, value === "perspective" || value === "orthographic");
         }
         get snapshotMimeType() {
             return this._data.snapshotMimeType;