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

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

@@ -1,422 +1,433 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { assert } from '../utils/assert';
-import { getAccessorArrayTypeAndLength } from '../gltf-utils/gltf-utils';
+"use strict";
+// loaders.gl, MIT license
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.postProcessGLTF = void 0;
+const assert_1 = require("../utils/assert");
+const gltf_utils_1 = require("../gltf-utils/gltf-utils");
+// This is a post processor for loaded glTF files
+// The goal is to make the loaded data easier to use in WebGL applications
+//
+// Functions:
+// * Resolve indexed arrays structure of glTF into a linked tree.
+// * Translate stringified enum keys and values into WebGL constants.
+// * Load images (optional)
+// ENUM LOOKUP
 const COMPONENTS = {
-  SCALAR: 1,
-  VEC2: 2,
-  VEC3: 3,
-  VEC4: 4,
-  MAT2: 4,
-  MAT3: 9,
-  MAT4: 16
+    SCALAR: 1,
+    VEC2: 2,
+    VEC3: 3,
+    VEC4: 4,
+    MAT2: 4,
+    MAT3: 9,
+    MAT4: 16
 };
 const BYTES = {
-  5120: 1,
-  5121: 1,
-  5122: 2,
-  5123: 2,
-  5125: 4,
-  5126: 4
+    5120: 1,
+    5121: 1,
+    5122: 2,
+    5123: 2,
+    5125: 4,
+    5126: 4 // FLOAT
 };
 const GL_SAMPLER = {
-  TEXTURE_MAG_FILTER: 0x2800,
-  TEXTURE_MIN_FILTER: 0x2801,
-  TEXTURE_WRAP_S: 0x2802,
-  TEXTURE_WRAP_T: 0x2803,
-  REPEAT: 0x2901,
-  LINEAR: 0x2601,
-  NEAREST_MIPMAP_LINEAR: 0x2702
+    // Sampler parameters
+    TEXTURE_MAG_FILTER: 0x2800,
+    TEXTURE_MIN_FILTER: 0x2801,
+    TEXTURE_WRAP_S: 0x2802,
+    TEXTURE_WRAP_T: 0x2803,
+    // Sampler default values
+    REPEAT: 0x2901,
+    LINEAR: 0x2601,
+    NEAREST_MIPMAP_LINEAR: 0x2702
 };
 const SAMPLER_PARAMETER_GLTF_TO_GL = {
-  magFilter: GL_SAMPLER.TEXTURE_MAG_FILTER,
-  minFilter: GL_SAMPLER.TEXTURE_MIN_FILTER,
-  wrapS: GL_SAMPLER.TEXTURE_WRAP_S,
-  wrapT: GL_SAMPLER.TEXTURE_WRAP_T
+    magFilter: GL_SAMPLER.TEXTURE_MAG_FILTER,
+    minFilter: GL_SAMPLER.TEXTURE_MIN_FILTER,
+    wrapS: GL_SAMPLER.TEXTURE_WRAP_S,
+    wrapT: GL_SAMPLER.TEXTURE_WRAP_T
 };
-const DEFAULT_SAMPLER = {
-  [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
+// 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_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];
+    return BYTES[componentType];
 }
-
 function getSizeFromAccessorType(type) {
-  return COMPONENTS[type];
+    return COMPONENTS[type];
 }
-
 class GLTFPostProcessor {
-  constructor() {
-    _defineProperty(this, "baseUri", '');
-
-    _defineProperty(this, "json", {});
-
-    _defineProperty(this, "buffers", []);
-
-    _defineProperty(this, "images", []);
-  }
-
-  postProcess(gltf, options = {}) {
-    const {
-      json,
-      buffers = [],
-      images = [],
-      baseUri = ''
-    } = gltf;
-    assert(json);
-    this.baseUri = baseUri;
-    this.json = json;
-    this.buffers = buffers;
-    this.images = images;
-
-    this._resolveTree(this.json, options);
-
-    return this.json;
-  }
-
-  _resolveTree(json, options = {}) {
-    if (json.bufferViews) {
-      json.bufferViews = json.bufferViews.map((bufView, i) => this._resolveBufferView(bufView, i));
-    }
-
-    if (json.images) {
-      json.images = json.images.map((image, i) => this._resolveImage(image, i));
+    constructor() {
+        this.baseUri = '';
+        this.buffers = [];
+        this.images = [];
     }
-
-    if (json.samplers) {
-      json.samplers = json.samplers.map((sampler, i) => this._resolveSampler(sampler, i));
+    postProcess(gltf, options = {}) {
+        const { json, buffers = [], images = [] } = gltf;
+        // @ts-expect-error
+        const { baseUri = '' } = gltf;
+        (0, assert_1.assert)(json);
+        this.baseUri = baseUri;
+        this.buffers = buffers;
+        this.images = images;
+        this.jsonUnprocessed = json;
+        this.json = this._resolveTree(gltf.json, options);
+        return this.json;
     }
-
-    if (json.textures) {
-      json.textures = json.textures.map((texture, i) => this._resolveTexture(texture, i));
+    // Convert indexed glTF structure into tree structure
+    // cross-link index resolution, enum lookup, convenience calculations
+    // 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 (gltf.images) {
+            json.images = gltf.images.map((image, i) => this._resolveImage(image, i));
+        }
+        if (gltf.samplers) {
+            json.samplers = gltf.samplers.map((sampler, i) => this._resolveSampler(sampler, i));
+        }
+        if (gltf.textures) {
+            json.textures = gltf.textures.map((texture, i) => this._resolveTexture(texture, i));
+        }
+        if (gltf.accessors) {
+            json.accessors = gltf.accessors.map((accessor, i) => this._resolveAccessor(accessor, i));
+        }
+        if (gltf.materials) {
+            json.materials = gltf.materials.map((material, i) => this._resolveMaterial(material, i));
+        }
+        if (gltf.meshes) {
+            json.meshes = gltf.meshes.map((mesh, i) => this._resolveMesh(mesh, 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 (gltf.skins) {
+            json.skins = gltf.skins.map((skin, i) => this._resolveSkin(skin, i));
+        }
+        if (gltf.scenes) {
+            json.scenes = gltf.scenes.map((scene, i) => this._resolveScene(scene, i));
+        }
+        if (typeof this.json.scene === 'number' && json.scenes) {
+            json.scene = json.scenes[this.json.scene];
+        }
+        return json;
     }
-
-    if (json.accessors) {
-      json.accessors = json.accessors.map((accessor, i) => this._resolveAccessor(accessor, i));
+    getScene(index) {
+        return this._get(this.json.scenes, index);
     }
-
-    if (json.materials) {
-      json.materials = json.materials.map((material, i) => this._resolveMaterial(material, i));
+    getNode(index) {
+        return this._get(this.json.nodes, index);
     }
-
-    if (json.meshes) {
-      json.meshes = json.meshes.map((mesh, i) => this._resolveMesh(mesh, i));
+    getSkin(index) {
+        return this._get(this.json.skins, index);
     }
-
-    if (json.nodes) {
-      json.nodes = json.nodes.map((node, i) => this._resolveNode(node, i));
+    getMesh(index) {
+        return this._get(this.json.meshes, index);
     }
-
-    if (json.skins) {
-      json.skins = json.skins.map((skin, i) => this._resolveSkin(skin, i));
+    getMaterial(index) {
+        return this._get(this.json.materials, index);
     }
-
-    if (json.scenes) {
-      json.scenes = json.scenes.map((scene, i) => this._resolveScene(scene, i));
+    getAccessor(index) {
+        return this._get(this.json.accessors, index);
     }
-
-    if (json.scene !== undefined) {
-      json.scene = json.scenes[this.json.scene];
+    getCamera(index) {
+        return this._get(this.json.cameras, index);
     }
-  }
-
-  getScene(index) {
-    return this._get('scenes', index);
-  }
-
-  getNode(index) {
-    return this._get('nodes', index);
-  }
-
-  getSkin(index) {
-    return this._get('skins', index);
-  }
-
-  getMesh(index) {
-    return this._get('meshes', index);
-  }
-
-  getMaterial(index) {
-    return this._get('materials', index);
-  }
-
-  getAccessor(index) {
-    return this._get('accessors', index);
-  }
-
-  getCamera(index) {
-    return null;
-  }
-
-  getTexture(index) {
-    return this._get('textures', index);
-  }
-
-  getSampler(index) {
-    return this._get('samplers', index);
-  }
-
-  getImage(index) {
-    return this._get('images', index);
-  }
-
-  getBufferView(index) {
-    return this._get('bufferViews', index);
-  }
-
-  getBuffer(index) {
-    return this._get('buffers', index);
-  }
-
-  _get(array, index) {
-    if (typeof index === 'object') {
-      return index;
+    getTexture(index) {
+        return this._get(this.json.textures, index);
     }
-
-    const object = this.json[array] && this.json[array][index];
-
-    if (!object) {
-      console.warn("glTF file error: Could not find ".concat(array, "[").concat(index, "]"));
+    getSampler(index) {
+        return this._get(this.json.samplers, index);
     }
-
-    return object;
-  }
-
-  _resolveScene(scene, index) {
-    scene.id = scene.id || "scene-".concat(index);
-    scene.nodes = (scene.nodes || []).map(node => this.getNode(node));
-    return scene;
-  }
-
-  _resolveNode(node, index) {
-    node.id = node.id || "node-".concat(index);
-
-    if (node.children) {
-      node.children = node.children.map(child => this.getNode(child));
+    getImage(index) {
+        return this._get(this.json.images, index);
     }
-
-    if (node.mesh !== undefined) {
-      node.mesh = this.getMesh(node.mesh);
-    } else if (node.meshes !== undefined && node.meshes.length) {
-      node.mesh = node.meshes.reduce((accum, meshIndex) => {
-        const mesh = this.getMesh(meshIndex);
-        accum.id = mesh.id;
-        accum.primitives = accum.primitives.concat(mesh.primitives);
-        return accum;
-      }, {
-        primitives: []
-      });
+    getBufferView(index) {
+        return this._get(this.json.bufferViews, index);
     }
-
-    if (node.camera !== undefined) {
-      node.camera = this.getCamera(node.camera);
+    getBuffer(index) {
+        return this._get(this.json.buffers, index);
     }
-
-    if (node.skin !== undefined) {
-      node.skin = this.getSkin(node.skin);
+    _get(array, index) {
+        // check if already resolved
+        if (typeof index === 'object') {
+            return index;
+        }
+        const object = array && array[index];
+        if (!object) {
+            console.warn(`glTF file error: Could not find ${array}[${index}]`); // eslint-disable-line
+        }
+        return object;
     }
-
-    return node;
-  }
-
-  _resolveSkin(skin, index) {
-    skin.id = skin.id || "skin-".concat(index);
-    skin.inverseBindMatrices = this.getAccessor(skin.inverseBindMatrices);
-    return skin;
-  }
-
-  _resolveMesh(mesh, index) {
-    mesh.id = mesh.id || "mesh-".concat(index);
-
-    if (mesh.primitives) {
-      mesh.primitives = mesh.primitives.map(primitive => {
-        primitive = { ...primitive
+    // PARSING HELPERS
+    _resolveScene(scene, index) {
+        return {
+            ...scene,
+            // @ts-ignore
+            id: scene.id || `scene-${index}`,
+            nodes: (scene.nodes || []).map((node) => this.getNode(node))
         };
-        const attributes = primitive.attributes;
-        primitive.attributes = {};
-
-        for (const attribute in attributes) {
-          primitive.attributes[attribute] = this.getAccessor(attributes[attribute]);
-        }
-
-        if (primitive.indices !== undefined) {
-          primitive.indices = this.getAccessor(primitive.indices);
-        }
-
-        if (primitive.material !== undefined) {
-          primitive.material = this.getMaterial(primitive.material);
-        }
-
-        return primitive;
-      });
     }
-
-    return mesh;
-  }
-
-  _resolveMaterial(material, index) {
-    material.id = material.id || "material-".concat(index);
-
-    if (material.normalTexture) {
-      material.normalTexture = { ...material.normalTexture
-      };
-      material.normalTexture.texture = this.getTexture(material.normalTexture.index);
+    _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 (gltfNode.skin !== undefined) {
+            node.skin = this.getSkin(gltfNode.skin);
+        }
+        // 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: [] });
+        }
+        return node;
     }
-
-    if (material.occlusionTexture) {
-      material.occlustionTexture = { ...material.occlustionTexture
-      };
-      material.occlusionTexture.texture = this.getTexture(material.occlusionTexture.index);
+    _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;
     }
-
-    if (material.emissiveTexture) {
-      material.emmisiveTexture = { ...material.emmisiveTexture
-      };
-      material.emissiveTexture.texture = this.getTexture(material.emissiveTexture.index);
+    _resolveSkin(gltfSkin, index) {
+        const inverseBindMatrices = typeof gltfSkin.inverseBindMatrices === 'number'
+            ? this.getAccessor(gltfSkin.inverseBindMatrices)
+            : undefined;
+        return {
+            ...gltfSkin,
+            id: gltfSkin.id || `skin-${index}`,
+            inverseBindMatrices
+        };
     }
-
-    if (!material.emissiveFactor) {
-      material.emissiveFactor = material.emmisiveTexture ? [1, 1, 1] : [0, 0, 0];
+    _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 (gltfPrimitive.indices !== undefined) {
+                    primitive.indices = this.getAccessor(gltfPrimitive.indices);
+                }
+                if (gltfPrimitive.material !== undefined) {
+                    primitive.material = this.getMaterial(gltfPrimitive.material);
+                }
+                return primitive;
+            });
+        }
+        return mesh;
     }
-
-    if (material.pbrMetallicRoughness) {
-      material.pbrMetallicRoughness = { ...material.pbrMetallicRoughness
-      };
-      const mr = material.pbrMetallicRoughness;
-
-      if (mr.baseColorTexture) {
-        mr.baseColorTexture = { ...mr.baseColorTexture
+    _resolveMaterial(gltfMaterial, index) {
+        // @ts-expect-error
+        const material = {
+            ...gltfMaterial,
+            // @ts-expect-error
+            id: gltfMaterial.id || `material-${index}`
         };
-        mr.baseColorTexture.texture = this.getTexture(mr.baseColorTexture.index);
-      }
-
-      if (mr.metallicRoughnessTexture) {
-        mr.metallicRoughnessTexture = { ...mr.metallicRoughnessTexture
+        if (material.normalTexture) {
+            material.normalTexture = { ...material.normalTexture };
+            material.normalTexture.texture = this.getTexture(material.normalTexture.index);
+        }
+        if (material.occlusionTexture) {
+            material.occlusionTexture = { ...material.occlusionTexture };
+            material.occlusionTexture.texture = this.getTexture(material.occlusionTexture.index);
+        }
+        if (material.emissiveTexture) {
+            material.emissiveTexture = { ...material.emissiveTexture };
+            material.emissiveTexture.texture = this.getTexture(material.emissiveTexture.index);
+        }
+        if (!material.emissiveFactor) {
+            material.emissiveFactor = material.emissiveTexture ? [1, 1, 1] : [0, 0, 0];
+        }
+        if (material.pbrMetallicRoughness) {
+            material.pbrMetallicRoughness = { ...material.pbrMetallicRoughness };
+            const mr = material.pbrMetallicRoughness;
+            if (mr.baseColorTexture) {
+                mr.baseColorTexture = { ...mr.baseColorTexture };
+                mr.baseColorTexture.texture = this.getTexture(mr.baseColorTexture.index);
+            }
+            if (mr.metallicRoughnessTexture) {
+                mr.metallicRoughnessTexture = { ...mr.metallicRoughnessTexture };
+                mr.metallicRoughnessTexture.texture = this.getTexture(mr.metallicRoughnessTexture.index);
+            }
+        }
+        return material;
+    }
+    _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
         };
-        mr.metallicRoughnessTexture.texture = this.getTexture(mr.metallicRoughnessTexture.index);
-      }
+        if (gltfAccessor.bufferView !== undefined) {
+            // Draco encoded meshes don't have bufferView
+            accessor.bufferView = this.getBufferView(gltfAccessor.bufferView);
+        }
+        // Create TypedArray for the accessor
+        // Note: The canonical way to instantiate is to ignore this array and create
+        // WebGLBuffer's using the bufferViews.
+        if (accessor.bufferView) {
+            const buffer = accessor.bufferView.buffer;
+            const { ArrayType, byteLength } = (0, gltf_utils_1.getAccessorArrayTypeAndLength)(accessor, accessor.bufferView);
+            const byteOffset = (accessor.bufferView.byteOffset || 0) + (accessor.byteOffset || 0) + buffer.byteOffset;
+            let cutBuffer = buffer.arrayBuffer.slice(byteOffset, byteOffset + byteLength);
+            if (accessor.bufferView.byteStride) {
+                cutBuffer = this._getValueFromInterleavedBuffer(buffer, byteOffset, accessor.bufferView.byteStride, accessor.bytesPerElement, accessor.count);
+            }
+            accessor.value = new ArrayType(cutBuffer);
+        }
+        return accessor;
     }
-
-    return material;
-  }
-
-  _resolveAccessor(accessor, index) {
-    accessor.id = accessor.id || "accessor-".concat(index);
-
-    if (accessor.bufferView !== undefined) {
-      accessor.bufferView = this.getBufferView(accessor.bufferView);
+    /**
+     * Take values of particular accessor from interleaved buffer
+     * various parts of the buffer
+     * @param buffer
+     * @param byteOffset
+     * @param byteStride
+     * @param bytesPerElement
+     * @param count
+     * @returns
+     */
+    _getValueFromInterleavedBuffer(buffer, byteOffset, byteStride, bytesPerElement, count) {
+        const result = new Uint8Array(count * bytesPerElement);
+        for (let i = 0; i < count; i++) {
+            const elementOffset = byteOffset + i * byteStride;
+            result.set(new Uint8Array(buffer.arrayBuffer.slice(elementOffset, elementOffset + bytesPerElement)), i * bytesPerElement);
+        }
+        return result.buffer;
     }
-
-    accessor.bytesPerComponent = getBytesFromComponentType(accessor.componentType);
-    accessor.components = getSizeFromAccessorType(accessor.type);
-    accessor.bytesPerElement = accessor.bytesPerComponent * accessor.components;
-
-    if (accessor.bufferView) {
-      const buffer = accessor.bufferView.buffer;
-      const {
-        ArrayType,
-        byteLength
-      } = getAccessorArrayTypeAndLength(accessor, accessor.bufferView);
-      const byteOffset = (accessor.bufferView.byteOffset || 0) + (accessor.byteOffset || 0) + buffer.byteOffset;
-      let cutBuffer = buffer.arrayBuffer.slice(byteOffset, byteOffset + byteLength);
-
-      if (accessor.bufferView.byteStride) {
-        cutBuffer = this._getValueFromInterleavedBuffer(buffer, byteOffset, accessor.bufferView.byteStride, accessor.bytesPerElement, accessor.count);
-      }
-
-      accessor.value = new ArrayType(cutBuffer);
+    _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
+        };
     }
-
-    return accessor;
-  }
-
-  _getValueFromInterleavedBuffer(buffer, byteOffset, byteStride, bytesPerElement, count) {
-    const result = new Uint8Array(count * bytesPerElement);
-
-    for (let i = 0; i < count; i++) {
-      const elementOffset = byteOffset + i * byteStride;
-      result.set(new Uint8Array(buffer.arrayBuffer.slice(elementOffset, elementOffset + bytesPerElement)), i * bytesPerElement);
+    _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
+        for (const key in sampler) {
+            const glEnum = this._enumSamplerParameter(key);
+            if (glEnum !== undefined) {
+                sampler.parameters[glEnum] = sampler[key];
+            }
+        }
+        return sampler;
     }
-
-    return result.buffer;
-  }
-
-  _resolveTexture(texture, index) {
-    texture.id = texture.id || "texture-".concat(index);
-    texture.sampler = 'sampler' in texture ? this.getSampler(texture.sampler) : DEFAULT_SAMPLER;
-    texture.source = this.getImage(texture.source);
-    return texture;
-  }
-
-  _resolveSampler(sampler, index) {
-    sampler.id = sampler.id || "sampler-".concat(index);
-    sampler.parameters = {};
-
-    for (const key in sampler) {
-      const glEnum = this._enumSamplerParameter(key);
-
-      if (glEnum !== undefined) {
-        sampler.parameters[glEnum] = sampler[key];
-      }
+    _enumSamplerParameter(key) {
+        return SAMPLER_PARAMETER_GLTF_TO_GL[key];
     }
-
-    return sampler;
-  }
-
-  _enumSamplerParameter(key) {
-    return SAMPLER_PARAMETER_GLTF_TO_GL[key];
-  }
-
-  _resolveImage(image, index) {
-    image.id = image.id || "image-".concat(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];
+        if (preloadedImage) {
+            image.image = preloadedImage;
+        }
+        return image;
     }
-
-    const preloadedImage = this.images[index];
-
-    if (preloadedImage) {
-      image.image = preloadedImage;
+    _resolveBufferView(gltfBufferView, index) {
+        const bufferIndex = gltfBufferView.buffer;
+        const arrayBuffer = this.buffers[bufferIndex].arrayBuffer;
+        // Add offset of buffer, then offset of buffer view
+        let byteOffset = this.buffers[bufferIndex].byteOffset || 0;
+        if (gltfBufferView.byteOffset) {
+            byteOffset += gltfBufferView.byteOffset;
+        }
+        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;
     }
-
-    return image;
-  }
-
-  _resolveBufferView(bufferView, index) {
-    const bufferIndex = bufferView.buffer;
-    const result = {
-      id: "bufferView-".concat(index),
-      ...bufferView,
-      buffer: this.buffers[bufferIndex]
-    };
-    const arrayBuffer = this.buffers[bufferIndex].arrayBuffer;
-    let byteOffset = this.buffers[bufferIndex].byteOffset || 0;
-
-    if ('byteOffset' in bufferView) {
-      byteOffset += bufferView.byteOffset;
+    _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);
+        }
+        if (camera.orthographic) {
+            // camera.matrix = createOrthographicMatrix(camera.orthographic);
+        }
+        return camera;
     }
-
-    result.data = new Uint8Array(arrayBuffer, byteOffset, bufferView.byteLength);
-    return result;
-  }
-
-  _resolveCamera(camera, index) {
-    camera.id = camera.id || "camera-".concat(index);
-
-    if (camera.perspective) {}
-
-    if (camera.orthographic) {}
-
-    return camera;
-  }
-
 }
-
-export function postProcessGLTF(gltf, options) {
-  return new GLTFPostProcessor().postProcess(gltf, options);
+function postProcessGLTF(gltf, options) {
+    return new GLTFPostProcessor().postProcess(gltf, options);
 }
-//# sourceMappingURL=post-process-gltf.js.map
+exports.postProcessGLTF = postProcessGLTF;