@needle-tools/gltf-progressive 2.1.0-experimental.3 → 2.1.1

package/lib/lods_manager.js

@@ -309,9 +309,6 @@ export class LODsManager {
         // TODO: we currently can not switch texture lods because we need better caching for the textures internally (see copySettings in progressive + NE-4431)
         let textureLOD = levels.texture_lod;
         if (object.material && textureLOD >= 0) {
-            const debugLevel = object["DEBUG:LOD"];
-            if (debugLevel != undefined)
-                textureLOD = debugLevel;
             this.loadProgressiveTextures(object.material, textureLOD);
         }
         for (const plugin of plugins) {
@@ -343,6 +340,11 @@ export class LODsManager {
         else if (level < material[$currentLOD]) {
             update = true;
         }
+        const debugLevel = material["DEBUG:LOD"];
+        if (debugLevel != undefined) {
+            update = material[$currentLOD] != debugLevel;
+            level = debugLevel;
+        }
         if (update) {
             material[$currentLOD] = level;
             NEEDLE_progressive.assignTextureLOD(material, level).then(_ => {
@@ -359,7 +361,13 @@ export class LODsManager {
     loadProgressiveMeshes(mesh, level) {
         if (!mesh)
             return Promise.resolve(null);
-        if (mesh[$currentLOD] !== level) {
+        let update = mesh[$currentLOD] !== level;
+        const debugLevel = mesh["DEBUG:LOD"];
+        if (debugLevel != undefined) {
+            update = mesh[$currentLOD] != debugLevel;
+            level = debugLevel;
+        }
+        if (update) {
             mesh[$currentLOD] = level;
             const originalGeometry = mesh.geometry;
             return NEEDLE_progressive.assignMeshLOD(mesh, level).then(res => {
@@ -456,7 +464,7 @@ export class LODsManager {
             }
             boundingBox = skinnedMesh.boundingBox;
         }
-        if (boundingBox && camera.isPerspectiveCamera) {
+        if (boundingBox) {
             const cam = camera;
             // hack: if the mesh has vertex colors, has less than 100 vertices we always select the highest LOD
             if (mesh.geometry.attributes.color && mesh.geometry.attributes.color.count < 100) {
@@ -481,7 +489,7 @@ export class LODsManager {
             // High distortions would lead to lower LOD levels.
             // "Centrality" of the calculated screen-space bounding box could be a factor here –
             // what's the distance of the bounding box to the center of the screen?
-            if (LODsManager.isInside(this._tempBox, this.projectionScreenMatrix)) {
+            if (cam.isPerspectiveCamera && LODsManager.isInside(this._tempBox, this.projectionScreenMatrix)) {
                 result.mesh_lod = 0;
                 result.texture_lod = 0;
                 return;
@@ -489,7 +497,7 @@ export class LODsManager {
             this._tempBox.applyMatrix4(this.projectionScreenMatrix);
             // TODO might need to be adjusted for cameras that are rendered during an XR session but are 
             // actually not XR cameras (e.g. a render texture)
-            if (this.renderer.xr.enabled && cam.fov > 70) {
+            if (this.renderer.xr.enabled && (cam.isPerspectiveCamera) && cam.fov > 70) {
                 // calculate centrality of the bounding box - how close is it to the screen center
                 const min = this._tempBox.min;
                 const max = this._tempBox.max;
@@ -522,7 +530,13 @@ export class LODsManager {
                 if (canvasHeight > 0)
                     boxSize.multiplyScalar(canvasHeight / screen.availHeight);
             }
-            boxSize.x *= cam.aspect;
+            if (camera.isPerspectiveCamera) {
+                boxSize.x *= camera.aspect;
+            }
+            else if (camera.isOrthographicCamera) {
+                // const cam = camera as OrthographicCamera;
+                // boxSize.x *= cam.zoom * .01;
+            }
             const matView = camera.matrixWorldInverse;
             const box2 = this._tempBox2;
             box2.copy(boundingBox);
@@ -618,6 +632,7 @@ export class LODsManager {
                 }
                 const screenSize = canvasHeight / window.devicePixelRatio;
                 const pixelSizeOnScreen = screenSize * factor;
+                let foundLod = false;
                 for (let i = texture_lods_minmax.lods.length - 1; i >= 0; i--) {
                     let lod = texture_lods_minmax.lods[i];
                     if (saveDataEnabled && lod.max_height >= 2048) {
@@ -625,7 +640,8 @@ export class LODsManager {
                     }
                     if (isMobileDevice() && lod.max_height > 4096)
                         continue; // skip 8k textures on mobile devices (for now)
-                    if (lod.max_height > pixelSizeOnScreen) {
+                    if (lod.max_height > pixelSizeOnScreen || (!foundLod && i === 0)) {
+                        foundLod = true;
                         result.texture_lod = i;
                         if (result.texture_lod < state.lastLodLevel_Texture) {
                             const lod_pixel_height = lod.max_height;

package/lib/version.js

@@ -1,4 +1,4 @@
 // replaced at build time
-export const version = "2.1.0-experimental.3";
+export const version = "2.1.1";
 globalThis["GLTF_PROGRESSIVE_VERSION"] = version;
-console.debug(`[gltf-progressive] version ${version}`);
+console.debug(`[gltf-progressive] version ${version || "-"}`);

package/package.json

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