@loaders.gl/3d-tiles 4.0.0-alpha.4 → 4.0.0-alpha.6

package/dist/lib/classes/tile-3d-batch-table-hierarchy.js

@@ -1,215 +1,197 @@
-const defined = x => x !== undefined;
-
-export function initializeHierarchy(batchTable, jsonHeader, binaryBody) {
-  if (!jsonHeader) {
-    return null;
-  }
-
-  let hierarchy = batchTable.getExtension('3DTILES_batch_table_hierarchy');
-  const legacyHierarchy = jsonHeader.HIERARCHY;
-
-  if (legacyHierarchy) {
-    console.warn('3D Tile Parser: HIERARCHY is deprecated. Use 3DTILES_batch_table_hierarchy.');
-    jsonHeader.extensions = jsonHeader.extensions || {};
-    jsonHeader.extensions['3DTILES_batch_table_hierarchy'] = legacyHierarchy;
-    hierarchy = legacyHierarchy;
-  }
-
-  if (!hierarchy) {
-    return null;
-  }
-
-  return initializeHierarchyValues(hierarchy, binaryBody);
+"use strict";
+// This file is derived from the Cesium code base under Apache 2 license
+// See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.traverseHierarchy = exports.initializeHierarchy = void 0;
+// TODO - Finish hierarchy suypport: this file is only half ported
+/* eslint-disable */
+// @ts-nocheck
+const defined = (x) => x !== undefined;
+function initializeHierarchy(batchTable, jsonHeader, binaryBody) {
+    if (!jsonHeader) {
+        return null;
+    }
+    let hierarchy = batchTable.getExtension('3DTILES_batch_table_hierarchy');
+    const legacyHierarchy = jsonHeader.HIERARCHY;
+    if (legacyHierarchy) {
+        // eslint-disable-next-line
+        console.warn('3D Tile Parser: HIERARCHY is deprecated. Use 3DTILES_batch_table_hierarchy.');
+        jsonHeader.extensions = jsonHeader.extensions || {};
+        jsonHeader.extensions['3DTILES_batch_table_hierarchy'] = legacyHierarchy;
+        hierarchy = legacyHierarchy;
+    }
+    if (!hierarchy) {
+        return null;
+    }
+    return initializeHierarchyValues(hierarchy, binaryBody);
 }
-
+exports.initializeHierarchy = initializeHierarchy;
+// eslint-disable-next-line max-statements
 function initializeHierarchyValues(hierarchyJson, binaryBody) {
-  let i;
-  let classId;
-  let binaryAccessor;
-  const instancesLength = hierarchyJson.instancesLength;
-  const classes = hierarchyJson.classes;
-  let classIds = hierarchyJson.classIds;
-  let parentCounts = hierarchyJson.parentCounts;
-  let parentIds = hierarchyJson.parentIds;
-  let parentIdsLength = instancesLength;
-
-  if (defined(classIds.byteOffset)) {
-    classIds.componentType = defaultValue(classIds.componentType, GL.UNSIGNED_SHORT);
-    classIds.type = AttributeType.SCALAR;
-    binaryAccessor = getBinaryAccessor(classIds);
-    classIds = binaryAccessor.createArrayBufferView(binaryBody.buffer, binaryBody.byteOffset + classIds.byteOffset, instancesLength);
-  }
-
-  let parentIndexes;
-
-  if (defined(parentCounts)) {
-    if (defined(parentCounts.byteOffset)) {
-      parentCounts.componentType = defaultValue(parentCounts.componentType, GL.UNSIGNED_SHORT);
-      parentCounts.type = AttributeType.SCALAR;
-      binaryAccessor = getBinaryAccessor(parentCounts);
-      parentCounts = binaryAccessor.createArrayBufferView(binaryBody.buffer, binaryBody.byteOffset + parentCounts.byteOffset, instancesLength);
-    }
-
-    parentIndexes = new Uint16Array(instancesLength);
-    parentIdsLength = 0;
-
+    let i;
+    let classId;
+    let binaryAccessor;
+    const instancesLength = hierarchyJson.instancesLength;
+    const classes = hierarchyJson.classes;
+    let classIds = hierarchyJson.classIds;
+    let parentCounts = hierarchyJson.parentCounts;
+    let parentIds = hierarchyJson.parentIds;
+    let parentIdsLength = instancesLength;
+    if (defined(classIds.byteOffset)) {
+        classIds.componentType = defaultValue(classIds.componentType, GL.UNSIGNED_SHORT);
+        classIds.type = AttributeType.SCALAR;
+        binaryAccessor = getBinaryAccessor(classIds);
+        classIds = binaryAccessor.createArrayBufferView(binaryBody.buffer, binaryBody.byteOffset + classIds.byteOffset, instancesLength);
+    }
+    let parentIndexes;
+    if (defined(parentCounts)) {
+        if (defined(parentCounts.byteOffset)) {
+            parentCounts.componentType = defaultValue(parentCounts.componentType, GL.UNSIGNED_SHORT);
+            parentCounts.type = AttributeType.SCALAR;
+            binaryAccessor = getBinaryAccessor(parentCounts);
+            parentCounts = binaryAccessor.createArrayBufferView(binaryBody.buffer, binaryBody.byteOffset + parentCounts.byteOffset, instancesLength);
+        }
+        parentIndexes = new Uint16Array(instancesLength);
+        parentIdsLength = 0;
+        for (i = 0; i < instancesLength; ++i) {
+            parentIndexes[i] = parentIdsLength;
+            parentIdsLength += parentCounts[i];
+        }
+    }
+    if (defined(parentIds) && defined(parentIds.byteOffset)) {
+        parentIds.componentType = defaultValue(parentIds.componentType, GL.UNSIGNED_SHORT);
+        parentIds.type = AttributeType.SCALAR;
+        binaryAccessor = getBinaryAccessor(parentIds);
+        parentIds = binaryAccessor.createArrayBufferView(binaryBody.buffer, binaryBody.byteOffset + parentIds.byteOffset, parentIdsLength);
+    }
+    const classesLength = classes.length;
+    for (i = 0; i < classesLength; ++i) {
+        const classInstancesLength = classes[i].length;
+        const properties = classes[i].instances;
+        const binaryProperties = getBinaryProperties(classInstancesLength, properties, binaryBody);
+        classes[i].instances = combine(binaryProperties, properties);
+    }
+    const classCounts = new Array(classesLength).fill(0);
+    const classIndexes = new Uint16Array(instancesLength);
     for (i = 0; i < instancesLength; ++i) {
-      parentIndexes[i] = parentIdsLength;
-      parentIdsLength += parentCounts[i];
-    }
-  }
-
-  if (defined(parentIds) && defined(parentIds.byteOffset)) {
-    parentIds.componentType = defaultValue(parentIds.componentType, GL.UNSIGNED_SHORT);
-    parentIds.type = AttributeType.SCALAR;
-    binaryAccessor = getBinaryAccessor(parentIds);
-    parentIds = binaryAccessor.createArrayBufferView(binaryBody.buffer, binaryBody.byteOffset + parentIds.byteOffset, parentIdsLength);
-  }
-
-  const classesLength = classes.length;
-
-  for (i = 0; i < classesLength; ++i) {
-    const classInstancesLength = classes[i].length;
-    const properties = classes[i].instances;
-    const binaryProperties = getBinaryProperties(classInstancesLength, properties, binaryBody);
-    classes[i].instances = combine(binaryProperties, properties);
-  }
-
-  const classCounts = new Array(classesLength).fill(0);
-  const classIndexes = new Uint16Array(instancesLength);
-
-  for (i = 0; i < instancesLength; ++i) {
-    classId = classIds[i];
-    classIndexes[i] = classCounts[classId];
-    ++classCounts[classId];
-  }
-
-  const hierarchy = {
-    classes,
-    classIds,
-    classIndexes,
-    parentCounts,
-    parentIndexes,
-    parentIds
-  };
-  validateHierarchy(hierarchy);
-  return hierarchy;
+        classId = classIds[i];
+        classIndexes[i] = classCounts[classId];
+        ++classCounts[classId];
+    }
+    const hierarchy = {
+        classes,
+        classIds,
+        classIndexes,
+        parentCounts,
+        parentIndexes,
+        parentIds
+    };
+    validateHierarchy(hierarchy);
+    return hierarchy;
 }
-
-export function traverseHierarchy(hierarchy, instanceIndex, endConditionCallback) {
-  if (!hierarchy) {
-    return;
-  }
-
-  const parentCounts = hierarchy.parentCounts;
-  const parentIds = hierarchy.parentIds;
-
-  if (parentIds) {
-    return endConditionCallback(hierarchy, instanceIndex);
-  }
-
-  if (parentCounts > 0) {
-    return traverseHierarchyMultipleParents(hierarchy, instanceIndex, endConditionCallback);
-  }
-
-  return traverseHierarchySingleParent(hierarchy, instanceIndex, endConditionCallback);
+// HELPER CODE
+// Traverse over the hierarchy and process each instance with the endConditionCallback.
+// When the endConditionCallback returns a value, the traversal stops and that value is returned.
+function traverseHierarchy(hierarchy, instanceIndex, endConditionCallback) {
+    if (!hierarchy) {
+        return;
+    }
+    const parentCounts = hierarchy.parentCounts;
+    const parentIds = hierarchy.parentIds;
+    if (parentIds) {
+        return endConditionCallback(hierarchy, instanceIndex);
+    }
+    if (parentCounts > 0) {
+        return traverseHierarchyMultipleParents(hierarchy, instanceIndex, endConditionCallback);
+    }
+    return traverseHierarchySingleParent(hierarchy, instanceIndex, endConditionCallback);
 }
-
+exports.traverseHierarchy = traverseHierarchy;
+// eslint-disable-next-line max-statements
 function traverseHierarchyMultipleParents(hierarchy, instanceIndex, endConditionCallback) {
-  const classIds = hierarchy.classIds;
-  const parentCounts = hierarchy.parentCounts;
-  const parentIds = hierarchy.parentIds;
-  const parentIndexes = hierarchy.parentIndexes;
-  const instancesLength = classIds.length;
-  const visited = scratchVisited;
-  visited.length = Math.max(visited.length, instancesLength);
-  const visitedMarker = ++marker;
-  const stack = scratchStack;
-  stack.length = 0;
-  stack.push(instanceIndex);
-
-  while (stack.length > 0) {
-    instanceIndex = stack.pop();
-
-    if (visited[instanceIndex] === visitedMarker) {
-      continue;
-    }
-
-    visited[instanceIndex] = visitedMarker;
-    const result = endConditionCallback(hierarchy, instanceIndex);
-
-    if (defined(result)) {
-      return result;
-    }
-
-    const parentCount = parentCounts[instanceIndex];
-    const parentIndex = parentIndexes[instanceIndex];
-
-    for (let i = 0; i < parentCount; ++i) {
-      const parentId = parentIds[parentIndex + i];
-
-      if (parentId !== instanceIndex) {
-        stack.push(parentId);
-      }
-    }
-  }
-
-  return null;
+    const classIds = hierarchy.classIds;
+    const parentCounts = hierarchy.parentCounts;
+    const parentIds = hierarchy.parentIds;
+    const parentIndexes = hierarchy.parentIndexes;
+    const instancesLength = classIds.length;
+    // Ignore instances that have already been visited. This occurs in diamond inheritance situations.
+    // Use a marker value to indicate that an instance has been visited, which increments with each run.
+    // This is more efficient than clearing the visited array every time.
+    const visited = scratchVisited;
+    visited.length = Math.max(visited.length, instancesLength);
+    const visitedMarker = ++marker;
+    const stack = scratchStack;
+    stack.length = 0;
+    stack.push(instanceIndex);
+    while (stack.length > 0) {
+        instanceIndex = stack.pop();
+        if (visited[instanceIndex] === visitedMarker) {
+            // This instance has already been visited, stop traversal
+            continue;
+        }
+        visited[instanceIndex] = visitedMarker;
+        const result = endConditionCallback(hierarchy, instanceIndex);
+        if (defined(result)) {
+            // The end condition was met, stop the traversal and return the result
+            return result;
+        }
+        const parentCount = parentCounts[instanceIndex];
+        const parentIndex = parentIndexes[instanceIndex];
+        for (let i = 0; i < parentCount; ++i) {
+            const parentId = parentIds[parentIndex + i];
+            // Stop the traversal when the instance has no parent (its parentId equals itself)
+            // else add the parent to the stack to continue the traversal.
+            if (parentId !== instanceIndex) {
+                stack.push(parentId);
+            }
+        }
+    }
+    return null;
 }
-
 function traverseHierarchySingleParent(hierarchy, instanceIndex, endConditionCallback) {
-  let hasParent = true;
-
-  while (hasParent) {
-    const result = endConditionCallback(hierarchy, instanceIndex);
-
-    if (defined(result)) {
-      return result;
-    }
-
-    const parentId = hierarchy.parentIds[instanceIndex];
-    hasParent = parentId !== instanceIndex;
-    instanceIndex = parentId;
-  }
-
-  throw new Error('traverseHierarchySingleParent');
+    let hasParent = true;
+    while (hasParent) {
+        const result = endConditionCallback(hierarchy, instanceIndex);
+        if (defined(result)) {
+            // The end condition was met, stop the traversal and return the result
+            return result;
+        }
+        const parentId = hierarchy.parentIds[instanceIndex];
+        hasParent = parentId !== instanceIndex;
+        instanceIndex = parentId;
+    }
+    throw new Error('traverseHierarchySingleParent');
 }
-
+// DEBUG CODE
 function validateHierarchy(hierarchy) {
-  const scratchValidateStack = [];
-  const classIds = hierarchy.classIds;
-  const instancesLength = classIds.length;
-
-  for (let i = 0; i < instancesLength; ++i) {
-    validateInstance(hierarchy, i, stack);
-  }
+    const scratchValidateStack = [];
+    const classIds = hierarchy.classIds;
+    const instancesLength = classIds.length;
+    for (let i = 0; i < instancesLength; ++i) {
+        validateInstance(hierarchy, i, stack);
+    }
 }
-
 function validateInstance(hierarchy, instanceIndex, stack) {
-  const parentCounts = hierarchy.parentCounts;
-  const parentIds = hierarchy.parentIds;
-  const parentIndexes = hierarchy.parentIndexes;
-  const classIds = hierarchy.classIds;
-  const instancesLength = classIds.length;
-
-  if (!defined(parentIds)) {
-    return;
-  }
-
-  assert(instanceIndex < instancesLength, "Parent index ".concat(instanceIndex, " exceeds the total number of instances: ").concat(instancesLength));
-  assert(stack.indexOf(instanceIndex) === -1, 'Circular dependency detected in the batch table hierarchy.');
-  stack.push(instanceIndex);
-  const parentCount = defined(parentCounts) ? parentCounts[instanceIndex] : 1;
-  const parentIndex = defined(parentCounts) ? parentIndexes[instanceIndex] : instanceIndex;
-
-  for (let i = 0; i < parentCount; ++i) {
-    const parentId = parentIds[parentIndex + i];
-
-    if (parentId !== instanceIndex) {
-      validateInstance(hierarchy, parentId, stack);
-    }
-  }
-
-  stack.pop(instanceIndex);
+    const parentCounts = hierarchy.parentCounts;
+    const parentIds = hierarchy.parentIds;
+    const parentIndexes = hierarchy.parentIndexes;
+    const classIds = hierarchy.classIds;
+    const instancesLength = classIds.length;
+    if (!defined(parentIds)) {
+        // No need to validate if there are no parents
+        return;
+    }
+    assert(instanceIndex < instancesLength, `Parent index ${instanceIndex} exceeds the total number of instances: ${instancesLength}`);
+    assert(stack.indexOf(instanceIndex) === -1, 'Circular dependency detected in the batch table hierarchy.');
+    stack.push(instanceIndex);
+    const parentCount = defined(parentCounts) ? parentCounts[instanceIndex] : 1;
+    const parentIndex = defined(parentCounts) ? parentIndexes[instanceIndex] : instanceIndex;
+    for (let i = 0; i < parentCount; ++i) {
+        const parentId = parentIds[parentIndex + i];
+        // Stop the traversal when the instance has no parent (its parentId equals itself), else continue the traversal.
+        if (parentId !== instanceIndex) {
+            validateInstance(hierarchy, parentId, stack);
+        }
+    }
+    stack.pop(instanceIndex);
 }
-//# sourceMappingURL=tile-3d-batch-table-hierarchy.js.map

package/dist/lib/classes/tile-3d-batch-table.d.ts

@@ -0,0 +1,34 @@
+export default class Tile3DBatchTableParser {
+    json: any;
+    binary: any;
+    featureCount: any;
+    _extensions: any;
+    _properties: any;
+    _binaryProperties: any;
+    _hierarchy: any;
+    constructor(json: any, binary: any, featureCount: any, options?: {});
+    getExtension(extensionName: any): any;
+    memorySizeInBytes(): number;
+    isClass(batchId: any, className: string): boolean;
+    isExactClass(batchId: any, className: any): boolean;
+    getExactClassName(batchId: any): any;
+    hasProperty(batchId: any, name: any): boolean;
+    getPropertyNames(batchId: any, results: any): any;
+    getProperty(batchId: any, name: any): any;
+    setProperty(batchId: any, name: any, value: any): void;
+    _checkBatchId(batchId: any): void;
+    _getBinaryProperty(binaryProperty: any, index: any): any;
+    _setBinaryProperty(binaryProperty: any, index: any, value: any): void;
+    _initializeBinaryProperties(): Record<string, any> | null;
+    _initializeBinaryProperty(name: any, property: any): {
+        typedArray: import("@math.gl/types").TypedArray;
+        componentCount: any;
+        unpack: any;
+        pack: any;
+    } | null;
+    _hasPropertyInHierarchy(batchId: any, name: any): boolean;
+    _getPropertyNamesInHierarchy(batchId: any, results: any): void;
+    _getHierarchyProperty(batchId: any, name: any): any;
+    _setHierarchyProperty(batchTable: any, batchId: any, name: any, value: any): boolean;
+}
+//# sourceMappingURL=tile-3d-batch-table.d.ts.map

package/dist/lib/classes/tile-3d-batch-table.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tile-3d-batch-table.d.ts","sourceRoot":"","sources":["../../../src/lib/classes/tile-3d-batch-table.ts"],"names":[],"mappings":"AAsBA,MAAM,CAAC,OAAO,OAAO,sBAAsB;IACzC,IAAI,MAAC;IACL,MAAM,MAAC;IACP,YAAY,MAAC;IACb,WAAW,MAAC;IAEZ,WAAW,MAAC;IACZ,iBAAiB,MAAC;IAElB,UAAU,MAAC;gBAEC,IAAI,KAAA,EAAE,MAAM,KAAA,EAAE,YAAY,KAAA,EAAE,OAAO,KAAK;IAwBpD,YAAY,CAAC,aAAa,KAAA;IAI1B,iBAAiB,IAAI,MAAM;IAI3B,OAAO,CAAC,OAAO,KAAA,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO;IAoB5C,YAAY,CAAC,OAAO,KAAA,EAAE,SAAS,KAAA;IAM/B,iBAAiB,CAAC,OAAO,KAAA;IAazB,WAAW,CAAC,OAAO,KAAA,EAAE,IAAI,KAAA;IAOzB,gBAAgB,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAgBjC,WAAW,CAAC,OAAO,KAAA,EAAE,IAAI,KAAA;IA2BzB,WAAW,CAAC,OAAO,KAAA,EAAE,IAAI,KAAA,EAAE,KAAK,KAAA;IAiChC,aAAa,CAAC,OAAO,KAAA;IAOrB,kBAAkB,CAAC,cAAc,KAAA,EAAE,KAAK,KAAA;IAIxC,kBAAkB,CAAC,cAAc,KAAA,EAAE,KAAK,KAAA,EAAE,KAAK,KAAA;IAI/C,2BAA2B;IAe3B,yBAAyB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;;;;;;IA8BxC,uBAAuB,CAAC,OAAO,KAAA,EAAE,IAAI,KAAA;IAcrC,4BAA4B,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAc7C,qBAAqB,CAAC,OAAO,KAAA,EAAE,IAAI,KAAA;IAgBnC,qBAAqB,CAAC,UAAU,KAAA,EAAE,OAAO,KAAA,EAAE,IAAI,KAAA,EAAE,KAAK,KAAA;CAmBvD"}