@itwin/frontend-tiles 4.1.0-dev.2 → 4.1.0-dev.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/frontend-tiles",
-  "version": "4.1.0-dev.2",
+  "version": "4.1.0-dev.21",
   "description": "Experimental alternative technique for visualizing the contents of iModels",
   "main": "lib/cjs/frontend-tiles.js",
   "module": "lib/esm/frontend-tiles.js",
@@ -23,10 +23,10 @@
     "url": "http://www.bentley.com"
   },
   "peerDependencies": {
-    "@itwin/core-bentley": "4.1.0-dev.2",
-    "@itwin/core-common": "4.1.0-dev.2",
-    "@itwin/core-frontend": "4.1.0-dev.2",
-    "@itwin/core-geometry": "4.1.0-dev.2"
+    "@itwin/core-bentley": "4.1.0-dev.21",
+    "@itwin/core-frontend": "4.1.0-dev.21",
+    "@itwin/core-common": "4.1.0-dev.21",
+    "@itwin/core-geometry": "4.1.0-dev.21"
   },
   "devDependencies": {
     "@itwin/eslint-plugin": "^4.0.0-dev.33",
@@ -34,11 +34,11 @@
     "eslint": "^8.36.0",
     "rimraf": "^3.0.2",
     "typescript": "~5.0.2",
-    "@itwin/build-tools": "4.1.0-dev.2",
-    "@itwin/core-frontend": "4.1.0-dev.2",
-    "@itwin/core-geometry": "4.1.0-dev.2",
-    "@itwin/core-common": "4.1.0-dev.2",
-    "@itwin/core-bentley": "4.1.0-dev.2"
+    "@itwin/build-tools": "4.1.0-dev.21",
+    "@itwin/core-geometry": "4.1.0-dev.21",
+    "@itwin/core-bentley": "4.1.0-dev.21",
+    "@itwin/core-frontend": "4.1.0-dev.21",
+    "@itwin/core-common": "4.1.0-dev.21"
   },
   "eslintConfig": {
     "plugins": [

package/src/BatchedTile.ts

@@ -6,12 +6,11 @@
 import { assert, BeTimePoint, ByteStream, Logger } from "@itwin/core-bentley";
 import { ColorDef, Tileset3dSchema } from "@itwin/core-common";
 import {
-  GltfReaderProps, GraphicBuilder, ImdlReader, IModelApp, RealityTileLoader, RenderSystem, Tile, TileBoundingBoxes, TileContent,
+  GraphicBuilder, 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";
-import { BatchedTileContentReader } from "./BatchedTileContentReader";
 import { getMaxLevelsToSkip } from "./FrontendTiles";
 
 /** @internal */
@@ -128,45 +127,22 @@ export class BatchedTile extends Tile {
     return response.arrayBuffer();
   }
 
-  public override async readContent(data: TileRequest.ResponseData, system: RenderSystem, shouldAbort?: () => boolean): Promise<TileContent> {
+  public override async readContent(data: TileRequest.ResponseData, system: RenderSystem, isCanceled?: () => boolean): Promise<TileContent> {
     assert(data instanceof Uint8Array);
     if (!(data instanceof Uint8Array))
       return { };
 
-    let reader: ImdlReader | BatchedTileContentReader | undefined = ImdlReader.create({
-      stream: ByteStream.fromUint8Array(data),
-      iModel: this.tree.iModel,
-      modelId: this.tree.modelId,
-      is3d: true,
-      isLeaf: this.isLeaf,
-      system,
-      isCanceled: shouldAbort,
-      timeline: this.batchedTree.scheduleScript,
-      options: {
-        tileId: this.contentId,
-      },
-    });
-
-    if (!reader) {
-      const gltfProps = GltfReaderProps.create(data, false, this.batchedTree.reader.baseUrl);
-      if (gltfProps) {
-        reader = new BatchedTileContentReader({
-          props: gltfProps,
-          iModel: this.tree.iModel,
-          system,
-          shouldAbort,
-          vertexTableRequired: true,
-          modelId: this.tree.modelId,
-          isLeaf: this.isLeaf,
-          range: this.range,
-        });
-      }
+    try {
+      return await this.batchedTree.decoder.decode({
+        stream: ByteStream.fromUint8Array(data),
+        options: { tileId: this.contentId },
+        system,
+        isCanceled,
+        isLeaf: this.isLeaf,
+      });
+    } catch {
+      return { isLeaf: true };
     }
-
-    if (!reader)
-      return { };
-
-    return reader.read();
   }
 
   protected override addRangeGraphic(builder: GraphicBuilder, type: TileBoundingBoxes): void {

package/src/BatchedTileTree.ts

@@ -4,9 +4,9 @@
 *--------------------------------------------------------------------------------------------*/
 
 import { BeTimePoint } from "@itwin/core-bentley";
-import { RenderMode, RenderSchedule, ViewFlagOverrides } from "@itwin/core-common";
+import { BatchType, RenderMode, RenderSchedule, ViewFlagOverrides } from "@itwin/core-common";
 import {
-  Tile, TileDrawArgs, TileTree, TileTreeParams,
+  acquireImdlDecoder, ImdlDecoder, IModelApp, Tile, TileDrawArgs, TileTree, TileTreeParams,
 } from "@itwin/core-frontend";
 import { BatchedTile, BatchedTileParams } from "./BatchedTile";
 import { BatchedTilesetReader } from "./BatchedTilesetReader";
@@ -28,12 +28,28 @@ export class BatchedTileTree extends TileTree {
   private readonly _rootTile: BatchedTile;
   public readonly reader: BatchedTilesetReader;
   public readonly scheduleScript?: RenderSchedule.Script;
+  public readonly decoder: ImdlDecoder;
 
   public constructor(params: BatchedTileTreeParams) {
     super(params);
     this._rootTile = new BatchedTile(params.rootTile, this);
     this.reader = params.reader;
     this.scheduleScript = params.script;
+
+    this.decoder = acquireImdlDecoder({
+      type: BatchType.Primary,
+      timeline: this.scheduleScript,
+      iModel: this.iModel,
+      batchModelId: this.modelId,
+      is3d: true,
+      containsTransformNodes: false,
+      noWorker: !IModelApp.tileAdmin.decodeImdlInWorker,
+    });
+  }
+
+  public override dispose(): void {
+    this.decoder.release();
+    super.dispose();
   }
 
   public override get rootTile(): BatchedTile {