@needle-tools/gltf-build-pipeline 2.2.0-alpha.4 → 2.2.0-alpha.5

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.0-alpha.4] - 2023-06-06
+## [2.2.0-alpha.5] - 2023-06-06
 - add: CLI `--progressive` option to `transform` command (default is true)
 - add: CLI `--compress` option to `transform` command (default is true)
 - add: config `meshes: { lods: boolean }` option
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - change: enable texture LODs by default
 - fix: `--config` path can now point to a directory or a `needle.config.json` file as well
 - fix: mesh LOD regression caused by change in gltf-transform `weld` behaviour 
+- fix: KTX SOFTWARE >= 4.3.0 is installed
 
 ## [2.1.0-alpha.6] - 2023-06-04
 - fix: errors when invoking npm scripts caused by the cli program

package/dist/transforms/needle_texture_transform.js

@@ -39,8 +39,12 @@ export const needle_texture_transform = function (options) {
     };
     return createTransform("needle_texture_transform", async (document) => {
         await webPContext.prepare(document);
-        if (context.noToktx !== true)
-            await toktxContext.prepare(document);
+        if (context.noToktx !== true) {
+            const validToktx = await toktxContext.prepare(document);
+            if (!validToktx) {
+                context.noToktx = true;
+            }
+        }
         try {
             const logger = document.getLogger();
             const textures = document.getRoot().listTextures();
@@ -168,7 +172,7 @@ async function processTexture(texture, index, document, logger, context) {
             successFullyProcessed = await context.toktxContext.process(index, texture, options, context);
         }
         else {
-            console.log("Toktx not found: Skipping texture compression.");
+            console.log("Toktx not found: Skipping texture compression: " + originalMimeType);
         }
     }
     if (context.useCache && successFullyProcessed && key) {

package/dist/transforms/needle_toktx.js

@@ -1,7 +1,7 @@
 import { BufferUtils, FileUtils, ImageUtils, uuid } from "@gltf-transform/core";
 import { listTextureSlots, getTextureChannelMask, fitPowerOfTwo, TextureResizeFilter } from "@gltf-transform/functions";
 import { KHRTextureBasisu } from "@gltf-transform/extensions";
-import { checkKTXSoftware, createParams, Mode } from "./toktx.js";
+import { checkKTXSoftware, createParams, KTX_SOFTWARE_VERSION_MIN, Mode } from "./toktx.js";
 import { existsSync, mkdirSync } from "fs";
 import { formatBytes, spawn, waitExit } from './util.js';
 import { ETC1S_DEFAULTS, UASTC_DEFAULTS } from "./toktx_types.js";
@@ -70,7 +70,7 @@ export class NeedleToktxContext {
             const logger = document.getLogger();
             this.version = await checkKTXSoftware(logger, this.env);
             if (this.version === null) {
-                console.log("Will not run toktx transform");
+                logger.warn(`WARN: toktx not found, skipping texture compression. Please install KTX-Software >= ${KTX_SOFTWARE_VERSION_MIN}`);
                 this._prepareFailed = true;
                 return false;
             }

package/dist/transforms/toktx.d.ts

@@ -1,5 +1,6 @@
 import { Document, ILogger, vec2, Texture } from '@gltf-transform/core';
 import { ETC1SOptions, UASTCOptions } from './toktx_types.js';
+export declare const KTX_SOFTWARE_VERSION_MIN = "4.3.0";
 export declare const Filter: {
     BOX: string;
     TENT: string;

package/dist/transforms/toktx.js

@@ -10,8 +10,7 @@ import { TextureResizeFilter, getTextureColorSpace } from '@gltf-transform/funct
 import { ETC1S_DEFAULTS, UASTC_DEFAULTS } from './toktx_types.js';
 tmp.setGracefulCleanup();
 const NUM_CPUS = os.cpus().length || 1; // microsoft/vscode#112122
-const KTX_SOFTWARE_VERSION_MIN = '4.0.0-rc1';
-const KTX_SOFTWARE_VERSION_ACTIVE = '4.1.0-rc1';
+export const KTX_SOFTWARE_VERSION_MIN = '4.3.0';
 export const Filter = {
     BOX: 'box',
     TENT: 'tent',
@@ -167,6 +166,7 @@ export async function checkKTXSoftware(logger, env) {
     }
     else if (semver.lt(semver.clean(version), KTX_SOFTWARE_VERSION_MIN)) {
         logger.warn(`toktx: Expected KTX-Software >= v${KTX_SOFTWARE_VERSION_MIN}, found ${version}.`);
+        return null;
     }
     else {
         if (!didLogToktxVersion)

package/package.json

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