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

package/dist/glb-writer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glb-writer.d.ts","sourceRoot":"","sources":["../src/glb-writer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,iBAAiB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC/E,OAAO,KAAK,EAAC,GAAG,EAAC,iCAA8B;AAC/C,OAAO,KAAK,EAAC,gBAAgB,EAAC,qCAAkC;AAIhE,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE,gBAAgB,CAAC;CACxB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,SAAS,EAAE,iBAAiB,CAAC,GAAG,EAAE,KAAK,EAAE,gBAAgB,CAerE,CAAC"}
+{"version":3,"file":"glb-writer.d.ts","sourceRoot":"","sources":["../src/glb-writer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAoB,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC/E,OAAO,KAAK,EAAC,GAAG,EAAC,iCAA8B;AAC/C,OAAO,KAAK,EAAC,gBAAgB,EAAC,qCAAkC;AAIhE,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE,gBAAgB,CAAC;CACxB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,SAAS;;;;;;;;;;;0CAaS,gBAAgB;;CAEqB,CAAC;AAErE,iBAAS,UAAU,CAAC,GAAG,KAAA,EAAE,OAAO,KAAA,eAY/B"}

package/dist/gltf-loader.d.ts

@@ -1,4 +1,4 @@
-import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
+import type { LoaderOptions } from '@loaders.gl/loader-utils';
 import type { DracoLoaderOptions } from '@loaders.gl/draco';
 import type { ImageLoaderOptions } from '@loaders.gl/images';
 import type { TextureLoaderOptions } from '@loaders.gl/textures';
@@ -14,6 +14,28 @@ export type GLTFLoaderOptions = LoaderOptions & ImageLoaderOptions & TextureLoad
 /**
  * GLTF loader
  */
-export declare const GLTFLoader: LoaderWithParser<GLTFWithBuffers, never, GLBLoaderOptions>;
+export declare const GLTFLoader: {
+    readonly dataType: GLTFWithBuffers;
+    readonly batchType: never;
+    readonly name: "glTF";
+    readonly id: "gltf";
+    readonly module: "gltf";
+    readonly version: any;
+    readonly extensions: ["gltf", "glb"];
+    readonly mimeTypes: ["model/gltf+json", "model/gltf-binary"];
+    readonly text: true;
+    readonly binary: true;
+    readonly tests: ["glTF"];
+    readonly parse: typeof parse;
+    readonly options: {
+        readonly gltf: {
+            readonly normalize: true;
+            readonly loadBuffers: true;
+            readonly loadImages: true;
+            readonly decompressMeshes: true;
+        };
+        readonly log: Console;
+    };
+};
 export declare function parse(arrayBuffer: any, options: GLTFLoaderOptions | undefined, context: any): Promise<GLTFWithBuffers>;
 //# sourceMappingURL=gltf-loader.d.ts.map

package/dist/gltf-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gltf-loader.d.ts","sourceRoot":"","sources":["../src/gltf-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC9E,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAC;AAE1D,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,oCAAiC;AAC/D,OAAO,KAAK,EAAC,eAAe,EAAC,kCAA+B;AAC5D,OAAO,KAAK,EAAC,gBAAgB,EAAC,wBAAqB;AAGnD;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAC3C,kBAAkB,GAClB,oBAAoB,GACpB,gBAAgB,GAChB,kBAAkB,GAAG;IACnB,IAAI,CAAC,EAAE,gBAAgB,CAAC;CACzB,CAAC;AAEJ;;GAEG;AACH,eAAO,MAAM,UAAU,EAAE,gBAAgB,CAAC,eAAe,EAAE,KAAK,EAAE,gBAAgB,CAwBjF,CAAC;AAEF,wBAAsB,KAAK,CACzB,WAAW,KAAA,EACX,OAAO,+BAAwB,EAC/B,OAAO,KAAA,GACN,OAAO,CAAC,eAAe,CAAC,CAS1B"}
+{"version":3,"file":"gltf-loader.d.ts","sourceRoot":"","sources":["../src/gltf-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC9E,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAC;AAE1D,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,oCAAiC;AAC/D,OAAO,KAAK,EAAC,eAAe,EAAC,kCAA+B;AAC5D,OAAO,KAAK,EAAC,gBAAgB,EAAC,wBAAqB;AAGnD;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAC3C,kBAAkB,GAClB,oBAAoB,GACpB,gBAAgB,GAChB,kBAAkB,GAAG;IACnB,IAAI,CAAC,EAAE,gBAAgB,CAAC;CACzB,CAAC;AAEJ;;GAEG;AACH,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;CA0BwD,CAAC;AAEhF,wBAAsB,KAAK,CACzB,WAAW,KAAA,EACX,OAAO,+BAAwB,EAC/B,OAAO,KAAA,GACN,OAAO,CAAC,eAAe,CAAC,CAS1B"}

package/dist/gltf-loader.js

@@ -4,6 +4,8 @@ import { parseGLTF } from "./lib/parsers/parse-gltf.js";
  * GLTF loader
  */
 export const GLTFLoader = {
+    dataType: null,
+    batchType: null,
     name: 'glTF',
     id: 'gltf',
     module: 'gltf',

package/dist/gltf-writer.d.ts

@@ -1,4 +1,4 @@
-import type { Writer, WriterOptions } from '@loaders.gl/loader-utils';
+import type { WriterOptions, WriterWithEncoder } from '@loaders.gl/loader-utils';
 export type GLTFWriterOptions = WriterOptions & {
     gltf?: {};
     byteOffset?: number;
@@ -6,21 +6,5 @@ export type GLTFWriterOptions = WriterOptions & {
 /**
  * GLTF exporter
  */
-export declare const GLTFWriter: {
-    name: string;
-    id: string;
-    module: string;
-    version: any;
-    extensions: string[];
-    mimeTypes: string[];
-    binary: boolean;
-    options: {
-        gltf: {};
-    };
-    encode: (gltf: any, options?: GLTFWriterOptions) => Promise<ArrayBuffer>;
-    encodeSync: typeof encodeSync;
-};
-declare function encodeSync(gltf: any, options?: GLTFWriterOptions): ArrayBuffer;
-export declare const _TypecheckGLBLoader: Writer;
-export {};
+export declare const GLTFWriter: WriterWithEncoder<any, never, GLTFWriterOptions>;
 //# sourceMappingURL=gltf-writer.d.ts.map

package/dist/gltf-writer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gltf-writer.d.ts","sourceRoot":"","sources":["../src/gltf-writer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAIpE,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAC9C,IAAI,CAAC,EAAE,EAAE,CAAC;IACV,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU;;;;;;;;;;;kCAaS,iBAAiB;;CAEhD,CAAC;AAEF,iBAAS,UAAU,CAAC,IAAI,KAAA,EAAE,OAAO,GAAE,iBAAsB,eAUxD;AAGD,eAAO,MAAM,mBAAmB,EAAE,MAAmB,CAAC"}
+{"version":3,"file":"gltf-writer.d.ts","sourceRoot":"","sources":["../src/gltf-writer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AAI/E,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAC9C,IAAI,CAAC,EAAE,EAAE,CAAC;IACV,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,kDAkB8B,CAAC"}

package/dist/gltf-writer.js

@@ -4,6 +4,8 @@ import { encodeGLTFSync } from "./lib/encoders/encode-gltf.js";
  * GLTF exporter
  */
 export const GLTFWriter = {
+    dataType: null,
+    batchType: null,
     name: 'glTF',
     id: 'gltf',
     module: 'gltf',
@@ -26,5 +28,3 @@ function encodeSync(gltf, options = {}) {
     encodeGLTFSync(gltf, dataView, byteOffset, options);
     return arrayBuffer;
 }
-// TYPE TESTS - TODO find a better way than exporting junk
-export const _TypecheckGLBLoader = GLTFWriter;

package/dist/index.cjs

@@ -201,6 +201,10 @@ function makeDefaultGLTFJson() {
   };
 }
 var GLTFScenegraph = class {
+  // internal
+  gltf;
+  sourceBuffers;
+  byteLength;
   // TODO - why is this not GLTFWithBuffers - what happens to images?
   constructor(gltf) {
     this.gltf = {
@@ -1448,7 +1452,7 @@ function processPrimitiveTextures(scenegraph, attributeName, featureTexturePrope
 }
 
 // dist/lib/utils/version.js
-var VERSION = true ? "4.2.0-alpha.4" : "latest";
+var VERSION = true ? "4.2.0-alpha.6" : "latest";
 
 // dist/lib/parsers/parse-gltf.js
 var import_loader_utils4 = require("@loaders.gl/loader-utils");
@@ -2032,15 +2036,15 @@ __export(KHR_texture_transform_exports, {
   name: () => name8
 });
 var import_core = require("@math.gl/core");
-var EXT_MESHOPT_TRANSFORM = "KHR_texture_transform";
-var name8 = EXT_MESHOPT_TRANSFORM;
+var KHR_TEXTURE_TRANSFORM = "KHR_texture_transform";
+var name8 = KHR_TEXTURE_TRANSFORM;
 var scratchVector = new import_core.Vector3();
 var scratchRotationMatrix = new import_core.Matrix3();
 var scratchScaleMatrix = new import_core.Matrix3();
 async function decode7(gltfData, options) {
   var _a;
   const gltfScenegraph = new GLTFScenegraph(gltfData);
-  const hasExtension = gltfScenegraph.hasExtension(EXT_MESHOPT_TRANSFORM);
+  const hasExtension = gltfScenegraph.hasExtension(KHR_TEXTURE_TRANSFORM);
   if (!hasExtension || !((_a = options.gltf) == null ? void 0 : _a.loadBuffers)) {
     return;
   }
@@ -2050,28 +2054,20 @@ async function decode7(gltfData, options) {
   }
 }
 function transformTexCoords(materialIndex, gltfData) {
-  var _a, _b, _c;
-  const processedTexCoords = [];
+  var _a, _b, _c, _d;
   const material = (_a = gltfData.json.materials) == null ? void 0 : _a[materialIndex];
-  const baseColorTexture = (_b = material == null ? void 0 : material.pbrMetallicRoughness) == null ? void 0 : _b.baseColorTexture;
-  if (baseColorTexture) {
-    transformPrimitives(gltfData, materialIndex, baseColorTexture, processedTexCoords);
-  }
-  const emisiveTexture = material == null ? void 0 : material.emissiveTexture;
-  if (emisiveTexture) {
-    transformPrimitives(gltfData, materialIndex, emisiveTexture, processedTexCoords);
-  }
-  const normalTexture = material == null ? void 0 : material.normalTexture;
-  if (normalTexture) {
-    transformPrimitives(gltfData, materialIndex, normalTexture, processedTexCoords);
-  }
-  const occlusionTexture = material == null ? void 0 : material.occlusionTexture;
-  if (occlusionTexture) {
-    transformPrimitives(gltfData, materialIndex, occlusionTexture, processedTexCoords);
-  }
-  const metallicRoughnessTexture = (_c = material == null ? void 0 : material.pbrMetallicRoughness) == null ? void 0 : _c.metallicRoughnessTexture;
-  if (metallicRoughnessTexture) {
-    transformPrimitives(gltfData, materialIndex, metallicRoughnessTexture, processedTexCoords);
+  const materialTextures = [
+    (_b = material == null ? void 0 : material.pbrMetallicRoughness) == null ? void 0 : _b.baseColorTexture,
+    material == null ? void 0 : material.emissiveTexture,
+    material == null ? void 0 : material.normalTexture,
+    material == null ? void 0 : material.occlusionTexture,
+    (_c = material == null ? void 0 : material.pbrMetallicRoughness) == null ? void 0 : _c.metallicRoughnessTexture
+  ];
+  const processedTexCoords = [];
+  for (const textureInfo of materialTextures) {
+    if (textureInfo && ((_d = textureInfo == null ? void 0 : textureInfo.extensions) == null ? void 0 : _d[KHR_TEXTURE_TRANSFORM])) {
+      transformPrimitives(gltfData, materialIndex, textureInfo, processedTexCoords);
+    }
   }
 }
 function transformPrimitives(gltfData, materialIndex, texture, processedTexCoords) {
@@ -2091,7 +2087,7 @@ function transformPrimitives(gltfData, materialIndex, texture, processedTexCoord
 }
 function getTransformParameters(texture, processedTexCoords) {
   var _a;
-  const textureInfo = (_a = texture.extensions) == null ? void 0 : _a[EXT_MESHOPT_TRANSFORM];
+  const textureInfo = (_a = texture.extensions) == null ? void 0 : _a[KHR_TEXTURE_TRANSFORM];
   const { texCoord: originalTexCoord = 0 } = texture;
   const { texCoord = originalTexCoord } = textureInfo;
   const isProcessed = processedTexCoords.findIndex(([original, newTexCoord]) => original === originalTexCoord && newTexCoord === texCoord) !== -1;
@@ -2417,22 +2413,21 @@ var GLTF_KEYS = {
   texture: "textures"
 };
 var GLTFV1Normalizer = class {
-  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
@@ -2730,6 +2725,8 @@ async function loadImage(gltf, image, index, options, context) {
 
 // dist/gltf-loader.js
 var GLTFLoader = {
+  dataType: null,
+  batchType: null,
   name: "glTF",
   id: "gltf",
   module: "gltf",
@@ -2825,6 +2822,8 @@ function convertBuffersToBase64(gltf, { firstBuffer = 0 } = {}) {
 
 // dist/gltf-writer.js
 var GLTFWriter = {
+  dataType: null,
+  batchType: null,
   name: "glTF",
   id: "gltf",
   module: "gltf",
@@ -2851,6 +2850,8 @@ function encodeSync(gltf, options = {}) {
 
 // dist/glb-loader.js
 var GLBLoader = {
+  dataType: null,
+  batchType: null,
   name: "GLB",
   id: "glb",
   module: "gltf",
@@ -2961,11 +2962,13 @@ function getSizeFromAccessorType(type) {
   return COMPONENTS2[type];
 }
 var GLTFPostProcessor = class {
-  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;
     const { baseUri = "" } = gltf;