@loaders.gl/gltf 3.1.0-alpha.3 → 3.1.0-beta.2

package/dist/esm/lib/api/normalize-gltf-v1.js

@@ -0,0 +1,250 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import * as KHR_binary_glTF from '../extensions/KHR_binary_gltf';
+const GLTF_ARRAYS = {
+  accessors: 'accessor',
+  animations: 'animation',
+  buffers: 'buffer',
+  bufferViews: 'bufferView',
+  images: 'image',
+  materials: 'material',
+  meshes: 'mesh',
+  nodes: 'node',
+  samplers: 'sampler',
+  scenes: 'scene',
+  skins: 'skin',
+  textures: 'texture'
+};
+const GLTF_KEYS = {
+  accessor: 'accessors',
+  animations: 'animation',
+  buffer: 'buffers',
+  bufferView: 'bufferViews',
+  image: 'images',
+  material: 'materials',
+  mesh: 'meshes',
+  node: 'nodes',
+  sampler: 'samplers',
+  scene: 'scenes',
+  skin: 'skins',
+  texture: 'textures'
+};
+
+class GLTFV1Normalizer {
+  constructor() {
+    _defineProperty(this, "idToIndexMap", {
+      animations: {},
+      accessors: {},
+      buffers: {},
+      bufferViews: {},
+      images: {},
+      materials: {},
+      meshes: {},
+      nodes: {},
+      samplers: {},
+      scenes: {},
+      skins: {},
+      textures: {}
+    });
+
+    _defineProperty(this, "json", void 0);
+  }
+
+  normalize(gltf, options) {
+    this.json = gltf.json;
+    const json = gltf.json;
+
+    switch (json.asset && json.asset.version) {
+      case '2.0':
+        return;
+
+      case undefined:
+      case '1.0':
+        break;
+
+      default:
+        console.warn("glTF: Unknown version ".concat(json.asset.version));
+        return;
+    }
+
+    if (!options.normalize) {
+      throw new Error('glTF v1 is not supported.');
+    }
+
+    console.warn('Converting glTF v1 to glTF v2 format. This is experimental and may fail.');
+
+    this._addAsset(json);
+
+    this._convertTopLevelObjectsToArrays(json);
+
+    KHR_binary_glTF.preprocess(gltf);
+
+    this._convertObjectIdsToArrayIndices(json);
+
+    this._updateObjects(json);
+
+    this._updateMaterial(json);
+  }
+
+  _addAsset(json) {
+    json.asset = json.asset || {};
+    json.asset.version = '2.0';
+    json.asset.generator = json.asset.generator || 'Normalized to glTF 2.0 by loaders.gl';
+  }
+
+  _convertTopLevelObjectsToArrays(json) {
+    for (const arrayName in GLTF_ARRAYS) {
+      this._convertTopLevelObjectToArray(json, arrayName);
+    }
+  }
+
+  _convertTopLevelObjectToArray(json, mapName) {
+    const objectMap = json[mapName];
+
+    if (!objectMap || Array.isArray(objectMap)) {
+      return;
+    }
+
+    json[mapName] = [];
+
+    for (const id in objectMap) {
+      const object = objectMap[id];
+      object.id = object.id || id;
+      const index = json[mapName].length;
+      json[mapName].push(object);
+      this.idToIndexMap[mapName][id] = index;
+    }
+  }
+
+  _convertObjectIdsToArrayIndices(json) {
+    for (const arrayName in GLTF_ARRAYS) {
+      this._convertIdsToIndices(json, arrayName);
+    }
+
+    if ('scene' in json) {
+      json.scene = this._convertIdToIndex(json.scene, 'scene');
+    }
+
+    for (const texture of json.textures) {
+      this._convertTextureIds(texture);
+    }
+
+    for (const mesh of json.meshes) {
+      this._convertMeshIds(mesh);
+    }
+
+    for (const node of json.nodes) {
+      this._convertNodeIds(node);
+    }
+
+    for (const node of json.scenes) {
+      this._convertSceneIds(node);
+    }
+  }
+
+  _convertTextureIds(texture) {
+    if (texture.source) {
+      texture.source = this._convertIdToIndex(texture.source, 'image');
+    }
+  }
+
+  _convertMeshIds(mesh) {
+    for (const primitive of mesh.primitives) {
+      const {
+        attributes,
+        indices,
+        material
+      } = primitive;
+
+      for (const attributeName in attributes) {
+        attributes[attributeName] = this._convertIdToIndex(attributes[attributeName], 'accessor');
+      }
+
+      if (indices) {
+        primitive.indices = this._convertIdToIndex(indices, 'accessor');
+      }
+
+      if (material) {
+        primitive.material = this._convertIdToIndex(material, 'material');
+      }
+    }
+  }
+
+  _convertNodeIds(node) {
+    if (node.children) {
+      node.children = node.children.map(child => this._convertIdToIndex(child, 'node'));
+    }
+
+    if (node.meshes) {
+      node.meshes = node.meshes.map(mesh => this._convertIdToIndex(mesh, 'mesh'));
+    }
+  }
+
+  _convertSceneIds(scene) {
+    if (scene.nodes) {
+      scene.nodes = scene.nodes.map(node => this._convertIdToIndex(node, 'node'));
+    }
+  }
+
+  _convertIdsToIndices(json, topLevelArrayName) {
+    if (!json[topLevelArrayName]) {
+      console.warn("gltf v1: json doesn't contain attribute ".concat(topLevelArrayName));
+      json[topLevelArrayName] = [];
+    }
+
+    for (const object of json[topLevelArrayName]) {
+      for (const key in object) {
+        const id = object[key];
+
+        const index = this._convertIdToIndex(id, key);
+
+        object[key] = index;
+      }
+    }
+  }
+
+  _convertIdToIndex(id, key) {
+    const arrayName = GLTF_KEYS[key];
+
+    if (arrayName in this.idToIndexMap) {
+      const index = this.idToIndexMap[arrayName][id];
+
+      if (!Number.isFinite(index)) {
+        throw new Error("gltf v1: failed to resolve ".concat(key, " with id ").concat(id));
+      }
+
+      return index;
+    }
+
+    return id;
+  }
+
+  _updateObjects(json) {
+    for (const buffer of this.json.buffers) {
+      delete buffer.type;
+    }
+  }
+
+  _updateMaterial(json) {
+    for (const material of json.materials) {
+      material.pbrMetallicRoughness = {
+        baseColorFactor: [1, 1, 1, 1],
+        metallicFactor: 1,
+        roughnessFactor: 1
+      };
+      const textureId = material.values && material.values.tex;
+      const textureIndex = json.textures.findIndex(texture => texture.id === textureId);
+
+      if (textureIndex !== -1) {
+        material.pbrMetallicRoughness.baseColorTexture = {
+          index: textureIndex
+        };
+      }
+    }
+  }
+
+}
+
+export function normalizeGLTFV1(gltf, options = {}) {
+  return new GLTFV1Normalizer().normalize(gltf, options);
+}
+//# sourceMappingURL=normalize-gltf-v1.js.map

package/dist/esm/lib/api/normalize-gltf-v1.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/lib/api/normalize-gltf-v1.ts"],"names":["KHR_binary_glTF","GLTF_ARRAYS","accessors","animations","buffers","bufferViews","images","materials","meshes","nodes","samplers","scenes","skins","textures","GLTF_KEYS","accessor","buffer","bufferView","image","material","mesh","node","sampler","scene","skin","texture","GLTFV1Normalizer","normalize","gltf","options","json","asset","version","undefined","console","warn","Error","_addAsset","_convertTopLevelObjectsToArrays","preprocess","_convertObjectIdsToArrayIndices","_updateObjects","_updateMaterial","generator","arrayName","_convertTopLevelObjectToArray","mapName","objectMap","Array","isArray","id","object","index","length","push","idToIndexMap","_convertIdsToIndices","_convertIdToIndex","_convertTextureIds","_convertMeshIds","_convertNodeIds","_convertSceneIds","source","primitive","primitives","attributes","indices","attributeName","children","map","child","topLevelArrayName","key","Number","isFinite","type","pbrMetallicRoughness","baseColorFactor","metallicFactor","roughnessFactor","textureId","values","tex","textureIndex","findIndex","baseColorTexture","normalizeGLTFV1"],"mappings":"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","sourcesContent":["/* eslint-disable camelcase */\nimport * as KHR_binary_glTF from '../extensions/KHR_binary_gltf';\n\n// Binary format changes (mainly implemented by GLBLoader)\n// https://github.com/KhronosGroup/glTF/tree/master/extensions/1.0/Khronos/KHR_binary_glTF\n\n// JSON format changes:\n// https://github.com/khronosgroup/gltf/issues/605\n\n// - [x] Top-level JSON objects are arrays now\n// - [ ] Removed indirection from animation: sampler now refers directly to accessors, #712\n// - [ ] material.parameter.value and technique.parameter.value must be an array, #690\n// - [ ] Node can have only one mesh #821\n// - [ ] Added reqs on JSON encoding\n// - [ ] Added reqs on binary data alignment #802 (comment)\n\n// Additions:\n// - [ ] Added accessor.normalized, #691, #706\n// - [ ] Added glExtensionsUsed property and 5125 (UNSIGNED_INT) accessor.componentType value, #619\n// - [ ] Added extensionsRequired property, #720, #721\n// - [ ] Added \"STEP\" as valid animation.sampler.interpolation value, #712\n\n// Removals:\n// - [x] Removed buffer.type, #786, #629\n// - [ ] Removed revision number from profile.version, #709\n// - [ ] Removed technique.functions.scissor and removed 3089 (SCISSOR_TEST) as a valid value for technique.states.enable, #681\n// - [ ] Techniques, programs, and shaders were moved out to KHR_technique_webgl extension.\n\n// Other edits:\n// - [x] asset is now required, #642\n// - [ ] buffer.byteLength and bufferView.byteLength are now required, #560.\n// - [ ] accessor.min and accessor.max are now required, #593, and clarified that the JSON value and binary data must be the same, #628.\n// - [ ] Clarified animation.sampler and animation.channel restrictions, #712\n// - [ ] skin.inverseBindMatrices is now optional, #461.\n// - [ ] Attribute parameters can't have a value defined in the technique or parameter, #563 (comment).\n// - [ ] Only TEXCOORD and COLOR attribute semantics can be written in the form [semantic]_[set_index], #563 (comment).\n// - [ ] TEXCOORD and COLOR attribute semantics must be written in the form [semantic]_[set_index], e.g., just TEXCOORD should be TEXCOORD_0, and just COLOR should be COLOR_0, #649\n// - [ ] camera.perspective.aspectRatio and camera.perspective.yfov must now be > 0, not >= 0, #563 (comment).\n// - [ ] Application-specific parameter semantics must start with an underscore, e.g., _TEMPERATURE and _SIMULATION_TIME, #563 (comment).\n// - [ ] Properties in technique.parameters must be defined in technique.uniforms or technique.attributes,\n\n// #563 (comment).\n// - [ ] technique.parameter.count can only be defined when the semantic is JOINTMATRIX or an application-specific semantic is used. It can never be defined for attribute parameters; only uniforms, d2f6945\n// - [ ] technique.parameter.semantic is required when the parameter is an attribute, 28e113d\n// - [ ] Mesh-only models are allowed, e.g., without materials, #642\n// - [ ] Skeleton hierarchies (nodes containing jointName) must be separated from non-skeleton hierarchies., #647\n// - [ ] technique.states.functions.blendColor and technique.states.functions.depthRange parameters now must match WebGL function min/max, #707\n\nconst GLTF_ARRAYS = {\n  accessors: 'accessor',\n  animations: 'animation',\n  buffers: 'buffer',\n  bufferViews: 'bufferView',\n  images: 'image',\n  materials: 'material',\n  meshes: 'mesh',\n  nodes: 'node',\n  samplers: 'sampler',\n  scenes: 'scene',\n  skins: 'skin',\n  textures: 'texture'\n};\n\nconst GLTF_KEYS = {\n  accessor: 'accessors',\n  animations: 'animation',\n  buffer: 'buffers',\n  bufferView: 'bufferViews',\n  image: 'images',\n  material: 'materials',\n  mesh: 'meshes',\n  node: 'nodes',\n  sampler: 'samplers',\n  scene: 'scenes',\n  skin: 'skins',\n  texture: 'textures'\n};\n\n/**\n * Converts (normalizes) glTF v1 to v2\n */\nclass GLTFV1Normalizer {\n  idToIndexMap = {\n    animations: {},\n    accessors: {},\n    buffers: {},\n    bufferViews: {},\n    images: {},\n    materials: {},\n    meshes: {},\n    nodes: {},\n    samplers: {},\n    scenes: {},\n    skins: {},\n    textures: {}\n  };\n\n  json;\n\n  // constructor() {}\n\n  /**\n   * Convert (normalize) glTF < 2.0 to glTF 2.0\n   * @param gltf - object with json and binChunks\n   * @param options\n   * @param options normalize Whether to actually normalize\n   */\n  normalize(gltf, options) {\n    this.json = gltf.json;\n    const json = gltf.json;\n\n    // Check version\n    switch (json.asset && json.asset.version) {\n      // We are converting to v2 format. Return if there is nothing to do\n      case '2.0':\n        return;\n\n      // This class is written to convert 1.0\n      case undefined:\n      case '1.0':\n        break;\n\n      default:\n        // eslint-disable-next-line no-undef, no-console\n        console.warn(`glTF: Unknown version ${json.asset.version}`);\n        return;\n    }\n\n    if (!options.normalize) {\n      // We are still missing a few conversion tricks, remove once addressed\n      throw new Error('glTF v1 is not supported.');\n    }\n\n    // eslint-disable-next-line no-undef, no-console\n    console.warn('Converting glTF v1 to glTF v2 format. This is experimental and may fail.');\n\n    this._addAsset(json);\n\n    // In glTF2 top-level fields are Arrays not Object maps\n    this._convertTopLevelObjectsToArrays(json);\n\n    // Extract bufferView indices for images\n    // (this extension needs to be invoked early in the normalization process)\n    // TODO can this be handled by standard extension processing instead of called explicitly?\n    KHR_binary_glTF.preprocess(gltf);\n\n    // Convert object references from ids to indices\n    this._convertObjectIdsToArrayIndices(json);\n\n    this._updateObjects(json);\n\n    this._updateMaterial(json);\n  }\n\n  // asset is now required, #642 https://github.com/KhronosGroup/glTF/issues/639\n  _addAsset(json) {\n    json.asset = json.asset || {};\n    // We are normalizing to glTF v2, so change version to \"2.0\"\n    json.asset.version = '2.0';\n    json.asset.generator = json.asset.generator || 'Normalized to glTF 2.0 by loaders.gl';\n  }\n\n  _convertTopLevelObjectsToArrays(json) {\n    // TODO check that all arrays are covered\n    for (const arrayName in GLTF_ARRAYS) {\n      this._convertTopLevelObjectToArray(json, arrayName);\n    }\n  }\n\n  /** Convert one top level object to array */\n  _convertTopLevelObjectToArray(json, mapName) {\n    const objectMap = json[mapName];\n    if (!objectMap || Array.isArray(objectMap)) {\n      return;\n    }\n\n    // Rewrite the top-level field as an array\n    json[mapName] = [];\n    // Copy the map key into object.id\n    for (const id in objectMap) {\n      const object = objectMap[id];\n      object.id = object.id || id; // Mutates the loaded object\n      const index = json[mapName].length;\n      json[mapName].push(object);\n      this.idToIndexMap[mapName][id] = index;\n    }\n  }\n\n  /** Go through all objects in all top-level arrays and replace ids with indices */\n  _convertObjectIdsToArrayIndices(json) {\n    for (const arrayName in GLTF_ARRAYS) {\n      this._convertIdsToIndices(json, arrayName);\n    }\n    if ('scene' in json) {\n      json.scene = this._convertIdToIndex(json.scene, 'scene');\n    }\n\n    // Convert any index references that are not using array names\n\n    // texture.source (image)\n    for (const texture of json.textures) {\n      this._convertTextureIds(texture);\n    }\n    for (const mesh of json.meshes) {\n      this._convertMeshIds(mesh);\n    }\n    for (const node of json.nodes) {\n      this._convertNodeIds(node);\n    }\n    for (const node of json.scenes) {\n      this._convertSceneIds(node);\n    }\n  }\n\n  _convertTextureIds(texture) {\n    if (texture.source) {\n      texture.source = this._convertIdToIndex(texture.source, 'image');\n    }\n  }\n\n  _convertMeshIds(mesh) {\n    for (const primitive of mesh.primitives) {\n      const {attributes, indices, material} = primitive;\n      for (const attributeName in attributes) {\n        attributes[attributeName] = this._convertIdToIndex(attributes[attributeName], 'accessor');\n      }\n      if (indices) {\n        primitive.indices = this._convertIdToIndex(indices, 'accessor');\n      }\n      if (material) {\n        primitive.material = this._convertIdToIndex(material, 'material');\n      }\n    }\n  }\n\n  _convertNodeIds(node) {\n    if (node.children) {\n      node.children = node.children.map((child) => this._convertIdToIndex(child, 'node'));\n    }\n    if (node.meshes) {\n      node.meshes = node.meshes.map((mesh) => this._convertIdToIndex(mesh, 'mesh'));\n    }\n  }\n\n  _convertSceneIds(scene) {\n    if (scene.nodes) {\n      scene.nodes = scene.nodes.map((node) => this._convertIdToIndex(node, 'node'));\n    }\n  }\n\n  /** Go through all objects in a top-level array and replace ids with indices */\n  _convertIdsToIndices(json, topLevelArrayName) {\n    if (!json[topLevelArrayName]) {\n      console.warn(`gltf v1: json doesn't contain attribute ${topLevelArrayName}`); // eslint-disable-line no-console, no-undef\n      json[topLevelArrayName] = [];\n    }\n    for (const object of json[topLevelArrayName]) {\n      for (const key in object) {\n        const id = object[key];\n        const index = this._convertIdToIndex(id, key);\n        object[key] = index;\n      }\n    }\n  }\n\n  _convertIdToIndex(id, key) {\n    const arrayName = GLTF_KEYS[key];\n    if (arrayName in this.idToIndexMap) {\n      const index = this.idToIndexMap[arrayName][id];\n      if (!Number.isFinite(index)) {\n        throw new Error(`gltf v1: failed to resolve ${key} with id ${id}`);\n      }\n      return index;\n    }\n    return id;\n  }\n\n  /**\n   *\n   * @param {*} json\n   */\n  _updateObjects(json) {\n    for (const buffer of this.json.buffers) {\n      // - [x] Removed buffer.type, #786, #629\n      delete buffer.type;\n    }\n  }\n\n  /**\n   * Update material (set pbrMetallicRoughness)\n   * @param {*} json\n   */\n  _updateMaterial(json) {\n    for (const material of json.materials) {\n      material.pbrMetallicRoughness = {\n        baseColorFactor: [1, 1, 1, 1],\n        metallicFactor: 1,\n        roughnessFactor: 1\n      };\n\n      const textureId = material.values && material.values.tex;\n      const textureIndex = json.textures.findIndex((texture) => texture.id === textureId);\n      if (textureIndex !== -1) {\n        material.pbrMetallicRoughness.baseColorTexture = {index: textureIndex};\n      }\n    }\n  }\n}\n\nexport function normalizeGLTFV1(gltf, options = {}) {\n  return new GLTFV1Normalizer().normalize(gltf, options);\n}\n"],"file":"normalize-gltf-v1.js"}

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

@@ -0,0 +1,403 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import { assert } from '../utils/assert';
+import { getAccessorArrayTypeAndLength } from '../gltf-utils/gltf-utils';
+const COMPONENTS = {
+  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
+};
+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
+};
+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
+};
+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
+};
+
+function getBytesFromComponentType(componentType) {
+  return BYTES[componentType];
+}
+
+function getSizeFromAccessorType(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));
+    }
+
+    if (json.samplers) {
+      json.samplers = json.samplers.map((sampler, i) => this._resolveSampler(sampler, i));
+    }
+
+    if (json.textures) {
+      json.textures = json.textures.map((texture, i) => this._resolveTexture(texture, i));
+    }
+
+    if (json.accessors) {
+      json.accessors = json.accessors.map((accessor, i) => this._resolveAccessor(accessor, i));
+    }
+
+    if (json.materials) {
+      json.materials = json.materials.map((material, i) => this._resolveMaterial(material, i));
+    }
+
+    if (json.meshes) {
+      json.meshes = json.meshes.map((mesh, i) => this._resolveMesh(mesh, i));
+    }
+
+    if (json.nodes) {
+      json.nodes = json.nodes.map((node, i) => this._resolveNode(node, i));
+    }
+
+    if (json.skins) {
+      json.skins = json.skins.map((skin, i) => this._resolveSkin(skin, i));
+    }
+
+    if (json.scenes) {
+      json.scenes = json.scenes.map((scene, i) => this._resolveScene(scene, i));
+    }
+
+    if (json.scene !== undefined) {
+      json.scene = json.scenes[this.json.scene];
+    }
+  }
+
+  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;
+    }
+
+    const object = this.json[array] && this.json[array][index];
+
+    if (!object) {
+      console.warn("glTF file error: Could not find ".concat(array, "[").concat(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));
+    }
+
+    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: []
+      });
+    }
+
+    if (node.camera !== undefined) {
+      node.camera = this.getCamera(node.camera);
+    }
+
+    if (node.skin !== undefined) {
+      node.skin = this.getSkin(node.skin);
+    }
+
+    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
+        };
+        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);
+    }
+
+    if (material.occlusionTexture) {
+      material.occlustionTexture = { ...material.occlustionTexture
+      };
+      material.occlusionTexture.texture = this.getTexture(material.occlusionTexture.index);
+    }
+
+    if (material.emissiveTexture) {
+      material.emmisiveTexture = { ...material.emmisiveTexture
+      };
+      material.emissiveTexture.texture = this.getTexture(material.emissiveTexture.index);
+    }
+
+    if (!material.emissiveFactor) {
+      material.emissiveFactor = material.emmisiveTexture ? [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(accessor, index) {
+    accessor.id = accessor.id || "accessor-".concat(index);
+
+    if (accessor.bufferView !== undefined) {
+      accessor.bufferView = this.getBufferView(accessor.bufferView);
+    }
+
+    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;
+      const cutBufffer = buffer.arrayBuffer.slice(byteOffset, byteOffset + byteLength);
+      accessor.value = new ArrayType(cutBufffer);
+    }
+
+    return accessor;
+  }
+
+  _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];
+      }
+    }
+
+    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);
+    }
+
+    const preloadedImage = this.images[index];
+
+    if (preloadedImage) {
+      image.image = preloadedImage;
+    }
+
+    return image;
+  }
+
+  _resolveBufferView(bufferView, index) {
+    bufferView.id = bufferView.id || "bufferView-".concat(index);
+    const bufferIndex = bufferView.buffer;
+    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;
+    }
+
+    bufferView.data = new Uint8Array(arrayBuffer, byteOffset, bufferView.byteLength);
+    return bufferView;
+  }
+
+  _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);
+}
+//# sourceMappingURL=post-process-gltf.js.map