@needle-tools/gltf-build-pipeline 1.4.4 → 1.4.6

package/CHANGELOG.md

@@ -4,6 +4,13 @@ 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).
 
+## [1.4.6] - 2023-04-10
+- fix: NEEDLE_progressive meshes do not revert primitive data for skinned meshes anymore. See NE-4596
+
+## [1.4.5] - 2023-04-05
+- fix: generating mesh and texture LOD for glbs without `NEEDLE_` extension
+- fix: guid generation for progressive meshes when no `NEEDLE_` extension is present
+
 ## [1.4.4] - 2023-04-03
 - change: clamp simplification error for LOD meshes to 5%
 

package/dist/transforms/needle_progressive.js

@@ -2,7 +2,7 @@ import { BufferUtils, Document, NodeIO, PropertyType } from '@gltf-transform/cor
 import { SIMPLIFY_DEFAULTS, WELD_DEFAULTS, listTextureSlots, sparse } from '@gltf-transform/functions';
 import { NEEDLE_PROGRESSIVE_EXTENSION_NAME, NEEDLE_progressive } from "../extensions/NEEDLE_progressive/index.js";
 import { createOpaqueExtension, currentGenerator, NEEDLE_compression_texture, NEEDLE_mesh_compression, NEEDLE_progressive_mesh_settings, NEEDLE_progressive_texture_settings, registerExtensions as registerDefaultExtensions } from '../extensions/index.js';
-import path from 'path';
+import path, { basename } from 'path';
 import { existsSync, readFileSync, rmSync, statSync, writeFileSync } from 'fs';
 import { addMetaToCache, addToCache, getHash, getKey, tryGetFromCache, tryGetMetaFromCache } from '../cache/index.js';
 import sharp from "sharp";
@@ -97,6 +97,7 @@ const NAME = 'NEEDLE_progressive';
 export function make_progressive_textures(filePath, _options = TEXTURE_RESIZE_DEFAULTS, opts) {
     console.log("Make progressive: " + filePath);
     const startTime = Date.now();
+    const filename = basename(filePath);
     const options = { ...TEXTURE_RESIZE_DEFAULTS, ..._options };
     const directory = path.dirname(filePath);
     // const fileNameWithoutExtension = path.basename(filePath, path.extname(filePath));
@@ -122,13 +123,23 @@ export function make_progressive_textures(filePath, _options = TEXTURE_RESIZE_DE
                 logger.debug(`[${NAME}] Skipping, [${slots.join(', ')}] excluded by "slots" parameter. ${textureIndex}`);
                 continue;
             }
-            const settings = texture.getExtension(NEEDLE_progressive_texture_settings.EXTENSION_NAME);
+            let settings = texture.getExtension(NEEDLE_progressive_texture_settings.EXTENSION_NAME);
             if (!settings) {
-                logger.warn(`[${NAME}] Skipping, no settings found ${textureIndex}`);
-                continue;
+                const size = texture.getSize();
+                if (size?.length >= 2 && size[0] <= 128 && size[1] <= 128) {
+                    logger.warn(`[${NAME}] Skipping texture[${textureIndex}], no settings found`);
+                    continue;
+                }
+                else {
+                    settings = {
+                        guid: generateGuid(filename + "_texture_" + index.toString()),
+                        maxSize: 128,
+                    };
+                    logger.debug(`[${NAME}] No settings found for texture[${index}] - will use default settings (maxSize: ${settings.maxSize}, guid: ${settings.guid})`);
+                }
             }
-            if (!settings.isValid) {
-                logger.warn(`[${NAME}] Skipping, settings are invalid ${textureIndex}`);
+            if (settings.maxSize == undefined || settings.maxSize <= 0) {
+                logger.warn(`[${NAME}] Skipping texture[${textureIndex}], settings are invalid (maxSize: ${settings.maxSize})`);
                 continue;
             }
             options.size[0] = settings.maxSize;
@@ -343,10 +354,10 @@ export function make_progressive_meshes(filePath, _options, opts) {
         const root = doc.getRoot();
         const meshes = root.listMeshes();
         for (const mesh of meshes) {
-            await processMesh(mesh);
+            await processMesh(mesh, { filename });
         }
         console.log(`[${NAME}]: Finished generating progressive meshes for \"${filename}\"`);
-        async function processMesh(mesh) {
+        async function processMesh(mesh, args) {
             /** The size and vertex count of the original mesh */
             const originalMeshInformation = getMeshInformation(mesh);
             const { totalVertexCount: originalTotalVertexCount, maxVertexCount: originalMaxVertexCount } = originalMeshInformation;
@@ -358,7 +369,7 @@ export function make_progressive_meshes(filePath, _options, opts) {
                 }
                 else {
                     settings = {
-                        guid: generateGuid(path + "_mesh_" + index.toString()),
+                        guid: generateGuid(args.filename + "_mesh_" + index.toString()),
                         generateLods: true,
                     };
                     logger.debug(`[${NAME}] No settings found for mesh[${index}] with ${originalTotalVertexCount} vertices (max: ${originalMaxVertexCount}) - will use default settings (guid: ${settings.guid})`);
@@ -463,11 +474,13 @@ export function make_progressive_meshes(filePath, _options, opts) {
             let maxDensity = 0;
             let primitiveIndex = 0;
             const lodLevelInFile = generatedLODInfos.length;
-            const clonedData = new Array();
+            const clonedData = { primitives: [], weights: [...mesh.getWeights()] };
             for (const prim of mesh.listPrimitives()) {
                 const data = clonePrimitiveData(prim);
-                clonedData.push(data);
-                console.log(`[${NAME}] Simplify mesh[${index}] primitive[${primitiveIndex}] with ${data.indices.length / 3} triangles`);
+                if (data != null) {
+                    clonedData.primitives.push(data);
+                }
+                console.log(`[${NAME}] Simplify mesh[${index}] primitive[${primitiveIndex}] (embedded)`);
                 const lastLod = LODS[lodLevelInFile];
                 // TODO: this should be run after simplification but then we need to change the runtime to use the LOD 0 density
                 const density = calculateMeshDensity(prim);
@@ -485,7 +498,7 @@ export function make_progressive_meshes(filePath, _options, opts) {
             }
             else if (difference < 32 || diff01 <= 0.05) {
                 // the lowest LOD has the same vertex count as the original mesh → we don't need to write the extension and can also delete previously generated LODs
-                console.log(`[${NAME}]: Flag mesh LOD ${generatedLODInfos.length}: vertex count difference below threshold (removed ${difference} vertices, ${(-diff01 * 100).toFixed(2)} %) → will remove LODs. \"${mesh.getName()}\"`);
+                console.log(`[${NAME}]: Flag mesh LOD ${generatedLODInfos.length} (embedded): vertex count difference below threshold (removed ${difference} vertices, ${(-diff01 * 100).toFixed(2)} %) → will remove LOD. \"${mesh.getName()}\"`);
                 try {
                     for (const lodInfo of generatedLODInfos) {
                         rmSync(outputDirectory + "/" + lodInfo.path);
@@ -496,9 +509,12 @@ export function make_progressive_meshes(filePath, _options, opts) {
                 }
                 // reset data (simplify might have changed the mesh data that we cloned before)
                 const primitives = mesh.listPrimitives();
-                if (clonedData.length == primitives.length) {
+                if (clonedData.primitives.length == primitives.length) {
+                    if (clonedData.weights?.length > 0) {
+                        mesh.setWeights(clonedData.weights);
+                    }
                     for (let i = 0; i < primitives.length; i++) {
-                        setPrimitiveData(primitives[i], clonedData[i]);
+                        setPrimitiveData(primitives[i], clonedData.primitives[i]);
                     }
                 }
                 return;
@@ -529,9 +545,14 @@ export function make_progressive_meshes(filePath, _options, opts) {
     });
 }
 function clonePrimitiveData(prim) {
+    const semantics = prim.listSemantics();
+    if (semantics.some(s => s.includes("JOINTS"))) {
+        return null;
+    }
     const indices = new Uint32Array(prim.getIndices().getArray());
     const attributes = {};
-    for (const attr of prim.listSemantics()) {
+    for (const attr of semantics) {
+        console.log(`[${NAME}] Clone attribute ${attr}`);
         const accessor = prim.getAttribute(attr);
         if (accessor) {
             attributes[attr] = new Float32Array(accessor.getArray());

package/package.json

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