@needle-tools/gltf-build-pipeline 2.2.1-alpha.3 → 2.2.1-alpha.4

package/CHANGELOG.md

@@ -4,7 +4,7 @@ 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.1-alpha.3] - 2023-06-17
+## [2.2.1-alpha.4] - 2023-06-17
 - add: `--verbose` option to transform command
 - add: `stats` command to create stats.needle.json
 - add: automatically detect mimetype mismatch and attempt to fix it

package/dist/transforms/needle_progressive.js

@@ -7,7 +7,7 @@ import path, { basename, resolve } 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";
-import { detectTextureCompressionMode, foreachGLTF, generateGuid, writeNodeIO } from '../utils/index.js';
+import { detectTextureCompressionMode, foreachGLTF, generateGuid, validateImageMimeType, writeNodeIO } from '../utils/index.js';
 import { needle_asset, writeNeedleAsset } from './needle_asset.js';
 import { MeshoptDecoder, MeshoptSimplifier } from 'meshoptimizer';
 import { compressPrimitive } from './needle_mesh_transform.js';
@@ -172,6 +172,11 @@ export function make_progressive_textures(filePath, _options = TEXTURE_RESIZE_DE
                 logger.debug(`[${NAME}] Skipping because progressive extension is not available. ${textureIndex}`);
                 continue;
             }
+            const mimeTypeResult = validateImageMimeType(texture.getMimeType(), texture.getImage());
+            if (mimeTypeResult?.error) {
+                logger.warn(`[${NAME}] Texture[${index}] has invalid mime type! Reported \"${texture.getMimeType()}\" but is actually \"${mimeTypeResult.mimeType}\": auto-fix`);
+                texture.setMimeType(mimeTypeResult.mimeType);
+            }
             /** This is the current texture's size  */
             const currentSize = Math.min(...texture.getSize());
             if (currentSize <= settings.maxSize) {
@@ -195,7 +200,7 @@ export function make_progressive_textures(filePath, _options = TEXTURE_RESIZE_DE
                     const size = lastSize * .5;
                     if (size <= maxSize)
                         break;
-                    lastSize = size;
+                    lastSize = Math.round(size);
                     LOD_LEVEL.push({ size: size });
                 }
             }
@@ -424,6 +429,11 @@ export async function resizeTextureToMax(texture, maxSize, logger) {
     await resizeTexture(options, texture, logger);
 }
 async function resizeTexture(options, texture, logger, uri, slots) {
+    const mimeTypeResult = validateImageMimeType(texture.getMimeType(), texture.getImage());
+    if (mimeTypeResult?.error) {
+        logger.warn(`[${NAME}] Texture[${uri}] has invalid mime type: ${mimeTypeResult.error}: auto-fix`);
+        texture.setMimeType(mimeTypeResult.mimeType);
+    }
     const [maxWidth, maxHeight] = options.size;
     const [srcWidth, srcHeight] = texture.getSize();
     if (srcWidth <= maxWidth && srcHeight <= maxHeight) {
@@ -444,7 +454,9 @@ async function resizeTexture(options, texture, logger, uri, slots) {
         dstWidth = Math.floor(dstWidth * (maxHeight / dstHeight));
         dstHeight = maxHeight;
     }
-    logger.info("> Resize texture to " + dstWidth + "x" + dstHeight + " (from " + srcWidth + "x" + srcHeight + ")");
+    dstWidth = Math.floor(dstWidth);
+    dstHeight = Math.floor(dstHeight);
+    logger.warn("> Resize texture to " + dstWidth + "x" + dstHeight + " (from " + srcWidth + "x" + srcHeight + ")");
     // https://sharp.pixelplumbing.com/api-resize
     const buffer = await sharp(texture.getImage())
         .resize(dstWidth, dstHeight, {

package/package.json

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