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

package/dist/lib/api/gltf-scenegraph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gltf-scenegraph.d.ts","sourceRoot":"","sources":["../../../src/lib/api/gltf-scenegraph.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gltf-scenegraph.d.ts","sourceRoot":"","sources":["../../../src/lib/api/gltf-scenegraph.ts"],"names":[],"mappings":"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"}

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

@@ -1,25 +1,34 @@
 "use strict";
+// loaders.gl, MIT license
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.GLTFScenegraph = void 0;
 const images_1 = require("@loaders.gl/images");
 const loader_utils_1 = require("@loaders.gl/loader-utils");
 const assert_1 = require("../utils/assert");
 const gltf_utils_1 = require("../gltf-utils/gltf-utils");
-const DEFAULT_GLTF_JSON = {
-    asset: {
-        version: '2.0',
-        generator: 'loaders.gl'
-    },
-    buffers: []
-};
+function makeDefaultGLTFJson() {
+    return {
+        asset: {
+            version: '2.0',
+            generator: 'loaders.gl'
+        },
+        buffers: [],
+        extensions: {},
+        extensionsRequired: [],
+        extensionsUsed: []
+    };
+}
 /**
  * Class for structured access to GLTF data
  */
 class GLTFScenegraph {
+    // TODO - why is this not GLTFWithBuffers - what happens to images?
     constructor(gltf) {
-        // @ts-ignore
-        this.gltf = gltf || {
-            json: { ...DEFAULT_GLTF_JSON },
-            buffers: []
+        // Declare locally so
+        this.gltf = {
+            json: gltf?.json || makeDefaultGLTFJson(),
+            buffers: gltf?.buffers || [],
+            images: gltf?.images || []
         };
         this.sourceBuffers = [];
         this.byteLength = 0;
@@ -43,10 +52,15 @@ class GLTFScenegraph {
         const extras = this.json.extras || {};
         return extras[key];
     }
+    hasExtension(extensionName) {
+        const isUsedExtension = this.getUsedExtensions().find((name) => name === extensionName);
+        const isRequiredExtension = this.getRequiredExtensions().find((name) => name === extensionName);
+        return typeof isUsedExtension === 'string' || typeof isRequiredExtension === 'string';
+    }
     getExtension(extensionName) {
         const isExtension = this.getUsedExtensions().find((name) => name === extensionName);
         const extensions = this.json.extensions || {};
-        return isExtension ? extensions[extensionName] || true : null;
+        return isExtension ? extensions[extensionName] : null;
     }
     getRequiredExtension(extensionName) {
         const isRequired = this.getRequiredExtensions().find((name) => name === extensionName);
@@ -186,17 +200,20 @@ class GLTFScenegraph {
         return this;
     }
     setObjectExtension(object, extensionName, data) {
-        // @ts-ignore
         const extensions = object.extensions || {};
         extensions[extensionName] = data;
         // TODO - add to usedExtensions...
     }
     removeObjectExtension(object, extensionName) {
-        // @ts-ignore
-        const extensions = object.extensions || {};
-        const extension = extensions[extensionName];
+        const extensions = object?.extensions || {};
+        if (extensions[extensionName]) {
+            this.json.extensionsRemoved = this.json.extensionsRemoved || [];
+            const extensionsRemoved = this.json.extensionsRemoved;
+            if (!extensionsRemoved.includes(extensionName)) {
+                extensionsRemoved.push(extensionName);
+            }
+        }
         delete extensions[extensionName];
-        return extension;
     }
     /**
      * Add to standard GLTF top level extension object, mark as used
@@ -240,8 +257,15 @@ class GLTFScenegraph {
      * Removes an extension from the top-level list
      */
     removeExtension(extensionName) {
-        if (!this.getExtension(extensionName)) {
-            return;
+        if (this.json.extensions?.[extensionName]) {
+            this.json.extensionsRemoved = this.json.extensionsRemoved || [];
+            const extensionsRemoved = this.json.extensionsRemoved;
+            if (!extensionsRemoved.includes(extensionName)) {
+                extensionsRemoved.push(extensionName);
+            }
+        }
+        if (this.json.extensions) {
+            delete this.json.extensions[extensionName];
         }
         if (this.json.extensionsRequired) {
             this._removeStringFromArray(this.json.extensionsRequired, extensionName);
@@ -249,16 +273,6 @@ class GLTFScenegraph {
         if (this.json.extensionsUsed) {
             this._removeStringFromArray(this.json.extensionsUsed, extensionName);
         }
-        if (this.json.extensions) {
-            delete this.json.extensions[extensionName];
-        }
-        if (!Array.isArray(this.json.extensionsRemoved)) {
-            this.json.extensionsRemoved = [];
-        }
-        const extensionsRemoved = this.json.extensionsRemoved;
-        if (!extensionsRemoved.includes(extensionName)) {
-            extensionsRemoved.push(extensionName);
-        }
     }
     /**
      *  Set default scene which is to be displayed at load time
@@ -359,16 +373,16 @@ class GLTFScenegraph {
      * Add one untyped source buffer, create a matching glTF `bufferView`, and return its index
      * @param buffer
      */
-    addBufferView(buffer) {
+    addBufferView(buffer, bufferIndex = 0, byteOffset = this.byteLength) {
         const byteLength = buffer.byteLength;
         (0, assert_1.assert)(Number.isFinite(byteLength));
         // Add this buffer to the list of buffers to be written to the body.
         this.sourceBuffers = this.sourceBuffers || [];
         this.sourceBuffers.push(buffer);
         const glTFBufferView = {
-            buffer: 0,
+            buffer: bufferIndex,
             // Write offset from the start of the binary body
-            byteOffset: this.byteLength,
+            byteOffset,
             byteLength
         };
         // We've now added the contents to the body, so update the total length
@@ -563,4 +577,4 @@ class GLTFScenegraph {
         return result;
     }
 }
-exports.default = GLTFScenegraph;
+exports.GLTFScenegraph = GLTFScenegraph;

package/dist/lib/api/post-process-gltf.d.ts

@@ -1,2 +1,5 @@
-export declare function postProcessGLTF(gltf: any, options?: any): Record<string, any>;
+import type { GLTFWithBuffers } from '../types/gltf-types';
+import type { ParseGLTFOptions } from '../parsers/parse-gltf';
+import type { GLTFPostprocessed } from '../types/gltf-postprocessed-schema';
+export declare function postProcessGLTF(gltf: GLTFWithBuffers, options?: ParseGLTFOptions): GLTFPostprocessed;
 //# sourceMappingURL=post-process-gltf.d.ts.map

package/dist/lib/api/post-process-gltf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"post-process-gltf.d.ts","sourceRoot":"","sources":["../../../src/lib/api/post-process-gltf.ts"],"names":[],"mappings":"AA4aA,wBAAgB,eAAe,CAAC,IAAI,KAAA,EAAE,OAAO,CAAC,KAAA,uBAE7C"}
+{"version":3,"file":"post-process-gltf.d.ts","sourceRoot":"","sources":["../../../src/lib/api/post-process-gltf.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAiB5D,OAAO,KAAK,EACV,iBAAiB,EAclB,MAAM,oCAAoC,CAAC;AAmgB5C,wBAAgB,eAAe,CAC7B,IAAI,EAAE,eAAe,EACrB,OAAO,CAAC,EAAE,gBAAgB,GACzB,iBAAiB,CAEnB"}

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);