@loaders.gl/gltf 4.0.0-alpha.6 → 4.0.0-alpha.7

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

@@ -1,4 +1,5 @@
 "use strict";
+// loaders.gl, MIT license
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.postProcessGLTF = void 0;
 const assert_1 = require("../utils/assert");
@@ -47,12 +48,18 @@ const SAMPLER_PARAMETER_GLTF_TO_GL = {
 };
 // When undefined, a sampler with repeat wrapping and auto filtering should be used.
 // https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#texture
-const DEFAULT_SAMPLER = {
+const DEFAULT_SAMPLER_PARAMETERS = {
     [GL_SAMPLER.TEXTURE_MAG_FILTER]: GL_SAMPLER.LINEAR,
     [GL_SAMPLER.TEXTURE_MIN_FILTER]: GL_SAMPLER.NEAREST_MIPMAP_LINEAR,
     [GL_SAMPLER.TEXTURE_WRAP_S]: GL_SAMPLER.REPEAT,
     [GL_SAMPLER.TEXTURE_WRAP_T]: GL_SAMPLER.REPEAT
 };
+function makeDefaultSampler() {
+    return {
+        id: 'default-sampler',
+        parameters: DEFAULT_SAMPLER_PARAMETERS
+    };
+}
 function getBytesFromComponentType(componentType) {
     return BYTES[componentType];
 }
@@ -62,100 +69,106 @@ function getSizeFromAccessorType(type) {
 class GLTFPostProcessor {
     constructor() {
         this.baseUri = '';
-        this.json = {};
         this.buffers = [];
         this.images = [];
     }
     postProcess(gltf, options = {}) {
-        const { json, buffers = [], images = [], baseUri = '' } = gltf;
+        const { json, buffers = [], images = [] } = gltf;
+        // @ts-expect-error
+        const { baseUri = '' } = gltf;
         (0, assert_1.assert)(json);
         this.baseUri = baseUri;
-        this.json = json;
         this.buffers = buffers;
         this.images = images;
-        this._resolveTree(this.json, options);
+        this.jsonUnprocessed = json;
+        this.json = this._resolveTree(gltf.json, options);
         return this.json;
     }
     // Convert indexed glTF structure into tree structure
     // cross-link index resolution, enum lookup, convenience calculations
-    // eslint-disable-next-line complexity
-    _resolveTree(json, options = {}) {
-        if (json.bufferViews) {
-            json.bufferViews = json.bufferViews.map((bufView, i) => this._resolveBufferView(bufView, i));
+    // eslint-disable-next-line complexity, max-statements
+    _resolveTree(gltf, options = {}) {
+        // @ts-expect-error
+        const json = { ...gltf };
+        this.json = json;
+        if (gltf.bufferViews) {
+            json.bufferViews = gltf.bufferViews.map((bufView, i) => this._resolveBufferView(bufView, i));
         }
-        if (json.images) {
-            json.images = json.images.map((image, i) => this._resolveImage(image, i));
+        if (gltf.images) {
+            json.images = gltf.images.map((image, i) => this._resolveImage(image, i));
         }
-        if (json.samplers) {
-            json.samplers = json.samplers.map((sampler, i) => this._resolveSampler(sampler, i));
+        if (gltf.samplers) {
+            json.samplers = gltf.samplers.map((sampler, i) => this._resolveSampler(sampler, i));
         }
-        if (json.textures) {
-            json.textures = json.textures.map((texture, i) => this._resolveTexture(texture, i));
+        if (gltf.textures) {
+            json.textures = gltf.textures.map((texture, i) => this._resolveTexture(texture, i));
         }
-        if (json.accessors) {
-            json.accessors = json.accessors.map((accessor, i) => this._resolveAccessor(accessor, i));
+        if (gltf.accessors) {
+            json.accessors = gltf.accessors.map((accessor, i) => this._resolveAccessor(accessor, i));
         }
-        if (json.materials) {
-            json.materials = json.materials.map((material, i) => this._resolveMaterial(material, i));
+        if (gltf.materials) {
+            json.materials = gltf.materials.map((material, i) => this._resolveMaterial(material, i));
         }
-        if (json.meshes) {
-            json.meshes = json.meshes.map((mesh, i) => this._resolveMesh(mesh, i));
+        if (gltf.meshes) {
+            json.meshes = gltf.meshes.map((mesh, i) => this._resolveMesh(mesh, i));
         }
-        if (json.nodes) {
-            json.nodes = json.nodes.map((node, i) => this._resolveNode(node, i));
+        if (gltf.nodes) {
+            json.nodes = gltf.nodes.map((node, i) => this._resolveNode(node, i));
+            json.nodes = json.nodes.map((node, i) => this._resolveNodeChildren(node));
         }
-        if (json.skins) {
-            json.skins = json.skins.map((skin, i) => this._resolveSkin(skin, i));
+        if (gltf.skins) {
+            json.skins = gltf.skins.map((skin, i) => this._resolveSkin(skin, i));
         }
-        if (json.scenes) {
-            json.scenes = json.scenes.map((scene, i) => this._resolveScene(scene, i));
+        if (gltf.scenes) {
+            json.scenes = gltf.scenes.map((scene, i) => this._resolveScene(scene, i));
         }
-        if (json.scene !== undefined) {
+        if (typeof this.json.scene === 'number' && json.scenes) {
             json.scene = json.scenes[this.json.scene];
         }
+        return json;
     }
     getScene(index) {
-        return this._get('scenes', index);
+        return this._get(this.json.scenes, index);
     }
     getNode(index) {
-        return this._get('nodes', index);
+        return this._get(this.json.nodes, index);
     }
     getSkin(index) {
-        return this._get('skins', index);
+        return this._get(this.json.skins, index);
     }
     getMesh(index) {
-        return this._get('meshes', index);
+        return this._get(this.json.meshes, index);
     }
     getMaterial(index) {
-        return this._get('materials', index);
+        return this._get(this.json.materials, index);
     }
     getAccessor(index) {
-        return this._get('accessors', index);
+        return this._get(this.json.accessors, index);
     }
     getCamera(index) {
-        return null; // TODO: fix this
+        return this._get(this.json.cameras, index);
     }
     getTexture(index) {
-        return this._get('textures', index);
+        return this._get(this.json.textures, index);
     }
     getSampler(index) {
-        return this._get('samplers', index);
+        return this._get(this.json.samplers, index);
     }
     getImage(index) {
-        return this._get('images', index);
+        return this._get(this.json.images, index);
     }
     getBufferView(index) {
-        return this._get('bufferViews', index);
+        return this._get(this.json.bufferViews, index);
     }
     getBuffer(index) {
-        return this._get('buffers', index);
+        return this._get(this.json.buffers, index);
     }
     _get(array, index) {
         // check if already resolved
         if (typeof index === 'object') {
             return index;
         }
-        const object = this.json[array] && this.json[array][index];
+        const object = array && array[index];
         if (!object) {
             console.warn(`glTF file error: Could not find ${array}[${index}]`); // eslint-disable-line
         }
@@ -163,81 +176,109 @@ class GLTFPostProcessor {
     }
     // PARSING HELPERS
     _resolveScene(scene, index) {
-        // scene = {...scene};
-        scene.id = scene.id || `scene-${index}`;
-        scene.nodes = (scene.nodes || []).map((node) => this.getNode(node));
-        return scene;
+        return {
+            ...scene,
+            // @ts-ignore
+            id: scene.id || `scene-${index}`,
+            nodes: (scene.nodes || []).map((node) => this.getNode(node))
+        };
     }
-    _resolveNode(node, index) {
-        // node = {...node};
-        node.id = node.id || `node-${index}`;
-        if (node.children) {
-            node.children = node.children.map((child) => this.getNode(child));
+    _resolveNode(gltfNode, index) {
+        // @ts-expect-error
+        const node = {
+            ...gltfNode,
+            // @ts-expect-error id could already be present, glTF standard does not prevent it
+            id: gltfNode?.id || `node-${index}`
+        };
+        if (gltfNode.mesh !== undefined) {
+            node.mesh = this.getMesh(gltfNode.mesh);
+        }
+        if (gltfNode.camera !== undefined) {
+            node.camera = this.getCamera(gltfNode.camera);
         }
-        if (node.mesh !== undefined) {
-            node.mesh = this.getMesh(node.mesh);
+        if (gltfNode.skin !== undefined) {
+            node.skin = this.getSkin(gltfNode.skin);
         }
-        else if (node.meshes !== undefined && node.meshes.length) {
-            node.mesh = node.meshes.reduce((accum, meshIndex) => {
+        // TODO deprecated - Delete in v4.0?
+        // @ts-expect-error node.meshes does not seem to be part of the GLTF standard
+        if (gltfNode.meshes !== undefined && gltfNode.meshes.length) {
+            // @ts-expect-error
+            node.mesh = gltfNode.meshes.reduce((accum, meshIndex) => {
                 const mesh = this.getMesh(meshIndex);
                 accum.id = mesh.id;
                 accum.primitives = accum.primitives.concat(mesh.primitives);
                 return accum;
             }, { primitives: [] });
         }
-        if (node.camera !== undefined) {
-            node.camera = this.getCamera(node.camera);
-        }
-        if (node.skin !== undefined) {
-            node.skin = this.getSkin(node.skin);
+        return node;
+    }
+    _resolveNodeChildren(node) {
+        if (node.children) {
+            // @ts-expect-error node.children are numbers at this stage
+            node.children = node.children.map((child) => this.getNode(child));
         }
         return node;
     }
-    _resolveSkin(skin, index) {
-        // skin = {...skin};
-        skin.id = skin.id || `skin-${index}`;
-        skin.inverseBindMatrices = this.getAccessor(skin.inverseBindMatrices);
-        return skin;
+    _resolveSkin(gltfSkin, index) {
+        const inverseBindMatrices = typeof gltfSkin.inverseBindMatrices === 'number'
+            ? this.getAccessor(gltfSkin.inverseBindMatrices)
+            : undefined;
+        return {
+            ...gltfSkin,
+            id: gltfSkin.id || `skin-${index}`,
+            inverseBindMatrices
+        };
     }
-    _resolveMesh(mesh, index) {
-        // mesh = {...mesh};
-        mesh.id = mesh.id || `mesh-${index}`;
-        if (mesh.primitives) {
-            mesh.primitives = mesh.primitives.map((primitive) => {
-                primitive = { ...primitive };
-                const attributes = primitive.attributes;
-                primitive.attributes = {};
+    _resolveMesh(gltfMesh, index) {
+        const mesh = {
+            ...gltfMesh,
+            id: gltfMesh.id || `mesh-${index}`,
+            primitives: []
+        };
+        if (gltfMesh.primitives) {
+            mesh.primitives = gltfMesh.primitives.map((gltfPrimitive) => {
+                const primitive = {
+                    ...gltfPrimitive,
+                    attributes: {},
+                    indices: undefined,
+                    material: undefined
+                };
+                const attributes = gltfPrimitive.attributes;
                 for (const attribute in attributes) {
                     primitive.attributes[attribute] = this.getAccessor(attributes[attribute]);
                 }
-                if (primitive.indices !== undefined) {
-                    primitive.indices = this.getAccessor(primitive.indices);
+                if (gltfPrimitive.indices !== undefined) {
+                    primitive.indices = this.getAccessor(gltfPrimitive.indices);
                 }
-                if (primitive.material !== undefined) {
-                    primitive.material = this.getMaterial(primitive.material);
+                if (gltfPrimitive.material !== undefined) {
+                    primitive.material = this.getMaterial(gltfPrimitive.material);
                 }
                 return primitive;
             });
         }
         return mesh;
     }
-    _resolveMaterial(material, index) {
-        // material = {...material};
-        material.id = material.id || `material-${index}`;
+    _resolveMaterial(gltfMaterial, index) {
+        // @ts-expect-error
+        const material = {
+            ...gltfMaterial,
+            // @ts-expect-error
+            id: gltfMaterial.id || `material-${index}`
+        };
         if (material.normalTexture) {
             material.normalTexture = { ...material.normalTexture };
             material.normalTexture.texture = this.getTexture(material.normalTexture.index);
         }
         if (material.occlusionTexture) {
-            material.occlustionTexture = { ...material.occlustionTexture };
+            material.occlusionTexture = { ...material.occlusionTexture };
             material.occlusionTexture.texture = this.getTexture(material.occlusionTexture.index);
         }
         if (material.emissiveTexture) {
-            material.emmisiveTexture = { ...material.emmisiveTexture };
+            material.emissiveTexture = { ...material.emissiveTexture };
             material.emissiveTexture.texture = this.getTexture(material.emissiveTexture.index);
         }
         if (!material.emissiveFactor) {
-            material.emissiveFactor = material.emmisiveTexture ? [1, 1, 1] : [0, 0, 0];
+            material.emissiveFactor = material.emissiveTexture ? [1, 1, 1] : [0, 0, 0];
         }
         if (material.pbrMetallicRoughness) {
             material.pbrMetallicRoughness = { ...material.pbrMetallicRoughness };
@@ -253,17 +294,26 @@ class GLTFPostProcessor {
         }
         return material;
     }
-    _resolveAccessor(accessor, index) {
-        // accessor = {...accessor};
-        accessor.id = accessor.id || `accessor-${index}`;
-        if (accessor.bufferView !== undefined) {
+    _resolveAccessor(gltfAccessor, index) {
+        // Look up enums
+        const bytesPerComponent = getBytesFromComponentType(gltfAccessor.componentType);
+        const components = getSizeFromAccessorType(gltfAccessor.type);
+        const bytesPerElement = bytesPerComponent * components;
+        const accessor = {
+            ...gltfAccessor,
+            // @ts-expect-error
+            id: gltfAccessor.id || `accessor-${index}`,
+            bytesPerComponent,
+            components,
+            bytesPerElement,
+            value: undefined,
+            bufferView: undefined,
+            sparse: undefined
+        };
+        if (gltfAccessor.bufferView !== undefined) {
             // Draco encoded meshes don't have bufferView
-            accessor.bufferView = this.getBufferView(accessor.bufferView);
+            accessor.bufferView = this.getBufferView(gltfAccessor.bufferView);
         }
-        // Look up enums
-        accessor.bytesPerComponent = getBytesFromComponentType(accessor.componentType);
-        accessor.components = getSizeFromAccessorType(accessor.type);
-        accessor.bytesPerElement = accessor.bytesPerComponent * accessor.components;
         // Create TypedArray for the accessor
         // Note: The canonical way to instantiate is to ignore this array and create
         // WebGLBuffer's using the bufferViews.
@@ -297,18 +347,25 @@ class GLTFPostProcessor {
         }
         return result.buffer;
     }
-    _resolveTexture(texture, index) {
-        // texture = {...texture};
-        texture.id = texture.id || `texture-${index}`;
-        texture.sampler = 'sampler' in texture ? this.getSampler(texture.sampler) : DEFAULT_SAMPLER;
-        texture.source = this.getImage(texture.source);
-        return texture;
+    _resolveTexture(gltfTexture, index) {
+        return {
+            ...gltfTexture,
+            // @ts-expect-error id could already be present, glTF standard does not prevent it
+            id: gltfTexture.id || `texture-${index}`,
+            sampler: typeof gltfTexture.sampler === 'number'
+                ? this.getSampler(gltfTexture.sampler)
+                : makeDefaultSampler(),
+            source: typeof gltfTexture.source === 'number' ? this.getImage(gltfTexture.source) : undefined
+        };
     }
-    _resolveSampler(sampler, index) {
-        // sampler = {...sampler};
-        sampler.id = sampler.id || `sampler-${index}`;
+    _resolveSampler(gltfSampler, index) {
+        const sampler = {
+            // @ts-expect-error id could already be present, glTF standard does not prevent it
+            id: gltfSampler.id || `sampler-${index}`,
+            ...gltfSampler,
+            parameters: {}
+        };
         // Map textual parameters to GL parameter values
-        sampler.parameters = {};
         for (const key in sampler) {
             const glEnum = this._enumSamplerParameter(key);
             if (glEnum !== undefined) {
@@ -320,12 +377,14 @@ class GLTFPostProcessor {
     _enumSamplerParameter(key) {
         return SAMPLER_PARAMETER_GLTF_TO_GL[key];
     }
-    _resolveImage(image, index) {
-        // image = {...image};
-        image.id = image.id || `image-${index}`;
-        if (image.bufferView !== undefined) {
-            image.bufferView = this.getBufferView(image.bufferView);
-        }
+    _resolveImage(gltfImage, index) {
+        const image = {
+            ...gltfImage,
+            // @ts-expect-error id could already be present, glTF standard does not prevent it
+            id: gltfImage.id || `image-${index}`,
+            image: null,
+            bufferView: gltfImage.bufferView !== undefined ? this.getBufferView(gltfImage.bufferView) : undefined
+        };
         // Check if image has been preloaded by the GLTFLoader
         // If so, link it into the JSON and drop the URI
         const preloadedImage = this.images[index];
@@ -334,26 +393,30 @@ class GLTFPostProcessor {
         }
         return image;
     }
-    _resolveBufferView(bufferView, index) {
-        // bufferView = {...bufferView};
-        const bufferIndex = bufferView.buffer;
-        const result = {
-            id: `bufferView-${index}`,
-            ...bufferView,
-            buffer: this.buffers[bufferIndex]
-        };
-        // @ts-expect-error
+    _resolveBufferView(gltfBufferView, index) {
+        const bufferIndex = gltfBufferView.buffer;
         const arrayBuffer = this.buffers[bufferIndex].arrayBuffer;
-        // @ts-expect-error
+        // Add offset of buffer, then offset of buffer view
         let byteOffset = this.buffers[bufferIndex].byteOffset || 0;
-        if ('byteOffset' in bufferView) {
-            byteOffset += bufferView.byteOffset;
+        if (gltfBufferView.byteOffset) {
+            byteOffset += gltfBufferView.byteOffset;
         }
-        result.data = new Uint8Array(arrayBuffer, byteOffset, bufferView.byteLength);
-        return result;
+        const bufferView = {
+            // // @ts-expect-error id could already be present, glTF standard does not prevent it
+            id: `bufferView-${index}`,
+            ...gltfBufferView,
+            // ...this.buffers[bufferIndex],
+            buffer: this.buffers[bufferIndex],
+            data: new Uint8Array(arrayBuffer, byteOffset, gltfBufferView.byteLength)
+        };
+        return bufferView;
     }
-    _resolveCamera(camera, index) {
-        camera.id = camera.id || `camera-${index}`;
+    _resolveCamera(gltfCamera, index) {
+        const camera = {
+            ...gltfCamera,
+            // @ts-expect-error id could already be present, glTF standard does not prevent it
+            id: gltfCamera.id || `camera-${index}`
+        };
         // TODO - create 4x4 matrices
         if (camera.perspective) {
             // camera.matrix = createPerspectiveMatrix(camera.perspective);

package/dist/lib/encoders/encode-glb.d.ts

@@ -1,3 +1,15 @@
 export type GLBEncodeOptions = {};
-export default function encodeGLBSync(glb: any, dataView: any, byteOffset?: number, options?: GLBEncodeOptions): number;
+/**
+ * Encode the full GLB buffer with header etc
+ *
+ * @param glb
+ * @param dataView - if `null`, does not encode but just calculates length
+ * @param byteOffset
+ * @param options
+ * @returns
+ *
+ * @see https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#glb-file-format-specification
+ * @todo type GLB argument
+ */
+export declare function encodeGLBSync(glb: any, dataView: DataView | null, byteOffset?: number, options?: GLBEncodeOptions): number;
 //# sourceMappingURL=encode-glb.d.ts.map

package/dist/lib/encoders/encode-glb.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encode-glb.d.ts","sourceRoot":"","sources":["../../../src/lib/encoders/encode-glb.ts"],"names":[],"mappings":"AAYA,MAAM,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAKlC,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,GAAG,KAAA,EACH,QAAQ,KAAA,EACR,UAAU,SAAI,EACd,OAAO,GAAE,gBAAqB,UA4D/B"}
+{"version":3,"file":"encode-glb.d.ts","sourceRoot":"","sources":["../../../src/lib/encoders/encode-glb.ts"],"names":[],"mappings":"AAaA,MAAM,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAElC;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAC3B,GAAG,KAAA,EACH,QAAQ,EAAE,QAAQ,GAAG,IAAI,EACzB,UAAU,SAAI,EACd,OAAO,GAAE,gBAAqB,UA4D/B"}

package/dist/lib/encoders/encode-glb.js

@@ -1,14 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.encodeGLBSync = void 0;
 /* eslint-disable camelcase, max-statements */
 const loader_utils_1 = require("@loaders.gl/loader-utils");
+// import type {GLB} from '../types/glb-types.js';
 const MAGIC_glTF = 0x46546c67; // glTF in ASCII
 const MAGIC_JSON = 0x4e4f534a; // JSON in ASCII
 const MAGIC_BIN = 0x004e4942; // BIN\0 in ASCII
 const LE = true; // Binary GLTF is little endian.
-// Encode the full GLB buffer with header etc
-// https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#
-// glb-file-format-specification
+/**
+ * Encode the full GLB buffer with header etc
+ *
+ * @param glb
+ * @param dataView - if `null`, does not encode but just calculates length
+ * @param byteOffset
+ * @param options
+ * @returns
+ *
+ * @see https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#glb-file-format-specification
+ * @todo type GLB argument
+ */
 function encodeGLBSync(glb, dataView, byteOffset = 0, options = {}) {
     const { magic = MAGIC_glTF, version = 2, json = {}, binary } = glb;
     const byteOffsetStart = byteOffset;
@@ -58,4 +69,4 @@ function encodeGLBSync(glb, dataView, byteOffset = 0, options = {}) {
     }
     return byteOffset;
 }
-exports.default = encodeGLBSync;
+exports.encodeGLBSync = encodeGLBSync;

package/dist/lib/encoders/encode-gltf.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.encodeGLTFSync = void 0;
-const encode_glb_1 = __importDefault(require("./encode-glb"));
+const encode_glb_1 = require("./encode-glb");
 /**
  * Encode the full glTF file as a binary GLB file
  * Returns an ArrayBuffer that represents the complete GLB image that can be saved to file
@@ -25,7 +22,7 @@ const encode_glb_1 = __importDefault(require("./encode-glb"));
 function encodeGLTFSync(gltf, arrayBuffer, byteOffset, options) {
     convertBuffersToBase64(gltf);
     // TODO: Copy buffers to binary
-    return (0, encode_glb_1.default)(gltf, arrayBuffer, byteOffset, options);
+    return (0, encode_glb_1.encodeGLBSync)(gltf, arrayBuffer, byteOffset, options);
 }
 exports.encodeGLTFSync = encodeGLTFSync;
 function convertBuffersToBase64(gltf, { firstBuffer = 0 } = {}) {

package/dist/lib/extensions/EXT_meshopt_compression.d.ts

@@ -1,4 +1,4 @@
-import type { GLTF } from '../types/gltf-types';
+import type { GLTF } from '../types/gltf-json-schema';
 import type { GLTFLoaderOptions } from '../../gltf-loader';
 export declare const name = "EXT_meshopt_compression";
 export declare function decode(gltfData: {

package/dist/lib/extensions/EXT_meshopt_compression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EXT_meshopt_compression.d.ts","sourceRoot":"","sources":["../../../src/lib/extensions/EXT_meshopt_compression.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,IAAI,EAA+C,MAAM,qBAAqB,CAAC;AAC5F,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAczD,eAAO,MAAM,IAAI,4BAA0B,CAAC;AAE5C,wBAAsB,MAAM,CAAC,QAAQ,EAAE;IAAC,IAAI,EAAE,IAAI,CAAA;CAAC,EAAE,OAAO,EAAE,iBAAiB,iBAiB9E"}
+{"version":3,"file":"EXT_meshopt_compression.d.ts","sourceRoot":"","sources":["../../../src/lib/extensions/EXT_meshopt_compression.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,IAAI,EAA+C,MAAM,2BAA2B,CAAC;AAClG,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAczD,eAAO,MAAM,IAAI,4BAA0B,CAAC;AAE5C,wBAAsB,MAAM,CAAC,QAAQ,EAAE;IAAC,IAAI,EAAE,IAAI,CAAA;CAAC,EAAE,OAAO,EAAE,iBAAiB,iBAiB9E"}

package/dist/lib/extensions/EXT_meshopt_compression.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decode = exports.name = void 0;
-const gltf_scenegraph_1 = __importDefault(require("../api/gltf-scenegraph"));
+const gltf_scenegraph_1 = require("../api/gltf-scenegraph");
 const meshopt_decoder_1 = require("../../meshopt/meshopt-decoder");
 // @ts-ignore
 // eslint-disable-next-line
@@ -16,7 +13,7 @@ const DEFAULT_MESHOPT_OPTIONS = {
 const EXT_MESHOPT_COMPRESSION = 'EXT_meshopt_compression';
 exports.name = EXT_MESHOPT_COMPRESSION;
 async function decode(gltfData, options) {
-    const scenegraph = new gltf_scenegraph_1.default(gltfData);
+    const scenegraph = new gltf_scenegraph_1.GLTFScenegraph(gltfData);
     if (!options?.gltf?.decompressMeshes) {
         return;
     }
@@ -39,7 +36,6 @@ async function decodeMeshoptBufferView(scenegraph, bufferView) {
         const source = new Uint8Array(buffer.arrayBuffer, buffer.byteOffset + byteOffset, byteLength);
         const result = new Uint8Array(scenegraph.gltf.buffers[bufferView.buffer].arrayBuffer, bufferView.byteOffset, bufferView.byteLength);
         await (0, meshopt_decoder_1.meshoptDecodeGltfBuffer)(result, count, byteStride, source, mode, filter);
-        return result;
+        scenegraph.removeObjectExtension(bufferView, EXT_MESHOPT_COMPRESSION);
     }
-    return null;
 }

package/dist/lib/extensions/EXT_texture_webp.d.ts

@@ -1,4 +1,4 @@
-import type { GLTF } from '../types/gltf-types';
+import type { GLTF } from '../types/gltf-json-schema';
 import type { GLTFLoaderOptions } from '../../gltf-loader';
 /** Extension name */
 export declare const name = "EXT_texture_webp";

package/dist/lib/extensions/EXT_texture_webp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EXT_texture_webp.d.ts","sourceRoot":"","sources":["../../../src/lib/extensions/EXT_texture_webp.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,IAAI,EAAwB,MAAM,qBAAqB,CAAC;AACrE,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAOzD,qBAAqB;AACrB,eAAO,MAAM,IAAI,qBAAmB,CAAC;AAErC;;;GAGG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE;IAAC,IAAI,EAAE,IAAI,CAAA;CAAC,EAAE,OAAO,EAAE,iBAAiB,GAAG,IAAI,CA0BnF"}
+{"version":3,"file":"EXT_texture_webp.d.ts","sourceRoot":"","sources":["../../../src/lib/extensions/EXT_texture_webp.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,IAAI,EAAwB,MAAM,2BAA2B,CAAC;AAC3E,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAOzD,qBAAqB;AACrB,eAAO,MAAM,IAAI,qBAAmB,CAAC;AAErC;;;GAGG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE;IAAC,IAAI,EAAE,IAAI,CAAA;CAAC,EAAE,OAAO,EAAE,iBAAiB,GAAG,IAAI,CA0BnF"}

package/dist/lib/extensions/EXT_texture_webp.js

@@ -2,13 +2,10 @@
 // GLTF EXTENSION: EXT_TEXTURE_WEBP
 // https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/EXT_TEXTURE_WEBP
 /* eslint-disable camelcase */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.preprocess = exports.name = void 0;
 const images_1 = require("@loaders.gl/images");
-const gltf_scenegraph_1 = __importDefault(require("../api/gltf-scenegraph"));
+const gltf_scenegraph_1 = require("../api/gltf-scenegraph");
 const EXT_TEXTURE_WEBP = 'EXT_texture_webp';
 /** Extension name */
 exports.name = EXT_TEXTURE_WEBP;
@@ -17,7 +14,7 @@ exports.name = EXT_TEXTURE_WEBP;
  * Done in preprocess() to prevent load of default image
  */
 function preprocess(gltfData, options) {
-    const scenegraph = new gltf_scenegraph_1.default(gltfData);
+    const scenegraph = new gltf_scenegraph_1.GLTFScenegraph(gltfData);
     if (!(0, images_1.isImageFormatSupported)('image/webp')) {
         if (scenegraph.getRequiredExtensions().includes(EXT_TEXTURE_WEBP)) {
             throw new Error(`gltf: Required extension ${EXT_TEXTURE_WEBP} not supported by browser`);

package/dist/lib/extensions/KHR_binary_gltf.d.ts

@@ -1,4 +1,4 @@
-import type { GLTF } from '../types/gltf-types';
+import type { GLTF } from '../types/gltf-json-schema';
 /** Extension name */
 export declare const name = "KHR_binary_glTF";
 export declare function preprocess(gltfData: {

package/dist/lib/extensions/KHR_binary_gltf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"KHR_binary_gltf.d.ts","sourceRoot":"","sources":["../../../src/lib/extensions/KHR_binary_gltf.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,IAAI,EAAuB,MAAM,qBAAqB,CAAC;AAMpE,qBAAqB;AACrB,eAAO,MAAM,IAAI,oBAAkB,CAAC;AAEpC,wBAAgB,UAAU,CAAC,QAAQ,EAAE;IAAC,IAAI,EAAE,IAAI,CAAA;CAAC,GAAG,IAAI,CA+BvD"}
+{"version":3,"file":"KHR_binary_gltf.d.ts","sourceRoot":"","sources":["../../../src/lib/extensions/KHR_binary_gltf.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,IAAI,EAAuB,MAAM,2BAA2B,CAAC;AAM1E,qBAAqB;AACrB,eAAO,MAAM,IAAI,oBAAkB,CAAC;AAEpC,wBAAgB,UAAU,CAAC,QAAQ,EAAE;IAAC,IAAI,EAAE,IAAI,CAAA;CAAC,GAAG,IAAI,CA+BvD"}