@inweb/client 25.2.5 → 25.2.8

package/dist/client.js

@@ -1592,6 +1592,7 @@
                 cameraAxisXSpeed: 4,
                 cameraAxisYSpeed: 1,
                 ambientOcclusion: false,
+                enableStreamingMode: true,
                 enablePartialMode: false,
                 memoryLimit: 3294967296,
                 cuttingPlaneFillColor: { red: 0xff, green: 0x98, blue: 0x00 },
@@ -1720,6 +1721,13 @@
             this._data.ambientOcclusion = value;
             this.notifierChangeEvent();
         }
+        get enableStreamingMode() {
+            return this._data.enableStreamingMode;
+        }
+        set enableStreamingMode(value) {
+            this._data.enableStreamingMode = value;
+            this.notifierChangeEvent();
+        }
         get enablePartialMode() {
             return this._data.enablePartialMode;
         }
@@ -3914,7 +3922,7 @@
                 .then((data) => ({
                 ...data,
                 server: data.version,
-                client: "25.2.5",
+                client: "25.2.8",
             }));
         }
         /**
@@ -6675,7 +6683,7 @@
     }
 
     ///////////////////////////////////////////////////////////////////////////////
-    class VsfXLoader extends BaseLoader {
+    class VsfXStreamingLoader extends BaseLoader {
         async load() {
             if (!this.viewer.visualizeJs)
                 return;
@@ -6884,14 +6892,51 @@
         }
     }
 
+    ///////////////////////////////////////////////////////////////////////////////
+    class VsfXLoader extends BaseLoader {
+        async load() {
+            if (!this.viewer.visualizeJs)
+                return;
+            const visLib = this.viewer.visLib();
+            const visViewer = visLib.getViewer();
+            const abortController = new AbortController();
+            this.viewer._abortController = abortController;
+            console.time("File load time");
+            try {
+                this.viewer.emitEvent({ type: "geometrystart", model: this.model });
+                const progressCb = (progress) => this.viewer.emitEvent({ type: "geometryprogress", data: progress, model: this.model });
+                const arrayBuffer = await this.model.downloadResource(this.model.database, progressCb, abortController.signal);
+                if (abortController.signal.aborted) {
+                    await Promise.reject(new Error(`Open model aborted ${this.model.name}`));
+                }
+                if (this.viewer.visualizeJs) {
+                    visViewer.parseVsfx(new Uint8Array(arrayBuffer));
+                    this.viewer.update(true);
+                    this.viewer.syncOpenCloudVisualStyle(false);
+                    this.viewer.syncOptions();
+                    this.viewer.resize();
+                }
+                console.timeEnd("File load time");
+                this.viewer.emitEvent({ type: "geometryend", model: this.model });
+            }
+            catch (error) {
+                this.viewer.emitEvent({ type: "geometryerror", data: error, model: this.model });
+                throw error;
+            }
+        }
+    }
+
     ///////////////////////////////////////////////////////////////////////////////
     class LoaderFactory {
         create(viewer, model, options) {
             const geometryType = model.database.split(".").pop();
             if (model.geometry.length === 0 && geometryType === "vsfx") {
-                return options.enablePartialMode
-                    ? new VsfXPartialLoader(viewer, model, options)
-                    : new VsfXLoader(viewer, model, options);
+                if (!options.enableStreamingMode)
+                    return new VsfXLoader(viewer, model, options);
+                else if (options.enablePartialMode)
+                    return new VsfXPartialLoader(viewer, model, options);
+                else
+                    return new VsfXStreamingLoader(viewer, model, options);
             }
             if (geometryType === "data") {
                 return new TCSLoader(viewer, model, options);
@@ -19212,43 +19257,14 @@
             });
             this._konvaLayer.draw();
         }
-        drawViewpoint(viewpoint) {
-            function getLogicalPoint3dAsArray(point3d) {
-                return [point3d.x, point3d.y, point3d.z];
-            }
-            if (!this._isInitialized)
-                return;
-            if (!this._viewer.visualizeJs)
-                return;
-            const visLib = this._viewer.visLib();
-            const visViewer = visLib.getViewer();
-            const activeView = visViewer.activeView;
-            this._viewer.resetActiveDragger();
-            this._viewer.clearSlices();
-            this._viewer.clearOverlay();
-            if (viewpoint.orthogonal_camera) {
-                activeView.setView(getLogicalPoint3dAsArray(viewpoint.orthogonal_camera.view_point), getLogicalPoint3dAsArray(viewpoint.orthogonal_camera.direction), getLogicalPoint3dAsArray(viewpoint.orthogonal_camera.up_vector), viewpoint.orthogonal_camera.field_width, viewpoint.orthogonal_camera.field_height, true);
-            }
-            this._viewer.syncOverlay();
+        setViewpoint(viewpoint) {
             const markupColor = viewpoint.custom_fields.markup_color || { r: 255, g: 0, b: 0 };
             this.setMarkupColor(markupColor.r, markupColor.g, markupColor.b);
-            if (viewpoint.clipping_planes) {
-                for (const plane of viewpoint.clipping_planes) {
-                    const cuttingPlane = new visLib.OdTvPlane();
-                    cuttingPlane.set(getLogicalPoint3dAsArray(plane.location), getLogicalPoint3dAsArray(plane.direction));
-                    activeView.addCuttingPlane(cuttingPlane);
-                    activeView.setEnableCuttingPlaneFill(true, 0x66, 0x66, 0x66);
-                }
-            }
             this.loadMarkup(viewpoint);
-            this._viewer.update();
         }
-        createViewpoint() {
+        getViewpoint() {
             if (!this._viewer.visualizeJs)
                 return {};
-            const visLib = this._viewer.visLib();
-            const visViewer = visLib.getViewer();
-            const activeView = visViewer.activeView;
             const viewpoint = {
                 lines: [],
                 texts: [],
@@ -19257,23 +19273,7 @@
                 ellipses: [],
                 images: [],
                 rectangles: [],
-                clipping_planes: [],
-            };
-            viewpoint.orthogonal_camera = {
-                view_point: this.getPoint3dFromArray(activeView.viewPosition),
-                direction: this.getPoint3dFromArray(activeView.viewTarget),
-                up_vector: this.getPoint3dFromArray(activeView.upVector),
-                field_width: activeView.viewFieldWidth,
-                field_height: activeView.viewFieldHeight,
             };
-            for (let i = 0; i < activeView.numCuttingPlanes(); i++) {
-                const cuttingPlane = activeView.getCuttingPlane(i);
-                const plane = {
-                    location: this.getPoint3dFromArray(cuttingPlane.getOrigin()),
-                    direction: this.getPoint3dFromArray(cuttingPlane.normal()),
-                };
-                viewpoint.clipping_planes.push(plane);
-            }
             viewpoint.snapshot = {
                 data: this.combineMarkupWithDrawing(),
             };
@@ -20125,7 +20125,7 @@
             itr.delete();
             this._viewer.update();
         }
-        drawViewpoint(viewpoint) {
+        setViewpoint(viewpoint) {
             function getLogicalPoint3dAsArray(point3d) {
                 return [point3d.x, point3d.y, point3d.z];
             }
@@ -20137,12 +20137,6 @@
             const visLib = this._viewer.visLib();
             const visViewer = visLib.getViewer();
             const activeView = visViewer.activeView;
-            this._viewer.resetActiveDragger();
-            this._viewer.clearSlices();
-            this.clearOverlay();
-            if (viewpoint.orthogonal_camera) {
-                activeView.setView(getLogicalPoint3dAsArray(viewpoint.orthogonal_camera.view_point), getLogicalPoint3dAsArray(viewpoint.orthogonal_camera.direction), getLogicalPoint3dAsArray(viewpoint.orthogonal_camera.up_vector), viewpoint.orthogonal_camera.field_width, viewpoint.orthogonal_camera.field_height, true);
-            }
             this._viewer.syncOverlay();
             const markupColor = viewpoint.custom_fields.markup_color || { r: 255, g: 0, b: 0 };
             this.setMarkupColor(markupColor.r, markupColor.g, markupColor.b);
@@ -20176,17 +20170,9 @@
                     entityPtr.delete();
                 }
             }
-            if (viewpoint.clipping_planes) {
-                for (const plane of viewpoint.clipping_planes) {
-                    const cuttingPlane = new visLib.OdTvPlane();
-                    cuttingPlane.set(getLogicalPoint3dAsArray(plane.location), getLogicalPoint3dAsArray(plane.direction));
-                    activeView.addCuttingPlane(cuttingPlane);
-                    activeView.setEnableCuttingPlaneFill(true, 0x66, 0x66, 0x66);
-                }
-            }
             this._viewer.update();
         }
-        createViewpoint() {
+        getViewpoint() {
             function getLogicalPoint3dFromArray(array) {
                 return { x: array[0], y: array[1], z: array[2] };
             }
@@ -20194,18 +20180,9 @@
                 return {};
             const visLib = this._viewer.visLib();
             const visViewer = visLib.getViewer();
-            const activeView = visViewer.activeView;
             const viewpoint = {
                 lines: [],
                 texts: [],
-                clipping_planes: [],
-            };
-            viewpoint.orthogonal_camera = {
-                view_point: getLogicalPoint3dFromArray(activeView.viewPosition),
-                direction: getLogicalPoint3dFromArray(activeView.viewTarget),
-                up_vector: getLogicalPoint3dFromArray(activeView.upVector),
-                field_width: activeView.viewFieldWidth,
-                field_height: activeView.viewFieldHeight,
             };
             const model = visViewer.getMarkupModel();
             const itr = model.getEntitiesIterator();
@@ -20246,14 +20223,6 @@
                 entityPtr.delete();
             }
             itr.delete();
-            for (let i = 0; i < activeView.numCuttingPlanes(); i++) {
-                const cuttingPlane = activeView.getCuttingPlane(i);
-                const plane = {
-                    location: getLogicalPoint3dFromArray(cuttingPlane.getOrigin()),
-                    direction: getLogicalPoint3dFromArray(cuttingPlane.normal()),
-                };
-                viewpoint.clipping_planes.push(plane);
-            }
             viewpoint.snapshot = {
                 data: visLib.canvas.toDataURL("image/jpeg", 0.25),
             };
@@ -20281,6 +20250,9 @@
         clearSelected() {
             throw new Error("Not implemented yet");
         }
+        getPoint3dFromArray(array) {
+            return { x: array[0], y: array[1], z: array[2] };
+        }
     }
 
     class MarkupFactory {
@@ -21149,7 +21121,9 @@
          * @param viewpoint - Viewpoint.
          */
         drawViewpoint(viewpoint) {
-            this.markup.drawViewpoint(viewpoint);
+            this.setOrthogonalCameraSettings(viewpoint);
+            this.setClippingPlanes(viewpoint);
+            this.markup.setViewpoint(viewpoint);
         }
         /**
          * Create a viewpoint. To add a viewpoint to the list of model viewpoints, use the
@@ -21157,9 +21131,65 @@
          * {@link File#saveViewpoint | File.saveViewpoint()}.
          */
         createViewpoint() {
-            const vp = this.markup.createViewpoint();
+            const vp = this.markup.getViewpoint();
+            vp.orthogonal_camera = this.getOrthogonalCameraSettings();
+            vp.clipping_planes = this.getClippingPlanes();
             return vp;
         }
+        getPoint3dFromArray(array) {
+            return { x: array[0], y: array[1], z: array[2] };
+        }
+        getLogicalPoint3dAsArray(point3d) {
+            return [point3d.x, point3d.y, point3d.z];
+        }
+        getOrthogonalCameraSettings() {
+            const visViewer = this.visViewer();
+            const activeView = visViewer.activeView;
+            return {
+                view_point: this.getPoint3dFromArray(activeView.viewPosition),
+                direction: this.getPoint3dFromArray(activeView.viewTarget),
+                up_vector: this.getPoint3dFromArray(activeView.upVector),
+                field_width: activeView.viewFieldWidth,
+                field_height: activeView.viewFieldHeight,
+            };
+        }
+        setOrthogonalCameraSettings(viewpoint) {
+            const visViewer = this.visViewer();
+            const activeView = visViewer.activeView;
+            this.resetActiveDragger();
+            this.clearSlices();
+            this.clearOverlay();
+            if (viewpoint.orthogonal_camera) {
+                activeView.setView(this.getLogicalPoint3dAsArray(viewpoint.orthogonal_camera.view_point), this.getLogicalPoint3dAsArray(viewpoint.orthogonal_camera.direction), this.getLogicalPoint3dAsArray(viewpoint.orthogonal_camera.up_vector), viewpoint.orthogonal_camera.field_width, viewpoint.orthogonal_camera.field_height, true);
+            }
+            this.syncOverlay();
+        }
+        getClippingPlanes() {
+            const visViewer = this.visViewer();
+            const activeView = visViewer.activeView;
+            const clipping_planes = [];
+            for (let i = 0; i < activeView.numCuttingPlanes(); i++) {
+                const cuttingPlane = activeView.getCuttingPlane(i);
+                const plane = {
+                    location: this.getPoint3dFromArray(cuttingPlane.getOrigin()),
+                    direction: this.getPoint3dFromArray(cuttingPlane.normal()),
+                };
+                clipping_planes.push(plane);
+            }
+            return clipping_planes;
+        }
+        setClippingPlanes(viewpoint) {
+            if (viewpoint.clipping_planes) {
+                const visViewer = this.visViewer();
+                const activeView = visViewer.activeView;
+                for (const plane of viewpoint.clipping_planes) {
+                    const cuttingPlane = new (this.visLib().OdTvPlane)();
+                    cuttingPlane.set(this.getLogicalPoint3dAsArray(plane.location), this.getLogicalPoint3dAsArray(plane.direction));
+                    activeView.addCuttingPlane(cuttingPlane);
+                    activeView.setEnableCuttingPlaneFill(true, 0x66, 0x66, 0x66);
+                }
+            }
+        }
         /**
          * Executes the command denoted by the given command identifier.
          *
@@ -21485,7 +21515,7 @@
     commands("VisualizeJS").registerCommand("zoomToSelected", zoomToSelected);
 
     ///////////////////////////////////////////////////////////////////////////////
-    const version = "25.2.5";
+    const version = "25.2.8";
 
     exports.Assembly = Assembly;
     exports.CANVAS_EVENTS = CANVAS_EVENTS;