@inweb/viewer-three 27.1.1 → 27.1.2

package/dist/viewer-three.module.js

@@ -23,12 +23,13 @@
 
 import { draggersRegistry, commandsRegistry, Options, componentsRegistry, Info, Loader, loadersRegistry, CANVAS_EVENTS } from '@inweb/viewer-core';
 export * from '@inweb/viewer-core';
-import { Line, Vector3, BufferGeometry, Float32BufferAttribute, LineBasicMaterial, Mesh, MeshBasicMaterial, DoubleSide, EventDispatcher, MOUSE, TOUCH, Spherical, Quaternion, Vector2, Plane, Object3D, Line3, Raycaster, MathUtils, EdgesGeometry, Matrix4, Vector4, Controls, Clock, Sphere, Box3, Color, PerspectiveCamera, OrthographicCamera, AmbientLight, DirectionalLight, HemisphereLight, REVISION, MeshPhongMaterial, WebGLRenderTarget, UnsignedByteType, RGBAFormat, CylinderGeometry, Sprite, CanvasTexture, SRGBColorSpace, SpriteMaterial, TextureLoader, BufferAttribute, PointsMaterial, Points, TriangleStripDrawMode, TriangleFanDrawMode, LineSegments, LineLoop, Group, NormalBlending, LoadingManager, LoaderUtils, FileLoader, UniformsUtils, ShaderMaterial, AdditiveBlending, HalfFloatType, Scene, WebGLRenderer, LinearSRGBColorSpace } from 'three';
+import { Line, Vector3, BufferGeometry, Float32BufferAttribute, LineBasicMaterial, Mesh, MeshBasicMaterial, DoubleSide, EventDispatcher, MOUSE, TOUCH, Spherical, Quaternion, Vector2, Plane, Object3D, Line3, Raycaster, MathUtils, EdgesGeometry, Matrix4, Vector4, Controls, Clock, Box3, Color, PerspectiveCamera, OrthographicCamera, AmbientLight, DirectionalLight, HemisphereLight, REVISION, MeshPhongMaterial, WebGLRenderTarget, UnsignedByteType, RGBAFormat, CylinderGeometry, Sprite, CanvasTexture, SRGBColorSpace, SpriteMaterial, TextureLoader, BufferAttribute, PointsMaterial, Points, TriangleStripDrawMode, TriangleFanDrawMode, LineSegments, LineLoop, Group, NormalBlending, LoadingManager, LoaderUtils, FileLoader, UniformsUtils, ShaderMaterial, AdditiveBlending, HalfFloatType, Scene, WebGLRenderer, LinearSRGBColorSpace } from 'three';
 import { TransformControls } from 'three/examples/jsm/controls/TransformControls.js';
 import { LineSegmentsGeometry } from 'three/examples/jsm/lines/LineSegmentsGeometry.js';
 import { Wireframe } from 'three/examples/jsm/lines/Wireframe.js';
 import { LineMaterial } from 'three/examples/jsm/lines/LineMaterial.js';
 import { mergeGeometries } from 'three/examples/jsm/utils/BufferGeometryUtils.js';
+import { JSONParser } from '@streamparser/json';
 import { EffectComposer } from 'three/examples/jsm/postprocessing/EffectComposer.js';
 import { RenderPass } from 'three/examples/jsm/postprocessing/RenderPass.js';
 import { FXAAPass } from 'three/examples/jsm/postprocessing/FXAAPass.js';
@@ -841,7 +842,7 @@ class CuttingPlaneDragger extends OrbitDragger {
             this.orbit.enabled = !event.value;
         };
         this.updatePlaneSize = () => {
-            this.planeHelper.size = this.viewer.extents.getSize(new Vector3()).length();
+            this.planeHelper.size = this.viewer.extents.getSize(new Vector3()).length() || 1;
             this.viewer.update();
         };
         this.updateTransformCamera = () => {
@@ -852,17 +853,17 @@ class CuttingPlaneDragger extends OrbitDragger {
             this.plane.negate();
             this.viewer.update();
         };
-        const size = viewer.extents.getSize(new Vector3()).length();
-        const center = viewer.extents.getCenter(new Vector3());
-        const constant = -center.dot(normal);
+        const extentsSize = viewer.extents.getSize(new Vector3()).length() || 1;
+        const extentsCenter = viewer.extents.getCenter(new Vector3());
+        const constant = -extentsCenter.dot(normal);
         this.plane = new Plane(normal, constant);
         if (!viewer.renderer.clippingPlanes)
             viewer.renderer.clippingPlanes = [];
         viewer.renderer.clippingPlanes.push(this.plane);
-        this.planeHelper = new PlaneHelper(this.plane, size, color, center);
+        this.planeHelper = new PlaneHelper(this.plane, extentsSize, color, extentsCenter);
         this.viewer.helpers.add(this.planeHelper);
         this.planeCenter = new Object3D();
-        this.planeCenter.position.copy(viewer.extents.getCenter(new Vector3()));
+        this.planeCenter.position.copy(extentsCenter);
         this.viewer.helpers.add(this.planeCenter);
         this.transform = new TransformControls(viewer.camera, viewer.canvas);
         this.transform.showX = !!normal.x;
@@ -1173,7 +1174,11 @@ class MeasureLineDragger extends OrbitDragger {
             const model = this.viewer.models[0];
             const units = (_a = this.viewer.options.rulerUnit) !== null && _a !== void 0 ? _a : "Default";
             const precision = (_b = this.viewer.options.rulerPrecision) !== null && _b !== void 0 ? _b : "Default";
-            if (units === "Default") {
+            if (!model) {
+                this.scale = 1;
+                this.units = "";
+            }
+            else if (units === "Default") {
                 this.scale = model.getUnitScale();
                 this.units = model.getUnitString();
             }
@@ -1181,20 +1186,21 @@ class MeasureLineDragger extends OrbitDragger {
                 this.scale = convertUnits(model.getUnits(), units, 1);
                 this.units = units;
             }
-            if (precision === "Default") {
+            if (!model)
+                this.precision = 2;
+            else if (precision === "Default")
                 this.precision = model.getPrecision();
-            }
-            else {
+            else
                 this.precision = precision;
-            }
             this.overlay.updateLineUnits(this.scale, this.units, this.precision);
         };
         this.overlay = new MeasureOverlay(viewer.camera, viewer.canvas);
         this.overlay.attach();
         this.line = new MeasureLine(this.overlay, this.scale, this.units, this.precision);
         this.overlay.addLine(this.line);
+        const extentsSize = this.viewer.extents.getSize(new Vector3()).length() || 1;
         this.snapper = new Snapper(viewer.camera, viewer.renderer, viewer.canvas);
-        this.snapper.threshold = viewer.extents.getSize(new Vector3()).length() / 10000;
+        this.snapper.threshold = extentsSize / 10000;
         this.objects = [];
         this.updateObjects();
         this.updateUnits();
@@ -1893,7 +1899,7 @@ class WalkDragger {
     constructor(viewer) {
         this.updateControls = () => {
             const size = this.viewer.extents.getSize(new Vector3());
-            this.controls.movementSpeed = Math.min(size.x, size.y, size.z) / 2;
+            this.controls.movementSpeed = Math.min(size.x, size.y, size.z) / 2 || 1;
             this.joyStickControls.movementSpeed = this.controls.movementSpeed;
             this.joyStickControls.multiplier = this.controls.multiplier;
         };
@@ -2099,7 +2105,7 @@ class FlyDragger {
     constructor(viewer) {
         this.updateControls = () => {
             const size = this.viewer.extents.getSize(new Vector3());
-            this.controls.movementSpeed = Math.min(size.x, size.y, size.z) / 2;
+            this.controls.movementSpeed = Math.min(size.x, size.y, size.z) / 2 || 1;
             this.joyStickControls.movementSpeed = this.controls.movementSpeed;
             this.joyStickControls.multiplier = this.controls.multiplier;
         };
@@ -2204,27 +2210,27 @@ function zoomTo(viewer, box) {
     if (box.isEmpty())
         return;
     const boxCenter = box.getCenter(new Vector3());
-    const boxSize = box.getBoundingSphere(new Sphere()).radius;
+    const boxSize = box.getSize(new Vector3()).length() || 1;
     const rendererSize = viewer.renderer.getSize(new Vector2());
     const aspectRatio = rendererSize.x / rendererSize.y;
     const camera = viewer.camera;
     if (camera.isPerspectiveCamera) {
         const offset = new Vector3(0, 0, 1)
             .applyQuaternion(camera.quaternion)
-            .multiplyScalar(boxSize / Math.tan(MathUtils.degToRad(camera.fov * 0.5)));
+            .multiplyScalar(boxSize / (2 * Math.tan(MathUtils.degToRad(camera.fov * 0.5))));
         camera.position.copy(offset).add(boxCenter);
         camera.updateMatrixWorld();
     }
     if (camera.isOrthographicCamera) {
-        camera.top = boxSize;
-        camera.bottom = -boxSize;
+        camera.top = boxSize / 2;
+        camera.bottom = -boxSize / 2;
         camera.left = camera.bottom * aspectRatio;
         camera.right = camera.top * aspectRatio;
         camera.zoom = 1;
         camera.updateProjectionMatrix();
         const offset = new Vector3(0, 0, 1)
             .applyQuaternion(camera.quaternion)
-            .multiplyScalar(viewer.extents.getBoundingSphere(new Sphere()).radius * 3);
+            .multiplyScalar(viewer.extents.getSize(new Vector3()).length() || 1);
         camera.position.copy(offset).add(boxCenter);
         camera.updateMatrixWorld();
     }
@@ -2245,9 +2251,9 @@ const defaultViewPositions = {
     ne: new Vector3(-1, 1, 1).normalize(),
     nw: new Vector3(1, 1, 1).normalize(),
 };
-function setDefaultViewPosition(viewer, position) {
+function setDefaultViewPosition(viewer, position = "sw") {
     const extentsCenter = viewer.extents.getCenter(new Vector3());
-    const extentsSize = viewer.extents.getBoundingSphere(new Sphere()).radius * 2;
+    const extentsSize = viewer.extents.getSize(new Vector3()).length() || 1;
     const upY = new Vector3(0, 1, 0);
     const offsetY = defaultViewPositions[position] || defaultViewPositions["sw"];
     const up = new Vector3().copy(viewer.camera.up);
@@ -2504,7 +2510,7 @@ class CameraComponent {
         return camera.isOrthographicCamera ? "orthographic" : "perspective";
     }
     switchCamera(camera) {
-        const extentsSize = this.viewer.extents.getBoundingSphere(new Sphere()).radius * 2 || 1;
+        const extentsSize = this.viewer.extents.getSize(new Vector3()).length() || 1;
         const rendererSize = this.viewer.renderer.getSize(new Vector2());
         const aspectRatio = rendererSize.x / rendererSize.y;
         if (camera.isPerspectiveCamera) {
@@ -2544,7 +2550,7 @@ class CameraComponent {
         if (currentCamera.isPerspectiveCamera) {
             const fov = currentCamera.fov;
             const distance = currentCamera.position.distanceTo(target);
-            const fieldHeight = 2 * Math.tan(MathUtils.degToRad(fov) / 2) * distance;
+            const fieldHeight = 2 * Math.tan(MathUtils.degToRad(fov * 0.5)) * distance;
             camera = new OrthographicCamera();
             camera.top = fieldHeight / 2;
             camera.bottom = -fieldHeight / 2;
@@ -2602,7 +2608,7 @@ class LightComponent {
             if (this.viewer.extents.isEmpty())
                 return;
             const extentsCenter = this.viewer.extents.getCenter(new Vector3());
-            const extentsSize = this.viewer.extents.getBoundingSphere(new Sphere()).radius;
+            const extentsSize = this.viewer.extents.getSize(new Vector3()).length() || 1;
             const upY = new Vector3(0, 1, 0);
             const frontY = new Vector3(0, 0, -1);
             const up = new Vector3().copy(this.viewer.camera.up);
@@ -2611,17 +2617,14 @@ class LightComponent {
             this.directionalLight.position
                 .copy(up)
                 .applyAxisAngle(front, (-Math.PI * 30) / 180)
-                .multiplyScalar(extentsSize * 2)
+                .multiplyScalar(extentsSize)
                 .add(extentsCenter);
             this.directionalLight.target.position.copy(extentsCenter);
-            this.frontLight.position
-                .copy(front)
-                .multiplyScalar(extentsSize * 2)
-                .add(extentsCenter);
+            this.frontLight.position.copy(front).multiplyScalar(extentsSize).add(extentsCenter);
             this.frontLight.target.position.copy(extentsCenter);
             this.hemisphereLight.position
                 .copy(front)
-                .multiplyScalar(extentsSize * 3)
+                .multiplyScalar(extentsSize * 1.5)
                 .add(extentsCenter);
             this.viewer.scene.add(this.ambientLight);
             this.viewer.scene.add(this.directionalLight);
@@ -3027,8 +3030,9 @@ class SelectionComponent {
             const upPosition = this.getMousePosition(event, new Vector2());
             if (upPosition.distanceTo(this.downPosition) !== 0)
                 return;
+            const extentsSize = this.viewer.extents.getSize(new Vector3()).length() || 1;
             const snapper = new Snapper(this.viewer.camera, this.viewer.renderer, this.viewer.canvas);
-            snapper.threshold = this.viewer.extents.getSize(new Vector3()).length() / 10000;
+            snapper.threshold = extentsSize / 10000;
             let intersections = [];
             this.viewer.models.forEach((model) => {
                 const objects = model.getVisibleObjects();
@@ -3797,7 +3801,11 @@ class GltfStructure {
     this.criticalError = null;
   }
   async initialize(loader) {
-    this.json = await this.loadController.loadJson();
+    const json = await this.loadController.loadJson();
+    if (json.asset === undefined || json.asset.version[0] < 2) {
+      throw new Error("GltfStructure: Unsupported asset. glTF versions >=2.0 are supported.");
+    }
+    this.json = json;
     this.loader = loader;
     this.uri = this.json.buffers[0].uri || "";
   }
@@ -6293,48 +6301,59 @@ class GLTFLoadingManager extends LoadingManager {
 
 const BINARY_EXTENSION_HEADER_MAGIC = "glTF";
 const BINARY_EXTENSION_HEADER_LENGTH = 12;
-const BINARY_EXTENSION_CHUNK_TYPES = { JSON: 0x4e4f534a, BIN: 0x004e4042 };
-class GLTFBinaryExtension {
+const BINARY_EXTENSION_CHUNK_TYPES = { JSON: 0x4e4f534a, BIN: 0x004e4942 };
+class GLTFBinaryParser {
     constructor(data) {
-        const headerView = new DataView(data, 0, BINARY_EXTENSION_HEADER_LENGTH);
+        const dataView = new DataView(data, 0);
         const textDecoder = new TextDecoder();
-        const magic = textDecoder.decode(new Uint8Array(data.slice(0, 4)));
+        const magic = textDecoder.decode(new Uint8Array(data, 0, Math.min(4, data.byteLength)));
         if (magic !== BINARY_EXTENSION_HEADER_MAGIC) {
-            this.content = textDecoder.decode(data);
+            this.content = new Uint8Array(data);
             return;
         }
-        const header = {
+        this.header = {
             magic,
-            version: headerView.getUint32(4, true),
-            length: headerView.getUint32(8, true),
+            version: dataView.getUint32(4, true),
+            length: dataView.getUint32(8, true),
         };
-        if (header.magic !== BINARY_EXTENSION_HEADER_MAGIC) {
-            throw new Error("Unsupported glTF-Binary header.");
-        }
-        if (header.version < 2.0) {
-            throw new Error("Legacy binary file detected.");
-        }
-        const chunkContentsLength = header.length - BINARY_EXTENSION_HEADER_LENGTH;
-        const chunkView = new DataView(data, BINARY_EXTENSION_HEADER_LENGTH);
-        let chunkIndex = 0;
-        while (chunkIndex < chunkContentsLength) {
-            const chunkLength = chunkView.getUint32(chunkIndex, true);
-            chunkIndex += 4;
-            const chunkType = chunkView.getUint32(chunkIndex, true);
-            chunkIndex += 4;
+        if (this.header.length !== data.byteLength) {
+            throw new Error("GLTFBinaryParser: Invalid binary file header.");
+        }
+        if (this.header.version < 2.0) {
+            throw new Error("GLTFBinaryParser: Legacy binary file detected.");
+        }
+        let offset = BINARY_EXTENSION_HEADER_LENGTH;
+        while (offset < this.header.length) {
+            const chunkLength = dataView.getUint32(offset, true);
+            offset += 4;
+            const chunkType = dataView.getUint32(offset, true);
+            offset += 4;
             if (chunkType === BINARY_EXTENSION_CHUNK_TYPES.JSON) {
-                const contentArray = new Uint8Array(data, BINARY_EXTENSION_HEADER_LENGTH + chunkIndex, chunkLength);
-                this.content = textDecoder.decode(contentArray);
+                this.content = new Uint8Array(data, offset, chunkLength);
             }
             else if (chunkType === BINARY_EXTENSION_CHUNK_TYPES.BIN) {
-                const byteOffset = BINARY_EXTENSION_HEADER_LENGTH + chunkIndex;
-                this.body = data.slice(byteOffset, byteOffset + chunkLength);
+                this.body = data.slice(offset, offset + chunkLength);
             }
-            chunkIndex += chunkLength;
+            offset += chunkLength;
         }
         if (typeof this.content === "undefined") {
-            throw new Error("JSON content not found.");
+            throw new Error("GLTFBinaryParser: JSON content not found.");
         }
+        if (typeof this.body === "undefined") {
+            throw new Error("GLTFBinaryParser: Binary buffer chunk not found or type not supported.");
+        }
+    }
+}
+
+class JSONStreamParser extends JSONParser {
+    constructor(data) {
+        super();
+        this.onValue = ({ value, stack }) => {
+            if (stack.length === 0)
+                this.json = value;
+        };
+        if (data)
+            this.write(data);
     }
 }
 
@@ -6443,13 +6462,13 @@ class GLTFFileDynamicLoader extends Loader {
                     this.viewer.emitEvent({ type: "geometryprogress", data: progress, file });
                 };
                 const data = await loader.loadAsync(this.manager.fileURL, progress);
-                const extension = new GLTFBinaryExtension(data);
-                this.gltf = JSON.parse(extension.content);
-                this.glb = extension.body;
-                if (/\.glb$/i.test(this.manager.fileURL) && !this.glb) {
-                    throw new Error("GLTFFileDynamicLoader: Binary buffer chunk not found or type not supported.");
+                const binaryParser = new GLTFBinaryParser(data);
+                const jsonParser = new JSONStreamParser(binaryParser.content);
+                if (!jsonParser.json) {
+                    throw new Error("GLTFFileDynamicLoader: JSON content not found or invalid.");
                 }
-                return this.gltf;
+                this.glb = binaryParser.body;
+                return jsonParser.json;
             },
             loadBinaryData: (ranges, uri = "") => {
                 const loader = new RangesLoader();
@@ -6520,13 +6539,16 @@ class GLTFCloudDynamicLoader extends Loader {
         });
         const loadController = {
             loadJson: async () => {
-                const progress = (progress) => {
+                const jsonParser = new JSONStreamParser();
+                const progress = (progress, chunk) => {
+                    jsonParser.write(chunk);
                     this.viewer.emitEvent({ type: "geometryprogress", data: progress, file: model.file, model });
                 };
-                const arrayBuffer = await model.downloadResource(model.database, progress, this.gltfLoader.getAbortController().signal);
-                const text = new TextDecoder().decode(arrayBuffer);
-                const json = JSON.parse(text);
-                return json;
+                await model.downloadResource(model.database, progress, this.gltfLoader.getAbortController().signal);
+                if (!jsonParser.json) {
+                    throw new Error("GLTFCloudDynamicLoader: JSON content not found or invalid.");
+                }
+                return jsonParser.json;
             },
             loadBinaryData: (requests) => {
                 const ranges = requests.map((request) => ({
@@ -6963,10 +6985,8 @@ class Viewer extends EventEmitter2 {
         if (model && typeof model.database === "string") {
             file = model.file;
         }
-        if (!model)
-            throw new Error(`Format not supported`);
         let format = params.format;
-        if (!format && typeof file["type"] === "string")
+        if (!format && file && typeof file["type"] === "string")
             format = file["type"].split(".").pop();
         if (!format && typeof file === "string")
             format = file.split(".").pop();
@@ -6974,7 +6994,7 @@ class Viewer extends EventEmitter2 {
             format = file.name.split(".").pop();
         const loader = loaders.createLoader(this, model, format);
         if (!loader)
-            throw new Error(`Format not supported`);
+            throw new Error(`Format not supported (${format})`);
         this.loaders.push(loader);
         this.emitEvent({ type: "geometrystart", file, model });
         try {
@@ -7016,7 +7036,6 @@ class Viewer extends EventEmitter2 {
         this.scene.clear();
         this.helpers.clear();
         this.extents.makeEmpty();
-        this.target.set(0, 0, 0);
         this.syncOptions();
         this.syncOverlay();
         this.emitEvent({ type: "clear" });
@@ -7132,7 +7151,7 @@ class Viewer extends EventEmitter2 {
         const getVector3FromPoint3d = ({ x, y, z }) => new Vector3(x, y, z);
         const setOrthogonalCamera = (orthogonal_camera) => {
             if (orthogonal_camera) {
-                const extentsSize = this.extents.getBoundingSphere(new Sphere()).radius * 2;
+                const extentsSize = this.extents.getSize(new Vector3()).length() || 1;
                 const rendererSize = this.renderer.getSize(new Vector2());
                 const aspectRatio = rendererSize.x / rendererSize.y;
                 const camera = new OrthographicCamera();
@@ -7158,7 +7177,7 @@ class Viewer extends EventEmitter2 {
         };
         const setPerspectiveCamera = (perspective_camera) => {
             if (perspective_camera) {
-                const extentsSize = this.extents.getBoundingSphere(new Sphere()).radius * 2;
+                const extentsSize = this.extents.getSize(new Vector3()).length() || 1;
                 const rendererSize = this.renderer.getSize(new Vector2());
                 const aspectRatio = rendererSize.x / rendererSize.y;
                 const camera = new PerspectiveCamera();