@inweb/viewer-three 26.9.0 → 26.9.1

package/dist/viewer-three.js

@@ -82047,32 +82047,32 @@ void main() {
     function zoomTo(viewer, box) {
         if (box.isEmpty())
             return;
-        const center = box.getCenter(new Vector3());
-        const sphere = box.getBoundingSphere(new Sphere());
+        const boxCenter = box.getCenter(new Vector3());
+        const boxSize = box.getBoundingSphere(new Sphere()).radius;
         const rendererSize = viewer.renderer.getSize(new Vector2());
         const aspect = rendererSize.x / rendererSize.y;
         const camera = viewer.camera;
         if (camera.isPerspectiveCamera) {
-            const offset = new Vector3(0, 0, 1);
-            offset.applyQuaternion(camera.quaternion);
-            offset.multiplyScalar(sphere.radius / Math.tan(MathUtils.DEG2RAD * camera.fov * 0.5));
-            camera.position.copy(center).add(offset);
+            const offset = new Vector3(0, 0, 1)
+                .applyQuaternion(camera.quaternion)
+                .multiplyScalar(boxSize / Math.tan(MathUtils.DEG2RAD * camera.fov * 0.5));
+            camera.position.copy(offset).add(boxCenter);
             camera.updateMatrixWorld();
         }
         if (camera.isOrthographicCamera) {
-            camera.top = sphere.radius;
-            camera.bottom = -sphere.radius;
+            camera.top = boxSize;
+            camera.bottom = -boxSize;
             camera.left = camera.bottom * aspect;
             camera.right = camera.top * aspect;
             camera.zoom = 1;
             camera.updateProjectionMatrix();
-            const offset = new Vector3(0, 0, 1);
-            offset.applyQuaternion(camera.quaternion);
-            offset.multiplyScalar(viewer.extents.getBoundingSphere(new Sphere()).radius * 3);
-            camera.position.copy(center).add(offset);
+            const offset = new Vector3(0, 0, 1)
+                .applyQuaternion(camera.quaternion)
+                .multiplyScalar(viewer.extents.getBoundingSphere(new Sphere()).radius * 3);
+            camera.position.copy(offset).add(boxCenter);
             camera.updateMatrixWorld();
         }
-        viewer.target.copy(center);
+        viewer.target.copy(boxCenter);
         viewer.update();
         viewer.emitEvent({ type: "zoom" });
     }
@@ -82100,27 +82100,30 @@ void main() {
     // acknowledge and accept the above terms.
     ///////////////////////////////////////////////////////////////////////////////
     const defaultViewPositions = {
-        front: new Vector3(0, 0, 1),
-        back: new Vector3(0, 0, -1),
-        left: new Vector3(-1, 0, 0),
-        right: new Vector3(1, 0, 0),
+        front: new Vector3(0, 0, -1),
+        back: new Vector3(0, 0, 1),
+        left: new Vector3(1, 0, 0),
+        right: new Vector3(-1, 0, 0),
         bottom: new Vector3(0, -1, 0),
         top: new Vector3(0, 1, 0),
-        ns: new Vector3(-0.5, 1.0, -0.5).normalize(),
-        sw: new Vector3(0.5, 1.0, -0.5).normalize(),
-        nw: new Vector3(0.5, 1.0, 0.5).normalize(),
-        se: new Vector3(-0.5, 1.0, 0.5).normalize(),
+        se: new Vector3(-1, 1, -1).normalize(),
+        sw: new Vector3(1, 1, -1).normalize(),
+        ne: new Vector3(-1, 1, 1).normalize(),
+        nw: new Vector3(1, 1, 1).normalize(),
     };
     function setDefaultViewPosition(viewer, position) {
-        const direction = defaultViewPositions[position] || defaultViewPositions["sw"];
-        const center = viewer.extents.getCenter(new Vector3());
-        const sphere = viewer.extents.getBoundingSphere(new Sphere());
-        const offset = direction.clone().multiplyScalar(sphere.radius);
+        const extentsCenter = viewer.extents.getCenter(new Vector3());
+        const extentsSize = viewer.extents.getBoundingSphere(new Sphere()).radius * 2;
+        const upY = new Vector3(0, 1, 0);
+        const offsetY = defaultViewPositions[position] || defaultViewPositions["sw"];
+        const up = new Vector3().copy(viewer.camera.up);
+        const quaternion = new Quaternion().setFromUnitVectors(upY, up);
+        const offset = new Vector3().copy(offsetY).applyQuaternion(quaternion);
         const camera = viewer.camera;
-        camera.position.copy(center).add(offset);
-        camera.lookAt(center);
+        camera.position.copy(offset).multiplyScalar(extentsSize).add(extentsCenter);
+        camera.lookAt(extentsCenter);
         camera.updateMatrixWorld();
-        viewer.target.copy(center);
+        viewer.target.copy(extentsCenter);
         viewer.update();
         viewer.emit({ type: "viewposition", data: position });
         zoomTo(viewer, viewer.extents);
@@ -82857,12 +82860,13 @@ void main() {
                     return;
                 const extentsCenter = this.viewer.extents.getCenter(new Vector3());
                 const extentsSize = this.viewer.extents.getBoundingSphere(new Sphere()).radius;
-                const front = new Vector3()
-                    .copy(this.viewer.camera.up)
-                    .cross(new Vector3(1, 0, 0))
-                    .negate();
+                const upY = new Vector3(0, 1, 0);
+                const frontY = new Vector3(0, 0, -1);
+                const up = new Vector3().copy(this.viewer.camera.up);
+                const quaternion = new Quaternion().setFromUnitVectors(upY, up);
+                const front = new Vector3().copy(frontY).applyQuaternion(quaternion).negate();
                 this.directionalLight.position
-                    .copy(this.viewer.camera.up)
+                    .copy(up)
                     .applyAxisAngle(front, (-Math.PI * 30) / 180)
                     .multiplyScalar(extentsSize * 2)
                     .add(extentsCenter);
@@ -90265,11 +90269,12 @@ void main() {
     const MAX_CHUNK = 30 * 1024 * 1024; // 100 MB
 
     class GltfStructure {
-      constructor(id) {
+      constructor(id, loadController) {
         this.id = `${id}`;
         this.json = null;
         this.baseUrl = "";
-        this.loadController = null;
+        this.loadController = loadController;
+        this.loader = null;
         this.batchDelay = 10;
         this.maxBatchSize = 5 * 1024 * 1024;
         this.maxRangesPerRequest = 512;
@@ -90281,10 +90286,10 @@ void main() {
         this.materialCache = new Map();
       }
 
-      async initialize(loadController) {
-        this.json = await loadController.loadJson();
-        this.baseUrl = await loadController.baseUrl();
-        this.loadController = loadController;
+      async initialize(loader) {
+        this.json = await this.loadController.loadJson();
+        this.baseUrl = await this.loadController.baseUrl();
+        this.loader = loader;
       }
 
       clear() {
@@ -90297,10 +90302,12 @@ void main() {
           this.batchTimeout = null;
         }
 
-        // Clear materials and textures
         this.disposeMaterials();
         this.textureCache.clear();
         this.materials.clear();
+
+        this.activeChunkLoads = 0;
+        this.chunkQueue = [];
       }
 
       getJson() {
@@ -90379,35 +90386,32 @@ void main() {
             finalRanges.push({ start, end, requests });
           }
         }
-        /*
-        for (const range of finalRanges) {
-          const length = range.end - range.start;
-          const buffer = await this.loadController.loadBinaryData([
-            { offset: range.start, length: length }
-          ]);
-          for (const req of range.requests) {
-            const relOffset = req.offset - range.start;
-            try {
-              req._resolve({ buffer, relOffset, length: req.length });
-            } catch (e) {
-              req._reject(e);
-            }
-          }
-        }
-        */
 
-        const promises = finalRanges.map(async (range) => {
-          const length = range.end - range.start;
-          const buffer = await this.loadController.loadBinaryData([{ offset: range.start, length }]);
-          for (const req of range.requests) {
-            const relOffset = req.offset - range.start;
-            try {
-              req._resolve({ buffer, relOffset, length: req.length });
-            } catch (e) {
-              req._reject(e);
+        const promises = finalRanges.map(async (range, index) => {
+          await this.loader.waitForChunkSlot();
+
+          try {
+            const length = range.end - range.start;
+            const buffer = await this.loadController.loadBinaryData([{ offset: range.start, length }]);
+
+            for (const req of range.requests) {
+              const relOffset = req.offset - range.start;
+              try {
+                req._resolve({ buffer, relOffset, length: req.length });
+              } catch (e) {
+                req._reject(e);
+              }
+            }
+          } catch (error) {
+            for (const req of range.requests) {
+              req._reject(error);
             }
+            console.warn(`Failed to load chunk ${index + 1}/${finalRanges.length} (${range.start}-${range.end}):`, error);
+          } finally {
+            this.loader.releaseChunkSlot();
           }
         });
+
         await Promise.all(promises);
 
         this.pendingRequests = [];
@@ -90825,6 +90829,10 @@ void main() {
         this.hiddenHandles = new Set();
         this.newOptimizedObjects = new Set();
         this.oldOptimizeObjects = new Set();
+
+        this.maxConcurrentChunks = 8;
+        this.activeChunkLoads = 0;
+        this.chunkQueue = [];
       }
 
       setVisibleEdges(visible) {
@@ -91234,6 +91242,7 @@ void main() {
         const structureArray = Array.isArray(structures) ? structures : [structures];
 
         for (const structure of structureArray) {
+          await structure.initialize(this);
           this.structures.push(structure);
         }
 
@@ -91625,13 +91634,6 @@ void main() {
         this.nodesToLoad = [];
       }
 
-      async addStructure(loadController) {
-        const structure = new GltfStructure();
-        await structure.initialize(loadController);
-        this.structures.push(structure);
-        return structure;
-      }
-
       removeOptimization() {
         this.originalObjects.forEach((obj) => (obj.visible = true));
 
@@ -91663,7 +91665,8 @@ void main() {
       }
 
       clear() {
-        // Clear all structures
+        this.chunkQueue = [];
+
         this.structures.forEach((structure) => {
           if (structure) {
             structure.clear();
@@ -91704,7 +91707,6 @@ void main() {
         });
         this.loadedMeshes.clear();
 
-        // Clear all structure roots and their children
         this.structureRoots.forEach((rootGroup) => {
           if (rootGroup) {
             rootGroup.traverse((child) => {
@@ -91724,7 +91726,6 @@ void main() {
         });
         this.structureRoots.clear();
 
-        // Clear all optimized objects
         this.mergedMesh.forEach((mesh) => {
           if (mesh.geometry) mesh.geometry.dispose();
           if (mesh.material) {
@@ -92477,7 +92478,6 @@ void main() {
         });
       }
 
-      // Возвращает bounding box для конкретной структуры
       getStructureGeometryExtent(structureId) {
         const extent = new Box3();
         for (const [nodeId, node] of this.nodes.entries()) {
@@ -92495,6 +92495,35 @@ void main() {
         }
         return extent;
       }
+
+      setMaxConcurrentChunks(maxChunks) {
+        if (maxChunks < 1) {
+          console.warn("Max concurrent chunks must be at least 1");
+          return;
+        }
+        this.maxConcurrentChunks = maxChunks;
+      }
+
+      waitForChunkSlot() {
+        if (this.activeChunkLoads < this.maxConcurrentChunks) {
+          this.activeChunkLoads++;
+          return Promise.resolve();
+        }
+
+        return new Promise((resolve) => {
+          this.chunkQueue.push(resolve);
+        });
+      }
+
+      releaseChunkSlot() {
+        this.activeChunkLoads--;
+
+        if (this.chunkQueue.length > 0) {
+          const nextResolve = this.chunkQueue.shift();
+          this.activeChunkLoads++;
+          nextResolve();
+        }
+      }
     }
 
     ///////////////////////////////////////////////////////////////////////////////
@@ -92540,6 +92569,7 @@ void main() {
             this.gltfLoader = new DynamicGltfLoader(this.viewer.camera, scene, this.viewer.renderer);
             this.gltfLoader.memoryLimit = this.viewer.options.memoryLimit;
             this.gltfLoader.setVisibleEdges(this.viewer.options.edgeModel);
+            // this.gltfLoader.setMaxConcurrentChunks(this.viewer.options.maxConcurrentChunks);
             this.gltfLoader.addEventListener("databasechunk", (data) => {
                 const modelImpl = new DynamicModelImpl(scene);
                 modelImpl.loader = this;
@@ -92583,8 +92613,7 @@ void main() {
                 },
                 baseUrl: () => Promise.resolve(`${model.httpClient.serverUrl}${model.path}/`),
             };
-            const structure = new GltfStructure(model.id);
-            await structure.initialize(loadController);
+            const structure = new GltfStructure(model.id, loadController);
             await this.gltfLoader.loadStructure(structure);
             await this.gltfLoader.loadNodes();
             return this;
@@ -109790,13 +109819,13 @@ void main() {
             this.addEventListener("optionschange", (event) => this.syncOptions(event.data));
             this.scene = new Scene();
             this.helpers = new Helpers();
-            this.target = new Vector3();
+            this.target = new Vector3(0, 0, 0);
             const pixelRatio = window.devicePixelRatio;
             const rect = canvas.parentElement.getBoundingClientRect();
             const width = rect.width || 1;
             const height = rect.height || 1;
             const aspect = width / height;
-            this.camera = new PerspectiveCamera(45, aspect, 0.01, 1000);
+            this.camera = new PerspectiveCamera(45, aspect, 0.001, 1000);
             this.camera.up.set(0, 1, 0);
             this.camera.position.set(0, 0, 1);
             this.camera.lookAt(this.target);
@@ -110202,7 +110231,7 @@ void main() {
                     camera.left = camera.bottom * aspect;
                     camera.right = camera.top * aspect;
                     camera.near = 0;
-                    camera.far = extentsSize * 100;
+                    camera.far = extentsSize * 1000;
                     camera.zoom = orthogonal_camera.view_to_world_scale;
                     camera.updateProjectionMatrix();
                     camera.up.copy(getVector3FromPoint3d(orthogonal_camera.up_vector));
@@ -110223,8 +110252,8 @@ void main() {
                     const camera = new PerspectiveCamera();
                     camera.fov = perspective_camera.field_of_view;
                     camera.aspect = aspect;
-                    camera.near = extentsSize / 100;
-                    camera.far = extentsSize * 100;
+                    camera.near = extentsSize / 1000;
+                    camera.far = extentsSize * 1000;
                     camera.updateProjectionMatrix();
                     camera.up.copy(getVector3FromPoint3d(perspective_camera.up_vector));
                     camera.position.copy(getVector3FromPoint3d(perspective_camera.view_point));