@loaders.gl/gltf 4.2.0-alpha.5 → 4.2.0-alpha.6

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.5" : "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
@@ -2961,11 +2956,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;