@inweb/viewer-core 27.4.7 → 27.6.0

package/dist/viewer-core.js

@@ -164,8 +164,7 @@
             this.abortController = new AbortController();
         }
         dispose() {
-            this.abortController.abort();
-            this.abortController = undefined;
+            this.cancel();
         }
         isSupport(file, format) {
             return false;
@@ -184,10 +183,10 @@
         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 "";
         }
     }
 
@@ -242,6 +241,15 @@
             enablePartialMode: false,
             memoryLimit: 3294967296,
             cuttingPlaneFillColor: { red: 0xff, green: 0x98, blue: 0x00 },
+            enableSectionFill: true,
+            sectionFillColor: { r: 0xff, g: 0x98, b: 0x00 },
+            sectionUseObjectColor: false,
+            enableSectionHatch: true,
+            sectionHatchColor: { r: 0, g: 0, b: 0 },
+            sectionHatchScale: 8,
+            enableSectionOutline: true,
+            sectionOutlineColor: { r: 0, g: 0, b: 0 },
+            sectionOutlineWidth: 2,
             edgesColor: { r: 0xff, g: 0x98, b: 0x00 },
             facesColor: { r: 0xff, g: 0x98, b: 0x00 },
             edgesVisibility: true,
@@ -301,230 +309,301 @@
                 }
         }
         resetToDefaults(fields) {
+            const defaults = Options.defaults();
             if (fields !== undefined) {
-                const defaults = Options.defaults();
-                const resetData = fields.reduce((acc, field) => {
-                    acc[field] = defaults[field];
-                    return acc;
-                }, {});
-                this.data = { ...this.data, ...resetData };
+                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 = Options.defaults()[key]) {
+            if (this._data[key] !== value) {
+                this._data[key] = value;
+                this.change();
             }
         }
         get data() {
             return this._data;
         }
         set data(value) {
-            const enablePartialMode = value.enableStreamingMode ? value.enablePartialMode : false;
-            const sceneGraph = enablePartialMode ? false : value.sceneGraph;
-            this._data = { ...Options.defaults(), ...this._data, ...value, enablePartialMode, sceneGraph };
+            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._data = merged;
+            if (this._data.enablePartialMode) {
+                this._data.enableStreamingMode = true;
+                this._data.sceneGraph = false;
+            }
+            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);
         }
         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);
+            if (!value) {
+                this.setProperty("enablePartialMode", false);
+            }
         }
         get enablePartialMode() {
             return this._data.enablePartialMode;
         }
         set enablePartialMode(value) {
-            this._data.enablePartialMode = value;
+            this.setProperty("enablePartialMode", value);
             if (value) {
-                this._data.enableStreamingMode = true;
-                this._data.sceneGraph = false;
+                this.setProperty("enableStreamingMode", true);
+                this.setProperty("sceneGraph", false);
             }
-            this.change();
         }
         get memoryLimit() {
             return this._data.memoryLimit;
         }
         set memoryLimit(value) {
-            this._data.memoryLimit = value;
-            this.change();
+            this.setProperty("memoryLimit", value);
         }
         get cuttingPlaneFillColor() {
-            return this._data.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,
+            };
         }
         set cuttingPlaneFillColor(value) {
-            this._data.cuttingPlaneFillColor = value;
-            this.change();
+            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,
+            });
+        }
+        get enableSectionFill() {
+            return this._data.enableSectionFill;
+        }
+        set enableSectionFill(value) {
+            this.setProperty("enableSectionFill", value);
+        }
+        get sectionFillColor() {
+            return this._data.sectionFillColor;
+        }
+        set sectionFillColor(value) {
+            this.setProperty("sectionFillColor", value);
+        }
+        get sectionUseObjectColor() {
+            return this._data.sectionUseObjectColor;
+        }
+        set sectionUseObjectColor(value) {
+            this.setProperty("sectionUseObjectColor", value);
+        }
+        get enableSectionHatch() {
+            return this._data.enableSectionHatch;
+        }
+        set enableSectionHatch(value) {
+            this.setProperty("enableSectionHatch", value);
+        }
+        get sectionHatchColor() {
+            return this._data.sectionHatchColor;
+        }
+        set sectionHatchColor(value) {
+            this.setProperty("sectionHatchColor", value);
+        }
+        get sectionHatchScale() {
+            return this._data.sectionHatchScale;
+        }
+        set sectionHatchScale(value) {
+            this.setProperty("sectionHatchScale", value);
+        }
+        get enableSectionOutline() {
+            return this._data.enableSectionOutline;
+        }
+        set enableSectionOutline(value) {
+            this.setProperty("enableSectionOutline", value);
+        }
+        get sectionOutlineColor() {
+            return this._data.sectionOutlineColor;
+        }
+        set sectionOutlineColor(value) {
+            this.setProperty("sectionOutlineColor", value);
+        }
+        get sectionOutlineWidth() {
+            return this._data.sectionOutlineWidth;
+        }
+        set sectionOutlineWidth(value) {
+            this.setProperty("sectionOutlineWidth", value);
         }
         get edgesColor() {
             return this._data.edgesColor;
         }
         set edgesColor(value) {
-            this._data.edgesColor = value;
-            this.change();
+            this.setProperty("edgesColor", value);
         }
         get facesColor() {
             return this._data.facesColor;
         }
         set facesColor(value) {
-            this._data.facesColor = value;
-            this.change();
+            this.setProperty("facesColor", 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);
+            if (value) {
+                this.setProperty("enablePartialMode", false);
+            }
         }
         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);
         }
         get cameraMode() {
             return this._data.cameraMode || "perspective";
         }
         set cameraMode(value) {
-            this._data.cameraMode = value;
-            this.change();
+            this.setProperty("cameraMode", value);
+        }
+        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);
         }
     }