@loaders.gl/gltf 4.0.0-beta.4 → 4.0.0-beta.6

package/src/lib/api/gltf-scenegraph.ts

@@ -78,9 +78,9 @@ export class GLTFScenegraph {
     return data;
   }
 
-  getExtraData(key: string): {[key: string]: unknown} {
+  getExtraData(key: string): unknown {
     // TODO - Data is already unpacked by GLBParser
-    const extras = this.json.extras || {};
+    const extras = (this.json.extras || {}) as Record<string, unknown>;
     return extras[key];
   }
 
@@ -166,16 +166,16 @@ export class GLTFScenegraph {
     return this.getObject('buffers', index) as GLTFBuffer;
   }
 
-  getObject(array: string, index: number | object): object {
+  getObject(array: string, index: number | object): Record<string, unknown> {
     // check if already resolved
     if (typeof index === 'object') {
-      return index;
+      return index as Record<string, unknown>;
     }
     const object = this.json[array] && (this.json[array] as {}[])[index];
     if (!object) {
       throw new Error(`glTF file error: Could not find ${array}[${index}]`); // eslint-disable-line
     }
-    return object;
+    return object as Record<string, unknown>;
   }
 
   /**

package/src/lib/extensions/EXT_structural_metadata.ts

@@ -15,7 +15,6 @@ import type {
   GLTF_EXT_structural_metadata_Primitive
 } from '../types/gltf-ext-structural-metadata-schema';
 import type {GLTFLoaderOptions} from '../../gltf-loader';
-import type {FeatureTableJson} from '../types/gltf-types';
 
 import {GLTFScenegraph} from '../api/gltf-scenegraph';
 import {
@@ -38,52 +37,6 @@ export async function decode(gltfData: {json: GLTF}, options: GLTFLoaderOptions)
   decodeExtStructuralMetadata(scenegraph, options);
 }
 
-/**
- * Handles EXT_structural_metadata to get property table.
- * @param extension - Global level of EXT_STRUCTURAL_METADATA extension.
- * @param metadataClass - User selected feature metadata class name.
- * @returns {FeatureTableJson | null} Property table or null if the extension can't be handled properly.
- */
-export function getPropertyTableFromExtStructuralMetadata(
-  extension: GLTF_EXT_structural_metadata_GLTF,
-  metadataClass?: string
-): FeatureTableJson | null {
-  if (extension.propertyTables) {
-    /**
-     * Take only first feature table to generate attributes storage info object.
-     * TODO: Think about getting data from all feature tables?
-     * It can be tricky just because 3dTiles is able to have multiple featureId attributes and multiple feature tables.
-     * In I3S we should decide which featureIds attribute will be passed to geometry data.
-     */
-    const firstPropertyTable = extension?.propertyTables[0];
-    const propertyTableWithData = {};
-
-    for (const propertyName in firstPropertyTable.properties) {
-      propertyTableWithData[propertyName] = firstPropertyTable.properties[propertyName].data;
-    }
-
-    return propertyTableWithData;
-  }
-
-  if (extension.propertyTextures) {
-    // TODO: Think about getting data from all property textures.
-    const firstPropertyTexture = extension?.propertyTextures[0];
-    const propertyTableWithData = {};
-
-    for (const propertyName in firstPropertyTexture.properties) {
-      propertyTableWithData[propertyName] = firstPropertyTexture.properties[propertyName].data;
-    }
-
-    return propertyTableWithData;
-  }
-
-  // eslint-disable-next-line no-console
-  console.warn(
-    'Cannot get property table from EXT_structural_metadata extension. There is neither propertyTables, nor propertyTextures in the extension.'
-  );
-  return null;
-}
-
 /*
 // Example of the extension.
 // See more info at https://github.com/CesiumGS/glTF/tree/3d-tiles-next/extensions/2.0/Vendor/EXT_structural_metadata

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

@@ -11,7 +11,6 @@ import type {
   GLTF_EXT_feature_metadata_Schema
 } from '../../types/gltf-ext-feature-metadata-schema';
 import type {BigTypedArray, TypedArray} from '@loaders.gl/schema';
-import type {FeatureTableJson} from '../../types/gltf-types';
 import {GLTFScenegraph} from '../../api/gltf-scenegraph';
 import {GLTFMeshPrimitive} from '../../types/gltf-json-schema';
 import {GLTFLoaderOptions} from '../../../gltf-loader';
@@ -36,65 +35,6 @@ export async function decode(gltfData: {json: GLTF}, options: GLTFLoaderOptions)
   decodeExtFeatureMetadata(scenegraph, options);
 }
 
-/**
- * Handles EXT_feature_metadata to get property table.
- * @param extension - Global level of EXT_FEATURE_METADATA extension.
- * @param metadataClass - User selected feature metadata class name.
- * @returns {FeatureTableJson | null} Property table or null if the extension can't be handled properly.
- */
-export function getPropertyTableFromExtFeatureMetadata(
-  extension: GLTF_EXT_feature_metadata_GLTF,
-  metadataClass?: string
-): FeatureTableJson | null {
-  if (extension.featureTables) {
-    /**
-     * Take only first feature table to generate attributes storage info object.
-     * TODO: Think about getting data from all feature tables?
-     * It can be tricky just because 3dTiles is able to have multiple featureId attributes and multiple feature tables.
-     * In I3S we should decide which featureIds attribute will be passed to geometry data.
-     */
-    const firstFeatureTableName = Object.keys(extension.featureTables)?.[0];
-
-    if (firstFeatureTableName) {
-      const featureTable = extension.featureTables[firstFeatureTableName];
-      const propertyTable = {};
-
-      for (const propertyName in featureTable.properties) {
-        propertyTable[propertyName] = featureTable.properties[propertyName].data;
-      }
-
-      return propertyTable;
-    }
-  }
-
-  if (extension.featureTextures) {
-    let featureTexture: string | undefined;
-    for (const textureKey in extension.featureTextures) {
-      const texture = extension.featureTextures[textureKey];
-      if (texture.class === metadataClass) {
-        featureTexture = textureKey;
-      }
-    }
-
-    if (typeof featureTexture === 'string') {
-      const featureTable = extension.featureTextures[featureTexture];
-      const propertyTable = {};
-
-      for (const propertyName in featureTable.properties) {
-        propertyTable[propertyName] = featureTable.properties[propertyName].data;
-      }
-
-      return propertyTable;
-    }
-  }
-
-  // eslint-disable-next-line no-console
-  console.warn(
-    'Cannot get property table from EXT_feature_metadata extension. There is neither featureTables, nor featureTextures in the extension.'
-  );
-  return null;
-}
-
 /**
  * Decodes feature metadata from extension.
  * @param scenegraph - Instance of the class for structured access to GLTF data.

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

@@ -24,9 +24,8 @@ export type ParseGLTFOptions = ParseGLBOptions & {
   loadBuffers?: boolean;
   decompressMeshes?: boolean;
   excludeExtensions?: string[];
-
   /** @deprecated not supported in v4. `postProcessGLTF()` must be called by the application */
-  postProcess?: false;
+  postProcess?: never;
 };
 
 /** Check if an array buffer appears to contain GLTF data */