@itwin/frontend-tiles 4.0.0-dev.85 → 4.0.0-dev.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/frontend-tiles",
-  "version": "4.0.0-dev.85",
+  "version": "4.0.0-dev.87",
   "description": "Experimental alternative technique for visualizing the contents of iModels",
   "main": "lib/cjs/frontend-tiles.js",
   "module": "lib/esm/frontend-tiles.js",
@@ -23,17 +23,17 @@
     "url": "http://www.bentley.com"
   },
   "peerDependencies": {
-    "@itwin/core-bentley": "4.0.0-dev.85",
-    "@itwin/core-common": "4.0.0-dev.85",
-    "@itwin/core-frontend": "4.0.0-dev.85",
-    "@itwin/core-geometry": "4.0.0-dev.85"
+    "@itwin/core-bentley": "4.0.0-dev.87",
+    "@itwin/core-common": "4.0.0-dev.87",
+    "@itwin/core-frontend": "4.0.0-dev.87",
+    "@itwin/core-geometry": "4.0.0-dev.87"
   },
   "devDependencies": {
-    "@itwin/build-tools": "4.0.0-dev.85",
-    "@itwin/core-bentley": "4.0.0-dev.85",
-    "@itwin/core-common": "4.0.0-dev.85",
-    "@itwin/core-frontend": "4.0.0-dev.85",
-    "@itwin/core-geometry": "4.0.0-dev.85",
+    "@itwin/build-tools": "4.0.0-dev.87",
+    "@itwin/core-bentley": "4.0.0-dev.87",
+    "@itwin/core-common": "4.0.0-dev.87",
+    "@itwin/core-frontend": "4.0.0-dev.87",
+    "@itwin/core-geometry": "4.0.0-dev.87",
     "@itwin/eslint-plugin": "^4.0.0-dev.33",
     "@types/node": "^18.11.5",
     "eslint": "^8.36.0",

package/src/BatchedTile.ts

@@ -6,8 +6,8 @@
 import { assert, BeTimePoint, ByteStream, Logger } from "@itwin/core-bentley";
 import { ColorDef, Tileset3dSchema } from "@itwin/core-common";
 import {
-  GltfReaderProps, GraphicBuilder, ImdlReader, IModelApp, RealityTileLoader, RenderSystem, SelectParent, Tile, TileBoundingBoxes, TileContent,
-  TileDrawArgs, TileLoadStatus, TileParams, TileRequest, TileRequestChannel, TileTreeLoadStatus, TileUser, TileVisibility, Viewport,
+  GltfReaderProps, GraphicBuilder, ImdlReader, IModelApp, RealityTileLoader, RenderSystem, Tile, TileBoundingBoxes, TileContent,
+  TileDrawArgs, TileParams, TileRequest, TileRequestChannel, TileTreeLoadStatus, TileUser, TileVisibility, Viewport,
 } from "@itwin/core-frontend";
 import { loggerCategory } from "./LoggerCategory";
 import { BatchedTileTree } from "./BatchedTileTree";
@@ -24,6 +24,7 @@ let channel: TileRequestChannel | undefined;
 /** @internal */
 export class BatchedTile extends Tile {
   private readonly _childrenProps?: Tileset3dSchema.Tile[];
+  private readonly _unskippable: boolean;
 
   public get batchedTree(): BatchedTileTree {
     return this.tree as BatchedTileTree;
@@ -31,6 +32,10 @@ export class BatchedTile extends Tile {
 
   public constructor(params: BatchedTileParams, tree: BatchedTileTree) {
     super(params, tree);
+
+    // The root tile never has content, so it doesn't count toward max levels to skip.
+    this._unskippable = 0 === (this.depth % getMaxLevelsToSkip());
+
     if (params.childrenProps?.length)
       this._childrenProps = params.childrenProps;
 
@@ -50,132 +55,40 @@ export class BatchedTile extends Tile {
     return RealityTileLoader.computeTileLocationPriority(this, viewports, this.tree.iModelTransform);
   }
 
-  public selectTiles(selected: BatchedTile[], args: TileDrawArgs, numSkipped: number): SelectParent {
+  public selectTiles(selected: Set<BatchedTile>, args: TileDrawArgs, closestDisplayableAncestor: BatchedTile | undefined): void {
     const vis = this.computeVisibility(args);
     if (TileVisibility.OutsideFrustum === vis)
-      return SelectParent.No;
-
-    if (TileVisibility.Visible === vis) {
-      // This tile is of appropriate resolution to draw. If need loading or refinement, enqueue.
-      if (!this.isReady)
-        args.insertMissing(this);
-
-      if (this.hasGraphics) {
-        // It can be drawn - select it
-        args.markReady(this);
-        selected.push(this);
-      } else if (!this.isReady) {
-        // It can't be drawn. Try to draw children in its place; otherwise draw the parent.
-        // Do not load/request the children for this purpose.
-        const initialSize = selected.length;
-        const kids = this._batchedChildren;
-        if (undefined === kids)
-          return SelectParent.Yes;
-
-        // Find any descendant to draw, until we exceed max initial tiles to skip.
-        // if (this.depth < this.iModelTree.maxInitialTilesToSkip) {
-        //   for (const kid of kids) {
-        //     if (SelectParent.Yes === kid.selectTiles(selected, args, numSkipped)) {
-        //       selected.length = initialSize;
-        //       return SelectParent.Yes;
-        //     }
-
-        //     return SelectParent.No;
-        //   }
-        // }
-
-        // If all visible direct children can be drawn, draw them.
-        for (const kid of kids) {
-          if (TileVisibility.OutsideFrustum !== kid.computeVisibility(args)) {
-            if (!kid.hasGraphics) {
-              selected.length = initialSize;
-              return SelectParent.Yes;
-            } else {
-              selected.push(kid);
-            }
-          }
-        }
-
-        args.markUsed(this);
-      }
-
-      // We're drawing either this tile, or its direct children.
-      return SelectParent.No;
-    }
-
-    // This tile is too coarse to draw. Try to draw something more appropriate.
-    // If it is not ready to draw, we may want to skip loading in favor of loading its descendants.
-    // If we previously loaded and later unloaded content for this tile to free memory, don't force it to reload its content - proceed to children.
-    const maximumLevelsToSkip = getMaxLevelsToSkip();
-    let canSkipThisTile = (this._hadGraphics && !this.hasGraphics) /* || this.depth < this.iModelTree.maxInitialTilesToSkip */ ;
-    if (canSkipThisTile) {
-      numSkipped = 1;
-    } else {
-      canSkipThisTile = this.isReady || this.isParentDisplayable /* || this.depth < this.iModelTree.maxInitialTilesToSkip */ ;
-      if (canSkipThisTile && this.isDisplayable) { // skipping an undisplayable tile doesn't count toward the maximum
-        // Some tiles do not sub-divide - they only facet the same geometry to a higher resolution. We can skip directly to the correct resolution.
-        const isNotReady = !this.isReady && !this.hasGraphics /* && !this.hasSizeMultiplier */ ;
-        if (isNotReady) {
-          if (numSkipped >= maximumLevelsToSkip)
-            canSkipThisTile = false;
-          else
-            numSkipped += 1;
-        }
-      }
-    }
+      return;
 
-    const childrenLoadStatus = this.loadChildren(); // NB: asynchronous
-    const children = canSkipThisTile ? this._batchedChildren : undefined;
-    if (canSkipThisTile && TileTreeLoadStatus.Loading === childrenLoadStatus) {
-      args.markChildrenLoading();
+    if (this._unskippable) {
+      // Prevent this tile's content from being unloaded due to memory pressure.
+      args.touchedTiles.add(this);
       args.markUsed(this);
     }
 
-    if (undefined !== children) {
-      // If we are the root tile and we are not displayable, then we want to draw *any* currently available children in our place, or else we would draw nothing.
-      // Otherwise, if we want to draw children in our place, we should wait for *all* of them to load, or else we would show missing chunks where not-yet-loaded children belong.
-      const isUndisplayableRootTile = this.isUndisplayableRootTile;
+    closestDisplayableAncestor = this.hasGraphics ? this : closestDisplayableAncestor;
+    if (TileVisibility.TooCoarse === vis && (this.isReady || !this._unskippable)) {
       args.markUsed(this);
-      let drawChildren = true;
-      const initialSize = selected.length;
-      for (const child of children) {
-        // NB: We must continue iterating children so that they can be requested if missing.
-        if (SelectParent.Yes === child.selectTiles(selected, args, numSkipped)) {
-          if (child.loadStatus === TileLoadStatus.NotFound) {
-            // At least one child we want to draw failed to load. e.g., we reached max depth of map tile tree. Draw parent instead.
-            drawChildren = canSkipThisTile = false;
-          } else {
-            // At least one child we want to draw is not yet loaded. Wait for it to load before drawing it and its siblings, unless we have nothing to draw in their place.
-            drawChildren = isUndisplayableRootTile;
-          }
-        }
-      }
+      args.markReady(this);
+      const childrenLoadStatus = this.loadChildren();
+      if (TileTreeLoadStatus.Loading === childrenLoadStatus)
+        args.markChildrenLoading();
 
-      if (drawChildren)
-        return SelectParent.No;
+      const children = this._batchedChildren;
+      if (children) {
+        for (const child of children)
+          child.selectTiles(selected, args, closestDisplayableAncestor);
 
-      // Some types of tiles (like maps) allow the ready children to be drawn on top of the parent while other children are not yet loaded.
-      if (args.parentsAndChildrenExclusive)
-        selected.length = initialSize;
-    }
-
-    if (this.isReady) {
-      if (this.hasGraphics) {
-        selected.push(this);
-        if (!canSkipThisTile) {
-          // This tile is too coarse, but we require loading it before we can start loading higher-res children.
-          args.markReady(this);
-        }
+        return;
       }
-
-      return SelectParent.No;
     }
 
-    // This tile is not ready to be drawn. Request it *only* if we cannot skip it.
-    if (!canSkipThisTile)
+    // We want to display this tile. Request its content if not already loaded.
+    if ((TileVisibility.Visible === vis || this._unskippable) && !this.isReady)
       args.insertMissing(this);
 
-    return this.isParentDisplayable ? SelectParent.Yes : SelectParent.No;
+    if (closestDisplayableAncestor)
+      selected.add(closestDisplayableAncestor);
   }
 
   protected override _loadChildren(resolve: (children: Tile[] | undefined) => void, reject: (error: Error) => void): void {
@@ -225,6 +138,7 @@ export class BatchedTile extends Tile {
       iModel: this.tree.iModel,
       modelId: this.tree.modelId,
       is3d: true,
+      isLeaf: this.isLeaf,
       system,
       isCanceled: shouldAbort,
       options: {

package/src/BatchedTileTree.ts

@@ -51,9 +51,9 @@ export class BatchedTileTree extends TileTree {
 
   // eslint-disable-next-line @typescript-eslint/naming-convention
   public override _selectTiles(args: TileDrawArgs): Tile[] {
-    const selected: BatchedTile[] = [];
-    this.rootTile.selectTiles(selected, args, 0);
-    return selected;
+    const selected = new Set<BatchedTile>();
+    this.rootTile.selectTiles(selected, args, undefined);
+    return Array.from(selected);
   }
 
   public override draw(args: TileDrawArgs): void {

package/.rush/temp/package-deps_build.json

@@ -1,23 +0,0 @@
-{
-  "files": {
-    "extensions/frontend-tiles/CHANGELOG.json": "a5b896a6c2f099210f946fe4b348923fb743ed24",
-    "extensions/frontend-tiles/CHANGELOG.md": "2cb56e72bf39b6dd290d7f01227776bff12edeb6",
-    "extensions/frontend-tiles/LICENSE.md": "77dfb5043040cc16a3611930daba56d86ef54334",
-    "extensions/frontend-tiles/README.md": "4ea38e83e862cdfa6fab08adc92eb62bcb2fe238",
-    "extensions/frontend-tiles/config/rush-project.json": "075dba097aa1ba473c368c262559aa10306afe68",
-    "extensions/frontend-tiles/package.json": "ce9786c9c548215ac23d16d41994b5e4902c222d",
-    "extensions/frontend-tiles/src/BatchedSpatialTileTreeRefs.ts": "1bd92ba0d816eada104e1eb9ec1c198eb69d6842",
-    "extensions/frontend-tiles/src/BatchedTile.ts": "5a65ba092f420eb9cd5ff2ee9ae2f80bb5b42945",
-    "extensions/frontend-tiles/src/BatchedTileContentReader.ts": "7a1392a3e55882eedd68f0fb098db9009f190a3e",
-    "extensions/frontend-tiles/src/BatchedTileTree.ts": "bc27ba7b54de36cfe58ce3ecd62c7795569d3509",
-    "extensions/frontend-tiles/src/BatchedTileTreeReference.ts": "38e908b8193aef773fb6782142482378041ab923",
-    "extensions/frontend-tiles/src/BatchedTileTreeSupplier.ts": "916587d978864b4f9595b560ee1bac3033a123f5",
-    "extensions/frontend-tiles/src/BatchedTilesetReader.ts": "0cc90a58fc8f4cafab8c2bbdac6dc1186337b4f0",
-    "extensions/frontend-tiles/src/FrontendTiles.ts": "576ca9d6b519e7c75187507f9243fa2b802787d8",
-    "extensions/frontend-tiles/src/LoggerCategory.ts": "458e67157ea150f6bff37674320dfc8cf5886049",
-    "extensions/frontend-tiles/src/frontend-tiles.ts": "2778da0ad9afc43273e7105641ef1213edc47a83",
-    "extensions/frontend-tiles/tsconfig.json": "67be9deac4eea3b76c3e1a66b0e9004ed0f6255e",
-    "extensions/frontend-tiles/.rush/temp/shrinkwrap-deps.json": "eb7572b17cd720bcebef5ea41c61d3fada733328"
-  },
-  "arguments": "npm run -s build:cjs && npm run -s build:esm "
-}