@needle-tools/gltf-progressive 3.0.0-next.90239b7 → 3.0.0-next.d16d57f

package/lib/{lods_manager.js → lods.manager.js}

@@ -1,10 +1,11 @@
 import { Box3, Clock, Matrix4, Mesh, MeshStandardMaterial, Sphere, Vector3 } from "three";
 import { NEEDLE_progressive } from "./extension.js";
 import { createLoaders } from "./loaders.js";
-import { getParam, isMobileDevice } from "./utils.internal.js";
+import { getParam, isDevelopmentServer, isMobileDevice } from "./utils.internal.js";
 import { plugins } from "./plugins/plugin.js";
 import { getRaycastMesh } from "./utils.js";
 import { applyDebugSettings, debug, debug_OverrideLodLevel } from "./lods.debug.js";
+import { PromiseGroup } from "./lods.loading.js";
 const debugProgressiveLoading = getParam("debugprogressive");
 const suppressProgressiveLoading = getParam("noprogressive");
 const $lodsManager = Symbol("Needle:LODSManager");
@@ -78,8 +79,8 @@ export class LODsManager {
         renderer[$lodsManager] = lodsManager;
         return lodsManager;
     }
-    context;
     renderer;
+    context;
     projectionScreenMatrix = new Matrix4();
     /** @deprecated use static `LODsManager.addPlugin()` method. This getter will be removed in later versions */
     get plugins() { return plugins; }
@@ -111,6 +112,37 @@ export class LODsManager {
      * @default false
      */
     manual = false;
+    _newPromiseGroups = [];
+    _promiseGroupIds = 0;
+    /**
+     * Call to await LODs loading during the next render cycle.
+     */
+    awaitLoading(opts) {
+        const id = this._promiseGroupIds++;
+        const newGroup = new PromiseGroup(this.#frame, { ...opts, });
+        this._newPromiseGroups.push(newGroup);
+        const start = performance.now();
+        newGroup.ready.finally(() => {
+            const index = this._newPromiseGroups.indexOf(newGroup);
+            if (index >= 0) {
+                this._newPromiseGroups.splice(index, 1);
+                if (isDevelopmentServer())
+                    performance.measure("LODsManager:awaitLoading", {
+                        start,
+                        detail: { id, name: opts?.name, awaited: newGroup.awaitedCount, resolved: newGroup.resolvedCount }
+                    });
+            }
+        });
+        return newGroup.ready;
+    }
+    _postprocessPromiseGroups() {
+        if (this._newPromiseGroups.length === 0)
+            return;
+        for (let i = this._newPromiseGroups.length - 1; i >= 0; i--) {
+            const group = this._newPromiseGroups[i];
+            group.update(this.#frame);
+        }
+    }
     _lodchangedlisteners = [];
     addEventListener(evt, listener) {
         if (evt === "changed") {
@@ -232,6 +264,7 @@ export class LODsManager {
                 return;
             }
             this.internalUpdate(scene, camera);
+            this._postprocessPromiseGroups();
         }
     }
     /**
@@ -368,9 +401,10 @@ export class LODsManager {
         }
         if (update) {
             material[$currentLOD] = level;
-            NEEDLE_progressive.assignTextureLOD(material, level).then(_ => {
+            const promise = NEEDLE_progressive.assignTextureLOD(material, level).then(_ => {
                 this._lodchangedlisteners.forEach(l => l({ type: "texture", level, object: material }));
             });
+            PromiseGroup.addPromise("texture", promise, this._newPromiseGroups);
         }
     }
     /** Load progressive meshes for the given mesh
@@ -391,19 +425,14 @@ export class LODsManager {
         if (update) {
             mesh[$currentLOD] = level;
             const originalGeometry = mesh.geometry;
-            return NEEDLE_progressive.assignMeshLOD(mesh, level).then(res => {
+            const promise = NEEDLE_progressive.assignMeshLOD(mesh, level).then(res => {
                 if (res && mesh[$currentLOD] == level && originalGeometry != mesh.geometry) {
                     this._lodchangedlisteners.forEach(l => l({ type: "mesh", level, object: mesh }));
-                    // if (this.handles) {
-                    //     for (const inst of this.handles) {
-                    //         // if (inst["LOD"] < level) continue;
-                    //         // inst["LOD"] = level;
-                    //         inst.setGeometry(mesh.geometry);
-                    //     }
-                    // }
                 }
                 return res;
             });
+            PromiseGroup.addPromise("mesh", promise, this._newPromiseGroups);
+            return promise;
         }
         return Promise.resolve(null);
     }

package/lib/plugins/modelviewer.js

@@ -1,4 +1,4 @@
-import { LODsManager } from "../lods_manager.js";
+import { LODsManager } from "../lods.manager.js";
 import { EXTENSION_NAME, NEEDLE_progressive } from "../extension.js";
 const $meshLODSymbol = Symbol("NEEDLE_mesh_lod");
 const $textureLODSymbol = Symbol("NEEDLE_texture_lod");

package/lib/utils.internal.d.ts

@@ -3,3 +3,4 @@ export declare function getParam(name: string): boolean | string;
 export declare function resolveUrl(source: string | undefined, uri: string): string;
 /** @returns `true` if it's a phone or tablet */
 export declare function isMobileDevice(): boolean;
+export declare function isDevelopmentServer(): boolean;

package/lib/utils.internal.js

@@ -50,3 +50,11 @@ export function isMobileDevice() {
         console.log("[glTF Progressive]: isMobileDevice", _ismobile);
     return _ismobile;
 }
+export function isDevelopmentServer() {
+    if (typeof window === "undefined")
+        return false;
+    const url = new URL(window.location.href);
+    const isLocalhostOrIpAddress = url.hostname === "localhost" || /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(url.hostname);
+    const isDevelopment = url.hostname === "127.0.0.1" || isLocalhostOrIpAddress;
+    return isDevelopment;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@needle-tools/gltf-progressive",
-  "version": "3.0.0-next.90239b7",
+  "version": "3.0.0-next.d16d57f",
   "description": "three.js support for loading glTF or GLB files that contain progressive loading data",
   "homepage": "https://needle.tools",
   "author": {