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

package/src/lib/extensions/EXT_texture_webp.ts

@@ -2,11 +2,11 @@
 // https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/EXT_TEXTURE_WEBP
 /* eslint-disable camelcase */
 
-import type {GLTF, GLTF_EXT_texture_webp} from '../types/gltf-types';
+import type {GLTF, GLTF_EXT_texture_webp} from '../types/gltf-json-schema';
 import type {GLTFLoaderOptions} from '../../gltf-loader';
 
 import {isImageFormatSupported} from '@loaders.gl/images';
-import GLTFScenegraph from '../api/gltf-scenegraph';
+import {GLTFScenegraph} from '../api/gltf-scenegraph';
 
 const EXT_TEXTURE_WEBP = 'EXT_texture_webp';
 

package/src/lib/extensions/KHR_binary_gltf.ts

@@ -2,9 +2,9 @@
 // https://github.com/KhronosGroup/glTF/tree/master/extensions/1.0/Khronos/KHR_binary_glTF
 /* eslint-disable camelcase */
 
-import type {GLTF, GLTF_KHR_binary_glTF} from '../types/gltf-types';
+import type {GLTF, GLTF_KHR_binary_glTF} from '../types/gltf-json-schema';
 
-import GLTFScenegraph from '../api/gltf-scenegraph';
+import {GLTFScenegraph} from '../api/gltf-scenegraph';
 
 const KHR_BINARY_GLTF = 'KHR_binary_glTF';
 

package/src/lib/extensions/KHR_draco_mesh_compression.ts

@@ -8,14 +8,14 @@ import type {
   GLTFAccessor,
   GLTFMeshPrimitive,
   GLTF_KHR_draco_mesh_compression
-} from '../types/gltf-types';
+} from '../types/gltf-json-schema';
 import type {GLTFLoaderOptions} from '../../gltf-loader';
 
 import type {LoaderContext} from '@loaders.gl/loader-utils';
 import {DracoLoader} from '@loaders.gl/draco';
 import {DracoLoaderOptions, DracoMesh} from '@loaders.gl/draco';
 import {sliceArrayBuffer} from '@loaders.gl/loader-utils';
-import {default as Scenegraph} from '../api/gltf-scenegraph';
+import {GLTFScenegraph} from '../api/gltf-scenegraph';
 import {getGLTFAccessors, getGLTFAccessor} from '../gltf-utils/gltf-attribute-utils';
 
 const KHR_DRACO_MESH_COMPRESSION = 'KHR_draco_mesh_compression';
@@ -28,7 +28,7 @@ export function preprocess(
   options: GLTFLoaderOptions,
   context: LoaderContext
 ): void {
-  const scenegraph = new Scenegraph(gltfData);
+  const scenegraph = new GLTFScenegraph(gltfData);
   for (const primitive of makeMeshPrimitiveIterator(scenegraph)) {
     if (scenegraph.getObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION)) {
       // TODO - Remove fallback accessors to make sure we don't load unnecessary buffers
@@ -45,7 +45,7 @@ export async function decode(
     return;
   }
 
-  const scenegraph = new Scenegraph(gltfData);
+  const scenegraph = new GLTFScenegraph(gltfData);
   const promises: Promise<void>[] = [];
   for (const primitive of makeMeshPrimitiveIterator(scenegraph)) {
     if (scenegraph.getObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION)) {
@@ -61,7 +61,7 @@ export async function decode(
 }
 
 export function encode(gltfData, options: GLTFLoaderOptions = {}): void {
-  const scenegraph = new Scenegraph(gltfData);
+  const scenegraph = new GLTFScenegraph(gltfData);
 
   for (const mesh of scenegraph.json.meshes || []) {
     // eslint-disable-next-line camelcase
@@ -81,7 +81,7 @@ export function encode(gltfData, options: GLTFLoaderOptions = {}): void {
 // TODO - Implement fallback behavior per KHR_DRACO_MESH_COMPRESSION spec
 
 async function decompressPrimitive(
-  scenegraph: Scenegraph,
+  scenegraph: GLTFScenegraph,
   primitive: GLTFMeshPrimitive,
   options: GLTFLoaderOptions,
   context: LoaderContext
@@ -128,7 +128,7 @@ async function decompressPrimitive(
   }
 
   // Extension has been processed, delete it
-  // delete primitive.extensions[KHR_DRACO_MESH_COMPRESSION];
+  scenegraph.removeObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION);
 
   checkPrimitive(primitive);
 }

package/src/lib/extensions/KHR_texture_basisu.ts

@@ -2,10 +2,10 @@
 // https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_texture_basisu
 /* eslint-disable camelcase */
 
-import type {GLTF, GLTF_KHR_texture_basisu} from '../types/gltf-types';
+import type {GLTF, GLTF_KHR_texture_basisu} from '../types/gltf-json-schema';
 import type {GLTFLoaderOptions} from '../../gltf-loader';
 
-import GLTFScenegraph from '../api/gltf-scenegraph';
+import {GLTFScenegraph} from '../api/gltf-scenegraph';
 
 const KHR_TEXTURE_BASISU = 'KHR_texture_basisu';
 
@@ -28,8 +28,8 @@ export function preprocess(gltfData: {json: GLTF}, options: GLTFLoaderOptions):
     if (extension) {
       // TODO - if multiple texture extensions are present which one wins?
       texture.source = extension.source;
+      scene.removeObjectExtension(texture, KHR_TEXTURE_BASISU);
     }
-    scene.removeObjectExtension(texture, KHR_TEXTURE_BASISU);
   }
 
   // Remove the top-level extension

package/src/lib/extensions/KHR_texture_transform.ts

@@ -3,18 +3,21 @@
  */
 
 import {Vector3, Matrix3} from '@math.gl/core';
-import type {GLTFMeshPrimitive, GLTFWithBuffers} from '../types/gltf-types';
+import type {GLTFWithBuffers} from '../types/gltf-types';
+import type {
+  GLTFMeshPrimitive,
+  GLTFAccessor,
+  GLTFBufferView,
+  GLTFMaterialNormalTextureInfo,
+  GLTFMaterialOcclusionTextureInfo,
+  GLTFTextureInfo
+} from '../types/gltf-json-schema';
 import type {GLTFLoaderOptions} from '../../gltf-loader';
+
 import {getAccessorArrayTypeAndLength} from '../gltf-utils/gltf-utils';
 import {BYTES, COMPONENTS} from '../gltf-utils/gltf-constants';
-import {
-  Accessor,
-  BufferView,
-  MaterialNormalTextureInfo,
-  MaterialOcclusionTextureInfo,
-  TextureInfo as GLTFTextureInfo
-} from '../types/gltf-json-schema';
-import GLTFScenegraph from '../api/gltf-scenegraph';
+import {} from '../types/gltf-json-schema';
+import {GLTFScenegraph} from '../api/gltf-scenegraph';
 
 /** Extension name */
 const EXT_MESHOPT_TRANSFORM = 'KHR_texture_transform';
@@ -38,8 +41,8 @@ type TextureInfo = {
 };
 /** Intersection of all GLTF textures */
 type CompoundGLTFTextureInfo = GLTFTextureInfo &
-  MaterialNormalTextureInfo &
-  MaterialOcclusionTextureInfo;
+  GLTFMaterialNormalTextureInfo &
+  GLTFMaterialOcclusionTextureInfo;
 /** Parameters for TEXCOORD transformation */
 type TransformParameters = {
   /** Original texCoord value https://www.khronos.org/registry/glTF/specs/2.0/glTF-2.0.html#_textureinfo_texcoord */
@@ -57,8 +60,8 @@ type TransformParameters = {
  */
 export async function decode(gltfData: GLTFWithBuffers, options: GLTFLoaderOptions) {
   const gltfScenegraph = new GLTFScenegraph(gltfData);
-  const extension = gltfScenegraph.getExtension(EXT_MESHOPT_TRANSFORM);
-  if (!extension) {
+  const hasExtension = gltfScenegraph.hasExtension(EXT_MESHOPT_TRANSFORM);
+  if (!hasExtension) {
     return;
   }
   const materials = gltfData.json.materials || [];
@@ -220,8 +223,8 @@ function transformPrimitive(
  * @param newTexcoordArray typed array with data after transformation
  */
 function updateGltf(
-  accessor: Accessor,
-  bufferView: BufferView,
+  accessor: GLTFAccessor,
+  bufferView: GLTFBufferView,
   buffers: {arrayBuffer: ArrayBuffer; byteOffset: number; byteLength: number}[],
   newTexCoordArray: Float32Array
 ): void {
@@ -248,7 +251,7 @@ function updateGltf(
  */
 function createAttribute(
   newTexCoord: number,
-  originalAccessor: Accessor,
+  originalAccessor: GLTFAccessor,
   primitive: GLTFMeshPrimitive,
   gltfData: GLTFWithBuffers,
   newTexCoordArray: Float32Array
@@ -288,8 +291,8 @@ function createAttribute(
  */
 function makeTransformationMatrix(extensionData: TextureInfo): Matrix3 {
   const {offset = [0, 0], rotation = 0, scale = [1, 1]} = extensionData;
-  const translationMatirx = new Matrix3().set(1, 0, 0, 0, 1, 0, offset[0], offset[1], 1);
-  const rotationMatirx = scratchRotationMatrix.set(
+  const translationMatrix = new Matrix3().set(1, 0, 0, 0, 1, 0, offset[0], offset[1], 1);
+  const rotationMatrix = scratchRotationMatrix.set(
     Math.cos(rotation),
     Math.sin(rotation),
     0,
@@ -301,5 +304,5 @@ function makeTransformationMatrix(extensionData: TextureInfo): Matrix3 {
     1
   );
   const scaleMatrix = scratchScaleMatrix.set(scale[0], 0, 0, 0, scale[1], 0, 0, 0, 1);
-  return translationMatirx.multiplyRight(rotationMatirx).multiplyRight(scaleMatrix);
+  return translationMatrix.multiplyRight(rotationMatrix).multiplyRight(scaleMatrix);
 }

package/src/lib/extensions/deprecated/EXT_feature_metadata.ts

@@ -1,7 +1,7 @@
 /* eslint-disable camelcase */
-import type {GLTF} from '../../types/gltf-types';
+import type {GLTF} from '../../types/gltf-json-schema';
 
-import GLTFScenegraph from '../../api/gltf-scenegraph';
+import {GLTFScenegraph} from '../../api/gltf-scenegraph';
 import {
   ClassProperty,
   EXT_feature_metadata_class_object,

package/src/lib/extensions/deprecated/KHR_lights_punctual.ts

@@ -1,10 +1,10 @@
 // GLTF EXTENSION: KHR_lights_punctual
 // https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_lights_punctual
 
-import type {GLTF} from '../../types/gltf-types';
+import type {GLTF} from '../../types/gltf-json-schema';
 
 import {assert} from '../../utils/assert';
-import GLTFScenegraph from '../../api/gltf-scenegraph';
+import {GLTFScenegraph} from '../../api/gltf-scenegraph';
 
 const KHR_LIGHTS_PUNCTUAL = 'KHR_lights_punctual';
 

package/src/lib/extensions/deprecated/KHR_materials_unlit.ts

@@ -1,9 +1,9 @@
 // GLTF EXTENSION: KHR_materials_unlit
 // https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_unlit
 
-import type {GLTF} from '../../types/gltf-types';
+import type {GLTF} from '../../types/gltf-json-schema';
 
-import GLTFScenegraph from '../../api/gltf-scenegraph';
+import {GLTFScenegraph} from '../../api/gltf-scenegraph';
 
 const KHR_MATERIALS_UNLIT = 'KHR_materials_unlit';
 

package/src/lib/extensions/deprecated/KHR_techniques_webgl.ts

@@ -1,9 +1,9 @@
 // GLTF EXTENSION: KHR_techniques_webgl
 // https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_techniques_webgl
 
-import type {GLTF} from '../../types/gltf-types';
+import type {GLTF} from '../../types/gltf-json-schema';
 
-import GLTFScenegraph from '../../api/gltf-scenegraph';
+import {GLTFScenegraph} from '../../api/gltf-scenegraph';
 
 const KHR_TECHNIQUES_WEBGL = 'KHR_techniques_webgl';
 

package/src/lib/gltf-utils/gltf-attribute-utils.ts

@@ -1,5 +1,5 @@
 // import type {TypedArray} from '../types/loader-utils';
-import type {GLTFAccessor} from '../types/gltf-types';
+import type {GLTFAccessor} from '../types/gltf-json-schema';
 // TODO - remove
 import {getAccessorTypeFromSize, getComponentTypeFromArray} from './gltf-utils';
 

package/src/lib/gltf-utils/gltf-utils.ts

@@ -1,4 +1,11 @@
 import {assert} from '../utils/assert';
+import type {GLTFPostprocessed} from '../types/gltf-postprocessed-schema';
+
+/**
+ * Memory needed to store texture and all mipmap levels 1 + 1/4 + 1/16 + 1/64 + ...
+ * Minimum 1.33, but due to GPU layout may be 1.5
+ */
+const MIPMAP_FACTOR = 1.33;
 
 const TYPES = ['SCALAR', 'VEC2', 'VEC3', 'VEC4'];
 
@@ -77,3 +84,27 @@ export function getAccessorArrayTypeAndLength(accessor, bufferView) {
   assert(byteLength >= 0 && byteLength <= bufferView.byteLength);
   return {ArrayType, length, byteLength};
 }
+
+/**
+ * Calculate the GPU memory used by a GLTF tile, for both buffer and texture memory
+ * @param gltf - the gltf content of a GLTF tile
+ * @returns - total memory usage in bytes
+ */
+export function getMemoryUsageGLTF(gltf: GLTFPostprocessed): number {
+  let {images, bufferViews} = gltf;
+  images = images || [];
+  bufferViews = bufferViews || [];
+  const imageBufferViews = images.map((i) => i.bufferView);
+  bufferViews = bufferViews.filter((view) => !imageBufferViews.includes(view as any));
+
+  const bufferMemory = bufferViews.reduce((acc, view) => acc + view.byteLength, 0);
+
+  // Assume each pixel of the texture is 4 channel with mimmaps (which add 33%)
+  // TODO correctly handle compressed textures
+  const pixelCount = images.reduce((acc, image) => {
+    // @ts-ignore
+    const {width, height} = (image as any).image;
+    return acc + width * height;
+  }, 0);
+  return bufferMemory + Math.ceil(4 * pixelCount * MIPMAP_FACTOR);
+}

package/src/lib/parsers/parse-glb.ts

@@ -4,24 +4,29 @@
 import type {GLB} from '../types/glb-types';
 import {padToNBytes, assert} from '@loaders.gl/loader-utils';
 
-export type GLBParseOptions = {
+/** Options for parsing a GLB */
+export type ParseGLBOptions = {
+  /** @deprecated This option was used by XVIZ protocol to define a non-standard magic number */
   magic?: number;
+  /** @deprecated This option was used by XVIZ protocol to embed non-standard chunks */
   strict?: boolean;
 };
 
-const MAGIC_glTF = 0x676c5446; // glTF in Big-Endian ASCII
+/** Binary GLTF is little endian. */
+const LITTLE_ENDIAN = true;
 
+/** 'glTF' in Big-Endian ASCII */
+const MAGIC_glTF = 0x676c5446;
 const GLB_FILE_HEADER_SIZE = 12;
 const GLB_CHUNK_HEADER_SIZE = 8;
-
 const GLB_CHUNK_TYPE_JSON = 0x4e4f534a;
 const GLB_CHUNK_TYPE_BIN = 0x004e4942;
-const GLB_CHUNK_TYPE_JSON_XVIZ_DEPRECATED = 0; // DEPRECATED - Backward compatibility for old xviz files
-const GLB_CHUNK_TYPE_BIX_XVIZ_DEPRECATED = 1; // DEPRECATED - Backward compatibility for old xviz files
-
 const GLB_V1_CONTENT_FORMAT_JSON = 0x0;
 
-const LE = true; // Binary GLTF is little endian.
+/** @deprecated - Backward compatibility for old xviz files */
+const GLB_CHUNK_TYPE_JSON_XVIZ_DEPRECATED = 0;
+/** @deprecated - Backward compatibility for old xviz files */
+const GLB_CHUNK_TYPE_BIX_XVIZ_DEPRECATED = 1;
 
 function getMagicString(dataView, byteOffset = 0) {
   return `\
@@ -31,11 +36,11 @@ ${String.fromCharCode(dataView.getUint8(byteOffset + 2))}\
 ${String.fromCharCode(dataView.getUint8(byteOffset + 3))}`;
 }
 
-// Check if a data view is a GLB
+/** Check if the contents of an array buffer contains GLB byte markers */
 export function isGLB(
   arrayBuffer: ArrayBuffer,
   byteOffset: number = 0,
-  options: GLBParseOptions = {}
+  options: ParseGLBOptions = {}
 ): boolean {
   const dataView = new DataView(arrayBuffer);
   // Check that GLB Header starts with the magic number
@@ -44,19 +49,27 @@ export function isGLB(
   return magic1 === magic || magic1 === MAGIC_glTF;
 }
 
-export default function parseGLBSync(
+/**
+ * Synchronously parse a GLB
+ * @param glb - Target, Output is stored there
+ * @param arrayBuffer - Input data
+ * @param byteOffset - Offset into arrayBuffer to start parsing from (for "embedded" GLBs, e.g. in 3D tiles)
+ * @param options
+ * @returns
+ */
+export function parseGLBSync(
   glb: GLB,
   arrayBuffer: ArrayBuffer,
   byteOffset: number = 0,
-  options: GLBParseOptions = {}
+  options: ParseGLBOptions = {}
 ) {
   // Check that GLB Header starts with the magic number
   const dataView = new DataView(arrayBuffer);
 
   // Compare format with GLBLoader documentation
   const type = getMagicString(dataView, byteOffset + 0);
-  const version = dataView.getUint32(byteOffset + 4, LE); // Version 2 of binary glTF container format
-  const byteLength = dataView.getUint32(byteOffset + 8, LE); // Total byte length of binary file
+  const version = dataView.getUint32(byteOffset + 4, LITTLE_ENDIAN); // Version 2 of binary glTF container format
+  const byteLength = dataView.getUint32(byteOffset + 8, LITTLE_ENDIAN); // Total byte length of binary file
 
   Object.assign(glb, {
     // Put less important stuff in a header, to avoid clutter
@@ -77,24 +90,29 @@ export default function parseGLBSync(
 
   switch (glb.version) {
     case 1:
-      // eslint-disable-next-line
       return parseGLBV1(glb, dataView, byteOffset);
     case 2:
-      // eslint-disable-next-line
       return parseGLBV2(glb, dataView, byteOffset, (options = {}));
     default:
-      throw new Error(`Invalid GLB version ${glb.version}. Only supports v1 and v2.`);
+      throw new Error(`Invalid GLB version ${glb.version}. Only supports version 1 and 2.`);
   }
 }
 
+/**
+ * Parse a V1 GLB
+ * @param glb - target, output is stored in this object
+ * @param dataView - Input, memory to be parsed
+ * @param byteOffset - Offset of first byte of GLB data in the data view
+ * @returns Number of bytes parsed (there could be additional non-GLB data after the GLB)
+ */
 function parseGLBV1(glb: GLB, dataView: DataView, byteOffset: number): number {
   // Sanity: ensure file is big enough to hold at least the headers
   assert(glb.header.byteLength > GLB_FILE_HEADER_SIZE + GLB_CHUNK_HEADER_SIZE);
 
   // Explanation of GLB structure:
   // https://cloud.githubusercontent.com/assets/3479527/22600725/36b87122-ea55-11e6-9d40-6fd42819fcab.png
-  const contentLength = dataView.getUint32(byteOffset + 0, LE); // Byte length of chunk
-  const contentFormat = dataView.getUint32(byteOffset + 4, LE); // Chunk format as uint32
+  const contentLength = dataView.getUint32(byteOffset + 0, LITTLE_ENDIAN); // Byte length of chunk
+  const contentFormat = dataView.getUint32(byteOffset + 4, LITTLE_ENDIAN); // Chunk format as uint32
   byteOffset += GLB_CHUNK_HEADER_SIZE;
 
   // GLB v1 only supports a single chunk type
@@ -108,11 +126,18 @@ function parseGLBV1(glb: GLB, dataView: DataView, byteOffset: number): number {
   return byteOffset;
 }
 
+/**
+ * Parse a V2 GLB
+ * @param glb - target, output is stored in this object
+ * @param dataView - Input, memory to be parsed
+ * @param byteOffset - Offset of first byte of GLB data in the data view
+ * @returns Number of bytes parsed (there could be additional non-GLB data after the GLB)
+ */
 function parseGLBV2(
   glb: GLB,
   dataView: DataView,
   byteOffset: number,
-  options: GLBParseOptions
+  options: ParseGLBOptions
 ): number {
   // Sanity: ensure file is big enough to hold at least the first chunk header
   assert(glb.header.byteLength > GLB_FILE_HEADER_SIZE + GLB_CHUNK_HEADER_SIZE);
@@ -122,17 +147,18 @@ function parseGLBV2(
   return byteOffset + glb.header.byteLength;
 }
 
+/** Iterate over GLB chunks and parse them */
 function parseGLBChunksSync(
   glb: GLB,
   dataView: DataView,
   byteOffset: number,
-  options: GLBParseOptions
+  options: ParseGLBOptions
 ) {
   // Per spec we must iterate over chunks, ignoring all except JSON and BIN
   // Iterate as long as there is space left for another chunk header
   while (byteOffset + 8 <= glb.header.byteLength) {
-    const chunkLength = dataView.getUint32(byteOffset + 0, LE); // Byte length of chunk
-    const chunkFormat = dataView.getUint32(byteOffset + 4, LE); // Chunk format as uint32
+    const chunkLength = dataView.getUint32(byteOffset + 0, LITTLE_ENDIAN); // Byte length of chunk
+    const chunkFormat = dataView.getUint32(byteOffset + 4, LITTLE_ENDIAN); // Chunk format as uint32
     byteOffset += GLB_CHUNK_HEADER_SIZE;
 
     // Per spec we must iterate over chunks, ignoring all except JSON and BIN
@@ -168,7 +194,7 @@ function parseGLBChunksSync(
   return byteOffset;
 }
 
-// Parse a GLB JSON chunk
+/* Parse a GLB JSON chunk */
 function parseJSONChunk(glb: GLB, dataView: DataView, byteOffset: number, chunkLength: number) {
   // 1. Create a "view" of the binary encoded JSON data inside the GLB
   const jsonChunk = new Uint8Array(dataView.buffer, byteOffset, chunkLength);
@@ -183,7 +209,7 @@ function parseJSONChunk(glb: GLB, dataView: DataView, byteOffset: number, chunkL
   return padToNBytes(chunkLength, 4);
 }
 
-// Parse a GLB BIN chunk
+/** Parse a GLB BIN chunk */
 function parseBINChunk(glb: GLB, dataView, byteOffset, chunkLength) {
   // Note: BIN chunk can be optional
   glb.header.hasBinChunk = true;

package/src/lib/parsers/parse-gltf.ts

@@ -1,34 +1,35 @@
 /* eslint-disable camelcase, max-statements, no-restricted-globals */
 import type {LoaderContext} from '@loaders.gl/loader-utils';
-import {BasisLoader, selectSupportedBasisFormat} from '@loaders.gl/textures';
 import type {GLTFLoaderOptions} from '../../gltf-loader';
-import type {GLB} from '../types/glb-types';
 import type {GLTFWithBuffers} from '../types/gltf-types';
+import type {GLB} from '../types/glb-types';
+import type {ParseGLBOptions} from './parse-glb';
 
-import {ImageLoader} from '@loaders.gl/images';
 import {parseJSON, sliceArrayBuffer} from '@loaders.gl/loader-utils';
+import {ImageLoader} from '@loaders.gl/images';
+import {BasisLoader, selectSupportedBasisFormat} from '@loaders.gl/textures';
+
 import {assert} from '../utils/assert';
+import {isGLB, parseGLBSync} from './parse-glb';
 import {resolveUrl} from '../gltf-utils/resolve-url';
 import {getTypedArrayForBufferView} from '../gltf-utils/get-typed-array';
 import {preprocessExtensions, decodeExtensions} from '../api/gltf-extensions';
 import {normalizeGLTFV1} from '../api/normalize-gltf-v1';
-import {postProcessGLTF} from '../api/post-process-gltf';
-import parseGLBSync, {isGLB} from './parse-glb';
 
-export type GLTFParseOptions = {
+/**  */
+export type ParseGLTFOptions = ParseGLBOptions & {
   normalize?: boolean;
   loadImages?: boolean;
   loadBuffers?: boolean;
   decompressMeshes?: boolean;
-  postProcess?: boolean;
   excludeExtensions?: string[];
-};
 
-// export type GLTFOptions = {
-//   gltf?: GLTFParseOptions;
-// };
+  /** @deprecated not supported in v4. `postProcessGLTF()` must be called by the application */
+  postProcess?: false;
+};
 
-export function isGLTF(arrayBuffer, options?): boolean {
+/** Check if an array buffer appears to contain GLTF data */
+export function isGLTF(arrayBuffer: ArrayBuffer, options?: ParseGLTFOptions): boolean {
   const byteOffset = 0;
   return isGLB(arrayBuffer, byteOffset, options);
 }
@@ -39,7 +40,7 @@ export async function parseGLTF(
   byteOffset = 0,
   options: GLTFLoaderOptions,
   context: LoaderContext
-) {
+): Promise<GLTFWithBuffers> {
   parseGLTFContainerSync(gltf, arrayBufferOrString, byteOffset, options);
 
   normalizeGLTFV1(gltf, {normalize: options?.gltf?.normalize});
@@ -64,11 +65,16 @@ export async function parseGLTF(
   // Parallelize image loading and buffer loading/extension decoding
   await Promise.all(promises);
 
-  // Post processing resolves indices to objects, buffers
-  return options?.gltf?.postProcess ? postProcessGLTF(gltf, options) : gltf;
+  return gltf;
 }
 
-// `data` - can be ArrayBuffer (GLB), ArrayBuffer (Binary JSON), String (JSON), or Object (parsed JSON)
+/**
+ *
+ * @param gltf
+ * @param data - can be ArrayBuffer (GLB), ArrayBuffer (Binary JSON), String (JSON), or Object (parsed JSON)
+ * @param byteOffset
+ * @param options
+ */
 function parseGLTFContainerSync(gltf, data, byteOffset, options) {
   // Initialize gltf container
   if (options.uri) {