@inweb/viewer-core 27.5.0 → 27.6.1

package/dist/viewer-core.module.js

@@ -158,8 +158,7 @@ class Loader {
         this.abortController = new AbortController();
     }
     dispose() {
-        this.abortController.abort();
-        this.abortController = undefined;
+        this.cancel();
     }
     isSupport(file, format) {
         return false;
@@ -178,10 +177,10 @@ class Loader {
     extractFileName(file) {
         const regex = /[^/\\?#:]+(?=\?|#|$)/;
         if (typeof file === "string")
-            return (file.match(regex) || [])[0];
+            return (file.match(regex) || [])[0] || "";
         else if (file instanceof globalThis.File)
-            return (file.name.match(regex) || [])[0];
-        return undefined;
+            return (file.name.match(regex) || [])[0] || "";
+        return "";
     }
 }
 
@@ -266,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 {
@@ -294,321 +316,312 @@ 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) {
-        if (fields !== undefined) {
-            const defaults = Options.defaults();
-            const resetData = fields.reduce((acc, field) => {
-                acc[field] = defaults[field];
-                return acc;
-            }, {});
-            this.data = { ...this.data, ...resetData };
+    resetToDefaults(fields, defaults = this._defaults) {
+        if (Array.isArray(fields)) {
+            const resetData = {};
+            for (const field of fields) {
+                if (field in defaults)
+                    resetData[field] = defaults[field];
+            }
+            this.data = resetData;
         }
         else {
-            this.data = { ...this.data, ...Options.defaults() };
+            this.data = defaults;
         }
     }
+    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) {
-        this._data = { ...Options.defaults(), ...this._data, ...value };
-        if (this._data.enablePartialMode) {
-            this._data.enableStreamingMode = true;
-            this._data.sceneGraph = false;
+        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;
+            }
+        }
+        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;
     }
     set showWCS(value) {
-        this._data.showWCS = value;
-        this.change();
+        this.setProperty("showWCS", value);
     }
     get cameraAnimation() {
         return this._data.cameraAnimation;
     }
     set cameraAnimation(value) {
-        this._data.cameraAnimation = value;
-        this.change();
+        this.setProperty("cameraAnimation", value);
     }
     get antialiasing() {
         return this._data.antialiasing;
     }
     set antialiasing(value) {
-        this._data.antialiasing = value;
-        this.change();
+        this.setProperty("antialiasing", value, typeof value === "boolean" || typeof value === "string");
     }
     get groundShadow() {
         return this._data.groundShadow;
     }
     set groundShadow(value) {
-        this._data.groundShadow = value;
-        this.change();
+        this.setProperty("groundShadow", value);
     }
     get shadows() {
         return this._data.shadows;
     }
     set shadows(value) {
-        this._data.shadows = value;
-        this.change();
+        this.setProperty("shadows", value);
     }
     get cameraAxisXSpeed() {
         return this._data.cameraAxisXSpeed;
     }
     set cameraAxisXSpeed(value) {
-        this._data.cameraAxisXSpeed = value;
-        this.change();
+        this.setProperty("cameraAxisXSpeed", value);
     }
     get cameraAxisYSpeed() {
         return this._data.cameraAxisYSpeed;
     }
     set cameraAxisYSpeed(value) {
-        this.cameraAxisYSpeed = value;
-        this.change();
+        this.setProperty("cameraAxisYSpeed", value);
     }
     get ambientOcclusion() {
         return this._data.ambientOcclusion;
     }
     set ambientOcclusion(value) {
-        this._data.ambientOcclusion = value;
-        this.change();
+        this.setProperty("ambientOcclusion", value);
     }
     get enableStreamingMode() {
         return this._data.enableStreamingMode;
     }
     set enableStreamingMode(value) {
-        this._data.enableStreamingMode = value;
-        if (!value)
-            this._data.enablePartialMode = false;
-        this.change();
+        this.setProperty("enableStreamingMode", value);
+        this.setProperty("enablePartialMode", this.enablePartialMode && this.enableStreamingMode);
     }
     get enablePartialMode() {
         return this._data.enablePartialMode;
     }
     set enablePartialMode(value) {
-        this._data.enablePartialMode = value;
-        if (value) {
-            this._data.enableStreamingMode = true;
-            this._data.sceneGraph = false;
-        }
-        this.change();
+        this.setProperty("enablePartialMode", value);
+        this.setProperty("enableStreamingMode", this.enableStreamingMode || this.enablePartialMode);
+        this.setProperty("sceneGraph", this.sceneGraph && !this.enablePartialMode);
     }
     get memoryLimit() {
         return this._data.memoryLimit;
     }
     set memoryLimit(value) {
-        this._data.memoryLimit = value;
-        this.change();
+        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._data.sectionFillColor = {
-            r: value.red,
-            g: value.green,
-            b: value.blue,
-        };
-        this.change();
+        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: this._data.cuttingPlaneFillColor.red,
+            g: this._data.cuttingPlaneFillColor.green,
+            b: this._data.cuttingPlaneFillColor.blue,
+        }, true);
     }
     get enableSectionFill() {
         return this._data.enableSectionFill;
     }
     set enableSectionFill(value) {
-        this._data.enableSectionFill = value;
-        this.change();
+        this.setProperty("enableSectionFill", value);
     }
     get sectionFillColor() {
         return this._data.sectionFillColor;
     }
     set sectionFillColor(value) {
-        this._data.sectionFillColor = value;
-        this.change();
+        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;
     }
     set sectionUseObjectColor(value) {
-        this._data.sectionUseObjectColor = value;
-        this.change();
+        this.setProperty("sectionUseObjectColor", value);
     }
     get enableSectionHatch() {
         return this._data.enableSectionHatch;
     }
     set enableSectionHatch(value) {
-        this._data.enableSectionHatch = value;
-        this.change();
+        this.setProperty("enableSectionHatch", value);
     }
     get sectionHatchColor() {
         return this._data.sectionHatchColor;
     }
     set sectionHatchColor(value) {
-        this._data.sectionHatchColor = value;
-        this.change();
+        this.setProperty("sectionHatchColor", value, isColorRGB(value));
     }
     get sectionHatchScale() {
         return this._data.sectionHatchScale;
     }
     set sectionHatchScale(value) {
-        this._data.sectionHatchScale = value;
-        this.change();
+        this.setProperty("sectionHatchScale", value);
     }
     get enableSectionOutline() {
         return this._data.enableSectionOutline;
     }
     set enableSectionOutline(value) {
-        this._data.enableSectionOutline = value;
-        this.change();
+        this.setProperty("enableSectionOutline", value);
     }
     get sectionOutlineColor() {
         return this._data.sectionOutlineColor;
     }
     set sectionOutlineColor(value) {
-        this._data.sectionOutlineColor = value;
-        this.change();
+        this.setProperty("sectionOutlineColor", value, isColorRGB(value));
     }
     get sectionOutlineWidth() {
         return this._data.sectionOutlineWidth;
     }
     set sectionOutlineWidth(value) {
-        this._data.sectionOutlineWidth = value;
-        this.change();
+        this.setProperty("sectionOutlineWidth", value);
     }
     get edgesColor() {
         return this._data.edgesColor;
     }
     set edgesColor(value) {
-        this._data.edgesColor = value;
-        this.change();
+        this.setProperty("edgesColor", value, isColorRGB(value));
     }
     get facesColor() {
         return this._data.facesColor;
     }
     set facesColor(value) {
-        this._data.facesColor = value;
-        this.change();
+        this.setProperty("facesColor", value, isColorRGB(value));
     }
     get edgesVisibility() {
         return this._data.edgesVisibility;
     }
     set edgesVisibility(value) {
-        this._data.edgesVisibility = value;
-        this.change();
+        this.setProperty("edgesVisibility", value);
     }
     get edgesOverlap() {
         return this._data.edgesOverlap;
     }
     set edgesOverlap(value) {
-        this._data.edgesOverlap = value;
-        this.change();
+        this.setProperty("edgesOverlap", value);
     }
     get facesOverlap() {
         return this._data.facesOverlap;
     }
     set facesOverlap(value) {
-        this._data.facesOverlap = value;
-        this.change();
+        this.setProperty("facesOverlap", value);
     }
     get facesTransparancy() {
         return this._data.facesTransparancy;
     }
     set facesTransparancy(value) {
-        this._data.facesTransparancy = value;
-        this.change();
+        this.setProperty("facesTransparancy", value);
     }
     get enableCustomHighlight() {
         return this._data.enableCustomHighlight;
     }
     set enableCustomHighlight(value) {
-        this._data.enableCustomHighlight = value;
-        this.change();
+        this.setProperty("enableCustomHighlight", value);
     }
     get sceneGraph() {
         return this._data.sceneGraph;
     }
     set sceneGraph(value) {
-        this._data.sceneGraph = value;
-        if (value)
-            this._data.enablePartialMode = false;
-        this.change();
+        this.setProperty("sceneGraph", value);
+        this.setProperty("enablePartialMode", this.enablePartialMode && !this.sceneGraph);
     }
     get edgeModel() {
         return Boolean(this._data.edgeModel);
     }
     set edgeModel(value) {
-        this._data.edgeModel = Boolean(value);
-        this.change();
+        this.setProperty("edgeModel", value);
     }
     get reverseZoomWheel() {
         return this._data.reverseZoomWheel;
     }
     set reverseZoomWheel(value) {
-        this._data.reverseZoomWheel = !!value;
-        this.change();
+        this.setProperty("reverseZoomWheel", value);
     }
     get enableZoomWheel() {
         return this._data.enableZoomWheel;
     }
     set enableZoomWheel(value) {
-        this._data.enableZoomWheel = !!value;
-        this.change();
+        this.setProperty("enableZoomWheel", value);
     }
     get enableGestures() {
         return this._data.enableGestures;
     }
     set enableGestures(value) {
-        this._data.enableGestures = !!value;
-        this.change();
+        this.setProperty("enableGestures", value);
     }
     get geometryType() {
         return this._data.geometryType;
     }
     set geometryType(value) {
-        this._data.geometryType = value;
-        this.change();
+        this.setProperty("geometryType", value);
     }
     get rulerUnit() {
         return this._data.rulerUnit;
     }
     set rulerUnit(value) {
-        this._data.rulerUnit = value;
-        this.change();
+        this.setProperty("rulerUnit", value);
     }
     get rulerPrecision() {
         return this._data.rulerPrecision;
     }
     set rulerPrecision(value) {
-        this._data.rulerPrecision = value;
-        this.change();
+        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._data.cameraMode = value;
-        this.change();
+        this.setProperty("cameraMode", value, value === "perspective" || value === "orthographic");
+    }
+    get snapshotMimeType() {
+        return this._data.snapshotMimeType;
+    }
+    set snapshotMimeType(value) {
+        this.setProperty("snapshotMimeType", value);
+    }
+    get snapshotQuality() {
+        return this._data.snapshotQuality;
+    }
+    set snapshotQuality(value) {
+        this.setProperty("snapshotQuality", value);
     }
 }