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

package/dist/tileset/tileset-cache.js

@@ -2,15 +2,9 @@
 // loaders.gl, MIT license
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TilesetCache = void 0;
-// 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
 const doubly_linked_list_1 = require("../utils/doubly-linked-list");
-function defined(x) {
-    return x !== undefined && x !== null;
-}
 /**
  * Stores tiles with content loaded.
- *
  * @private
  */
 class TilesetCache {
@@ -29,12 +23,12 @@ class TilesetCache {
     }
     touch(tile) {
         const node = tile._cacheNode;
-        if (defined(node)) {
+        if (node) {
             this._list.splice(this._sentinel, node);
         }
     }
     add(tileset, tile, addCallback) {
-        if (!defined(tile._cacheNode)) {
+        if (!tile._cacheNode) {
             tile._cacheNode = this._list.add(tile);
             if (addCallback) {
                 addCallback(tileset, tile);
@@ -43,11 +37,11 @@ class TilesetCache {
     }
     unloadTile(tileset, tile, unloadCallback) {
         const node = tile._cacheNode;
-        if (!defined(node)) {
+        if (!node) {
             return;
         }
         this._list.remove(node);
-        tile._cacheNode = undefined;
+        tile._cacheNode = null;
         if (unloadCallback) {
             unloadCallback(tileset, tile);
         }

package/dist/tileset/tileset-traverser.d.ts

@@ -1,46 +1,57 @@
+import type { Tile3D } from './tile-3d';
 import { ManagedArray } from '../utils/managed-array';
 import { FrameState } from './helpers/frame-state';
 export type TilesetTraverserProps = {
     loadSiblings?: boolean;
     skipLevelOfDetail?: boolean;
+    updateTransforms?: boolean;
     maximumScreenSpaceError?: number;
     onTraversalEnd?: (frameState: any) => any;
-    viewportTraversersMap?: {
-        [key: string]: any;
-    };
+    viewportTraversersMap?: Record<string, any>;
     basePath?: string;
-    updateTransforms?: boolean;
 };
 export declare const DEFAULT_PROPS: Required<TilesetTraverserProps>;
 export declare class TilesetTraverser {
     options: Required<TilesetTraverserProps>;
     root: any;
-    requestedTiles: object;
-    selectedTiles: object;
-    emptyTiles: object;
+    selectedTiles: Record<string, Tile3D>;
+    requestedTiles: Record<string, Tile3D>;
+    emptyTiles: Record<string, Tile3D>;
     protected lastUpdate: number;
     protected readonly updateDebounceTime = 1000;
+    /** temporary storage to hold the traversed tiles during a traversal */
     protected _traversalStack: ManagedArray;
     protected _emptyTraversalStack: ManagedArray;
+    /** set in every traverse cycle */
     protected _frameNumber: number | null;
     protected traversalFinished(frameState: FrameState): boolean;
     constructor(options: TilesetTraverserProps);
     traverse(root: any, frameState: any, options: any): void;
     reset(): void;
+    /**
+     * Execute traverse
+     * Depth-first traversal that traverses all visible tiles and marks tiles for selection.
+     * If skipLevelOfDetail is off then a tile does not refine until all children are loaded.
+     * This is the traditional replacement refinement approach and is called the base traversal.
+     * Tiles that have a greater screen space error than the base screen space error are part of the base traversal,
+     * all other tiles are part of the skip traversal. The skip traversal allows for skipping levels of the tree
+     * and rendering children and parent tiles simultaneously.
+     */
     executeTraversal(root: any, frameState: FrameState): void;
-    updateChildTiles(tile: any, frameState: any): boolean;
-    updateAndPushChildren(tile: any, frameState: any, stack: any, depth: any): boolean;
-    updateTile(tile: any, frameState: any): void;
-    selectTile(tile: any, frameState: any): void;
-    loadTile(tile: any, frameState: any): void;
-    touchTile(tile: any, frameState: any): void;
-    canTraverse(tile: any, frameState: any, useParentMetric?: boolean, ignoreVisibility?: boolean): boolean;
-    shouldLoadTile(tile: any): any;
-    shouldSelectTile(tile: any): any;
-    shouldRefine(tile: any, frameState: any, useParentMetric: any): boolean;
-    updateTileVisibility(tile: any, frameState: any): void;
-    compareDistanceToCamera(b: any, a: any): number;
-    anyChildrenVisible(tile: any, frameState: any): boolean;
-    executeEmptyTraversal(root: any, frameState: any): boolean;
+    updateChildTiles(tile: Tile3D, frameState: FrameState): void;
+    updateAndPushChildren(tile: Tile3D, frameState: FrameState, stack: any, depth: any): boolean;
+    updateTile(tile: Tile3D, frameState: FrameState): void;
+    selectTile(tile: Tile3D, frameState: FrameState): void;
+    loadTile(tile: Tile3D, frameState: FrameState): void;
+    touchTile(tile: Tile3D, frameState: FrameState): void;
+    canTraverse(tile: Tile3D, frameState: FrameState, useParentMetric?: boolean, ignoreVisibility?: boolean): boolean;
+    shouldLoadTile(tile: Tile3D): boolean;
+    shouldSelectTile(tile: Tile3D): boolean;
+    /** Decide if tile LoD (level of detail) is not sufficient under current viewport */
+    shouldRefine(tile: Tile3D, frameState: FrameState, useParentMetric?: boolean): boolean;
+    updateTileVisibility(tile: Tile3D, frameState: FrameState): void;
+    compareDistanceToCamera(b: Tile3D, a: Tile3D): number;
+    anyChildrenVisible(tile: Tile3D, frameState: FrameState): boolean;
+    executeEmptyTraversal(root: Tile3D, frameState: FrameState): boolean;
 }
 //# sourceMappingURL=tileset-traverser.d.ts.map

package/dist/tileset/tileset-traverser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tileset-traverser.d.ts","sourceRoot":"","sources":["../../src/tileset/tileset-traverser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,wBAAwB,CAAC;AAEpD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,MAAM,MAAM,qBAAqB,GAAG;IAClC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,cAAc,CAAC,EAAE,CAAC,UAAU,KAAA,KAAK,GAAG,CAAC;IACrC,qBAAqB,CAAC,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAYF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,qBAAqB,CAQzD,CAAC;AAEF,qBAAa,gBAAgB;IAC3B,OAAO,EAAE,QAAQ,CAAC,qBAAqB,CAAC,CAAC;IAEzC,IAAI,EAAE,GAAG,CAAC;IACV,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IAEnB,SAAS,CAAC,UAAU,EAAE,MAAM,CAAwB;IACpD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,QAAQ;IAC7C,SAAS,CAAC,eAAe,EAAE,YAAY,CAAC;IACxC,SAAS,CAAC,oBAAoB,EAAE,YAAY,CAAC;IAC7C,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAEtC,SAAS,CAAC,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO;gBAKhD,OAAO,EAAE,qBAAqB;IAuB1C,QAAQ,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA,EAAE,OAAO,KAAA;IAclC,KAAK;IAgBL,gBAAgB,CAAC,IAAI,KAAA,EAAE,UAAU,EAAE,UAAU;IAmE7C,gBAAgB,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IASjC,qBAAqB,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA,EAAE,KAAK,KAAA,EAAE,KAAK,KAAA;IAuDpD,UAAU,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IAK3B,UAAU,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IAS3B,QAAQ,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IASzB,SAAS,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IAQ1B,WAAW,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA,EAAE,eAAe,UAAQ,EAAE,gBAAgB,UAAQ;IAmB/E,cAAc,CAAC,IAAI,KAAA;IAMnB,gBAAgB,CAAC,IAAI,KAAA;IAOrB,YAAY,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA,EAAE,eAAe,KAAA;IAS9C,oBAAoB,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IAiBrC,uBAAuB,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA;IAI5B,kBAAkB,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IAWnC,qBAAqB,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;CAqCvC"}
+{"version":3,"file":"tileset-traverser.d.ts","sourceRoot":"","sources":["../../src/tileset/tileset-traverser.ts"],"names":[],"mappings":"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"}

package/dist/tileset/tileset-traverser.js

@@ -1,17 +1,9 @@
 "use strict";
+// loaders.gl, MIT license
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TilesetTraverser = exports.DEFAULT_PROPS = void 0;
 const managed_array_1 = require("../utils/managed-array");
 const constants_1 = require("../constants");
-// export type Props = {
-//   loadSiblings: boolean;
-//   skipLevelOfDetail: boolean;
-//   updateTransforms: boolean;
-//   maximumScreenSpaceError: number;
-//   onTraversalEnd: (frameState) => any;
-//   viewportTraversersMap: {[key: string]: any};
-//   basePath: string;
-// };
 exports.DEFAULT_PROPS = {
     loadSiblings: false,
     skipLevelOfDetail: false,
@@ -22,29 +14,28 @@ exports.DEFAULT_PROPS = {
     basePath: ''
 };
 class TilesetTraverser {
+    // RESULT
     traversalFinished(frameState) {
         return true;
     }
     // TODO nested props
     constructor(options) {
-        this.lastUpdate = new Date().getTime();
-        this.updateDebounceTime = 1000;
-        this.options = { ...exports.DEFAULT_PROPS, ...options };
-        // TRAVERSAL
-        // temporary storage to hold the traversed tiles during a traversal
-        this._traversalStack = new managed_array_1.ManagedArray();
-        this._emptyTraversalStack = new managed_array_1.ManagedArray();
-        // set in every traverse cycle
-        this._frameNumber = null;
         // fulfill in traverse call
         this.root = null;
-        // RESULT
         // tiles should be rendered
         this.selectedTiles = {};
         // tiles should be loaded from server
         this.requestedTiles = {};
         // tiles does not have render content
         this.emptyTiles = {};
+        this.lastUpdate = new Date().getTime();
+        this.updateDebounceTime = 1000;
+        /** temporary storage to hold the traversed tiles during a traversal */
+        this._traversalStack = new managed_array_1.ManagedArray();
+        this._emptyTraversalStack = new managed_array_1.ManagedArray();
+        /** set in every traverse cycle */
+        this._frameNumber = null;
+        this.options = { ...exports.DEFAULT_PROPS, ...options };
     }
     // tiles should be visible
     traverse(root, frameState, options) {
@@ -64,13 +55,15 @@ class TilesetTraverser {
         this._traversalStack.reset();
         this._emptyTraversalStack.reset();
     }
-    // execute traverse
-    // Depth-first traversal that traverses all visible tiles and marks tiles for selection.
-    // If skipLevelOfDetail is off then a tile does not refine until all children are loaded.
-    // This is the traditional replacement refinement approach and is called the base traversal.
-    // Tiles that have a greater screen space error than the base screen space error are part of the base traversal,
-    // all other tiles are part of the skip traversal. The skip traversal allows for skipping levels of the tree
-    // and rendering children and parent tiles simultaneously.
+    /**
+     * Execute traverse
+     * Depth-first traversal that traverses all visible tiles and marks tiles for selection.
+     * If skipLevelOfDetail is off then a tile does not refine until all children are loaded.
+     * This is the traditional replacement refinement approach and is called the base traversal.
+     * Tiles that have a greater screen space error than the base screen space error are part of the base traversal,
+     * all other tiles are part of the skip traversal. The skip traversal allows for skipping levels of the tree
+     * and rendering children and parent tiles simultaneously.
+     */
     /* eslint-disable-next-line complexity, max-statements */
     executeTraversal(root, frameState) {
         // stack to store traversed tiles, only visible tiles should be added to stack
@@ -132,7 +125,6 @@ class TilesetTraverser {
         for (const child of children) {
             this.updateTile(child, frameState);
         }
-        return true;
     }
     /* eslint-disable complexity, max-statements */
     updateAndPushChildren(tile, frameState, stack, depth) {
@@ -235,8 +227,8 @@ class TilesetTraverser {
         // and content available
         return tile.contentAvailable && !this.options.skipLevelOfDetail;
     }
-    // Decide if tile LoD (level of detail) is not sufficient under current viewport
-    shouldRefine(tile, frameState, useParentMetric) {
+    /** Decide if tile LoD (level of detail) is not sufficient under current viewport */
+    shouldRefine(tile, frameState, useParentMetric = false) {
         let screenSpaceError = tile._screenSpaceError;
         if (useParentMetric) {
             screenSpaceError = tile.getScreenSpaceError(frameState, true);
@@ -265,7 +257,9 @@ class TilesetTraverser {
     anyChildrenVisible(tile, frameState) {
         let anyVisible = false;
         for (const child of tile.children) {
+            // @ts-expect-error
             child.updateVisibility(frameState);
+            // @ts-expect-error
             anyVisible = anyVisible || child.isVisibleAndInRequestVolume;
         }
         return anyVisible;
@@ -304,6 +298,3 @@ class TilesetTraverser {
     }
 }
 exports.TilesetTraverser = TilesetTraverser;
-// TODO
-// enable expiration
-// enable optimization hint

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tiles",
-  "version": "4.0.0-alpha.6",
+  "version": "4.0.0-alpha.7",
   "description": "Common components for different tiles loaders.",
   "license": "MIT",
   "publishConfig": {
@@ -33,8 +33,8 @@
     "build-bundle": "esbuild src/bundle.ts --bundle --outfile=dist/dist.min.js"
   },
   "dependencies": {
-    "@loaders.gl/loader-utils": "4.0.0-alpha.6",
-    "@loaders.gl/math": "4.0.0-alpha.6",
+    "@loaders.gl/loader-utils": "4.0.0-alpha.7",
+    "@loaders.gl/math": "4.0.0-alpha.7",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
     "@math.gl/geospatial": "^3.5.1",
@@ -42,7 +42,10 @@
     "@probe.gl/stats": "^4.0.2"
   },
   "peerDependencies": {
-    "@loaders.gl/core": "4.0.0-alpha.5"
+    "@loaders.gl/core": "4.0.0-alpha.6"
   },
-  "gitHead": "acc1985050dfaa0f1f0c066f8da5bce7454a046c"
+  "devDependencies": {
+    "@deck.gl/core": "^8.9.0"
+  },
+  "gitHead": "afb59c4d8e5d8ebb9c28f111cb0c96c5527d0ffd"
 }

package/src/constants.ts

@@ -1,5 +1,13 @@
 // loaders.gl, MIT license
 
+export type TileContentState =
+  | 'unloaded' // Has never been requested
+  | 'loading' // Is waiting on a pending request
+  | 'processing' // Request received.  Contents are being processed for rendering.  Depending on the content, it might make its own requests for external data.
+  | 'ready' // Ready to render.
+  | 'expired' // Is expired and will be unloaded once new content is loaded.
+  | 'failed'; // Request failed.
+
 export const TILE_CONTENT_STATE = {
   UNLOADED: 0, // Has never been requested
   LOADING: 1, // Is waiting on a pending request
@@ -9,11 +17,15 @@ export const TILE_CONTENT_STATE = {
   FAILED: 5 // Request failed.
 };
 
+export type TileRefinement = 'add' | 'replace';
+
 export const TILE_REFINEMENT = {
   ADD: 1, // Render tile and, if screen space error exceeded, also refine to its children.
   REPLACE: 2 // Render tile or, if screen space error exceeded, refine to its descendants instead.
 };
 
+export type TileType = 'empty' | 'scenegraph' | 'pointcloud' | 'mesh';
+
 export const TILE_TYPE = {
   EMPTY: 'empty',
   SCENEGRAPH: 'scenegraph',
@@ -21,17 +33,23 @@ export const TILE_TYPE = {
   MESH: 'mesh'
 };
 
+export type TilesetType = 'I3S' | 'TILES3D';
+
 export const TILESET_TYPE = {
   I3S: 'I3S',
   TILES3D: 'TILES3D'
 };
 
+export type LODMetricType = 'geometricError' | 'maxScreenThreshold';
+
 export const LOD_METRIC_TYPE = {
   GEOMETRIC_ERROR: 'geometricError',
   MAX_SCREEN_THRESHOLD: 'maxScreenThreshold'
 };
 
 // Cesium 3D Tiles Specific
+export type Tile3DOptimizationHint = 'NOT_COMPUTED' | 'USE_OPTIMIZATION' | 'SKIP_OPTIMIZATION';
+
 export const TILE3D_OPTIMIZATION_HINT = {
   NOT_COMPUTED: -1,
   USE_OPTIMIZATION: 1,

package/src/tileset/helpers/3d-tiles-options.ts

@@ -1,4 +1,6 @@
-export function get3dTilesOptions(tileset) {
+import type {Tileset3D} from '../tileset-3d';
+
+export function get3dTilesOptions(tileset: Tileset3D): {assetGltfUpAxis: 'X' | 'Y' | 'Z'} {
   return {
     assetGltfUpAxis: (tileset.asset && tileset.asset.gltfUpAxis) || 'Y'
   };

package/src/tileset/tile-3d.ts

@@ -10,6 +10,7 @@ import {load} from '@loaders.gl/core';
 
 // Note: circular dependency
 import type {Tileset3D} from './tileset-3d';
+import type {DoublyLinkedListNode} from '../utils/doubly-linked-list-node';
 import {TILE_REFINEMENT, TILE_CONTENT_STATE, TILESET_TYPE} from '../constants';
 
 import {FrameState} from './helpers/frame-state';
@@ -54,73 +55,78 @@ export class Tile3D {
   id: string;
   url: string;
   parent: Tile3D;
+  /* Specifies the type of refine that is used when traversing this tile for rendering. */
   refine: number;
   type: string;
   contentUrl: string;
-  lodMetricType: string;
-  lodMetricValue: number;
-  boundingVolume: any;
-  content: any;
-  contentState: any;
-  gpuMemoryUsageInBytes: number;
-  children: Tile3D[];
-  depth: number;
-  viewportIds: any[];
-  transform: Matrix4;
-  extensions: any;
-  implicitTiling?: any;
-
-  // Container to store application specific data
-  userData: {[key: string]: any};
+  /** Different refinement algorithms used by I3S and 3D tiles */
+  lodMetricType: 'geometricError' | 'maxScreenThreshold' = 'geometricError';
+  /** The error, in meters, introduced if this tile is rendered and its children are not. */
+  lodMetricValue: number = 0;
+
+  /** @todo math.gl is not exporting BoundingVolume base type? */
+  boundingVolume: any = null;
+
+  /**
+   * The tile's content.  This represents the actual tile's payload,
+   * not the content's metadata in the tileset JSON file.
+   */
+  content: any = null;
+  contentState: number = TILE_CONTENT_STATE.UNLOADED;
+  gpuMemoryUsageInBytes: number = 0;
+
+  /** The tile's children - an array of Tile3D objects. */
+  children: Tile3D[] = [];
+  depth: number = 0;
+  viewportIds: any[] = [];
+  transform = new Matrix4();
+  extensions: any = null;
+  /** TODO Cesium 3d tiles specific */
+  implicitTiling?: any = null;
+
+  /** Container to store application specific data */
+  userData: Record<string, any> = {};
+
   computedTransform: any;
-  hasEmptyContent: boolean;
-  hasTilesetContent: boolean;
+  hasEmptyContent: boolean = false;
+  hasTilesetContent: boolean = false;
+
+  traverser = new TilesetTraverser({});
 
-  traverser: object;
+  /** Used by TilesetCache */
+  _cacheNode: DoublyLinkedListNode | null = null;
+
+  private _frameNumber: any = null;
 
-  // @ts-ignore
-  private _cacheNode: any;
-  private _frameNumber: any;
-  // TODO i3s specific, needs to remove
-  // @ts-ignore
-  private _lodJudge: any;
   // TODO Cesium 3d tiles specific
-  private _expireDate: any;
-  private _expiredContent: any;
-  // @ts-ignore
-  private _shouldRefine: boolean;
+  private _expireDate: any = null;
+  private _expiredContent: any = null;
 
   private _boundingBox?: CartographicBounds;
 
-  // Members this are updated every frame for tree traversal and rendering optimizations:
-  public _distanceToCamera: number;
-  // @ts-ignore
-  private _centerZDepth: number;
-  private _screenSpaceError: number;
+  /** updated every frame for tree traversal and rendering optimizations: */
+  public _distanceToCamera: number = 0;
+  _screenSpaceError: number = 0;
   private _visibilityPlaneMask: any;
-  private _visible?: boolean;
-  private _inRequestVolume: boolean;
-
-  // @ts-ignore
-  private _stackLength: number;
-  // @ts-ignore
-  private _selectionDepth: number;
-
-  // @ts-ignore
-  private _touchedFrame: number;
-  // @ts-ignore
-  private _visitedFrame: number;
-  private _selectedFrame: number;
-  // @ts-ignore
-  private _requestedFrame: number;
-
-  // @ts-ignore
-  private _priority: number;
+  private _visible: boolean | undefined = undefined;
 
   private _contentBoundingVolume: any;
   private _viewerRequestVolume: any;
 
-  _initialTransform: Matrix4;
+  _initialTransform: Matrix4 = new Matrix4();
+
+  // Used by traverser, cannot be marked private
+  _priority: number = 0;
+  _selectedFrame: number = 0;
+  _requestedFrame: number = 0;
+  _selectionDepth: number = 0;
+  _touchedFrame: number = 0;
+  _centerZDepth: number = 0;
+  _shouldRefine: boolean = false;
+  _stackLength: number = 0;
+  _visitedFrame: number = 0;
+  _inRequestVolume: boolean = false;
+  _lodJudge: any = null; // TODO i3s specific, needs to remove
 
   /**
    * @constructs
@@ -154,69 +160,12 @@ export class Tile3D {
     this.type = header.type;
     this.contentUrl = header.contentUrl;
 
-    // The error, in meters, introduced if this tile is rendered and its children are not.
-    this.lodMetricType = 'geometricError';
-    this.lodMetricValue = 0;
-
-    // Specifies the type of refine that is used when traversing this tile for rendering.
-    this.boundingVolume = null;
-
-    // The tile's content.  This represents the actual tile's payload,
-    // not the content's metadata in the tileset JSON file.
-    this.content = null;
-    this.contentState = TILE_CONTENT_STATE.UNLOADED;
-    this.gpuMemoryUsageInBytes = 0;
-
-    // The tile's children - an array of Tile3D objects.
-    this.children = [];
-
-    this.hasEmptyContent = false;
-    this.hasTilesetContent = false;
-
-    this.depth = 0;
-    this.viewportIds = [];
-
-    // Container to store application specific data
-    this.userData = {};
-    this.extensions = null;
-
-    // PRIVATE MEMBERS
-    this._priority = 0;
-    this._touchedFrame = 0;
-    this._visitedFrame = 0;
-    this._selectedFrame = 0;
-    this._requestedFrame = 0;
-    this._screenSpaceError = 0;
-
-    this._cacheNode = null;
-    this._frameNumber = null;
-    this._cacheNode = null;
-
-    this.traverser = new TilesetTraverser({});
-    this._shouldRefine = false;
-    this._distanceToCamera = 0;
-    this._centerZDepth = 0;
-    this._visible = undefined;
-    this._inRequestVolume = false;
-    this._stackLength = 0;
-    this._selectionDepth = 0;
-    this._initialTransform = new Matrix4();
-    this.transform = new Matrix4();
-
     this._initializeLodMetric(header);
     this._initializeTransforms(header);
     this._initializeBoundingVolumes(header);
     this._initializeContent(header);
     this._initializeRenderingState(header);
 
-    // TODO i3s specific, needs to remove
-    this._lodJudge = null;
-
-    // TODO Cesium 3d tiles specific
-    this._expireDate = null;
-    this._expiredContent = null;
-    this.implicitTiling = null;
-
     Object.seal(this);
   }
 
@@ -341,6 +290,13 @@ export class Tile3D {
     this._selectedFrame = 0;
   }
 
+  /**
+   * Memory usage of tile on GPU
+   */
+  _getGpuMemoryUsageInBytes(): number {
+    return this.content.gpuMemoryUsageInBytes || this.content.byteLength || 0;
+  }
+
   /*
    * If skipLevelOfDetail is off try to load child tiles as soon as possible so that their parent can refine sooner.
    * Tiles are prioritized by screen space error.
@@ -424,6 +380,7 @@ export class Tile3D {
       const options = {
         ...this.tileset.loadOptions,
         [loader.id]: {
+          // @ts-expect-error
           ...this.tileset.loadOptions[loader.id],
           isTileset: this.type === 'json',
           ...this._getLoaderSpecificOptions(loader.id)
@@ -734,6 +691,8 @@ export class Tile3D {
     // The content may be tileset json
     if (this._isTileset()) {
       this.hasTilesetContent = true;
+    } else {
+      this.gpuMemoryUsageInBytes = this._getGpuMemoryUsageInBytes();
     }
   }