diff --git a/src/core/renderer/index.d.ts b/src/core/renderer/index.d.ts index 9dfb59d41..a6bed991f 100644 --- a/src/core/renderer/index.d.ts +++ b/src/core/renderer/index.d.ts @@ -12,5 +12,7 @@ export * from './constants.js'; export { LRUCache } from './utilities/LRUCache.js'; export { PriorityQueue } from './utilities/PriorityQueue.js'; +export * as TraversalUtils from './utilities/TraversalUtils.js'; +export * as LoaderUtils from './utilities/LoaderUtils.js'; export { BatchTable } from './utilities/BatchTable.js'; export { FeatureTable } from './utilities/FeatureTable.js'; diff --git a/src/core/renderer/index.js b/src/core/renderer/index.js index 0a01e8942..e175b9654 100644 --- a/src/core/renderer/index.js +++ b/src/core/renderer/index.js @@ -11,3 +11,5 @@ export { LRUCache } from './utilities/LRUCache.js'; export * from './utilities/PriorityQueue.js'; export * as TraversalUtils from './utilities/TraversalUtils.js'; export * as LoaderUtils from './utilities/LoaderUtils.js'; +export { BatchTable } from './utilities/BatchTable.js'; +export { FeatureTable } from './utilities/FeatureTable.js'; diff --git a/src/core/renderer/utilities/BatchTable.d.ts b/src/core/renderer/utilities/BatchTable.d.ts index f0fc18bd0..0798e9881 100644 --- a/src/core/renderer/utilities/BatchTable.d.ts +++ b/src/core/renderer/utilities/BatchTable.d.ts @@ -1,4 +1,6 @@ -export class BatchTable { +import { FeatureTable } from './FeatureTable.js'; + +export class BatchTable extends FeatureTable { count : number; diff --git a/src/core/renderer/utilities/FeatureTable.d.ts b/src/core/renderer/utilities/FeatureTable.d.ts index 5f405cdbb..d9c8eb2e2 100644 --- a/src/core/renderer/utilities/FeatureTable.d.ts +++ b/src/core/renderer/utilities/FeatureTable.d.ts @@ -7,7 +7,10 @@ interface FeatureTableHeader { export class FeatureTable { - header: FeatureTableHeader; + buffer : ArrayBuffer; + binOffset : number; + binLength : number; + header : FeatureTableHeader; constructor( buffer : ArrayBuffer, diff --git a/src/core/renderer/utilities/LoaderUtils.d.ts b/src/core/renderer/utilities/LoaderUtils.d.ts new file mode 100644 index 000000000..7ad6076df --- /dev/null +++ b/src/core/renderer/utilities/LoaderUtils.d.ts @@ -0,0 +1,6 @@ +export function readMagicBytes( bufferOrDataView: ArrayBufferLike | DataView ): string | null; + +export function arrayToString( array: AllowSharedBufferSource ): string; + +// Returns a working path with a trailing slash +export function getWorkingPath( url: string ): string; diff --git a/src/core/renderer/utilities/TraversalUtils.d.ts b/src/core/renderer/utilities/TraversalUtils.d.ts new file mode 100644 index 000000000..9559cc4d1 --- /dev/null +++ b/src/core/renderer/utilities/TraversalUtils.d.ts @@ -0,0 +1,19 @@ +import { Tile } from '../tiles/Tile.js'; + +// Helper function for traversing a tile set. If `beforeCb` returns `true` then the +// traversal will end early. +export function traverseSet( + tile: Tile, + beforeCb?: ( ( + tile: Tile, + parent: Tile | null, + depth: number, + ) => boolean | void ) | null, + afterCb?: ( ( tile: Tile, parent: Tile | null, depth: number ) => void ) | null, +): void; + +// Traverses the ancestry of the tile up to the root tile. +export function traverseAncestors( + tile: Tile, + callback?: ( ( current: Tile, parent: Tile | null, depth: number ) => void ) | null, +): void; diff --git a/src/three/renderer/controls/EnvironmentControls.d.ts b/src/three/renderer/controls/EnvironmentControls.d.ts index 08bbd0a73..774534fa1 100644 --- a/src/three/renderer/controls/EnvironmentControls.d.ts +++ b/src/three/renderer/controls/EnvironmentControls.d.ts @@ -1,4 +1,4 @@ -import { Camera, EventDispatcher, Object3D, Plane, Vector3 } from 'three'; +import { Camera, Clock, EventDispatcher, Object3D, Plane, Vector3 } from 'three'; import { TilesRenderer } from '../tiles/TilesRenderer.js'; export interface EnvironmentControlsEventMap { @@ -35,6 +35,7 @@ export class EnvironmentControls extends EventDispatcher