@inweb/viewer-core 27.6.0 → 27.6.2

package/dist/viewer-core.module.js

@@ -265,21 +265,44 @@ function defaultOptions() {
     };
 }
 
+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 {
@@ -293,18 +316,15 @@ class Options {
         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)
@@ -316,34 +336,41 @@ class Options {
             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;
@@ -361,7 +388,7 @@ class Options {
         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;
@@ -397,19 +424,27 @@ class Options {
         return this._data.enableStreamingMode;
     }
     set enableStreamingMode(value) {
-        this.setProperty("enableStreamingMode", value);
-        if (!value) {
-            this.setProperty("enablePartialMode", false);
+        this.beginUpdate();
+        try {
+            this.setProperty("enableStreamingMode", value);
+            this.setProperty("enablePartialMode", this.enablePartialMode && this.enableStreamingMode);
+        }
+        finally {
+            this.endUpdate();
         }
     }
     get enablePartialMode() {
         return this._data.enablePartialMode;
     }
     set enablePartialMode(value) {
-        this.setProperty("enablePartialMode", value);
-        if (value) {
-            this.setProperty("enableStreamingMode", true);
-            this.setProperty("sceneGraph", false);
+        this.beginUpdate();
+        try {
+            this.setProperty("enablePartialMode", value);
+            this.setProperty("enableStreamingMode", this.enableStreamingMode || this.enablePartialMode);
+            this.setProperty("sceneGraph", this.sceneGraph && !this.enablePartialMode);
+        }
+        finally {
+            this.endUpdate();
         }
     }
     get memoryLimit() {
@@ -419,20 +454,24 @@ class Options {
         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");
-        this.setProperty("sectionFillColor", {
-            r: value.red,
-            g: value.green,
-            b: value.blue,
-        });
+        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.beginUpdate();
+        try {
+            this.setProperty("cuttingPlaneFillColor", value, isLegacyRGB(value));
+            this.setProperty("sectionFillColor", {
+                r: this._data.cuttingPlaneFillColor.red,
+                g: this._data.cuttingPlaneFillColor.green,
+                b: this._data.cuttingPlaneFillColor.blue,
+            });
+        }
+        finally {
+            this.endUpdate();
+        }
     }
     get enableSectionFill() {
         return this._data.enableSectionFill;
@@ -444,7 +483,18 @@ class Options {
         return this._data.sectionFillColor;
     }
     set sectionFillColor(value) {
-        this.setProperty("sectionFillColor", value);
+        this.beginUpdate();
+        try {
+            this.setProperty("sectionFillColor", value, isColorRGB(value));
+            this.setProperty("cuttingPlaneFillColor", {
+                red: this._data.sectionFillColor.r,
+                green: this._data.sectionFillColor.g,
+                blue: this._data.sectionFillColor.b,
+            });
+        }
+        finally {
+            this.endUpdate();
+        }
     }
     get sectionUseObjectColor() {
         return this._data.sectionUseObjectColor;
@@ -462,7 +512,7 @@ class Options {
         return this._data.sectionHatchColor;
     }
     set sectionHatchColor(value) {
-        this.setProperty("sectionHatchColor", value);
+        this.setProperty("sectionHatchColor", value, isColorRGB(value));
     }
     get sectionHatchScale() {
         return this._data.sectionHatchScale;
@@ -480,7 +530,7 @@ class Options {
         return this._data.sectionOutlineColor;
     }
     set sectionOutlineColor(value) {
-        this.setProperty("sectionOutlineColor", value);
+        this.setProperty("sectionOutlineColor", value, isColorRGB(value));
     }
     get sectionOutlineWidth() {
         return this._data.sectionOutlineWidth;
@@ -492,13 +542,13 @@ class Options {
         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;
@@ -534,9 +584,13 @@ class Options {
         return this._data.sceneGraph;
     }
     set sceneGraph(value) {
-        this.setProperty("sceneGraph", value);
-        if (value) {
-            this.setProperty("enablePartialMode", false);
+        this.beginUpdate();
+        try {
+            this.setProperty("sceneGraph", value);
+            this.setProperty("enablePartialMode", this.enablePartialMode && !this.sceneGraph);
+        }
+        finally {
+            this.endUpdate();
         }
     }
     get edgeModel() {
@@ -579,13 +633,13 @@ class Options {
         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;