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

package/dist/lib/extensions/deprecated/KHR_techniques_webgl.js

@@ -1,61 +1,74 @@
+// GLTF EXTENSION: KHR_techniques_webgl
+// https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_techniques_webgl
 import { GLTFScenegraph } from "../../api/gltf-scenegraph.js";
 const KHR_TECHNIQUES_WEBGL = 'KHR_techniques_webgl';
 export const name = KHR_TECHNIQUES_WEBGL;
 export async function decode(gltfData) {
-  const gltfScenegraph = new GLTFScenegraph(gltfData);
-  const {
-    json
-  } = gltfScenegraph;
-  const extension = gltfScenegraph.getExtension(KHR_TECHNIQUES_WEBGL);
-  if (extension) {
-    const techniques = resolveTechniques(extension, gltfScenegraph);
-    for (const material of json.materials || []) {
-      const materialExtension = gltfScenegraph.getObjectExtension(material, KHR_TECHNIQUES_WEBGL);
-      if (materialExtension) {
-        material.technique = Object.assign({}, materialExtension, techniques[materialExtension.technique]);
-        material.technique.values = resolveValues(material.technique, gltfScenegraph);
-      }
-      gltfScenegraph.removeObjectExtension(material, KHR_TECHNIQUES_WEBGL);
+    const gltfScenegraph = new GLTFScenegraph(gltfData);
+    const { json } = gltfScenegraph;
+    const extension = gltfScenegraph.getExtension(KHR_TECHNIQUES_WEBGL);
+    if (extension) {
+        const techniques = resolveTechniques(extension, gltfScenegraph);
+        for (const material of json.materials || []) {
+            const materialExtension = gltfScenegraph.getObjectExtension(material, KHR_TECHNIQUES_WEBGL);
+            if (materialExtension) {
+                // @ts-ignore TODO
+                material.technique = Object.assign({}, materialExtension, 
+                // @ts-ignore
+                techniques[materialExtension.technique]);
+                // @ts-ignore TODO
+                material.technique.values = resolveValues(material.technique, gltfScenegraph);
+            }
+            gltfScenegraph.removeObjectExtension(material, KHR_TECHNIQUES_WEBGL);
+        }
+        // Remove the top-level extension
+        gltfScenegraph.removeExtension(KHR_TECHNIQUES_WEBGL);
     }
-    gltfScenegraph.removeExtension(KHR_TECHNIQUES_WEBGL);
-  }
 }
-export async function encode(gltfData, options) {}
-function resolveTechniques(techniquesExtension, gltfScenegraph) {
-  const {
-    programs = [],
-    shaders = [],
-    techniques = []
-  } = techniquesExtension;
-  const textDecoder = new TextDecoder();
-  shaders.forEach(shader => {
-    if (Number.isFinite(shader.bufferView)) {
-      shader.code = textDecoder.decode(gltfScenegraph.getTypedArrayForBufferView(shader.bufferView));
-    } else {
-      throw new Error('KHR_techniques_webgl: no shader code');
-    }
-  });
-  programs.forEach(program => {
-    program.fragmentShader = shaders[program.fragmentShader];
-    program.vertexShader = shaders[program.vertexShader];
-  });
-  techniques.forEach(technique => {
-    technique.program = programs[technique.program];
-  });
-  return techniques;
+// eslint-disable-next-line
+export async function encode(gltfData, options) {
+    // TODO
+}
+function resolveTechniques(techniquesExtension, 
+// programs: {[key: string]: any}[],
+// shaders: {[key: string]: any}[],
+// techniques: {[key: string]: any}[]
+gltfScenegraph) {
+    const { programs = [], shaders = [], techniques = [] } = techniquesExtension;
+    const textDecoder = new TextDecoder();
+    shaders.forEach((shader) => {
+        if (Number.isFinite(shader.bufferView)) {
+            shader.code = textDecoder.decode(gltfScenegraph.getTypedArrayForBufferView(shader.bufferView));
+        }
+        else {
+            // TODO: handle URI shader
+            throw new Error('KHR_techniques_webgl: no shader code');
+        }
+    });
+    programs.forEach((program) => {
+        program.fragmentShader = shaders[program.fragmentShader];
+        program.vertexShader = shaders[program.vertexShader];
+    });
+    techniques.forEach((technique) => {
+        technique.program = programs[technique.program];
+    });
+    return techniques;
 }
 function resolveValues(technique, gltfScenegraph) {
-  const values = Object.assign({}, technique.values);
-  Object.keys(technique.uniforms || {}).forEach(uniform => {
-    if (technique.uniforms[uniform].value && !(uniform in values)) {
-      values[uniform] = technique.uniforms[uniform].value;
-    }
-  });
-  Object.keys(values).forEach(uniform => {
-    if (typeof values[uniform] === 'object' && values[uniform].index !== undefined) {
-      values[uniform].texture = gltfScenegraph.getTexture(values[uniform].index);
-    }
-  });
-  return values;
+    const values = Object.assign({}, technique.values);
+    // merge values from uniforms
+    Object.keys(technique.uniforms || {}).forEach((uniform) => {
+        if (technique.uniforms[uniform].value && !(uniform in values)) {
+            values[uniform] = technique.uniforms[uniform].value;
+        }
+    });
+    // resolve textures
+    Object.keys(values).forEach((uniform) => {
+        if (typeof values[uniform] === 'object' && values[uniform].index !== undefined) {
+            // Assume this is a texture
+            // TODO: find if there are any other types that can be referenced
+            values[uniform].texture = gltfScenegraph.getTexture(values[uniform].index);
+        }
+    });
+    return values;
 }
-//# sourceMappingURL=KHR_techniques_webgl.js.map

package/dist/lib/extensions/utils/3d-tiles-utils.d.ts

@@ -6,9 +6,9 @@
  * * EXT_mesh_features
  * * EXT_structural_metadata
  */
-import type { GLTFTextureInfoMetadata, GLTFMeshPrimitive } from '../../types/gltf-json-schema';
+import type { GLTFTextureInfoMetadata, GLTFMeshPrimitive } from "../../types/gltf-json-schema.js";
 import type { BigTypedArray, TypedArray } from '@loaders.gl/schema';
-import { GLTFScenegraph } from '../../api/gltf-scenegraph';
+import { GLTFScenegraph } from "../../api/gltf-scenegraph.js";
 export type NumericComponentType = 'INT8' | 'UINT8' | 'INT16' | 'UINT16' | 'INT32' | 'UINT32' | 'INT64' | 'UINT64' | 'FLOAT32' | 'FLOAT64';
 export declare function getArrayElementByteSize(attributeType: any, componentType: any): number;
 /**

package/dist/lib/extensions/utils/3d-tiles-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"3d-tiles-utils.d.ts","sourceRoot":"","sources":["../../../../src/lib/extensions/utils/3d-tiles-utils.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAC,uBAAuB,EAAE,iBAAiB,EAAC,MAAM,8BAA8B,CAAC;AAC7F,OAAO,KAAK,EAAC,aAAa,EAAE,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAGlE,OAAO,EAAC,cAAc,EAAC,MAAM,2BAA2B,CAAC;AAQzD,MAAM,MAAM,oBAAoB,GAC5B,MAAM,GACN,OAAO,GACP,OAAO,GACP,QAAQ,GACR,OAAO,GACP,QAAQ,GACR,OAAO,GACP,QAAQ,GACR,SAAS,GACT,SAAS,CAAC;AAyCd,wBAAgB,uBAAuB,CAAC,aAAa,KAAA,EAAE,aAAa,KAAA,GAAG,MAAM,CAK5E;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,cAAc,EAC1B,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,EAC7D,gBAAgB,EAAE,MAAM,GACvB,UAAU,GAAG,IAAI,CAsBnB;AAED;;;;;;;GAOG;AACH,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,UAAU,EAChB,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,oBAAoB,EACnC,YAAY,GAAE,MAAU,GACvB,aAAa,CAcf;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,cAAc,EAC1B,WAAW,EAAE,uBAAuB,EACpC,SAAS,EAAE,iBAAiB,GAC3B,MAAM,EAAE,CA6CV;AAED;;;;;;;;;GASG;AACH,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,cAAc,EAC1B,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,MAAM,EAAE,EACtB,SAAS,EAAE,iBAAiB,GAC3B,IAAI,CAkCN;AAsFD;;;;;;;;;;GAUG;AACH,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,aAAa,EACzB,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,UAAU,EACxB,qBAAqB,EAAE,MAAM,EAC7B,SAAS,EAAE,MAAM,GAChB,aAAa,EAAE,CAajB;AAED;;;;;;;;GAQG;AACH,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,aAAa,EACzB,gBAAgB,EAAE,MAAM,EACxB,UAAU,EAAE,MAAM,GACjB,aAAa,EAAE,CAOjB;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,gBAAgB,EAAE,MAAM,EACxB,eAAe,EAAE,UAAU,EAC3B,YAAY,EAAE,UAAU,GAAG,IAAI,EAC/B,aAAa,EAAE,UAAU,GAAG,IAAI,GAC/B,MAAM,EAAE,GAAG,MAAM,EAAE,EAAE,CA0BvB"}
+{"version":3,"file":"3d-tiles-utils.d.ts","sourceRoot":"","sources":["../../../../src/lib/extensions/utils/3d-tiles-utils.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAC,uBAAuB,EAAE,iBAAiB,EAAC,wCAAqC;AAC7F,OAAO,KAAK,EAAC,aAAa,EAAE,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAGlE,OAAO,EAAC,cAAc,EAAC,qCAAkC;AAQzD,MAAM,MAAM,oBAAoB,GAC5B,MAAM,GACN,OAAO,GACP,OAAO,GACP,QAAQ,GACR,OAAO,GACP,QAAQ,GACR,OAAO,GACP,QAAQ,GACR,SAAS,GACT,SAAS,CAAC;AAyCd,wBAAgB,uBAAuB,CAAC,aAAa,KAAA,EAAE,aAAa,KAAA,GAAG,MAAM,CAK5E;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,cAAc,EAC1B,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,EAC7D,gBAAgB,EAAE,MAAM,GACvB,UAAU,GAAG,IAAI,CAsBnB;AAED;;;;;;;GAOG;AACH,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,UAAU,EAChB,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,oBAAoB,EACnC,YAAY,GAAE,MAAU,GACvB,aAAa,CAcf;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,cAAc,EAC1B,WAAW,EAAE,uBAAuB,EACpC,SAAS,EAAE,iBAAiB,GAC3B,MAAM,EAAE,CA6CV;AAED;;;;;;;;;GASG;AACH,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,cAAc,EAC1B,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,MAAM,EAAE,EACtB,SAAS,EAAE,iBAAiB,GAC3B,IAAI,CAkCN;AAsFD;;;;;;;;;;GAUG;AACH,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,aAAa,EACzB,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,UAAU,EACxB,qBAAqB,EAAE,MAAM,EAC7B,SAAS,EAAE,MAAM,GAChB,aAAa,EAAE,CAajB;AAED;;;;;;;;GAQG;AACH,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,aAAa,EACzB,gBAAgB,EAAE,MAAM,EACxB,UAAU,EAAE,MAAM,GACjB,aAAa,EAAE,CAOjB;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,gBAAgB,EAAE,MAAM,EACxB,eAAe,EAAE,UAAU,EAC3B,YAAY,EAAE,UAAU,GAAG,IAAI,EAC/B,aAAa,EAAE,UAAU,GAAG,IAAI,GAC/B,MAAM,EAAE,GAAG,MAAM,EAAE,EAAE,CA0BvB"}