@needle-tools/gltf-build-pipeline 2.2.0-alpha.6 → 2.2.0-alpha.7

package/CHANGELOG.md

@@ -4,8 +4,10 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [2.2.0-alpha.6] - 2023-06-13
+## [2.2.0-alpha.7] - 2023-06-13
 - fix: progressive transform of converted GLB files where meshes don't have indicies
+- fix: skip progressive texture generation for textures for textures that already match the lowest LOD size
+- fix: if compression is set to None the LOD textures should respect that setting and also not be compressed
 
 ## [2.2.0-alpha.5] - 2023-06-06
 - add: CLI `--progressive` option to `transform` command (default is true)

package/dist/transforms/needle_progressive.js

@@ -172,11 +172,15 @@ export function make_progressive_textures(filePath, _options = TEXTURE_RESIZE_DE
                 logger.debug(`[${NAME}] Skipping because progressive extension is not available. ${textureIndex}`);
                 continue;
             }
+            /** This is the current texture's size  */
+            const currentSize = Math.min(...texture.getSize());
+            if (currentSize <= settings.maxSize) {
+                logger.debug(`[${NAME}] Skipping, texture[${textureIndex}] is already smaller than the requested size: ${currentSize}px <= ${settings.maxSize}px`);
+                continue;
+            }
             const textureGuid = settings.guid?.length ? settings.guid : generateGuid(filename + "_texture_" + index.toString());
             /** This is the size of the texture that is embedded in the glTF. No LOD should be smaller than this */
             const maxSize = settings.maxSize;
-            /** This is the current texture's size  */
-            const currentSize = Math.min(...texture.getSize());
             const LOD_LEVEL = new Array();
             LOD_LEVEL.push({ size: currentSize });
             let generateLods = true; //opts.config?.usecase === "world";
@@ -313,27 +317,32 @@ async function createTextureLod(args, opts) {
         // Make sure the material is used
         createMeshForMaterial(newDoc, newMaterial, slot_index++);
     }
-    const compressionSettings = texture.getExtension(NEEDLE_compression_texture.EXTENSION_NAME);
-    if (compressionSettings !== undefined && compressionSettings !== null && compressionSettings.getExtensionDefinition) {
+    const compressionSettingsExt = texture.getExtension(NEEDLE_compression_texture.EXTENSION_NAME);
+    if (compressionSettingsExt !== undefined && compressionSettingsExt !== null && compressionSettingsExt.getExtensionDefinition) {
         logger.info("> Pass compression extension to new texture");
         const newExt = newDoc.createExtension(NEEDLE_compression_texture);
-        const def = compressionSettings.getExtensionDefinition();
-        switch (opts.config.usecase) {
-            // For world scenarios we use ETC1S
-            case "world":
-                def.mode = "ETC1S";
-                break;
-            case "product":
-                def.mode = detectTextureCompressionMode(slots);
-                def.quality = 100;
-                break;
-            default:
-                def.mode = detectTextureCompressionMode(slots);
-                break;
+        const compressionSettings = compressionSettingsExt.getExtensionDefinition();
+        if (compressionSettings?.mode === "none") {
+            // if the mode is set to None then we keep that setting for the new texture
+        }
+        else {
+            switch (opts.config.usecase) {
+                // For world scenarios we use ETC1S
+                case "world":
+                    compressionSettings.mode = "ETC1S";
+                    break;
+                case "product":
+                    compressionSettings.mode = detectTextureCompressionMode(slots);
+                    compressionSettings.quality = 100;
+                    break;
+                default:
+                    compressionSettings.mode = detectTextureCompressionMode(slots);
+                    break;
+            }
         }
-        def.slot = slots[0];
-        const newProp = newExt.create(def);
-        newTexture.setExtension(NEEDLE_compression_texture.EXTENSION_NAME, newProp);
+        compressionSettings.slot = slots[0];
+        const newCompressionSettings = newExt.create(compressionSettings);
+        newTexture.setExtension(NEEDLE_compression_texture.EXTENSION_NAME, newCompressionSettings);
     }
     // add progressive texture extension
     const progressiveExt = newDoc.createExtension(NEEDLE_progressive);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@needle-tools/gltf-build-pipeline",
-  "version": "2.2.0-alpha.6",
+  "version": "2.2.0-alpha.7",
   "description": "Pipeline and tools for optimizing gltf files using gltf-transform and compression settings within glTF extensions",
   "main": "dist/index.js",
   "type": "module",