@needle-tools/gltf-progressive 1.1.0-alpha.1 → 1.2.0-alpha

package/lib/lods_manager.js

@@ -232,7 +232,7 @@ export class LODsManager {
             plugin.onAfterUpdatedLOD?.(this.renderer, scene, camera, object, levels);
         }
         state.lastLodLevel_Mesh = levels.mesh_lod;
-        state.lasLodLevel_Texture = levels.texture_lod;
+        state.lastLodLevel_Texture = levels.texture_lod;
     }
     /** Load progressive textures for the given material
      * @param material the material to load the textures for
@@ -338,7 +338,7 @@ export class LODsManager {
         const mesh_lods = mesh_lods_info?.lods;
         const has_mesh_lods = mesh_lods && mesh_lods.length > 0;
         const texture_lods_minmax = NEEDLE_progressive.getMaterialMinMaxLODsCount(mesh.material);
-        const has_texture_lods = texture_lods_minmax?.min != Infinity && texture_lods_minmax.min > 0 && texture_lods_minmax.max > 0;
+        const has_texture_lods = texture_lods_minmax?.min_count != Infinity && texture_lods_minmax.min_count > 0 && texture_lods_minmax.max_count > 0;
         // We can skip all this if we dont have any LOD information
         if (!has_mesh_lods && !has_texture_lods) {
             result.mesh_lod = 0;
@@ -486,9 +486,34 @@ export class LODsManager {
             }
         }
         result.mesh_lod = mesh_level;
-        if (texture_lods_minmax?.min && texture_lods_minmax.min > 0 && texture_lods_minmax.max > 0) {
-            const t = Math.min(1, Math.max(0, state.lastScreenCoverage * 3));
-            result.texture_lod = lerp(texture_lods_minmax.max, 0, t);
+        if (has_texture_lods) {
+            // If this is the first time a texture LOD is requested we want to get the highest LOD to not display the minimal resolution that the root glTF contains as long while we wait for loading of e.g. the 8k LOD 0 texture
+            if (state.lastLodLevel_Texture < 0) {
+                result.texture_lod = texture_lods_minmax.max_count - 1;
+                if (debugProgressiveLoading) {
+                    const level = texture_lods_minmax.lods[texture_lods_minmax.max_count - 1];
+                    if (debugProgressiveLoading)
+                        console.log(`First Texture LOD ${result.texture_lod} (${level.max_height}px) - ${mesh.name}`);
+                }
+            }
+            else {
+                const factor = state.lastScreenCoverage * 1.5;
+                const screenSize = this.renderer.domElement.clientHeight / window.devicePixelRatio;
+                const pixelSizeOnScreen = screenSize * factor;
+                for (let i = texture_lods_minmax.lods.length - 1; i >= 0; i--) {
+                    const lod = texture_lods_minmax.lods[i];
+                    if (lod.max_height > pixelSizeOnScreen) {
+                        result.texture_lod = i;
+                        if (result.texture_lod < state.lastLodLevel_Texture) {
+                            if (debugProgressiveLoading)
+                                console.log(`Texture LOD changed ${state.lastLodLevel_Texture} → ${result.texture_lod} (${lod.max_height}px: ${(100 * state.lastScreenCoverage).toFixed(2)} % = ${pixelSizeOnScreen.toFixed(0)}px) - ${mesh.name}`);
+                        }
+                        break;
+                    }
+                }
+                // const t = Math.min(1, Math.max(0, state.lastScreenCoverage * 1.1));
+                // result.texture_lod = lerp(texture_lods_minmax.max_count, 0, t);
+            }
         }
         else {
             result.texture_lod = 0;
@@ -500,8 +525,8 @@ function lerp(a, b, t) {
 }
 class LOD_state {
     frames = 0;
-    lastLodLevel_Mesh = 0;
-    lasLodLevel_Texture = 0;
+    lastLodLevel_Mesh = -1;
+    lastLodLevel_Texture = -1;
     lastScreenCoverage = 0;
     lastScreenspaceVolume = new Vector3();
     lastCentrality = 0;

package/lib/plugins/modelviewer.js

@@ -111,7 +111,7 @@ class RegisterModelviewerDataPlugin {
                             if (textureData?.extensions?.[EXTENSION_NAME]) {
                                 const ext = textureData.extensions[EXTENSION_NAME];
                                 if (ext && url) {
-                                    NEEDLE_progressive.registerTexture(url, value, ext.lods.length, ext);
+                                    NEEDLE_progressive.registerTexture(url, value, ext.lods.length, textureIndex, ext);
                                 }
                             }
                         }

package/package.json

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