@itwin/frontend-tiles 4.4.0-dev.21 → 4.4.0-dev.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (77) hide show
  1. package/lib/cjs/BatchedModelGroups.d.ts +45 -0
  2. package/lib/cjs/BatchedModelGroups.d.ts.map +1 -0
  3. package/lib/cjs/BatchedModelGroups.js +110 -0
  4. package/lib/cjs/BatchedModelGroups.js.map +1 -0
  5. package/lib/cjs/BatchedModels.d.ts +3 -2
  6. package/lib/cjs/BatchedModels.d.ts.map +1 -1
  7. package/lib/cjs/BatchedModels.js +3 -3
  8. package/lib/cjs/BatchedModels.js.map +1 -1
  9. package/lib/cjs/BatchedSpatialTileTreeRefs.d.ts.map +1 -1
  10. package/lib/cjs/BatchedSpatialTileTreeRefs.js +56 -35
  11. package/lib/cjs/BatchedSpatialTileTreeRefs.js.map +1 -1
  12. package/lib/cjs/BatchedTile.d.ts.map +1 -1
  13. package/lib/cjs/BatchedTile.js +3 -0
  14. package/lib/cjs/BatchedTile.js.map +1 -1
  15. package/lib/cjs/BatchedTileTree.d.ts +5 -4
  16. package/lib/cjs/BatchedTileTree.d.ts.map +1 -1
  17. package/lib/cjs/BatchedTileTree.js +1 -0
  18. package/lib/cjs/BatchedTileTree.js.map +1 -1
  19. package/lib/cjs/BatchedTileTreeReference.d.ts +25 -27
  20. package/lib/cjs/BatchedTileTreeReference.d.ts.map +1 -1
  21. package/lib/cjs/BatchedTileTreeReference.js +64 -44
  22. package/lib/cjs/BatchedTileTreeReference.js.map +1 -1
  23. package/lib/cjs/BatchedTileTreeSupplier.d.ts +5 -0
  24. package/lib/cjs/BatchedTileTreeSupplier.d.ts.map +1 -1
  25. package/lib/cjs/BatchedTileTreeSupplier.js +4 -2
  26. package/lib/cjs/BatchedTileTreeSupplier.js.map +1 -1
  27. package/lib/cjs/BatchedTilesetReader.d.ts +24 -7
  28. package/lib/cjs/BatchedTilesetReader.d.ts.map +1 -1
  29. package/lib/cjs/BatchedTilesetReader.js +15 -10
  30. package/lib/cjs/BatchedTilesetReader.js.map +1 -1
  31. package/lib/cjs/ModelGroup.d.ts +48 -0
  32. package/lib/cjs/ModelGroup.d.ts.map +1 -0
  33. package/lib/cjs/ModelGroup.js +89 -0
  34. package/lib/cjs/ModelGroup.js.map +1 -0
  35. package/lib/cjs/ModelGroupDisplayTransforms.d.ts +22 -0
  36. package/lib/cjs/ModelGroupDisplayTransforms.d.ts.map +1 -0
  37. package/lib/cjs/ModelGroupDisplayTransforms.js +62 -0
  38. package/lib/cjs/ModelGroupDisplayTransforms.js.map +1 -0
  39. package/lib/esm/BatchedModelGroups.d.ts +45 -0
  40. package/lib/esm/BatchedModelGroups.d.ts.map +1 -0
  41. package/lib/esm/BatchedModelGroups.js +106 -0
  42. package/lib/esm/BatchedModelGroups.js.map +1 -0
  43. package/lib/esm/BatchedModels.d.ts +3 -2
  44. package/lib/esm/BatchedModels.d.ts.map +1 -1
  45. package/lib/esm/BatchedModels.js +3 -3
  46. package/lib/esm/BatchedModels.js.map +1 -1
  47. package/lib/esm/BatchedSpatialTileTreeRefs.d.ts.map +1 -1
  48. package/lib/esm/BatchedSpatialTileTreeRefs.js +59 -38
  49. package/lib/esm/BatchedSpatialTileTreeRefs.js.map +1 -1
  50. package/lib/esm/BatchedTile.d.ts.map +1 -1
  51. package/lib/esm/BatchedTile.js +3 -0
  52. package/lib/esm/BatchedTile.js.map +1 -1
  53. package/lib/esm/BatchedTileTree.d.ts +5 -4
  54. package/lib/esm/BatchedTileTree.d.ts.map +1 -1
  55. package/lib/esm/BatchedTileTree.js +1 -0
  56. package/lib/esm/BatchedTileTree.js.map +1 -1
  57. package/lib/esm/BatchedTileTreeReference.d.ts +25 -27
  58. package/lib/esm/BatchedTileTreeReference.d.ts.map +1 -1
  59. package/lib/esm/BatchedTileTreeReference.js +63 -41
  60. package/lib/esm/BatchedTileTreeReference.js.map +1 -1
  61. package/lib/esm/BatchedTileTreeSupplier.d.ts +5 -0
  62. package/lib/esm/BatchedTileTreeSupplier.d.ts.map +1 -1
  63. package/lib/esm/BatchedTileTreeSupplier.js +5 -3
  64. package/lib/esm/BatchedTileTreeSupplier.js.map +1 -1
  65. package/lib/esm/BatchedTilesetReader.d.ts +24 -7
  66. package/lib/esm/BatchedTilesetReader.d.ts.map +1 -1
  67. package/lib/esm/BatchedTilesetReader.js +15 -10
  68. package/lib/esm/BatchedTilesetReader.js.map +1 -1
  69. package/lib/esm/ModelGroup.d.ts +48 -0
  70. package/lib/esm/ModelGroup.d.ts.map +1 -0
  71. package/lib/esm/ModelGroup.js +85 -0
  72. package/lib/esm/ModelGroup.js.map +1 -0
  73. package/lib/esm/ModelGroupDisplayTransforms.d.ts +22 -0
  74. package/lib/esm/ModelGroupDisplayTransforms.d.ts.map +1 -0
  75. package/lib/esm/ModelGroupDisplayTransforms.js +58 -0
  76. package/lib/esm/ModelGroupDisplayTransforms.js.map +1 -0
  77. package/package.json +12 -14
@@ -1 +1 @@
1
- {"version":3,"file":"BatchedTileTree.js","sourceRoot":"","sources":["../../src/BatchedTileTree.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;;;AAE/F,sDAA8D;AAE9D,oDAA8F;AAC9F,wDAE8B;AAC9B,+CAA+D;AAE/D,mDAAuD;AAEvD,MAAM,gBAAgB,GAAsB;IAC1C,UAAU,EAAE,wBAAU,CAAC,WAAW;IAClC,YAAY,EAAE,KAAK;CACpB,CAAC;AAUF,gBAAgB;AAChB,MAAa,eAAgB,SAAQ,wBAAQ;IAM3C,YAAmB,MAA6B;QAC9C,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,SAAS,GAAG,IAAI,yBAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC;QAEpC,IAAI,CAAC,OAAO,GAAG,IAAA,kCAAkB,EAAC;YAChC,IAAI,EAAE,uBAAS,CAAC,OAAO;YACvB,QAAQ,EAAE,IAAI,CAAC,cAAc;YAC7B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,YAAY,EAAE,IAAI,CAAC,OAAO;YAC1B,IAAI,EAAE,IAAI;YACV,sBAAsB,EAAE,KAAK;YAC7B,QAAQ,EAAE,CAAC,yBAAS,CAAC,SAAS,CAAC,kBAAkB;SAClD,CAAC,CAAC;IACL,CAAC;IAEe,OAAO;QACrB,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACvB,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;IAED,IAAoB,QAAQ;QAC1B,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,IAAoB,IAAI;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAoB,QAAQ;QAC1B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAoB,iBAAiB;QACnC,OAAO,oCAAoB,CAAC,WAAW,CAAC,CAAC,CAAA,EAAG,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAClE,CAAC;IAED,gEAAgE;IAChD,YAAY,CAAC,IAAkB;QAC7C,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAe,CAAC;QACxC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QACrD,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAEe,IAAI,CAAC,IAAkB;QACrC,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACrC,KAAK,MAAM,IAAI,IAAI,KAAK;YACtB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAE1B,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAEe,KAAK;QACnB,MAAM,SAAS,GAAG,0BAAW,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC/D,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACjC,CAAC;CACF;AA/DD,0CA+DC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n\r\nimport { BeTimePoint, Id64String } from \"@itwin/core-bentley\";\r\nimport { Range3d } from \"@itwin/core-geometry\";\r\nimport { BatchType, RenderMode, RenderSchedule, ViewFlagOverrides } from \"@itwin/core-common\";\r\nimport {\r\n acquireImdlDecoder, ImdlDecoder, IModelApp, Tile, TileDrawArgs, TileTree, TileTreeParams,\r\n} from \"@itwin/core-frontend\";\r\nimport { BatchedTile, BatchedTileParams } from \"./BatchedTile\";\r\nimport { BatchedTilesetReader } from \"./BatchedTilesetReader\";\r\nimport { frontendTilesOptions } from \"./FrontendTiles\";\r\n\r\nconst defaultViewFlags: ViewFlagOverrides = {\r\n renderMode: RenderMode.SmoothShade,\r\n visibleEdges: false,\r\n};\r\n\r\n/** @internal */\r\nexport interface BatchedTileTreeParams extends TileTreeParams {\r\n rootTile: BatchedTileParams;\r\n reader: BatchedTilesetReader;\r\n script?: RenderSchedule.Script;\r\n includedModels?: Map<Id64String, Range3d>;\r\n}\r\n\r\n/** @internal */\r\nexport class BatchedTileTree extends TileTree {\r\n private readonly _rootTile: BatchedTile;\r\n public readonly reader: BatchedTilesetReader;\r\n public readonly scheduleScript?: RenderSchedule.Script;\r\n public readonly decoder: ImdlDecoder;\r\n\r\n public constructor(params: BatchedTileTreeParams) {\r\n super(params);\r\n this._rootTile = new BatchedTile(params.rootTile, this);\r\n this.reader = params.reader;\r\n this.scheduleScript = params.script;\r\n\r\n this.decoder = acquireImdlDecoder({\r\n type: BatchType.Primary,\r\n timeline: this.scheduleScript,\r\n iModel: this.iModel,\r\n batchModelId: this.modelId,\r\n is3d: true,\r\n containsTransformNodes: false,\r\n noWorker: !IModelApp.tileAdmin.decodeImdlInWorker,\r\n });\r\n }\r\n\r\n public override dispose(): void {\r\n this.decoder.release();\r\n super.dispose();\r\n }\r\n\r\n public override get rootTile(): BatchedTile {\r\n return this._rootTile;\r\n }\r\n\r\n public override get is3d(): boolean {\r\n return true;\r\n }\r\n\r\n public override get maxDepth(): number | undefined {\r\n return undefined;\r\n }\r\n\r\n public override get viewFlagOverrides(): ViewFlagOverrides {\r\n return frontendTilesOptions.enableEdges ?{ } : defaultViewFlags;\r\n }\r\n\r\n // eslint-disable-next-line @typescript-eslint/naming-convention\r\n public override _selectTiles(args: TileDrawArgs): Tile[] {\r\n const selected = new Set<BatchedTile>();\r\n this.rootTile.selectTiles(selected, args, undefined);\r\n return Array.from(selected);\r\n }\r\n\r\n public override draw(args: TileDrawArgs): void {\r\n const tiles = this.selectTiles(args);\r\n for (const tile of tiles)\r\n tile.drawGraphics(args);\r\n\r\n args.drawGraphics();\r\n }\r\n\r\n public override prune(): void {\r\n const olderThan = BeTimePoint.now().minus(this.expirationTime);\r\n this.rootTile.prune(olderThan);\r\n }\r\n}\r\n"]}
1
+ {"version":3,"file":"BatchedTileTree.js","sourceRoot":"","sources":["../../src/BatchedTileTree.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;;;AAE/F,sDAAuE;AACvE,oDAA8F;AAC9F,wDAE8B;AAC9B,+CAA+D;AAE/D,mDAAuD;AAEvD,MAAM,gBAAgB,GAAsB;IAC1C,UAAU,EAAE,wBAAU,CAAC,WAAW;IAClC,YAAY,EAAE,KAAK;CACpB,CAAC;AAWF,gBAAgB;AAChB,MAAa,eAAgB,SAAQ,wBAAQ;IAO3C,YAAmB,MAA6B;QAC9C,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,SAAS,GAAG,IAAI,yBAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC;QACpC,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QAEtC,IAAI,CAAC,OAAO,GAAG,IAAA,kCAAkB,EAAC;YAChC,IAAI,EAAE,uBAAS,CAAC,OAAO;YACvB,QAAQ,EAAE,IAAI,CAAC,cAAc;YAC7B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,YAAY,EAAE,IAAI,CAAC,OAAO;YAC1B,IAAI,EAAE,IAAI;YACV,sBAAsB,EAAE,KAAK;YAC7B,QAAQ,EAAE,CAAC,yBAAS,CAAC,SAAS,CAAC,kBAAkB;SAClD,CAAC,CAAC;IACL,CAAC;IAEe,OAAO;QACrB,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACvB,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;IAED,IAAoB,QAAQ;QAC1B,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,IAAoB,IAAI;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAoB,QAAQ;QAC1B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAoB,iBAAiB;QACnC,OAAO,oCAAoB,CAAC,WAAW,CAAC,CAAC,CAAA,EAAG,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAClE,CAAC;IAED,gEAAgE;IAChD,YAAY,CAAC,IAAkB;QAC7C,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAe,CAAC;QACxC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QACrD,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAEe,IAAI,CAAC,IAAkB;QACrC,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACrC,KAAK,MAAM,IAAI,IAAI,KAAK;YACtB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAE1B,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAEe,KAAK;QACnB,MAAM,SAAS,GAAG,0BAAW,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC/D,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACjC,CAAC;CACF;AAjED,0CAiEC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n\r\nimport { BeTimePoint, Id64Set, Id64String } from \"@itwin/core-bentley\";\r\nimport { BatchType, RenderMode, RenderSchedule, ViewFlagOverrides } from \"@itwin/core-common\";\r\nimport {\r\n acquireImdlDecoder, ImdlDecoder, IModelApp, Tile, TileDrawArgs, TileTree, TileTreeParams,\r\n} from \"@itwin/core-frontend\";\r\nimport { BatchedTile, BatchedTileParams } from \"./BatchedTile\";\r\nimport { BatchedTilesetReader, ModelMetadata } from \"./BatchedTilesetReader\";\r\nimport { frontendTilesOptions } from \"./FrontendTiles\";\r\n\r\nconst defaultViewFlags: ViewFlagOverrides = {\r\n renderMode: RenderMode.SmoothShade,\r\n visibleEdges: false,\r\n};\r\n\r\n/** @internal */\r\nexport interface BatchedTileTreeParams extends TileTreeParams {\r\n rootTile: BatchedTileParams;\r\n reader: BatchedTilesetReader;\r\n script?: RenderSchedule.Script;\r\n models: Map<Id64String, ModelMetadata>;\r\n modelGroups: Id64Set[] | undefined;\r\n}\r\n\r\n/** @internal */\r\nexport class BatchedTileTree extends TileTree {\r\n private readonly _rootTile: BatchedTile;\r\n public readonly reader: BatchedTilesetReader;\r\n public readonly scheduleScript?: RenderSchedule.Script;\r\n public readonly decoder: ImdlDecoder;\r\n public readonly modelGroups: Id64Set[] | undefined;\r\n\r\n public constructor(params: BatchedTileTreeParams) {\r\n super(params);\r\n this._rootTile = new BatchedTile(params.rootTile, this);\r\n this.reader = params.reader;\r\n this.scheduleScript = params.script;\r\n this.modelGroups = params.modelGroups;\r\n\r\n this.decoder = acquireImdlDecoder({\r\n type: BatchType.Primary,\r\n timeline: this.scheduleScript,\r\n iModel: this.iModel,\r\n batchModelId: this.modelId,\r\n is3d: true,\r\n containsTransformNodes: false,\r\n noWorker: !IModelApp.tileAdmin.decodeImdlInWorker,\r\n });\r\n }\r\n\r\n public override dispose(): void {\r\n this.decoder.release();\r\n super.dispose();\r\n }\r\n\r\n public override get rootTile(): BatchedTile {\r\n return this._rootTile;\r\n }\r\n\r\n public override get is3d(): boolean {\r\n return true;\r\n }\r\n\r\n public override get maxDepth(): number | undefined {\r\n return undefined;\r\n }\r\n\r\n public override get viewFlagOverrides(): ViewFlagOverrides {\r\n return frontendTilesOptions.enableEdges ?{ } : defaultViewFlags;\r\n }\r\n\r\n // eslint-disable-next-line @typescript-eslint/naming-convention\r\n public override _selectTiles(args: TileDrawArgs): Tile[] {\r\n const selected = new Set<BatchedTile>();\r\n this.rootTile.selectTiles(selected, args, undefined);\r\n return Array.from(selected);\r\n }\r\n\r\n public override draw(args: TileDrawArgs): void {\r\n const tiles = this.selectTiles(args);\r\n for (const tile of tiles)\r\n tile.drawGraphics(args);\r\n\r\n args.drawGraphics();\r\n }\r\n\r\n public override prune(): void {\r\n const olderThan = BeTimePoint.now().minus(this.expirationTime);\r\n this.rootTile.prune(olderThan);\r\n }\r\n}\r\n"]}
@@ -1,34 +1,32 @@
1
1
  import { Range3d, Transform } from "@itwin/core-geometry";
2
- import { BatchType, FeatureAppearance, FeatureAppearanceProvider, FeatureAppearanceSource, GeometryClass, RenderSchedule } from "@itwin/core-common";
3
- import { AnimationNodeId, SceneContext, TileDrawArgs, TileTree, TileTreeOwner, TileTreeReference } from "@itwin/core-frontend";
2
+ import { BatchType, FeatureAppearance, FeatureAppearanceProvider, FeatureAppearanceSource, GeometryClass, ViewFlagOverrides } from "@itwin/core-common";
3
+ import { RenderClipVolume, SceneContext, TileDrawArgs, TileTree, TileTreeOwner, TileTreeReference } from "@itwin/core-frontend";
4
4
  import { BatchedModels } from "./BatchedModels";
5
- /** @internal */
6
- export declare abstract class BatchedTileTreeReference extends TileTreeReference {
7
- protected readonly _treeOwner: TileTreeOwner;
8
- protected constructor(treeOwner: TileTreeOwner);
9
- get treeOwner(): TileTreeOwner;
10
- protected computeBaseTransform(tree: TileTree): Transform;
11
- protected computeTransform(tree: TileTree): Transform;
5
+ import { ModelGroupInfo } from "./ModelGroup";
6
+ export interface BatchedTileTreeReferenceArgs {
7
+ readonly models: BatchedModels;
8
+ readonly groups: ReadonlyArray<ModelGroupInfo>;
9
+ readonly treeOwner: TileTreeOwner;
10
+ readonly getCurrentTimePoint: () => number;
12
11
  }
13
- export declare class PrimaryBatchedTileTreeReference extends BatchedTileTreeReference implements FeatureAppearanceProvider {
14
- private readonly _models;
15
- constructor(treeOwner: TileTreeOwner, models: BatchedModels);
16
- unionFitRange(range: Range3d): void;
17
- getAppearanceProvider(): FeatureAppearanceProvider | undefined;
12
+ export declare class BatchedTileTreeReference extends TileTreeReference implements FeatureAppearanceProvider {
13
+ private readonly _args;
14
+ private readonly _groupIndex;
15
+ private readonly _animationNodeId?;
16
+ private readonly _branchId?;
17
+ constructor(args: BatchedTileTreeReferenceArgs, groupIndex: number, animationNodeId: number | undefined);
18
+ private get _groupInfo();
19
+ get treeOwner(): TileTreeOwner;
20
+ getAppearanceProvider(): FeatureAppearanceProvider;
21
+ protected getClipVolume(): RenderClipVolume | undefined;
18
22
  getFeatureAppearance(source: FeatureAppearanceSource, elemLo: number, elemHi: number, subcatLo: number, subcatHi: number, geomClass: GeometryClass, modelLo: number, modelHi: number, type: BatchType, animationNodeId: number): FeatureAppearance | undefined;
19
- getAnimationTransformNodeId(): AnimationNodeId;
20
- }
21
- export interface AnimationNode {
22
- readonly timeline: RenderSchedule.ModelTimeline;
23
- readonly nodeId: number;
24
- getCurrentTimePoint(): number;
25
- }
26
- export declare class AnimatedBatchedTileTreeReference extends BatchedTileTreeReference {
27
- private readonly _node;
28
- private readonly _branchId;
29
- constructor(treeOwner: TileTreeOwner, node: AnimationNode);
30
- getAnimationTransformNodeId(): number;
31
- computeBaseTransform(tree: TileTree): Transform;
23
+ unionFitRange(range: Range3d): void;
24
+ get castsShadows(): boolean;
25
+ getViewFlagOverrides(): ViewFlagOverrides;
26
+ draw(args: TileDrawArgs): void;
27
+ protected computeTransform(tree: TileTree): Transform;
28
+ protected getAnimationTransformNodeId(): number | undefined;
29
+ protected getGroupNodeId(): number | undefined;
32
30
  createDrawArgs(context: SceneContext): TileDrawArgs | undefined;
33
31
  }
34
32
  //# sourceMappingURL=BatchedTileTreeReference.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"BatchedTileTreeReference.d.ts","sourceRoot":"","sources":["../../src/BatchedTileTreeReference.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EACL,SAAS,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,aAAa,EAAE,cAAc,EAChH,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,eAAe,EAA2B,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,iBAAiB,EACjH,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,gBAAgB;AAChB,8BAAsB,wBAAyB,SAAQ,iBAAiB;IACtE,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,aAAa,CAAC;IAE7C,SAAS,aAAa,SAAS,EAAE,aAAa;IAK9C,IAAoB,SAAS,IAAI,aAAa,CAE7C;IAED,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS;cAItC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS;CAK/D;AAED,qBAAa,+BAAgC,SAAQ,wBAAyB,YAAW,yBAAyB;IAChH,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;gBAErB,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa;IAKlD,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC,qBAAqB,IAAI,yBAAyB,GAAG,SAAS;IAIvE,oBAAoB,CACzB,MAAM,EAAE,uBAAuB,EAC/B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAC9B,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAClC,SAAS,EAAE,aAAa,EACxB,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAChC,IAAI,EAAE,SAAS,EACf,eAAe,EAAE,MAAM,GACtB,iBAAiB,GAAG,SAAS;IAOhB,2BAA2B;CAG5C;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC,aAAa,CAAC;IAChD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,mBAAmB,IAAI,MAAM,CAAC;CAC/B;AAED,qBAAa,gCAAiC,SAAQ,wBAAwB;IAC5E,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;gBAEhB,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa;IAMhD,2BAA2B,IAAI,MAAM;IAIrC,oBAAoB,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS;IAS/C,cAAc,CAAC,OAAO,EAAE,YAAY,GAAG,YAAY,GAAG,SAAS;CAShF"}
1
+ {"version":3,"file":"BatchedTileTreeReference.d.ts","sourceRoot":"","sources":["../../src/BatchedTileTreeReference.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EACL,SAAS,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,aAAa,EAAE,iBAAiB,EACnH,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACoB,gBAAgB,EAAE,YAAY,EAAE,YAAY,EAAmB,QAAQ,EAAE,aAAa,EAAE,iBAAiB,EACnI,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC;IAC/C,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;IAClC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,MAAM,CAAC;CAC5C;AAED,qBAAa,wBAAyB,SAAQ,iBAAkB,YAAW,yBAAyB;IAClG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA+B;IACrD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAS;gBAEjB,IAAI,EAAE,4BAA4B,EAAE,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,SAAS;IAW9G,OAAO,KAAK,UAAU,GAGrB;IAED,IAAoB,SAAS,IAAI,aAAa,CAE7C;IAEe,qBAAqB,IAAI,yBAAyB;cAI/C,aAAa,IAAI,gBAAgB,GAAG,SAAS;IAIzD,oBAAoB,CACzB,MAAM,EAAE,uBAAuB,EAC/B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAC9B,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAClC,SAAS,EAAE,aAAa,EACxB,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAChC,IAAI,EAAE,SAAS,EACf,eAAe,EAAE,MAAM,GACtB,iBAAiB,GAAG,SAAS;IAOhB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInD,IAAoB,YAAY,IAAI,OAAO,CAK1C;IAEe,oBAAoB,IAAI,iBAAiB;IAIzC,IAAI,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI;cAO3B,gBAAgB,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS;cAuB3C,2BAA2B;cAI3B,cAAc;IAIjB,cAAc,CAAC,OAAO,EAAE,YAAY,GAAG,YAAY,GAAG,SAAS;CAgBhF"}
@@ -4,72 +4,92 @@
4
4
  * See LICENSE.md in the project root for license terms and full copyright notice.
5
5
  *--------------------------------------------------------------------------------------------*/
6
6
  Object.defineProperty(exports, "__esModule", { value: true });
7
- exports.AnimatedBatchedTileTreeReference = exports.PrimaryBatchedTileTreeReference = exports.BatchedTileTreeReference = void 0;
7
+ exports.BatchedTileTreeReference = void 0;
8
+ const core_bentley_1 = require("@itwin/core-bentley");
8
9
  const core_frontend_1 = require("@itwin/core-frontend");
9
- /** @internal */
10
10
  class BatchedTileTreeReference extends core_frontend_1.TileTreeReference {
11
- constructor(treeOwner) {
11
+ constructor(args, groupIndex, animationNodeId) {
12
12
  super();
13
- this._treeOwner = treeOwner;
13
+ this._args = args;
14
+ this._groupIndex = groupIndex;
15
+ this._animationNodeId = animationNodeId;
16
+ if (undefined !== animationNodeId) {
17
+ (0, core_bentley_1.assert)(undefined !== this._groupInfo.timeline);
18
+ this._branchId = (0, core_frontend_1.formatAnimationBranchId)(this._groupInfo.timeline.modelId, animationNodeId);
19
+ }
14
20
  }
15
- get treeOwner() {
16
- return this._treeOwner;
17
- }
18
- computeBaseTransform(tree) {
19
- return super.computeTransform(tree);
20
- }
21
- computeTransform(tree) {
22
- const baseTf = this.computeBaseTransform(tree);
23
- // ###TODO this.view.modelDisplayTransformProvider?.getModelDisplayTransform(modelId...)
24
- return baseTf;
25
- }
26
- }
27
- exports.BatchedTileTreeReference = BatchedTileTreeReference;
28
- class PrimaryBatchedTileTreeReference extends BatchedTileTreeReference {
29
- constructor(treeOwner, models) {
30
- super(treeOwner);
31
- this._models = models;
21
+ get _groupInfo() {
22
+ (0, core_bentley_1.assert)(this._groupIndex < this._args.groups.length);
23
+ return this._args.groups[this._groupIndex];
32
24
  }
33
- unionFitRange(range) {
34
- this._models.unionRange(range);
25
+ get treeOwner() {
26
+ return this._args.treeOwner;
35
27
  }
36
28
  getAppearanceProvider() {
37
29
  return this;
38
30
  }
31
+ getClipVolume() {
32
+ return this._groupInfo.clip;
33
+ }
39
34
  getFeatureAppearance(source, elemLo, elemHi, subcatLo, subcatHi, geomClass, modelLo, modelHi, type, animationNodeId) {
40
- if (!this._models.isViewed(modelLo, modelHi))
35
+ if (!this._args.models.isViewed(modelLo, modelHi))
41
36
  return undefined;
42
37
  return source.getAppearance(elemLo, elemHi, subcatLo, subcatHi, geomClass, modelLo, modelHi, type, animationNodeId);
43
38
  }
44
- getAnimationTransformNodeId() {
45
- return core_frontend_1.AnimationNodeId.Untransformed;
39
+ unionFitRange(range) {
40
+ this._args.models.unionRange(range);
46
41
  }
47
- }
48
- exports.PrimaryBatchedTileTreeReference = PrimaryBatchedTileTreeReference;
49
- class AnimatedBatchedTileTreeReference extends BatchedTileTreeReference {
50
- constructor(treeOwner, node) {
51
- super(treeOwner);
52
- this._node = node;
53
- this._branchId = (0, core_frontend_1.formatAnimationBranchId)(node.timeline.modelId, node.nodeId);
42
+ get castsShadows() {
43
+ if (this._groupInfo.planProjection)
44
+ return false;
45
+ return super.castsShadows;
46
+ }
47
+ getViewFlagOverrides() {
48
+ return this._groupInfo.viewFlags;
49
+ }
50
+ draw(args) {
51
+ if (this._groupInfo.planProjection?.overlay)
52
+ args.context.withGraphicType(core_frontend_1.TileGraphicType.Overlay, () => args.tree.draw(args));
53
+ else
54
+ super.draw(args);
55
+ }
56
+ computeTransform(tree) {
57
+ const group = this._groupInfo;
58
+ let baseTf = super.computeTransform(tree);
59
+ if (group.planProjection) {
60
+ baseTf = baseTf.clone();
61
+ baseTf.origin.z += group.planProjection.elevation;
62
+ }
63
+ if (group.timeline) {
64
+ (0, core_bentley_1.assert)(undefined !== this._animationNodeId);
65
+ const animTf = group.timeline.getTransform(this._animationNodeId, this._args.getCurrentTimePoint());
66
+ if (animTf)
67
+ animTf.multiplyTransformTransform(baseTf, baseTf);
68
+ }
69
+ const displayTf = group.displayTransform;
70
+ if (!displayTf)
71
+ return baseTf;
72
+ return displayTf.premultiply ? displayTf.transform.multiplyTransformTransform(baseTf) : baseTf.multiplyTransformTransform(displayTf.transform);
54
73
  }
55
74
  getAnimationTransformNodeId() {
56
- return this._node.nodeId;
75
+ return this._animationNodeId;
57
76
  }
58
- computeBaseTransform(tree) {
59
- const tf = super.computeBaseTransform(tree);
60
- const animTf = this._node.timeline.getTransform(this._node.nodeId, this._node.getCurrentTimePoint());
61
- if (animTf)
62
- animTf.multiplyTransformTransform(tf, tf);
63
- return tf;
77
+ getGroupNodeId() {
78
+ return this._args.groups.length > 1 ? this._groupIndex : undefined;
64
79
  }
65
80
  createDrawArgs(context) {
66
- const animBranch = context.viewport.target.animationBranches?.branchStates.get(this._branchId);
67
- if (animBranch && animBranch.omit)
68
- return undefined;
81
+ if (this._branchId) {
82
+ const branch = context.viewport.target.animationBranches?.branchStates.get(this._branchId);
83
+ if (branch?.omit) {
84
+ // This branch is not supposed to be drawn
85
+ return undefined;
86
+ }
87
+ }
69
88
  const args = super.createDrawArgs(context);
70
89
  // ###TODO args.boundingRange = args.tree.getTransformNodeRange(this._animationTransformNodeId);
90
+ // ###TODO if PlanProjectionSettings.enforceDisplayPriority, createGraphicLayerContainer.
71
91
  return args;
72
92
  }
73
93
  }
74
- exports.AnimatedBatchedTileTreeReference = AnimatedBatchedTileTreeReference;
94
+ exports.BatchedTileTreeReference = BatchedTileTreeReference;
75
95
  //# sourceMappingURL=BatchedTileTreeReference.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"BatchedTileTreeReference.js","sourceRoot":"","sources":["../../src/BatchedTileTreeReference.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n\r\nimport { Range3d, Transform } from \"@itwin/core-geometry\";\r\nimport {\r\n BatchType, FeatureAppearance, FeatureAppearanceProvider, FeatureAppearanceSource, GeometryClass, RenderSchedule,\r\n} from \"@itwin/core-common\";\r\nimport {\r\n AnimationNodeId, formatAnimationBranchId, SceneContext, TileDrawArgs, TileTree, TileTreeOwner, TileTreeReference,\r\n} from \"@itwin/core-frontend\";\r\nimport { BatchedModels } from \"./BatchedModels\";\r\n\r\n/** @internal */\r\nexport abstract class BatchedTileTreeReference extends TileTreeReference {\r\n protected readonly _treeOwner: TileTreeOwner;\r\n\r\n protected constructor(treeOwner: TileTreeOwner) {\r\n super();\r\n this._treeOwner = treeOwner;\r\n }\r\n\r\n public override get treeOwner(): TileTreeOwner {\r\n return this._treeOwner;\r\n }\r\n\r\n protected computeBaseTransform(tree: TileTree): Transform {\r\n return super.computeTransform(tree);\r\n }\r\n\r\n protected override computeTransform(tree: TileTree): Transform {\r\n const baseTf = this.computeBaseTransform(tree);\r\n // ###TODO this.view.modelDisplayTransformProvider?.getModelDisplayTransform(modelId...)\r\n return baseTf;\r\n }\r\n}\r\n\r\nexport class PrimaryBatchedTileTreeReference extends BatchedTileTreeReference implements FeatureAppearanceProvider {\r\n private readonly _models: BatchedModels;\r\n\r\n public constructor(treeOwner: TileTreeOwner, models: BatchedModels) {\r\n super(treeOwner);\r\n this._models = models;\r\n }\r\n\r\n public override unionFitRange(range: Range3d): void {\r\n this._models.unionRange(range);\r\n }\r\n\r\n public override getAppearanceProvider(): FeatureAppearanceProvider | undefined {\r\n return this;\r\n }\r\n\r\n public getFeatureAppearance(\r\n source: FeatureAppearanceSource,\r\n elemLo: number, elemHi: number,\r\n subcatLo: number, subcatHi: number,\r\n geomClass: GeometryClass,\r\n modelLo: number, modelHi: number,\r\n type: BatchType,\r\n animationNodeId: number,\r\n ): FeatureAppearance | undefined {\r\n if (!this._models.isViewed(modelLo, modelHi))\r\n return undefined;\r\n\r\n return source.getAppearance(elemLo, elemHi, subcatLo, subcatHi, geomClass, modelLo, modelHi, type, animationNodeId);\r\n }\r\n\r\n public override getAnimationTransformNodeId() {\r\n return AnimationNodeId.Untransformed;\r\n }\r\n}\r\n\r\nexport interface AnimationNode {\r\n readonly timeline: RenderSchedule.ModelTimeline;\r\n readonly nodeId: number;\r\n getCurrentTimePoint(): number;\r\n}\r\n\r\nexport class AnimatedBatchedTileTreeReference extends BatchedTileTreeReference {\r\n private readonly _node: AnimationNode;\r\n private readonly _branchId: string;\r\n\r\n public constructor(treeOwner: TileTreeOwner, node: AnimationNode) {\r\n super(treeOwner);\r\n this._node = node;\r\n this._branchId = formatAnimationBranchId(node.timeline.modelId, node.nodeId);\r\n }\r\n\r\n public override getAnimationTransformNodeId(): number {\r\n return this._node.nodeId;\r\n }\r\n\r\n public override computeBaseTransform(tree: TileTree): Transform {\r\n const tf = super.computeBaseTransform(tree);\r\n const animTf = this._node.timeline.getTransform(this._node.nodeId, this._node.getCurrentTimePoint());\r\n if (animTf)\r\n animTf.multiplyTransformTransform(tf, tf);\r\n\r\n return tf;\r\n }\r\n\r\n public override createDrawArgs(context: SceneContext): TileDrawArgs | undefined {\r\n const animBranch = context.viewport.target.animationBranches?.branchStates.get(this._branchId);\r\n if (animBranch && animBranch.omit)\r\n return undefined;\r\n\r\n const args = super.createDrawArgs(context);\r\n // ###TODO args.boundingRange = args.tree.getTransformNodeRange(this._animationTransformNodeId);\r\n return args;\r\n }\r\n}\r\n"]}
1
+ {"version":3,"file":"BatchedTileTreeReference.js","sourceRoot":"","sources":["../../src/BatchedTileTreeReference.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n\r\nimport { assert } from \"@itwin/core-bentley\";\r\nimport { Range3d, Transform } from \"@itwin/core-geometry\";\r\nimport {\r\n BatchType, FeatureAppearance, FeatureAppearanceProvider, FeatureAppearanceSource, GeometryClass, ViewFlagOverrides,\r\n} from \"@itwin/core-common\";\r\nimport {\r\n formatAnimationBranchId, RenderClipVolume, SceneContext, TileDrawArgs, TileGraphicType, TileTree, TileTreeOwner, TileTreeReference,\r\n} from \"@itwin/core-frontend\";\r\nimport { BatchedModels } from \"./BatchedModels\";\r\nimport { ModelGroupInfo } from \"./ModelGroup\";\r\n\r\nexport interface BatchedTileTreeReferenceArgs {\r\n readonly models: BatchedModels;\r\n readonly groups: ReadonlyArray<ModelGroupInfo>;\r\n readonly treeOwner: TileTreeOwner;\r\n readonly getCurrentTimePoint: () => number;\r\n}\r\n\r\nexport class BatchedTileTreeReference extends TileTreeReference implements FeatureAppearanceProvider {\r\n private readonly _args: BatchedTileTreeReferenceArgs;\r\n private readonly _groupIndex: number;\r\n private readonly _animationNodeId?: number;\r\n private readonly _branchId?: string;\r\n\r\n public constructor(args: BatchedTileTreeReferenceArgs, groupIndex: number, animationNodeId: number | undefined) {\r\n super();\r\n this._args = args;\r\n this._groupIndex = groupIndex;\r\n this._animationNodeId = animationNodeId;\r\n if (undefined !== animationNodeId) {\r\n assert(undefined !== this._groupInfo.timeline);\r\n this._branchId = formatAnimationBranchId(this._groupInfo.timeline.modelId, animationNodeId);\r\n }\r\n }\r\n\r\n private get _groupInfo(): ModelGroupInfo {\r\n assert(this._groupIndex < this._args.groups.length);\r\n return this._args.groups[this._groupIndex];\r\n }\r\n\r\n public override get treeOwner(): TileTreeOwner {\r\n return this._args.treeOwner;\r\n }\r\n\r\n public override getAppearanceProvider(): FeatureAppearanceProvider {\r\n return this;\r\n }\r\n\r\n protected override getClipVolume(): RenderClipVolume | undefined {\r\n return this._groupInfo.clip;\r\n }\r\n\r\n public getFeatureAppearance(\r\n source: FeatureAppearanceSource,\r\n elemLo: number, elemHi: number,\r\n subcatLo: number, subcatHi: number,\r\n geomClass: GeometryClass,\r\n modelLo: number, modelHi: number,\r\n type: BatchType,\r\n animationNodeId: number,\r\n ): FeatureAppearance | undefined {\r\n if (!this._args.models.isViewed(modelLo, modelHi))\r\n return undefined;\r\n\r\n return source.getAppearance(elemLo, elemHi, subcatLo, subcatHi, geomClass, modelLo, modelHi, type, animationNodeId);\r\n }\r\n\r\n public override unionFitRange(range: Range3d): void {\r\n this._args.models.unionRange(range);\r\n }\r\n\r\n public override get castsShadows(): boolean {\r\n if (this._groupInfo.planProjection)\r\n return false;\r\n\r\n return super.castsShadows;\r\n }\r\n\r\n public override getViewFlagOverrides(): ViewFlagOverrides {\r\n return this._groupInfo.viewFlags;\r\n }\r\n\r\n public override draw(args: TileDrawArgs): void {\r\n if (this._groupInfo.planProjection?.overlay)\r\n args.context.withGraphicType(TileGraphicType.Overlay, () => args.tree.draw(args));\r\n else\r\n super.draw(args);\r\n }\r\n\r\n protected override computeTransform(tree: TileTree): Transform {\r\n const group = this._groupInfo;\r\n let baseTf = super.computeTransform(tree);\r\n\r\n if (group.planProjection) {\r\n baseTf = baseTf.clone();\r\n baseTf.origin.z += group.planProjection.elevation;\r\n }\r\n\r\n if (group.timeline) {\r\n assert(undefined !== this._animationNodeId);\r\n const animTf = group.timeline.getTransform(this._animationNodeId, this._args.getCurrentTimePoint());\r\n if (animTf)\r\n animTf.multiplyTransformTransform(baseTf, baseTf);\r\n }\r\n\r\n const displayTf = group.displayTransform;\r\n if (!displayTf)\r\n return baseTf;\r\n\r\n return displayTf.premultiply ? displayTf.transform.multiplyTransformTransform(baseTf) : baseTf.multiplyTransformTransform(displayTf.transform);\r\n }\r\n\r\n protected override getAnimationTransformNodeId() {\r\n return this._animationNodeId;\r\n }\r\n\r\n protected override getGroupNodeId() {\r\n return this._args.groups.length > 1 ? this._groupIndex : undefined;\r\n }\r\n\r\n public override createDrawArgs(context: SceneContext): TileDrawArgs | undefined {\r\n if (this._branchId) {\r\n const branch = context.viewport.target.animationBranches?.branchStates.get(this._branchId);\r\n if (branch?.omit) {\r\n // This branch is not supposed to be drawn\r\n return undefined;\r\n }\r\n }\r\n\r\n const args = super.createDrawArgs(context);\r\n\r\n // ###TODO args.boundingRange = args.tree.getTransformNodeRange(this._animationTransformNodeId);\r\n // ###TODO if PlanProjectionSettings.enforceDisplayPriority, createGraphicLayerContainer.\r\n\r\n return args;\r\n }\r\n}\r\n"]}
@@ -5,6 +5,11 @@ import { BatchedTilesetSpec } from "./BatchedTilesetReader";
5
5
  export interface BatchedTileTreeId {
6
6
  spec: BatchedTilesetSpec;
7
7
  script?: RenderSchedule.Script;
8
+ /** A stringified representation of the [[ModelGroup]]s by which to structure the contents of the tiles.
9
+ * Every unique combination of model groups has a corresponding unique string representation.
10
+ * @see [[BatchedModelGroups.guid]].
11
+ */
12
+ modelGroups: string;
8
13
  }
9
14
  /** @internal */
10
15
  export declare function getBatchedTileTreeOwner(iModel: IModelConnection, treeId: BatchedTileTreeId): TileTreeOwner;
@@ -1 +1 @@
1
- {"version":3,"file":"BatchedTileTreeSupplier.d.ts","sourceRoot":"","sources":["../../src/BatchedTileTreeSupplier.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EACL,gBAAgB,EAAY,aAAa,EAC1C,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAwB,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAGlF,gBAAgB;AAChB,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,kBAAkB,CAAC;IACzB,MAAM,CAAC,EAAE,cAAc,CAAC,MAAM,CAAC;CAChC;AAyBD,gBAAgB;AAChB,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,iBAAiB,GAAG,aAAa,CAE1G"}
1
+ {"version":3,"file":"BatchedTileTreeSupplier.d.ts","sourceRoot":"","sources":["../../src/BatchedTileTreeSupplier.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EACL,gBAAgB,EAAY,aAAa,EAC1C,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAwB,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAGlF,gBAAgB;AAChB,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,kBAAkB,CAAC;IACzB,MAAM,CAAC,EAAE,cAAc,CAAC,MAAM,CAAC;IAC/B;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB;AA2BD,gBAAgB;AAChB,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,iBAAiB,GAAG,aAAa,CAE1G"}
@@ -11,13 +11,15 @@ const BatchedTilesetReader_1 = require("./BatchedTilesetReader");
11
11
  const BatchedTileTree_1 = require("./BatchedTileTree");
12
12
  class BatchedTileTreeSupplier {
13
13
  compareTileTreeIds(lhs, rhs) {
14
- return (0, core_bentley_1.compareStrings)(lhs.toString(), rhs.toString())
14
+ return (0, core_bentley_1.compareStrings)(lhs.spec.baseUrl.toString(), rhs.spec.baseUrl.toString())
15
+ || (0, core_bentley_1.compareStrings)(lhs.modelGroups, rhs.modelGroups)
15
16
  || (0, core_bentley_1.comparePossiblyUndefined)((x, y) => x.compareTo(y), lhs.script, rhs.script);
16
17
  }
17
18
  async createTileTree(treeId, iModel) {
18
19
  const spec = treeId.spec;
19
20
  try {
20
- const reader = new BatchedTilesetReader_1.BatchedTilesetReader(spec, iModel);
21
+ const modelGroups = treeId.modelGroups ? treeId.modelGroups.split("_").map((x) => core_bentley_1.CompressedId64Set.decompressSet(x)) : undefined;
22
+ const reader = new BatchedTilesetReader_1.BatchedTilesetReader(spec, iModel, modelGroups);
21
23
  const params = await reader.readTileTreeParams();
22
24
  params.script = treeId.script;
23
25
  return new BatchedTileTree_1.BatchedTileTree(params);
@@ -1 +1 @@
1
- {"version":3,"file":"BatchedTileTreeSupplier.js","sourceRoot":"","sources":["../../src/BatchedTileTreeSupplier.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;;;AAE/F,sDAAuF;AAKvF,qDAAkD;AAClD,iEAAkF;AAClF,uDAAoD;AAQpD,MAAM,uBAAuB;IACpB,kBAAkB,CAAC,GAAsB,EAAE,GAAsB;QACtE,OAAO,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC;eAChD,IAAA,uCAAwB,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAClF,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,MAAyB,EAAE,MAAwB;QAC7E,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACzB,IAAI;YACF,MAAM,MAAM,GAAG,IAAI,2CAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACtD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,kBAAkB,EAAE,CAAC;YAEjD,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;YAC9B,OAAO,IAAI,iCAAe,CAAC,MAAM,CAAC,CAAC;SACpC;QAAC,OAAO,GAAG,EAAE;YACZ,qBAAM,CAAC,YAAY,CAAC,+BAAc,EAAE,GAAG,CAAC,CAAC;YACzC,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;CACF;AAED,MAAM,uBAAuB,GAAqB,IAAI,uBAAuB,EAAE,CAAC;AAEhF,gBAAgB;AAChB,SAAgB,uBAAuB,CAAC,MAAwB,EAAE,MAAyB;IACzF,OAAO,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;AACxE,CAAC;AAFD,0DAEC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n\r\nimport { comparePossiblyUndefined, compareStrings, Logger } from \"@itwin/core-bentley\";\r\nimport { RenderSchedule } from \"@itwin/core-common\";\r\nimport {\r\n IModelConnection, TileTree, TileTreeOwner, TileTreeSupplier,\r\n} from \"@itwin/core-frontend\";\r\nimport { loggerCategory } from \"./LoggerCategory\";\r\nimport { BatchedTilesetReader, BatchedTilesetSpec } from \"./BatchedTilesetReader\";\r\nimport { BatchedTileTree } from \"./BatchedTileTree\";\r\n\r\n/** @internal */\r\nexport interface BatchedTileTreeId {\r\n spec: BatchedTilesetSpec;\r\n script?: RenderSchedule.Script;\r\n}\r\n\r\nclass BatchedTileTreeSupplier implements TileTreeSupplier {\r\n public compareTileTreeIds(lhs: BatchedTileTreeId, rhs: BatchedTileTreeId): number {\r\n return compareStrings(lhs.toString(), rhs.toString())\r\n || comparePossiblyUndefined((x, y) => x.compareTo(y), lhs.script, rhs.script);\r\n }\r\n\r\n public async createTileTree(treeId: BatchedTileTreeId, iModel: IModelConnection): Promise<TileTree | undefined> {\r\n const spec = treeId.spec;\r\n try {\r\n const reader = new BatchedTilesetReader(spec, iModel);\r\n const params = await reader.readTileTreeParams();\r\n\r\n params.script = treeId.script;\r\n return new BatchedTileTree(params);\r\n } catch (err) {\r\n Logger.logException(loggerCategory, err);\r\n return undefined;\r\n }\r\n }\r\n}\r\n\r\nconst batchedTileTreeSupplier: TileTreeSupplier = new BatchedTileTreeSupplier();\r\n\r\n/** @internal */\r\nexport function getBatchedTileTreeOwner(iModel: IModelConnection, treeId: BatchedTileTreeId): TileTreeOwner {\r\n return iModel.tiles.getTileTreeOwner(treeId, batchedTileTreeSupplier);\r\n}\r\n"]}
1
+ {"version":3,"file":"BatchedTileTreeSupplier.js","sourceRoot":"","sources":["../../src/BatchedTileTreeSupplier.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;;;AAE/F,sDAA0G;AAK1G,qDAAkD;AAClD,iEAAkF;AAClF,uDAAoD;AAapD,MAAM,uBAAuB;IACpB,kBAAkB,CAAC,GAAsB,EAAE,GAAsB;QACtE,OAAO,IAAA,6BAAc,EAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;eAC1E,IAAA,6BAAc,EAAC,GAAG,CAAC,WAAW,EAAE,GAAG,CAAC,WAAW,CAAC;eAChD,IAAA,uCAAwB,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAClF,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,MAAyB,EAAE,MAAwB;QAC7E,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACzB,IAAI;YACF,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gCAAiB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAClI,MAAM,MAAM,GAAG,IAAI,2CAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;YACnE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,kBAAkB,EAAE,CAAC;YAEjD,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;YAC9B,OAAO,IAAI,iCAAe,CAAC,MAAM,CAAC,CAAC;SACpC;QAAC,OAAO,GAAG,EAAE;YACZ,qBAAM,CAAC,YAAY,CAAC,+BAAc,EAAE,GAAG,CAAC,CAAC;YACzC,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;CACF;AAED,MAAM,uBAAuB,GAAqB,IAAI,uBAAuB,EAAE,CAAC;AAEhF,gBAAgB;AAChB,SAAgB,uBAAuB,CAAC,MAAwB,EAAE,MAAyB;IACzF,OAAO,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;AACxE,CAAC;AAFD,0DAEC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n\r\nimport { comparePossiblyUndefined, compareStrings, CompressedId64Set, Logger } from \"@itwin/core-bentley\";\r\nimport { RenderSchedule } from \"@itwin/core-common\";\r\nimport {\r\n IModelConnection, TileTree, TileTreeOwner, TileTreeSupplier,\r\n} from \"@itwin/core-frontend\";\r\nimport { loggerCategory } from \"./LoggerCategory\";\r\nimport { BatchedTilesetReader, BatchedTilesetSpec } from \"./BatchedTilesetReader\";\r\nimport { BatchedTileTree } from \"./BatchedTileTree\";\r\n\r\n/** @internal */\r\nexport interface BatchedTileTreeId {\r\n spec: BatchedTilesetSpec;\r\n script?: RenderSchedule.Script;\r\n /** A stringified representation of the [[ModelGroup]]s by which to structure the contents of the tiles.\r\n * Every unique combination of model groups has a corresponding unique string representation.\r\n * @see [[BatchedModelGroups.guid]].\r\n */\r\n modelGroups: string;\r\n}\r\n\r\nclass BatchedTileTreeSupplier implements TileTreeSupplier {\r\n public compareTileTreeIds(lhs: BatchedTileTreeId, rhs: BatchedTileTreeId): number {\r\n return compareStrings(lhs.spec.baseUrl.toString(), rhs.spec.baseUrl.toString())\r\n || compareStrings(lhs.modelGroups, rhs.modelGroups)\r\n || comparePossiblyUndefined((x, y) => x.compareTo(y), lhs.script, rhs.script);\r\n }\r\n\r\n public async createTileTree(treeId: BatchedTileTreeId, iModel: IModelConnection): Promise<TileTree | undefined> {\r\n const spec = treeId.spec;\r\n try {\r\n const modelGroups = treeId.modelGroups ? treeId.modelGroups.split(\"_\").map((x) => CompressedId64Set.decompressSet(x)) : undefined;\r\n const reader = new BatchedTilesetReader(spec, iModel, modelGroups);\r\n const params = await reader.readTileTreeParams();\r\n\r\n params.script = treeId.script;\r\n return new BatchedTileTree(params);\r\n } catch (err) {\r\n Logger.logException(loggerCategory, err);\r\n return undefined;\r\n }\r\n }\r\n}\r\n\r\nconst batchedTileTreeSupplier: TileTreeSupplier = new BatchedTileTreeSupplier();\r\n\r\n/** @internal */\r\nexport function getBatchedTileTreeOwner(iModel: IModelConnection, treeId: BatchedTileTreeId): TileTreeOwner {\r\n return iModel.tiles.getTileTreeOwner(treeId, batchedTileTreeSupplier);\r\n}\r\n"]}
@@ -1,15 +1,31 @@
1
- import { Id64String } from "@itwin/core-bentley";
1
+ import { Id64Set, Id64String } from "@itwin/core-bentley";
2
2
  import { Range3d, Range3dProps } from "@itwin/core-geometry";
3
- import { Tileset3dSchema as schema } from "@itwin/core-common";
3
+ import { Tileset3dSchema as schema, ViewFlagOverrides } from "@itwin/core-common";
4
4
  import { IModelConnection } from "@itwin/core-frontend";
5
5
  import { BatchedTileTreeParams } from "./BatchedTileTree";
6
6
  import { BatchedTile, BatchedTileParams } from "./BatchedTile";
7
7
  /** @internal */
8
+ export interface ModelMetadataProps {
9
+ /** The spatial volume occupied by this model's geometry. */
10
+ extents: Range3dProps;
11
+ /** Overrides to be applied to the view's [ViewFlags]($common) when rendering this model, if any. */
12
+ viewFlags?: ViewFlagOverrides;
13
+ }
14
+ /** @internal */
15
+ export interface ModelMetadata {
16
+ /** The spatial volume occupied by this model's geometry. */
17
+ extents: Range3d;
18
+ /** Overrides to be applied to the view's [ViewFlags]($common) when rendering this model, if any. */
19
+ viewFlags?: ViewFlagOverrides;
20
+ }
21
+ /** @internal */
8
22
  export interface BatchedTilesetProps extends schema.Tileset {
9
23
  extensions: {
10
24
  BENTLEY_BatchedTileSet: {
11
- includedModels: Id64String[];
12
- includedModelExtents: Range3dProps[];
25
+ /** Contains an entry for every model that was processed during publishing of the tileset. */
26
+ models: {
27
+ [modelId: Id64String]: ModelMetadataProps | undefined;
28
+ };
13
29
  };
14
30
  };
15
31
  }
@@ -17,7 +33,7 @@ export interface BatchedTilesetProps extends schema.Tileset {
17
33
  export interface BatchedTilesetSpec {
18
34
  baseUrl: URL;
19
35
  props: BatchedTilesetProps;
20
- includedModels: Map<Id64String, Range3d>;
36
+ models: Map<Id64String, ModelMetadata>;
21
37
  }
22
38
  /** @internal */
23
39
  export declare namespace BatchedTilesetSpec {
@@ -25,9 +41,10 @@ export declare namespace BatchedTilesetSpec {
25
41
  }
26
42
  /** @internal */
27
43
  export declare class BatchedTilesetReader {
28
- private readonly _spec;
29
44
  private readonly _iModel;
30
- constructor(spec: BatchedTilesetSpec, iModel: IModelConnection);
45
+ private readonly _spec;
46
+ private readonly _modelGroups;
47
+ constructor(spec: BatchedTilesetSpec, iModel: IModelConnection, modelGroups: Id64Set[] | undefined);
31
48
  get baseUrl(): URL;
32
49
  readTileParams(json: schema.Tile, parent?: BatchedTile): BatchedTileParams;
33
50
  readTileTreeParams(): Promise<BatchedTileTreeParams>;
@@ -1 +1 @@
1
- {"version":3,"file":"BatchedTilesetReader.d.ts","sourceRoot":"","sources":["../../src/BatchedTilesetReader.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EACc,OAAO,EAAE,YAAY,EACzC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,eAAe,IAAI,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAA2C,MAAM,sBAAsB,CAAC;AACjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAE/D,gBAAgB;AAChB,MAAM,WAAW,mBAAoB,SAAQ,MAAM,CAAC,OAAO;IACzD,UAAU,EAAE;QACV,sBAAsB,EAAE;YACtB,cAAc,EAAE,UAAU,EAAE,CAAC;YAC7B,oBAAoB,EAAE,YAAY,EAAE,CAAC;SACtC,CAAC;KACH,CAAC;CACH;AAuBD,gBAAgB;AAChB,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,mBAAmB,CAAC;IAC3B,cAAc,EAAE,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;CAC1C;AAED,gBAAgB;AAChB,yBAAiB,kBAAkB,CAAC;IAClC,SAAgB,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,GAAG,kBAAkB,CAUtE;CACF;AAqCD,gBAAgB;AAChB,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmB;gBAExB,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,gBAAgB;IAKrE,IAAW,OAAO,IAAI,GAAG,CAA+B;IAEjD,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,iBAAiB;IAkCpE,kBAAkB,IAAI,OAAO,CAAC,qBAAqB,CAAC;CAelE"}
1
+ {"version":3,"file":"BatchedTilesetReader.d.ts","sourceRoot":"","sources":["../../src/BatchedTilesetReader.ts"],"names":[],"mappings":"AAKA,OAAO,EAAQ,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EACc,OAAO,EAAE,YAAY,EACzC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,eAAe,IAAI,MAAM,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAA2C,MAAM,sBAAsB,CAAC;AACjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAE/D,gBAAgB;AAChB,MAAM,WAAW,kBAAkB;IACjC,4DAA4D;IAC5D,OAAO,EAAE,YAAY,CAAC;IACtB,oGAAoG;IACpG,SAAS,CAAC,EAAE,iBAAiB,CAAC;CAC/B;AAED,gBAAgB;AAChB,MAAM,WAAW,aAAa;IAC5B,4DAA4D;IAC5D,OAAO,EAAE,OAAO,CAAC;IACjB,oGAAoG;IACpG,SAAS,CAAC,EAAE,iBAAiB,CAAC;CAC/B;AAED,gBAAgB;AAChB,MAAM,WAAW,mBAAoB,SAAQ,MAAM,CAAC,OAAO;IACzD,UAAU,EAAE;QACV,sBAAsB,EAAE;YACtB,6FAA6F;YAC7F,MAAM,EAAE;gBACN,CAAC,OAAO,EAAE,UAAU,GAAG,kBAAkB,GAAG,SAAS,CAAC;aACvD,CAAC;SACH,CAAC;KACH,CAAC;CACH;AAuBD,gBAAgB;AAChB,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,mBAAmB,CAAC;IAC3B,MAAM,EAAE,GAAG,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;CACxC;AAED,gBAAgB;AAChB,yBAAiB,kBAAkB,CAAC;IAClC,SAAgB,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,GAAG,kBAAkB,CAYtE;CACF;AAqCD,gBAAgB;AAChB,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmB;IAC3C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAC3C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAwB;gBAElC,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,gBAAgB,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,SAAS;IAMzG,IAAW,OAAO,IAAI,GAAG,CAA+B;IAEjD,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,iBAAiB;IAkCpE,kBAAkB,IAAI,OAAO,CAAC,qBAAqB,CAAC;CAgBlE"}
@@ -5,6 +5,7 @@
5
5
  *--------------------------------------------------------------------------------------------*/
6
6
  Object.defineProperty(exports, "__esModule", { value: true });
7
7
  exports.BatchedTilesetReader = exports.BatchedTilesetSpec = void 0;
8
+ const core_bentley_1 = require("@itwin/core-bentley");
8
9
  const core_geometry_1 = require("@itwin/core-geometry");
9
10
  const core_frontend_1 = require("@itwin/core-frontend");
10
11
  function isBatchedTileset(json) {
@@ -13,9 +14,9 @@ function isBatchedTileset(json) {
13
14
  const props = json;
14
15
  if (!props.root || !props.asset)
15
16
  return false;
16
- // The extension is required, and it must contain `id` and `range` fields.
17
- const extension = props.extensions?.BENTLEY_BatchedTileSet;
18
- if (!extension || !Array.isArray(extension.includedModels) || !Array.isArray(extension.includedModelExtents) || extension.includedModels.length !== extension.includedModelExtents.length)
17
+ // The extension is required.
18
+ const models = props.extensions?.BENTLEY_BatchedTileSet?.models;
19
+ if (!models || typeof models !== "object")
19
20
  return false;
20
21
  // ###TODO spec requires geometricError to be present on tileset and all tiles; exporter is omitting from tileset.
21
22
  if (undefined === props.geometricError)
@@ -28,11 +29,13 @@ var BatchedTilesetSpec;
28
29
  function create(baseUrl, json) {
29
30
  if (!isBatchedTileset(json))
30
31
  throw new Error("Invalid tileset JSON");
31
- const includedModels = new Map();
32
- const ext = json.extensions.BENTLEY_BatchedTileSet;
33
- for (let i = 0; i < ext.includedModels.length; i++)
34
- includedModels.set(ext.includedModels[i], core_geometry_1.Range3d.fromJSON(ext.includedModelExtents[i]));
35
- return { baseUrl, props: json, includedModels };
32
+ const models = new Map();
33
+ for (const [modelId, value] of Object.entries(json.extensions.BENTLEY_BatchedTileSet.models)) {
34
+ if (core_bentley_1.Id64.isValidId64(modelId) && value) {
35
+ models.set(modelId, { extents: core_geometry_1.Range3d.fromJSON(value.extents), viewFlags: value.viewFlags ? { ...value.viewFlags } : undefined });
36
+ }
37
+ }
38
+ return { baseUrl, props: json, models };
36
39
  }
37
40
  BatchedTilesetSpec.create = create;
38
41
  })(BatchedTilesetSpec = exports.BatchedTilesetSpec || (exports.BatchedTilesetSpec = {}));
@@ -64,9 +67,10 @@ function transformFromJSON(json) {
64
67
  }
65
68
  /** @internal */
66
69
  class BatchedTilesetReader {
67
- constructor(spec, iModel) {
70
+ constructor(spec, iModel, modelGroups) {
68
71
  this._iModel = iModel;
69
72
  this._spec = spec;
73
+ this._modelGroups = modelGroups;
70
74
  }
71
75
  get baseUrl() { return this._spec.baseUrl; }
72
76
  readTileParams(json, parent) {
@@ -111,7 +115,8 @@ class BatchedTilesetReader {
111
115
  priority: core_frontend_1.TileLoadPriority.Primary,
112
116
  rootTile: this.readTileParams(root),
113
117
  reader: this,
114
- includedModels: this._spec.includedModels,
118
+ models: this._spec.models,
119
+ modelGroups: this._modelGroups,
115
120
  };
116
121
  }
117
122
  }
@@ -1 +1 @@
1
- {"version":3,"file":"BatchedTilesetReader.js","sourceRoot":"","sources":["../../src/BatchedTilesetReader.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n\r\nimport { Id64String } from \"@itwin/core-bentley\";\r\nimport {\r\n Matrix3d, Point3d, Range3d, Range3dProps, Transform, Vector3d,\r\n} from \"@itwin/core-geometry\";\r\nimport { Tileset3dSchema as schema } from \"@itwin/core-common\";\r\nimport { IModelConnection, RealityModelTileUtils, TileLoadPriority } from \"@itwin/core-frontend\";\r\nimport { BatchedTileTreeParams } from \"./BatchedTileTree\";\r\nimport { BatchedTile, BatchedTileParams } from \"./BatchedTile\";\r\n\r\n/** @internal */\r\nexport interface BatchedTilesetProps extends schema.Tileset {\r\n extensions: {\r\n BENTLEY_BatchedTileSet: { // eslint-disable-line @typescript-eslint/naming-convention\r\n includedModels: Id64String[];\r\n includedModelExtents: Range3dProps[];\r\n };\r\n };\r\n}\r\n\r\nfunction isBatchedTileset(json: unknown): json is BatchedTilesetProps {\r\n if (typeof json !== \"object\")\r\n return false;\r\n\r\n const props = json as schema.Tileset;\r\n\r\n if (!props.root || !props.asset)\r\n return false;\r\n\r\n // The extension is required, and it must contain `id` and `range` fields.\r\n const extension = props.extensions?.BENTLEY_BatchedTileSet;\r\n if (!extension || !Array.isArray(extension.includedModels) || !Array.isArray(extension.includedModelExtents) || extension.includedModels.length !== extension.includedModelExtents.length)\r\n return false;\r\n\r\n // ###TODO spec requires geometricError to be present on tileset and all tiles; exporter is omitting from tileset.\r\n if (undefined === props.geometricError)\r\n props.geometricError = props.root.geometricError;\r\n\r\n return true;\r\n}\r\n\r\n/** @internal */\r\nexport interface BatchedTilesetSpec {\r\n baseUrl: URL;\r\n props: BatchedTilesetProps;\r\n includedModels: Map<Id64String, Range3d>;\r\n}\r\n\r\n/** @internal */\r\nexport namespace BatchedTilesetSpec {\r\n export function create(baseUrl: URL, json: unknown): BatchedTilesetSpec {\r\n if (!isBatchedTileset(json))\r\n throw new Error(\"Invalid tileset JSON\");\r\n\r\n const includedModels = new Map<Id64String, Range3d>();\r\n const ext = json.extensions.BENTLEY_BatchedTileSet;\r\n for (let i = 0; i < ext.includedModels.length; i++)\r\n includedModels.set(ext.includedModels[i], Range3d.fromJSON(ext.includedModelExtents[i]));\r\n\r\n return { baseUrl, props: json, includedModels };\r\n }\r\n}\r\n\r\nfunction rangeFromBoundingVolume(vol: schema.BoundingVolume): Range3d {\r\n if (vol.box) {\r\n const center = new Point3d(vol.box[0], vol.box[1], vol.box[2]);\r\n const ux = new Vector3d(vol.box[3], vol.box[4], vol.box[5]);\r\n const uy = new Vector3d(vol.box[6], vol.box[7], vol.box[8]);\r\n const uz = new Vector3d(vol.box[9], vol.box[10], vol.box[11]);\r\n\r\n const range = Range3d.createNull();\r\n for (let i = -1; i <= 1; i += 2)\r\n for (let j = -1; j <= 1; j += 2)\r\n for (let k = -1; k <= 1; k += 2)\r\n range.extendPoint(center.plus3Scaled(ux, i, uy, j, uz, k));\r\n\r\n return range;\r\n } else if (vol.sphere) {\r\n const center = new Point3d(vol.sphere[0], vol.sphere[1], vol.sphere[2]);\r\n const radius = vol.sphere[3];\r\n return Range3d.createXYZXYZ(center.x - radius, center.y - radius, center.z - radius, center.x + radius, center.y + radius, center.z + radius);\r\n }\r\n\r\n // We won't get region bounding volumes in our tiles.\r\n throw new Error(\"region bounding volume unimplemented\");\r\n}\r\n\r\nfunction transformFromJSON(json: schema.Transform): Transform {\r\n const translation = new Point3d(json[12], json[13], json[14]);\r\n const matrix = Matrix3d.createRowValues(\r\n json[0], json[4], json[8],\r\n json[1], json[5], json[9],\r\n json[2], json[6], json[10],\r\n );\r\n\r\n return Transform.createOriginAndMatrix(translation, matrix);\r\n}\r\n\r\n/** @internal */\r\nexport class BatchedTilesetReader {\r\n private readonly _spec: BatchedTilesetSpec;\r\n private readonly _iModel: IModelConnection;\r\n\r\n public constructor(spec: BatchedTilesetSpec, iModel: IModelConnection) {\r\n this._iModel = iModel;\r\n this._spec = spec;\r\n }\r\n\r\n public get baseUrl(): URL { return this._spec.baseUrl; }\r\n\r\n public readTileParams(json: schema.Tile, parent?: BatchedTile): BatchedTileParams {\r\n const content = json.content;\r\n const geometricError = json.geometricError;\r\n const range = rangeFromBoundingVolume(json.boundingVolume);\r\n const isLeaf = undefined === json.children || json.children.length === 0;\r\n\r\n let transformToRoot;\r\n if (undefined !== parent) {\r\n const localToParent = json.transform ? transformFromJSON(json.transform) : undefined;\r\n const parentToRoot = parent.transformToRoot;\r\n if (localToParent) {\r\n if (parentToRoot)\r\n localToParent.multiplyTransformTransform(parentToRoot, localToParent);\r\n\r\n transformToRoot = localToParent;\r\n } else {\r\n transformToRoot = parentToRoot;\r\n }\r\n }\r\n\r\n // ###TODO evaluate this. The geometric errors in the tiles seem far too small.\r\n const maximumSizeScale = 8;\r\n return {\r\n parent,\r\n contentId: content?.uri ?? \"\",\r\n range,\r\n contentRange: content?.boundingVolume ? rangeFromBoundingVolume(content.boundingVolume) : undefined,\r\n isLeaf,\r\n maximumSize: maximumSizeScale * RealityModelTileUtils.maximumSizeFromGeometricTolerance(range, geometricError),\r\n childrenProps: isLeaf ? undefined : json.children,\r\n transformToRoot,\r\n };\r\n }\r\n\r\n public async readTileTreeParams(): Promise<BatchedTileTreeParams> {\r\n const root = this._spec.props.root;\r\n const location = root.transform ? transformFromJSON(root.transform) : Transform.createIdentity();\r\n\r\n return {\r\n id: \"spatial-models\",\r\n modelId: this._iModel.transientIds.getNext(),\r\n iModel: this._iModel,\r\n location,\r\n priority: TileLoadPriority.Primary,\r\n rootTile: this.readTileParams(root),\r\n reader: this,\r\n includedModels: this._spec.includedModels,\r\n };\r\n }\r\n}\r\n"]}
1
+ {"version":3,"file":"BatchedTilesetReader.js","sourceRoot":"","sources":["../../src/BatchedTilesetReader.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n\r\nimport { Id64, Id64Set, Id64String } from \"@itwin/core-bentley\";\r\nimport {\r\n Matrix3d, Point3d, Range3d, Range3dProps, Transform, Vector3d,\r\n} from \"@itwin/core-geometry\";\r\nimport { Tileset3dSchema as schema, ViewFlagOverrides } from \"@itwin/core-common\";\r\nimport { IModelConnection, RealityModelTileUtils, TileLoadPriority } from \"@itwin/core-frontend\";\r\nimport { BatchedTileTreeParams } from \"./BatchedTileTree\";\r\nimport { BatchedTile, BatchedTileParams } from \"./BatchedTile\";\r\n\r\n/** @internal */\r\nexport interface ModelMetadataProps {\r\n /** The spatial volume occupied by this model's geometry. */\r\n extents: Range3dProps;\r\n /** Overrides to be applied to the view's [ViewFlags]($common) when rendering this model, if any. */\r\n viewFlags?: ViewFlagOverrides;\r\n}\r\n\r\n/** @internal */\r\nexport interface ModelMetadata {\r\n /** The spatial volume occupied by this model's geometry. */\r\n extents: Range3d;\r\n /** Overrides to be applied to the view's [ViewFlags]($common) when rendering this model, if any. */\r\n viewFlags?: ViewFlagOverrides;\r\n}\r\n\r\n/** @internal */\r\nexport interface BatchedTilesetProps extends schema.Tileset {\r\n extensions: {\r\n BENTLEY_BatchedTileSet: { // eslint-disable-line @typescript-eslint/naming-convention\r\n /** Contains an entry for every model that was processed during publishing of the tileset. */\r\n models: {\r\n [modelId: Id64String]: ModelMetadataProps | undefined;\r\n };\r\n };\r\n };\r\n}\r\n\r\nfunction isBatchedTileset(json: unknown): json is BatchedTilesetProps {\r\n if (typeof json !== \"object\")\r\n return false;\r\n\r\n const props = json as schema.Tileset;\r\n\r\n if (!props.root || !props.asset)\r\n return false;\r\n\r\n // The extension is required.\r\n const models = props.extensions?.BENTLEY_BatchedTileSet?.models;\r\n if (!models || typeof models !== \"object\")\r\n return false;\r\n\r\n // ###TODO spec requires geometricError to be present on tileset and all tiles; exporter is omitting from tileset.\r\n if (undefined === props.geometricError)\r\n props.geometricError = props.root.geometricError;\r\n\r\n return true;\r\n}\r\n\r\n/** @internal */\r\nexport interface BatchedTilesetSpec {\r\n baseUrl: URL;\r\n props: BatchedTilesetProps;\r\n models: Map<Id64String, ModelMetadata>;\r\n}\r\n\r\n/** @internal */\r\nexport namespace BatchedTilesetSpec {\r\n export function create(baseUrl: URL, json: unknown): BatchedTilesetSpec {\r\n if (!isBatchedTileset(json))\r\n throw new Error(\"Invalid tileset JSON\");\r\n\r\n const models = new Map<Id64String, ModelMetadata>();\r\n for (const [modelId, value] of Object.entries(json.extensions.BENTLEY_BatchedTileSet.models)) {\r\n if (Id64.isValidId64(modelId) && value) {\r\n models.set(modelId, { extents: Range3d.fromJSON(value.extents), viewFlags: value.viewFlags ? { ...value.viewFlags } : undefined });\r\n }\r\n }\r\n\r\n return { baseUrl, props: json, models };\r\n }\r\n}\r\n\r\nfunction rangeFromBoundingVolume(vol: schema.BoundingVolume): Range3d {\r\n if (vol.box) {\r\n const center = new Point3d(vol.box[0], vol.box[1], vol.box[2]);\r\n const ux = new Vector3d(vol.box[3], vol.box[4], vol.box[5]);\r\n const uy = new Vector3d(vol.box[6], vol.box[7], vol.box[8]);\r\n const uz = new Vector3d(vol.box[9], vol.box[10], vol.box[11]);\r\n\r\n const range = Range3d.createNull();\r\n for (let i = -1; i <= 1; i += 2)\r\n for (let j = -1; j <= 1; j += 2)\r\n for (let k = -1; k <= 1; k += 2)\r\n range.extendPoint(center.plus3Scaled(ux, i, uy, j, uz, k));\r\n\r\n return range;\r\n } else if (vol.sphere) {\r\n const center = new Point3d(vol.sphere[0], vol.sphere[1], vol.sphere[2]);\r\n const radius = vol.sphere[3];\r\n return Range3d.createXYZXYZ(center.x - radius, center.y - radius, center.z - radius, center.x + radius, center.y + radius, center.z + radius);\r\n }\r\n\r\n // We won't get region bounding volumes in our tiles.\r\n throw new Error(\"region bounding volume unimplemented\");\r\n}\r\n\r\nfunction transformFromJSON(json: schema.Transform): Transform {\r\n const translation = new Point3d(json[12], json[13], json[14]);\r\n const matrix = Matrix3d.createRowValues(\r\n json[0], json[4], json[8],\r\n json[1], json[5], json[9],\r\n json[2], json[6], json[10],\r\n );\r\n\r\n return Transform.createOriginAndMatrix(translation, matrix);\r\n}\r\n\r\n/** @internal */\r\nexport class BatchedTilesetReader {\r\n private readonly _iModel: IModelConnection;\r\n private readonly _spec: BatchedTilesetSpec;\r\n private readonly _modelGroups: Id64Set[] | undefined;\r\n\r\n public constructor(spec: BatchedTilesetSpec, iModel: IModelConnection, modelGroups: Id64Set[] | undefined) {\r\n this._iModel = iModel;\r\n this._spec = spec;\r\n this._modelGroups = modelGroups;\r\n }\r\n\r\n public get baseUrl(): URL { return this._spec.baseUrl; }\r\n\r\n public readTileParams(json: schema.Tile, parent?: BatchedTile): BatchedTileParams {\r\n const content = json.content;\r\n const geometricError = json.geometricError;\r\n const range = rangeFromBoundingVolume(json.boundingVolume);\r\n const isLeaf = undefined === json.children || json.children.length === 0;\r\n\r\n let transformToRoot;\r\n if (undefined !== parent) {\r\n const localToParent = json.transform ? transformFromJSON(json.transform) : undefined;\r\n const parentToRoot = parent.transformToRoot;\r\n if (localToParent) {\r\n if (parentToRoot)\r\n localToParent.multiplyTransformTransform(parentToRoot, localToParent);\r\n\r\n transformToRoot = localToParent;\r\n } else {\r\n transformToRoot = parentToRoot;\r\n }\r\n }\r\n\r\n // ###TODO evaluate this. The geometric errors in the tiles seem far too small.\r\n const maximumSizeScale = 8;\r\n return {\r\n parent,\r\n contentId: content?.uri ?? \"\",\r\n range,\r\n contentRange: content?.boundingVolume ? rangeFromBoundingVolume(content.boundingVolume) : undefined,\r\n isLeaf,\r\n maximumSize: maximumSizeScale * RealityModelTileUtils.maximumSizeFromGeometricTolerance(range, geometricError),\r\n childrenProps: isLeaf ? undefined : json.children,\r\n transformToRoot,\r\n };\r\n }\r\n\r\n public async readTileTreeParams(): Promise<BatchedTileTreeParams> {\r\n const root = this._spec.props.root;\r\n const location = root.transform ? transformFromJSON(root.transform) : Transform.createIdentity();\r\n\r\n return {\r\n id: \"spatial-models\",\r\n modelId: this._iModel.transientIds.getNext(),\r\n iModel: this._iModel,\r\n location,\r\n priority: TileLoadPriority.Primary,\r\n rootTile: this.readTileParams(root),\r\n reader: this,\r\n models: this._spec.models,\r\n modelGroups: this._modelGroups,\r\n };\r\n }\r\n}\r\n"]}
@@ -0,0 +1,48 @@
1
+ import { Id64Set, Id64String } from "@itwin/core-bentley";
2
+ import { PlanProjectionSettings, RenderSchedule, ViewFlagOverrides } from "@itwin/core-common";
3
+ import { ModelDisplayTransform, RenderClipVolume } from "@itwin/core-frontend";
4
+ import { ModelGroupDisplayTransforms } from "./ModelGroupDisplayTransforms";
5
+ /** Plan projection settings relevant to a [[ModelGroupInfo]].
6
+ * @internal
7
+ */
8
+ export interface PlanProjectionInfo {
9
+ /** Z elevation, from [PlanProjectionSettings.elevation]($common) if specified, else the default elevation of the model (computed from model extents). */
10
+ elevation: number;
11
+ /** Transparency in [0..1] with 0 being fully opaque. */
12
+ transparency: number;
13
+ /** If true, the graphics are drawn as overlays with no depth test. */
14
+ overlay: boolean;
15
+ }
16
+ /** Display settings to be applied to a group of models.
17
+ * @internal
18
+ */
19
+ export interface ModelGroupInfo {
20
+ displayTransform?: ModelDisplayTransform;
21
+ clip?: RenderClipVolume;
22
+ planProjection?: PlanProjectionInfo;
23
+ timeline?: RenderSchedule.ModelTimeline;
24
+ viewFlags: ViewFlagOverrides;
25
+ }
26
+ /** Represents a group of models and the display settings to be applied to them.
27
+ * @internal
28
+ */
29
+ export interface ModelGroup extends ModelGroupInfo {
30
+ /** The set of models belonging to this group. */
31
+ modelIds: Id64Set;
32
+ }
33
+ /** Context supplied to [[groupModels]].
34
+ * @internal
35
+ */
36
+ export interface ModelGroupingContext {
37
+ modelGroupDisplayTransforms: ModelGroupDisplayTransforms;
38
+ getModelClip(modelId: Id64String): RenderClipVolume | undefined;
39
+ getPlanProjectionSettings(modelId: Id64String): PlanProjectionSettings | undefined;
40
+ getModelTimeline(modelId: Id64String): RenderSchedule.ModelTimeline | undefined;
41
+ getDefaultElevation(modelId: Id64String): number;
42
+ getViewFlagOverrides(modelId: Id64String): ViewFlagOverrides | undefined;
43
+ }
44
+ /** Group the supplied `modelIds` such that all models that are to be drawn with equivalent display settings are grouped together.
45
+ * @internal
46
+ */
47
+ export declare function groupModels(context: ModelGroupingContext, modelIds: Id64Set): ModelGroup[];
48
+ //# sourceMappingURL=ModelGroup.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ModelGroup.d.ts","sourceRoot":"","sources":["../../src/ModelGroup.ts"],"names":[],"mappings":"AAKA,OAAO,EAAU,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC/F,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAE5E;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,yJAAyJ;IACzJ,SAAS,EAAE,MAAM,CAAC;IAClB,wDAAwD;IACxD,YAAY,EAAE,MAAM,CAAC;IACrB,sEAAsE;IACtE,OAAO,EAAE,OAAO,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,gBAAgB,CAAC,EAAE,qBAAqB,CAAC;IACzC,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,cAAc,CAAC,EAAE,kBAAkB,CAAC;IACpC,QAAQ,CAAC,EAAE,cAAc,CAAC,aAAa,CAAC;IACxC,SAAS,EAAE,iBAAiB,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,UAAW,SAAQ,cAAc;IAChD,iDAAiD;IACjD,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,2BAA2B,EAAE,2BAA2B,CAAC;IACzD,YAAY,CAAC,OAAO,EAAE,UAAU,GAAG,gBAAgB,GAAG,SAAS,CAAC;IAChE,yBAAyB,CAAC,OAAO,EAAE,UAAU,GAAG,sBAAsB,GAAG,SAAS,CAAC;IACnF,gBAAgB,CAAC,OAAO,EAAE,UAAU,GAAG,cAAc,CAAC,aAAa,GAAG,SAAS,CAAC;IAChF,mBAAmB,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM,CAAC;IACjD,oBAAoB,CAAC,OAAO,EAAE,UAAU,GAAG,iBAAiB,GAAG,SAAS,CAAC;CAC1E;AAgFD;;GAEG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,OAAO,GAAG,UAAU,EAAE,CAa1F"}