@loaders.gl/gltf 4.2.0-alpha.5 → 4.2.0-beta.1

package/dist/lib/api/gltf-scenegraph.js

@@ -22,6 +22,10 @@ function makeDefaultGLTFJson() {
  * Class for structured access to GLTF data
  */
 export class GLTFScenegraph {
+    // internal
+    gltf;
+    sourceBuffers;
+    byteLength;
     // TODO - why is this not GLTFWithBuffers - what happens to images?
     constructor(gltf) {
         // Declare locally so

package/dist/lib/api/normalize-gltf-v1.js

@@ -70,22 +70,21 @@ const GLTF_KEYS = {
  * Converts (normalizes) glTF v1 to v2
  */
 class GLTFV1Normalizer {
-    constructor() {
-        this.idToIndexMap = {
-            animations: {},
-            accessors: {},
-            buffers: {},
-            bufferViews: {},
-            images: {},
-            materials: {},
-            meshes: {},
-            nodes: {},
-            samplers: {},
-            scenes: {},
-            skins: {},
-            textures: {}
-        };
-    }
+    idToIndexMap = {
+        animations: {},
+        accessors: {},
+        buffers: {},
+        bufferViews: {},
+        images: {},
+        materials: {},
+        meshes: {},
+        nodes: {},
+        samplers: {},
+        scenes: {},
+        skins: {},
+        textures: {}
+    };
+    json;
     // constructor() {}
     /**
      * Convert (normalize) glTF < 2.0 to glTF 2.0

package/dist/lib/api/post-process-gltf.js

@@ -66,11 +66,13 @@ function getSizeFromAccessorType(type) {
     return COMPONENTS[type];
 }
 class GLTFPostProcessor {
-    constructor() {
-        this.baseUri = '';
-        this.buffers = [];
-        this.images = [];
-    }
+    baseUri = '';
+    // @ts-expect-error
+    jsonUnprocessed;
+    // @ts-expect-error
+    json;
+    buffers = [];
+    images = [];
     postProcess(gltf, options = {}) {
         const { json, buffers = [], images = [] } = gltf;
         // @ts-expect-error

package/dist/lib/extensions/KHR_texture_transform.js

@@ -6,8 +6,8 @@ import { getAccessorArrayTypeAndLength } from "../gltf-utils/gltf-utils.js";
 import { BYTES, COMPONENTS } from "../gltf-utils/gltf-constants.js";
 import { GLTFScenegraph } from "../api/gltf-scenegraph.js";
 /** Extension name */
-const EXT_MESHOPT_TRANSFORM = 'KHR_texture_transform';
-export const name = EXT_MESHOPT_TRANSFORM;
+const KHR_TEXTURE_TRANSFORM = 'KHR_texture_transform';
+export const name = KHR_TEXTURE_TRANSFORM;
 const scratchVector = new Vector3();
 const scratchRotationMatrix = new Matrix3();
 const scratchScaleMatrix = new Matrix3();
@@ -18,7 +18,7 @@ const scratchScaleMatrix = new Matrix3();
  */
 export async function decode(gltfData, options) {
     const gltfScenegraph = new GLTFScenegraph(gltfData);
-    const hasExtension = gltfScenegraph.hasExtension(EXT_MESHOPT_TRANSFORM);
+    const hasExtension = gltfScenegraph.hasExtension(KHR_TEXTURE_TRANSFORM);
     if (!hasExtension || !options.gltf?.loadBuffers) {
         return;
     }
@@ -33,28 +33,20 @@ export async function decode(gltfData, options) {
  * @param gltfData gltf buffers and json
  */
 function transformTexCoords(materialIndex, gltfData) {
+    const material = gltfData.json.materials?.[materialIndex];
+    const materialTextures = [
+        material?.pbrMetallicRoughness?.baseColorTexture,
+        material?.emissiveTexture,
+        material?.normalTexture,
+        material?.occlusionTexture,
+        material?.pbrMetallicRoughness?.metallicRoughnessTexture
+    ];
     // Save processed texCoords in order no to process the same twice
     const processedTexCoords = [];
-    const material = gltfData.json.materials?.[materialIndex];
-    const baseColorTexture = material?.pbrMetallicRoughness?.baseColorTexture;
-    if (baseColorTexture) {
-        transformPrimitives(gltfData, materialIndex, baseColorTexture, processedTexCoords);
-    }
-    const emisiveTexture = material?.emissiveTexture;
-    if (emisiveTexture) {
-        transformPrimitives(gltfData, materialIndex, emisiveTexture, processedTexCoords);
-    }
-    const normalTexture = material?.normalTexture;
-    if (normalTexture) {
-        transformPrimitives(gltfData, materialIndex, normalTexture, processedTexCoords);
-    }
-    const occlusionTexture = material?.occlusionTexture;
-    if (occlusionTexture) {
-        transformPrimitives(gltfData, materialIndex, occlusionTexture, processedTexCoords);
-    }
-    const metallicRoughnessTexture = material?.pbrMetallicRoughness?.metallicRoughnessTexture;
-    if (metallicRoughnessTexture) {
-        transformPrimitives(gltfData, materialIndex, metallicRoughnessTexture, processedTexCoords);
+    for (const textureInfo of materialTextures) {
+        if (textureInfo && textureInfo?.extensions?.[KHR_TEXTURE_TRANSFORM]) {
+            transformPrimitives(gltfData, materialIndex, textureInfo, processedTexCoords);
+        }
     }
 }
 /**
@@ -86,7 +78,7 @@ function transformPrimitives(gltfData, materialIndex, texture, processedTexCoord
  * @returns texCoord couple and transformation matrix
  */
 function getTransformParameters(texture, processedTexCoords) {
-    const textureInfo = texture.extensions?.[EXT_MESHOPT_TRANSFORM];
+    const textureInfo = texture.extensions?.[KHR_TEXTURE_TRANSFORM];
     const { texCoord: originalTexCoord = 0 } = texture;
     // If texCoord is not set in the extension, original attribute data will be replaced
     const { texCoord = originalTexCoord } = textureInfo;

package/dist/lib/utils/version.js

@@ -1,4 +1,4 @@
 // Version constant cannot be imported, it needs to correspond to the build version of **this** module.
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-export const VERSION = typeof "4.2.0-alpha.4" !== 'undefined' ? "4.2.0-alpha.4" : 'latest';
+export const VERSION = typeof "4.2.0-alpha.6" !== 'undefined' ? "4.2.0-alpha.6" : 'latest';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/gltf",
-  "version": "4.2.0-alpha.5",
+  "version": "4.2.0-beta.1",
   "description": "Framework-independent loader for the glTF format",
   "license": "MIT",
   "type": "module",
@@ -43,14 +43,15 @@
     "build-bundle-dev": "ocular-bundle ./bundle.ts --env=dev --output=dist/dist.dev.js"
   },
   "dependencies": {
-    "@loaders.gl/draco": "4.2.0-alpha.5",
-    "@loaders.gl/images": "4.2.0-alpha.5",
-    "@loaders.gl/loader-utils": "4.2.0-alpha.5",
-    "@loaders.gl/textures": "4.2.0-alpha.5",
+    "@loaders.gl/draco": "4.2.0-beta.1",
+    "@loaders.gl/images": "4.2.0-beta.1",
+    "@loaders.gl/loader-utils": "4.2.0-beta.1",
+    "@loaders.gl/schema": "4.2.0-beta.1",
+    "@loaders.gl/textures": "4.2.0-beta.1",
     "@math.gl/core": "^4.0.0"
   },
   "peerDependencies": {
     "@loaders.gl/core": "^4.0.0"
   },
-  "gitHead": "32d95a81971f104e4dfeb88ab57065f05321a76a"
+  "gitHead": "c386a9196516fe3ff24847b40e6c77be039cf905"
 }

package/src/glb-loader.ts

@@ -16,7 +16,9 @@ export type GLBLoaderOptions = LoaderOptions & {
  * GLB Loader -
  * GLB is the binary container format for GLTF
  */
-export const GLBLoader: LoaderWithParser<GLB, never, GLBLoaderOptions> = {
+export const GLBLoader = {
+  dataType: null as unknown as GLB,
+  batchType: null as never,
   name: 'GLB',
   id: 'glb',
   module: 'gltf',
@@ -31,7 +33,7 @@ export const GLBLoader: LoaderWithParser<GLB, never, GLBLoaderOptions> = {
       strict: false // Enables deprecated XVIZ support (illegal CHUNK formats)
     }
   }
-};
+} as const satisfies LoaderWithParser<GLB, never, GLBLoaderOptions>;
 
 async function parse(arrayBuffer: ArrayBuffer, options?: GLBLoaderOptions): Promise<GLB> {
   return parseSync(arrayBuffer, options);

package/src/glb-writer.ts

@@ -16,7 +16,7 @@ export type GLBWriterOptions = WriterOptions & {
  * GLB exporter
  * GLB is the binary container format for GLTF
  */
-export const GLBWriter: WriterWithEncoder<GLB, never, GLBWriterOptions> = {
+export const GLBWriter = {
   name: 'GLB',
   id: 'glb',
   module: 'gltf',
@@ -31,7 +31,7 @@ export const GLBWriter: WriterWithEncoder<GLB, never, GLBWriterOptions> = {
 
   encode: async (glb, options: GLBWriterOptions = {}) => encodeSync(glb, options),
   encodeSync
-};
+} as const satisfies WriterWithEncoder<GLB, never, GLBWriterOptions>;
 
 function encodeSync(glb, options) {
   const {byteOffset = 0} = options;

package/src/gltf-loader.ts

@@ -22,7 +22,9 @@ export type GLTFLoaderOptions = LoaderOptions &
 /**
  * GLTF loader
  */
-export const GLTFLoader: LoaderWithParser<GLTFWithBuffers, never, GLBLoaderOptions> = {
+export const GLTFLoader = {
+  dataType: null as unknown as GLTFWithBuffers,
+  batchType: null as never,
   name: 'glTF',
   id: 'gltf',
   module: 'gltf',
@@ -46,7 +48,7 @@ export const GLTFLoader: LoaderWithParser<GLTFWithBuffers, never, GLBLoaderOptio
     // common?
     log: console // eslint-disable-line
   }
-};
+} as const satisfies LoaderWithParser<GLTFWithBuffers, never, GLBLoaderOptions>;
 
 export async function parse(
   arrayBuffer,

package/src/gltf-writer.ts

@@ -1,4 +1,4 @@
-import type {Writer, WriterOptions} from '@loaders.gl/loader-utils';
+import type {WriterOptions, WriterWithEncoder} from '@loaders.gl/loader-utils';
 import {VERSION} from './lib/utils/version';
 import {encodeGLTFSync} from './lib/encoders/encode-gltf';
 
@@ -11,6 +11,9 @@ export type GLTFWriterOptions = WriterOptions & {
  * GLTF exporter
  */
 export const GLTFWriter = {
+  dataType: null as unknown as any,
+  batchType: null as never,
+
   name: 'glTF',
   id: 'gltf',
   module: 'gltf',
@@ -25,7 +28,7 @@ export const GLTFWriter = {
 
   encode: async (gltf, options: GLTFWriterOptions = {}) => encodeSync(gltf, options),
   encodeSync
-};
+} as WriterWithEncoder<any, never, GLTFWriterOptions>;
 
 function encodeSync(gltf, options: GLTFWriterOptions = {}) {
   const {byteOffset = 0} = options;
@@ -38,6 +41,3 @@ function encodeSync(gltf, options: GLTFWriterOptions = {}) {
 
   return arrayBuffer;
 }
-
-// TYPE TESTS - TODO find a better way than exporting junk
-export const _TypecheckGLBLoader: Writer = GLTFWriter;

package/src/lib/extensions/KHR_texture_transform.ts

@@ -20,9 +20,9 @@ import {} from '../types/gltf-json-schema';
 import {GLTFScenegraph} from '../api/gltf-scenegraph';
 
 /** Extension name */
-const EXT_MESHOPT_TRANSFORM = 'KHR_texture_transform';
+const KHR_TEXTURE_TRANSFORM = 'KHR_texture_transform';
 
-export const name = EXT_MESHOPT_TRANSFORM;
+export const name = KHR_TEXTURE_TRANSFORM;
 
 const scratchVector = new Vector3();
 const scratchRotationMatrix = new Matrix3();
@@ -60,7 +60,7 @@ type TransformParameters = {
  */
 export async function decode(gltfData: GLTFWithBuffers, options: GLTFLoaderOptions) {
   const gltfScenegraph = new GLTFScenegraph(gltfData);
-  const hasExtension = gltfScenegraph.hasExtension(EXT_MESHOPT_TRANSFORM);
+  const hasExtension = gltfScenegraph.hasExtension(KHR_TEXTURE_TRANSFORM);
   if (!hasExtension || !options.gltf?.loadBuffers) {
     return;
   }
@@ -76,28 +76,22 @@ export async function decode(gltfData: GLTFWithBuffers, options: GLTFLoaderOptio
  * @param gltfData gltf buffers and json
  */
 function transformTexCoords(materialIndex: number, gltfData: GLTFWithBuffers): void {
+  const material = gltfData.json.materials?.[materialIndex];
+  const materialTextures = [
+    material?.pbrMetallicRoughness?.baseColorTexture,
+    material?.emissiveTexture,
+    material?.normalTexture,
+    material?.occlusionTexture,
+    material?.pbrMetallicRoughness?.metallicRoughnessTexture
+  ];
+
   // Save processed texCoords in order no to process the same twice
   const processedTexCoords: [number, number][] = [];
-  const material = gltfData.json.materials?.[materialIndex];
-  const baseColorTexture = material?.pbrMetallicRoughness?.baseColorTexture;
-  if (baseColorTexture) {
-    transformPrimitives(gltfData, materialIndex, baseColorTexture, processedTexCoords);
-  }
-  const emisiveTexture = material?.emissiveTexture;
-  if (emisiveTexture) {
-    transformPrimitives(gltfData, materialIndex, emisiveTexture, processedTexCoords);
-  }
-  const normalTexture = material?.normalTexture;
-  if (normalTexture) {
-    transformPrimitives(gltfData, materialIndex, normalTexture, processedTexCoords);
-  }
-  const occlusionTexture = material?.occlusionTexture;
-  if (occlusionTexture) {
-    transformPrimitives(gltfData, materialIndex, occlusionTexture, processedTexCoords);
-  }
-  const metallicRoughnessTexture = material?.pbrMetallicRoughness?.metallicRoughnessTexture;
-  if (metallicRoughnessTexture) {
-    transformPrimitives(gltfData, materialIndex, metallicRoughnessTexture, processedTexCoords);
+
+  for (const textureInfo of materialTextures) {
+    if (textureInfo && textureInfo?.extensions?.[KHR_TEXTURE_TRANSFORM]) {
+      transformPrimitives(gltfData, materialIndex, textureInfo, processedTexCoords);
+    }
   }
 }
 
@@ -139,7 +133,7 @@ function getTransformParameters(
   texture: CompoundGLTFTextureInfo,
   processedTexCoords: [number, number][]
 ): TransformParameters | null {
-  const textureInfo = texture.extensions?.[EXT_MESHOPT_TRANSFORM];
+  const textureInfo = texture.extensions?.[KHR_TEXTURE_TRANSFORM];
   const {texCoord: originalTexCoord = 0} = texture;
   // If texCoord is not set in the extension, original attribute data will be replaced
   const {texCoord = originalTexCoord} = textureInfo;