@itwin/frontend-tiles 4.1.0-dev.11 → 4.1.0-dev.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/frontend-tiles",
-  "version": "4.1.0-dev.11",
+  "version": "4.1.0-dev.13",
   "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.11",
-    "@itwin/core-common": "4.1.0-dev.11",
-    "@itwin/core-frontend": "4.1.0-dev.11",
-    "@itwin/core-geometry": "4.1.0-dev.11"
+    "@itwin/core-bentley": "4.1.0-dev.13",
+    "@itwin/core-common": "4.1.0-dev.13",
+    "@itwin/core-geometry": "4.1.0-dev.13",
+    "@itwin/core-frontend": "4.1.0-dev.13"
   },
   "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/core-bentley": "4.1.0-dev.11",
-    "@itwin/build-tools": "4.1.0-dev.11",
-    "@itwin/core-common": "4.1.0-dev.11",
-    "@itwin/core-frontend": "4.1.0-dev.11",
-    "@itwin/core-geometry": "4.1.0-dev.11"
+    "@itwin/core-bentley": "4.1.0-dev.13",
+    "@itwin/build-tools": "4.1.0-dev.13",
+    "@itwin/core-frontend": "4.1.0-dev.13",
+    "@itwin/core-geometry": "4.1.0-dev.13",
+    "@itwin/core-common": "4.1.0-dev.13"
   },
   "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 {

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

@@ -1,24 +0,0 @@
-{
-  "files": {
-    "extensions/frontend-tiles/CHANGELOG.json": "c65632ab2e0afa94d3fc683fb45577ddf9b31a44",
-    "extensions/frontend-tiles/CHANGELOG.md": "658630a3f66554cb5bbbc9aec28afb645b29ca3d",
-    "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": "da696adcb63bd4e49733d3d64a5c59242d6e5751",
-    "extensions/frontend-tiles/src/BatchedModels.ts": "252c6bcb9094c6194be76c678137a4ee49acfcc2",
-    "extensions/frontend-tiles/src/BatchedSpatialTileTreeRefs.ts": "062d34aa44d88bc66c661980754c99795ca3722c",
-    "extensions/frontend-tiles/src/BatchedTile.ts": "6787ca3134b5afa53f1de6e31b820f0075747fc6",
-    "extensions/frontend-tiles/src/BatchedTileContentReader.ts": "7a1392a3e55882eedd68f0fb098db9009f190a3e",
-    "extensions/frontend-tiles/src/BatchedTileTree.ts": "ecaaa50ed2c0a2624e7b6eb449cde4cfc519a3cb",
-    "extensions/frontend-tiles/src/BatchedTileTreeReference.ts": "722463c5ab61984aeb69d0fedd4e4475165a8106",
-    "extensions/frontend-tiles/src/BatchedTileTreeSupplier.ts": "c5eacbd6243d0fb542f43900d96bd915374f841f",
-    "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": "7dc4286b5abc39d7f98a29606571946635e24768"
-  },
-  "arguments": "npm run -s build:cjs && npm run -s build:esm "
-}