@itwin/frontend-tiles 4.0.0-dev.46 → 4.0.0-dev.50

package/package.json

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

package/src/BatchedSpatialTileTreeRefs.ts

@@ -4,14 +4,14 @@
 *--------------------------------------------------------------------------------------------*/
 
 import {
-  IModelConnection, SpatialTileTreeReferences, TileTreeReference,
+  AttachToViewportArgs, IModelConnection, SpatialTileTreeReferences, SpatialViewState, TileTreeReference,
 } from "@itwin/core-frontend";
-import { createBatchedTileTreeReference } from "./BatchedTileTreeReference";
+import { BatchedTileTreeReference } from "./BatchedTileTreeReference";
 
 class TreeRefs implements SpatialTileTreeReferences {
-  private readonly _treeRef: TileTreeReference;
+  private readonly _treeRef: BatchedTileTreeReference;
 
-  public constructor(treeRef: TileTreeReference) {
+  public constructor(treeRef: BatchedTileTreeReference) {
     this._treeRef = treeRef;
   }
 
@@ -20,6 +20,15 @@ class TreeRefs implements SpatialTileTreeReferences {
   }
 
   public update(): void {
+    this._treeRef.updateViewedModels();
+  }
+
+  public attachToViewport(args: AttachToViewportArgs): void {
+    this._treeRef.attachToViewport(args);
+  }
+
+  public detachFromViewport(): void {
+    this._treeRef.detachFromViewport();
   }
 
   public setDeactivated(): void {
@@ -28,7 +37,7 @@ class TreeRefs implements SpatialTileTreeReferences {
 }
 
 /** @internal */
-export function createBatchedSpatialTileTreeReferences(iModel: IModelConnection, computeBaseUrl: (iModel: IModelConnection) => URL): SpatialTileTreeReferences {
-  const treeRef = createBatchedTileTreeReference(iModel, computeBaseUrl(iModel));
+export function createBatchedSpatialTileTreeReferences(view: SpatialViewState, computeBaseUrl: (iModel: IModelConnection) => URL): SpatialTileTreeReferences {
+  const treeRef = BatchedTileTreeReference.create(view, computeBaseUrl(view.iModel));
   return new TreeRefs(treeRef);
 }

package/src/BatchedTileTreeReference.ts

@@ -3,26 +3,68 @@
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
 
+import { Id64 } from "@itwin/core-bentley";
+import { BatchType, FeatureAppearance, FeatureAppearanceProvider, FeatureAppearanceSource, GeometryClass } from "@itwin/core-common";
 import {
-  IModelConnection, TileTreeOwner, TileTreeReference,
+  AttachToViewportArgs, SpatialViewState, TileTreeOwner, TileTreeReference,
 } from "@itwin/core-frontend";
 import { getBatchedTileTreeOwner } from "./BatchedTileTreeSupplier";
 
-class BatchedTileTreeReference extends TileTreeReference {
+/** @internal */
+export class BatchedTileTreeReference extends TileTreeReference implements FeatureAppearanceProvider {
   private readonly _treeOwner: TileTreeOwner;
+  private readonly _view: SpatialViewState;
+  private readonly _viewedModels = new Id64.Uint32Set();
+  private _onModelSelectorChanged?: () => void;
 
-  public constructor(treeOwner: TileTreeOwner) {
+  private constructor(treeOwner: TileTreeOwner, view: SpatialViewState) {
     super();
     this._treeOwner = treeOwner;
+    this._view = view;
+  }
+
+  public static create(view: SpatialViewState, baseUrl: URL): BatchedTileTreeReference {
+    const owner = getBatchedTileTreeOwner(view.iModel, baseUrl);
+    return new BatchedTileTreeReference(owner, view);
   }
 
   public override get treeOwner(): TileTreeOwner {
     return this._treeOwner;
   }
-}
 
-/** @internal */
-export function createBatchedTileTreeReference(iModel: IModelConnection, baseUrl: URL): TileTreeReference {
-  const owner = getBatchedTileTreeOwner(iModel, baseUrl);
-  return new BatchedTileTreeReference(owner);
+  public attachToViewport(args: AttachToViewportArgs): void {
+    this._onModelSelectorChanged = () => args.invalidateSymbologyOverrides();
+    this.updateViewedModels();
+  }
+
+  public detachFromViewport(): void {
+    this._onModelSelectorChanged = undefined;
+  }
+
+  public updateViewedModels(): void {
+    this._viewedModels.clear();
+    this._viewedModels.addIds(this._view.modelSelector.models);
+    if (this._onModelSelectorChanged)
+      this._onModelSelectorChanged();
+  }
+
+  public override getAppearanceProvider(): FeatureAppearanceProvider | undefined {
+    return this._onModelSelectorChanged ? this : undefined;
+  }
+
+  public getFeatureAppearance(
+    source: FeatureAppearanceSource,
+    elemLo: number, elemHi: number,
+    subcatLo: number, subcatHi: number,
+    geomClass: GeometryClass,
+    modelLo: number, modelHi: number,
+    type: BatchType,
+    animationNodeId: number
+  ): FeatureAppearance | undefined {
+    // ###TODO: Until MultiModelPackedFeatureTable is hooked up we'll always get the transient model Id - remove check after that.
+    if (modelHi !== 0xffffff00 && !this._viewedModels.has(modelLo, modelHi))
+      return undefined;
+
+    return source.getAppearance(elemLo, elemHi, subcatLo, subcatHi, geomClass, modelLo, modelHi, type, animationNodeId);
+  }
 }

package/src/BatchedTilesetReader.ts

@@ -4,7 +4,7 @@
 *--------------------------------------------------------------------------------------------*/
 
 import {
-  Angle, Matrix3d, Point3d, Range3d, Transform, Vector3d,
+  Matrix3d, Point3d, Range3d, Transform, Vector3d,
 } from "@itwin/core-geometry";
 import { Tileset3dSchema as schema } from "@itwin/core-common";
 import { IModelConnection, RealityModelTileUtils, TileLoadPriority } from "@itwin/core-frontend";
@@ -99,8 +99,6 @@ export class BatchedTilesetReader {
   public async readTileTreeParams(): Promise<BatchedTileTreeParams> {
     const root = this._tileset.root;
     const location = root.transform ? transformFromJSON(root.transform) : Transform.createIdentity();
-    // y axis is up in glTF. we want z up.
-    location.multiplyTransformMatrix3d(Matrix3d.createRotationAroundVector(Vector3d.create(1, 0, 0), Angle.createRadians(Angle.piOver2Radians))!, location);
 
     return {
       id: "spatial-models",

package/src/FrontendTiles.ts

@@ -20,5 +20,5 @@ export interface FrontendTilesOptions {
  * @alpha
  */
 export function initializeFrontendTiles(options: FrontendTilesOptions): void {
-  SpatialTileTreeReferences.create = (view: SpatialViewState) => createBatchedSpatialTileTreeReferences(view.iModel, options.computeSpatialTilesetBaseUrl);
+  SpatialTileTreeReferences.create = (view: SpatialViewState) => createBatchedSpatialTileTreeReferences(view, options.computeSpatialTilesetBaseUrl);
 }