@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,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"}
@@ -2,6 +2,7 @@
2
2
  * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
3
3
  * See LICENSE.md in the project root for license terms and full copyright notice.
4
4
  *--------------------------------------------------------------------------------------------*/
5
+ import { Id64 } from "@itwin/core-bentley";
5
6
  import { Matrix3d, Point3d, Range3d, Transform, Vector3d, } from "@itwin/core-geometry";
6
7
  import { RealityModelTileUtils, TileLoadPriority } from "@itwin/core-frontend";
7
8
  function isBatchedTileset(json) {
@@ -10,9 +11,9 @@ function isBatchedTileset(json) {
10
11
  const props = json;
11
12
  if (!props.root || !props.asset)
12
13
  return false;
13
- // The extension is required, and it must contain `id` and `range` fields.
14
- const extension = props.extensions?.BENTLEY_BatchedTileSet;
15
- if (!extension || !Array.isArray(extension.includedModels) || !Array.isArray(extension.includedModelExtents) || extension.includedModels.length !== extension.includedModelExtents.length)
14
+ // The extension is required.
15
+ const models = props.extensions?.BENTLEY_BatchedTileSet?.models;
16
+ if (!models || typeof models !== "object")
16
17
  return false;
17
18
  // ###TODO spec requires geometricError to be present on tileset and all tiles; exporter is omitting from tileset.
18
19
  if (undefined === props.geometricError)
@@ -25,11 +26,13 @@ export var BatchedTilesetSpec;
25
26
  function create(baseUrl, json) {
26
27
  if (!isBatchedTileset(json))
27
28
  throw new Error("Invalid tileset JSON");
28
- const includedModels = new Map();
29
- const ext = json.extensions.BENTLEY_BatchedTileSet;
30
- for (let i = 0; i < ext.includedModels.length; i++)
31
- includedModels.set(ext.includedModels[i], Range3d.fromJSON(ext.includedModelExtents[i]));
32
- return { baseUrl, props: json, includedModels };
29
+ const models = new Map();
30
+ for (const [modelId, value] of Object.entries(json.extensions.BENTLEY_BatchedTileSet.models)) {
31
+ if (Id64.isValidId64(modelId) && value) {
32
+ models.set(modelId, { extents: Range3d.fromJSON(value.extents), viewFlags: value.viewFlags ? { ...value.viewFlags } : undefined });
33
+ }
34
+ }
35
+ return { baseUrl, props: json, models };
33
36
  }
34
37
  BatchedTilesetSpec.create = create;
35
38
  })(BatchedTilesetSpec || (BatchedTilesetSpec = {}));
@@ -61,9 +64,10 @@ function transformFromJSON(json) {
61
64
  }
62
65
  /** @internal */
63
66
  export class BatchedTilesetReader {
64
- constructor(spec, iModel) {
67
+ constructor(spec, iModel, modelGroups) {
65
68
  this._iModel = iModel;
66
69
  this._spec = spec;
70
+ this._modelGroups = modelGroups;
67
71
  }
68
72
  get baseUrl() { return this._spec.baseUrl; }
69
73
  readTileParams(json, parent) {
@@ -108,7 +112,8 @@ export class BatchedTilesetReader {
108
112
  priority: TileLoadPriority.Primary,
109
113
  rootTile: this.readTileParams(root),
110
114
  reader: this,
111
- includedModels: this._spec.includedModels,
115
+ models: this._spec.models,
116
+ modelGroups: this._modelGroups,
112
117
  };
113
118
  }
114
119
  }
@@ -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"}
@@ -0,0 +1,85 @@
1
+ /*---------------------------------------------------------------------------------------------
2
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
3
+ * See LICENSE.md in the project root for license terms and full copyright notice.
4
+ *--------------------------------------------------------------------------------------------*/
5
+ import { assert } from "@itwin/core-bentley";
6
+ function createPlanProjectionInfo(modelId, context) {
7
+ const settings = context.getPlanProjectionSettings(modelId);
8
+ if (!settings)
9
+ return undefined;
10
+ return {
11
+ elevation: settings.elevation ?? context.getDefaultElevation(modelId),
12
+ transparency: settings.transparency ?? 0,
13
+ overlay: settings.overlay,
14
+ };
15
+ }
16
+ function equalPlanProjections(a, b) {
17
+ return a.elevation === b.elevation && a.overlay === b.overlay && a.transparency === b.transparency;
18
+ }
19
+ function createModelGroupInfo(context, modelId) {
20
+ const planProjection = createPlanProjectionInfo(modelId, context);
21
+ const viewFlags = { ...context.getViewFlagOverrides(modelId) };
22
+ if (planProjection) {
23
+ // Always enable improved z-fighting mitigation for plan projections (they're planar models).
24
+ viewFlags.forceSurfaceDiscard = true;
25
+ }
26
+ return {
27
+ displayTransform: context.modelGroupDisplayTransforms.getDisplayTransform(modelId),
28
+ clip: context.getModelClip(modelId),
29
+ planProjection,
30
+ viewFlags,
31
+ timeline: context.getModelTimeline(modelId),
32
+ };
33
+ }
34
+ function equalViewFlags(a, b) {
35
+ const lhs = Object.keys(a);
36
+ const rhs = Object.keys(b);
37
+ if (lhs.length !== rhs.length) {
38
+ return false;
39
+ }
40
+ for (const propName of lhs) {
41
+ const key = propName;
42
+ if (a[key] !== b[key])
43
+ return false;
44
+ }
45
+ return true;
46
+ }
47
+ function equalModelGroupInfo(a, b) {
48
+ // If a model has a timeline it cannot be grouped
49
+ if (a.timeline !== b.timeline)
50
+ return false;
51
+ // Display transforms are obtained from ModelGroupDisplayTransforms - they are guaranteed to be the same object if they are equivalent.
52
+ if (a.displayTransform !== b.displayTransform)
53
+ return false;
54
+ if (a.clip || b.clip) {
55
+ // Note: ClipVector lacks an `isAlmostEqual` method.
56
+ // For two models belonging to the same clip group, we should have the same exact object.
57
+ // But we won't currently detect two different objects that represent effectively identical clips.
58
+ if (!a.clip || !b.clip || a.clip.clipVector !== b.clip.clipVector)
59
+ return false;
60
+ }
61
+ if (a.planProjection || b.planProjection) {
62
+ if (!a.planProjection || !b.planProjection || !equalPlanProjections(a.planProjection, b.planProjection)) {
63
+ return false;
64
+ }
65
+ }
66
+ if (!equalViewFlags(a.viewFlags, b.viewFlags))
67
+ return false;
68
+ return true;
69
+ }
70
+ /** Group the supplied `modelIds` such that all models that are to be drawn with equivalent display settings are grouped together.
71
+ * @internal
72
+ */
73
+ export function groupModels(context, modelIds) {
74
+ const groups = [];
75
+ for (const modelId of modelIds) {
76
+ const info = createModelGroupInfo(context, modelId);
77
+ let group = groups.find((x) => equalModelGroupInfo(x, info));
78
+ if (!group)
79
+ groups.push(group = { ...info, modelIds: new Set() });
80
+ assert(!group.modelIds.has(modelId));
81
+ group.modelIds.add(modelId);
82
+ }
83
+ return groups;
84
+ }
85
+ //# sourceMappingURL=ModelGroup.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ModelGroup.js","sourceRoot":"","sources":["../../src/ModelGroup.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAE/F,OAAO,EAAE,MAAM,EAAuB,MAAM,qBAAqB,CAAC;AAgDlE,SAAS,wBAAwB,CAAC,OAAmB,EAAE,OAA6B;IAClF,MAAM,QAAQ,GAAG,OAAO,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;IAC5D,IAAI,CAAC,QAAQ;QACX,OAAO,SAAS,CAAC;IAEnB,OAAO;QACL,SAAS,EAAE,QAAQ,CAAC,SAAS,IAAI,OAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC;QACrE,YAAY,EAAE,QAAQ,CAAC,YAAY,IAAI,CAAC;QACxC,OAAO,EAAE,QAAQ,CAAC,OAAO;KAC1B,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,CAAqB,EAAE,CAAqB;IACxE,OAAO,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,YAAY,CAAC;AACrG,CAAC;AAED,SAAS,oBAAoB,CAAC,OAA6B,EAAE,OAAmB;IAC9E,MAAM,cAAc,GAAG,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAClE,MAAM,SAAS,GAAG,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC;IAC/D,IAAI,cAAc,EAAE;QAClB,6FAA6F;QAC7F,SAAS,CAAC,mBAAmB,GAAG,IAAI,CAAC;KACtC;IAED,OAAO;QACL,gBAAgB,EAAE,OAAO,CAAC,2BAA2B,CAAC,mBAAmB,CAAC,OAAO,CAAC;QAClF,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC;QACnC,cAAc;QACd,SAAS;QACT,QAAQ,EAAE,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC;KAC5C,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,CAAoB,EAAE,CAAoB;IAChE,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC3B,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC3B,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,CAAC,MAAM,EAAE;QAC7B,OAAO,KAAK,CAAC;KACd;IAED,KAAK,MAAM,QAAQ,IAAI,GAAG,EAAE;QAC1B,MAAM,GAAG,GAAG,QAAmC,CAAC;QAChD,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC;YACnB,OAAO,KAAK,CAAC;KAChB;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,mBAAmB,CAAC,CAAiB,EAAE,CAAiB;IAC/D,iDAAiD;IACjD,IAAI,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,QAAQ;QAC3B,OAAO,KAAK,CAAC;IAEf,uIAAuI;IACvI,IAAI,CAAC,CAAC,gBAAgB,KAAK,CAAC,CAAC,gBAAgB;QAC3C,OAAO,KAAK,CAAC;IAEf,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,EAAE;QACpB,oDAAoD;QACpD,yFAAyF;QACzF,kGAAkG;QAClG,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,KAAK,CAAC,CAAC,IAAI,CAAC,UAAU;YAC/D,OAAO,KAAK,CAAC;KAChB;IAED,IAAI,CAAC,CAAC,cAAc,IAAI,CAAC,CAAC,cAAc,EAAE;QACxC,IAAI,CAAC,CAAC,CAAC,cAAc,IAAI,CAAC,CAAC,CAAC,cAAc,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,cAAc,CAAC,EAAE;YACvG,OAAO,KAAK,CAAC;SACd;KACF;IAED,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC;QAC3C,OAAO,KAAK,CAAC;IAEf,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,WAAW,CAAC,OAA6B,EAAE,QAAiB;IAC1E,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC9B,MAAM,IAAI,GAAG,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;QAC7D,IAAI,CAAC,KAAK;YACR,MAAM,CAAC,IAAI,CAAC,KAAK,GAAG,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,IAAI,GAAG,EAAU,EAAE,CAAC,CAAC;QAEhE,MAAM,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QACrC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;KAC7B;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","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, Id64Set, Id64String } from \"@itwin/core-bentley\";\r\nimport { PlanProjectionSettings, RenderSchedule, ViewFlagOverrides } from \"@itwin/core-common\";\r\nimport { ModelDisplayTransform, RenderClipVolume } from \"@itwin/core-frontend\";\r\nimport { ModelGroupDisplayTransforms } from \"./ModelGroupDisplayTransforms\";\r\n\r\n/** Plan projection settings relevant to a [[ModelGroupInfo]].\r\n * @internal\r\n */\r\nexport interface PlanProjectionInfo {\r\n /** Z elevation, from [PlanProjectionSettings.elevation]($common) if specified, else the default elevation of the model (computed from model extents). */\r\n elevation: number;\r\n /** Transparency in [0..1] with 0 being fully opaque. */\r\n transparency: number;\r\n /** If true, the graphics are drawn as overlays with no depth test. */\r\n overlay: boolean;\r\n}\r\n\r\n/** Display settings to be applied to a group of models.\r\n * @internal\r\n */\r\nexport interface ModelGroupInfo {\r\n displayTransform?: ModelDisplayTransform;\r\n clip?: RenderClipVolume;\r\n planProjection?: PlanProjectionInfo;\r\n timeline?: RenderSchedule.ModelTimeline;\r\n viewFlags: ViewFlagOverrides;\r\n}\r\n\r\n/** Represents a group of models and the display settings to be applied to them.\r\n * @internal\r\n */\r\nexport interface ModelGroup extends ModelGroupInfo {\r\n /** The set of models belonging to this group. */\r\n modelIds: Id64Set;\r\n}\r\n\r\n/** Context supplied to [[groupModels]].\r\n * @internal\r\n */\r\nexport interface ModelGroupingContext {\r\n modelGroupDisplayTransforms: ModelGroupDisplayTransforms;\r\n getModelClip(modelId: Id64String): RenderClipVolume | undefined;\r\n getPlanProjectionSettings(modelId: Id64String): PlanProjectionSettings | undefined;\r\n getModelTimeline(modelId: Id64String): RenderSchedule.ModelTimeline | undefined;\r\n getDefaultElevation(modelId: Id64String): number;\r\n getViewFlagOverrides(modelId: Id64String): ViewFlagOverrides | undefined;\r\n}\r\n\r\nfunction createPlanProjectionInfo(modelId: Id64String, context: ModelGroupingContext): PlanProjectionInfo | undefined {\r\n const settings = context.getPlanProjectionSettings(modelId);\r\n if (!settings)\r\n return undefined;\r\n\r\n return {\r\n elevation: settings.elevation ?? context.getDefaultElevation(modelId),\r\n transparency: settings.transparency ?? 0,\r\n overlay: settings.overlay,\r\n };\r\n}\r\n\r\nfunction equalPlanProjections(a: PlanProjectionInfo, b: PlanProjectionInfo): boolean {\r\n return a.elevation === b.elevation && a.overlay === b.overlay && a.transparency === b.transparency;\r\n}\r\n\r\nfunction createModelGroupInfo(context: ModelGroupingContext, modelId: Id64String): ModelGroupInfo {\r\n const planProjection = createPlanProjectionInfo(modelId, context);\r\n const viewFlags = { ...context.getViewFlagOverrides(modelId) };\r\n if (planProjection) {\r\n // Always enable improved z-fighting mitigation for plan projections (they're planar models).\r\n viewFlags.forceSurfaceDiscard = true;\r\n }\r\n\r\n return {\r\n displayTransform: context.modelGroupDisplayTransforms.getDisplayTransform(modelId),\r\n clip: context.getModelClip(modelId),\r\n planProjection,\r\n viewFlags,\r\n timeline: context.getModelTimeline(modelId),\r\n };\r\n}\r\n\r\nfunction equalViewFlags(a: ViewFlagOverrides, b: ViewFlagOverrides): boolean {\r\n const lhs = Object.keys(a);\r\n const rhs = Object.keys(b);\r\n if (lhs.length !== rhs.length) {\r\n return false;\r\n }\r\n\r\n for (const propName of lhs) {\r\n const key = propName as keyof ViewFlagOverrides;\r\n if (a[key] !== b[key])\r\n return false;\r\n }\r\n\r\n return true;\r\n}\r\n\r\nfunction equalModelGroupInfo(a: ModelGroupInfo, b: ModelGroupInfo): boolean {\r\n // If a model has a timeline it cannot be grouped\r\n if (a.timeline !== b.timeline)\r\n return false;\r\n\r\n // Display transforms are obtained from ModelGroupDisplayTransforms - they are guaranteed to be the same object if they are equivalent.\r\n if (a.displayTransform !== b.displayTransform)\r\n return false;\r\n\r\n if (a.clip || b.clip) {\r\n // Note: ClipVector lacks an `isAlmostEqual` method.\r\n // For two models belonging to the same clip group, we should have the same exact object.\r\n // But we won't currently detect two different objects that represent effectively identical clips.\r\n if (!a.clip || !b.clip || a.clip.clipVector !== b.clip.clipVector)\r\n return false;\r\n }\r\n\r\n if (a.planProjection || b.planProjection) {\r\n if (!a.planProjection || !b.planProjection || !equalPlanProjections(a.planProjection, b.planProjection)) {\r\n return false;\r\n }\r\n }\r\n\r\n if (!equalViewFlags(a.viewFlags, b.viewFlags))\r\n return false;\r\n\r\n return true;\r\n}\r\n\r\n/** Group the supplied `modelIds` such that all models that are to be drawn with equivalent display settings are grouped together.\r\n * @internal\r\n */\r\nexport function groupModels(context: ModelGroupingContext, modelIds: Id64Set): ModelGroup[] {\r\n const groups: ModelGroup[] = [];\r\n for (const modelId of modelIds) {\r\n const info = createModelGroupInfo(context, modelId);\r\n let group = groups.find((x) => equalModelGroupInfo(x, info));\r\n if (!group)\r\n groups.push(group = { ...info, modelIds: new Set<string>() });\r\n\r\n assert(!group.modelIds.has(modelId));\r\n group.modelIds.add(modelId);\r\n }\r\n\r\n return groups;\r\n}\r\n"]}
@@ -0,0 +1,22 @@
1
+ import { Id64Set, Id64String } from "@itwin/core-bentley";
2
+ import { ModelDisplayTransform, ModelDisplayTransformProvider } from "@itwin/core-frontend";
3
+ /** Manages the display transforms to be applied to all of the models in a BatchedTileTree, enabling all models that share an equivalent transform
4
+ * to be drawn together.
5
+ * Call `update` whenever the transforms may have changed (e.g., after the viewport's scene is invalidated).
6
+ * @internal
7
+ */
8
+ export declare class ModelGroupDisplayTransforms {
9
+ private _state;
10
+ private readonly _modelIds;
11
+ /** Create a new set of groups for the specified `modelIds`. If `provider` is supplied, the grouping will be applied to those models immediately. */
12
+ constructor(modelIds: Id64Set, provider?: ModelDisplayTransformProvider);
13
+ /** A string uniquely identifying the current grouping. */
14
+ get guid(): string;
15
+ /** Get the display transform for the specified model.
16
+ * @note This method is guaranteed to return the same object for all models in the same group, at least between calls to `update`.
17
+ */
18
+ getDisplayTransform(modelId: Id64String): ModelDisplayTransform | undefined;
19
+ update(provider: ModelDisplayTransformProvider | undefined): boolean;
20
+ private computeState;
21
+ }
22
+ //# sourceMappingURL=ModelGroupDisplayTransforms.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ModelGroupDisplayTransforms.d.ts","sourceRoot":"","sources":["../../src/ModelGroupDisplayTransforms.ts"],"names":[],"mappings":"AAKA,OAAO,EAAqB,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AAqB5F;;;;GAIG;AACH,qBAAa,2BAA2B;IACtC,OAAO,CAAC,MAAM,CAAgD;IAC9D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAU;IAEpC,oJAAoJ;gBACjI,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,6BAA6B;IAM9E,0DAA0D;IAC1D,IAAW,IAAI,IAAI,MAAM,CAA6B;IAEtD;;OAEG;IACI,mBAAmB,CAAC,OAAO,EAAE,UAAU,GAAG,qBAAqB,GAAG,SAAS;IAM3E,MAAM,CAAC,QAAQ,EAAE,6BAA6B,GAAG,SAAS,GAAG,OAAO;IAM3E,OAAO,CAAC,YAAY;CAsBrB"}
@@ -0,0 +1,58 @@
1
+ /*---------------------------------------------------------------------------------------------
2
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
3
+ * See LICENSE.md in the project root for license terms and full copyright notice.
4
+ *--------------------------------------------------------------------------------------------*/
5
+ import { CompressedId64Set } from "@itwin/core-bentley";
6
+ function equalDisplayTransforms(a, b) {
7
+ return !!a.premultiply === !!b.premultiply && a.transform.isAlmostEqual(b.transform);
8
+ }
9
+ /** Optimization for the common case in which no display transforms are to be applied. */
10
+ const emptyState = { transforms: [], guid: "" };
11
+ /** Manages the display transforms to be applied to all of the models in a BatchedTileTree, enabling all models that share an equivalent transform
12
+ * to be drawn together.
13
+ * Call `update` whenever the transforms may have changed (e.g., after the viewport's scene is invalidated).
14
+ * @internal
15
+ */
16
+ export class ModelGroupDisplayTransforms {
17
+ /** Create a new set of groups for the specified `modelIds`. If `provider` is supplied, the grouping will be applied to those models immediately. */
18
+ constructor(modelIds, provider) {
19
+ this._state = emptyState;
20
+ this._modelIds = modelIds;
21
+ if (provider)
22
+ this.update(provider);
23
+ }
24
+ /** A string uniquely identifying the current grouping. */
25
+ get guid() { return this._state.guid; }
26
+ /** Get the display transform for the specified model.
27
+ * @note This method is guaranteed to return the same object for all models in the same group, at least between calls to `update`.
28
+ */
29
+ getDisplayTransform(modelId) {
30
+ return this._state.transforms.find((x) => x.modelIds.has(modelId))?.transform;
31
+ }
32
+ // Update the display transforms and the model groupings based on the transforms supplied by `provider`.
33
+ // Return `true` if the groupings changed as a result.
34
+ update(provider) {
35
+ const prevState = this._state;
36
+ this._state = this.computeState(provider);
37
+ return this._state.guid !== prevState.guid;
38
+ }
39
+ computeState(provider) {
40
+ if (!provider)
41
+ return emptyState;
42
+ const transforms = [];
43
+ for (const modelId of this._modelIds) {
44
+ const transform = provider.getModelDisplayTransform(modelId);
45
+ if (transform) {
46
+ let entry = transforms.find((x) => equalDisplayTransforms(transform, x.transform));
47
+ if (!entry)
48
+ transforms.push(entry = { transform, modelIds: new Set() });
49
+ entry.modelIds.add(modelId);
50
+ }
51
+ }
52
+ if (transforms.length === 0)
53
+ return emptyState;
54
+ const guid = transforms.map((x) => CompressedId64Set.compressSet(x.modelIds)).sort().join("_");
55
+ return { transforms, guid };
56
+ }
57
+ }
58
+ //# sourceMappingURL=ModelGroupDisplayTransforms.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ModelGroupDisplayTransforms.js","sourceRoot":"","sources":["../../src/ModelGroupDisplayTransforms.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAE/F,OAAO,EAAE,iBAAiB,EAAuB,MAAM,qBAAqB,CAAC;AAG7E,SAAS,sBAAsB,CAAC,CAAwB,EAAE,CAAwB;IAChF,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AACvF,CAAC;AAcD,yFAAyF;AACzF,MAAM,UAAU,GAAqC,EAAE,UAAU,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;AAElF;;;;GAIG;AACH,MAAM,OAAO,2BAA2B;IAItC,oJAAoJ;IACpJ,YAAmB,QAAiB,EAAE,QAAwC;QAJtE,WAAM,GAAqC,UAAU,CAAC;QAK5D,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,QAAQ;YACV,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC1B,CAAC;IAED,0DAA0D;IAC1D,IAAW,IAAI,KAAa,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAEtD;;OAEG;IACI,mBAAmB,CAAC,OAAmB;QAC5C,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC;IAChF,CAAC;IAED,wGAAwG;IACxG,sDAAsD;IAC/C,MAAM,CAAC,QAAmD;QAC/D,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC;QAC9B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC1C,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,CAAC;IAC7C,CAAC;IAEO,YAAY,CAAC,QAAmD;QACtE,IAAI,CAAC,QAAQ;YACX,OAAO,UAAU,CAAC;QAEpB,MAAM,UAAU,GAAiC,EAAE,CAAC;QACpD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,SAAS,EAAE;YACpC,MAAM,SAAS,GAAG,QAAQ,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;YAC7D,IAAI,SAAS,EAAE;gBACb,IAAI,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,sBAAsB,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBACnF,IAAI,CAAC,KAAK;oBACR,UAAU,CAAC,IAAI,CAAC,KAAK,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC,CAAC;gBAE9D,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aAC7B;SACF;QAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;YACzB,OAAO,UAAU,CAAC;QAEpB,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/F,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IAC9B,CAAC;CACF","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 { CompressedId64Set, Id64Set, Id64String } from \"@itwin/core-bentley\";\r\nimport { ModelDisplayTransform, ModelDisplayTransformProvider } from \"@itwin/core-frontend\";\r\n\r\nfunction equalDisplayTransforms(a: ModelDisplayTransform, b: ModelDisplayTransform): boolean {\r\n return !!a.premultiply === !!b.premultiply && a.transform.isAlmostEqual(b.transform);\r\n}\r\n\r\n/** A display transform to be applied to a set of models. */\r\ninterface ModelGroupDisplayTransform {\r\n modelIds: Id64Set;\r\n transform: ModelDisplayTransform;\r\n}\r\n\r\n/** A collection of model Ids grouped according to the unique transforms to be applied to each group. */\r\ninterface ModelGroupDisplayTransformsState {\r\n readonly transforms: ReadonlyArray<ModelGroupDisplayTransform>;\r\n readonly guid: string;\r\n}\r\n\r\n/** Optimization for the common case in which no display transforms are to be applied. */\r\nconst emptyState: ModelGroupDisplayTransformsState = { transforms: [], guid: \"\" };\r\n\r\n/** Manages the display transforms to be applied to all of the models in a BatchedTileTree, enabling all models that share an equivalent transform\r\n * to be drawn together.\r\n * Call `update` whenever the transforms may have changed (e.g., after the viewport's scene is invalidated).\r\n * @internal\r\n */\r\nexport class ModelGroupDisplayTransforms {\r\n private _state: ModelGroupDisplayTransformsState = emptyState;\r\n private readonly _modelIds: Id64Set;\r\n\r\n /** Create a new set of groups for the specified `modelIds`. If `provider` is supplied, the grouping will be applied to those models immediately. */\r\n public constructor(modelIds: Id64Set, provider?: ModelDisplayTransformProvider) {\r\n this._modelIds = modelIds;\r\n if (provider)\r\n this.update(provider);\r\n }\r\n\r\n /** A string uniquely identifying the current grouping. */\r\n public get guid(): string { return this._state.guid; }\r\n\r\n /** Get the display transform for the specified model.\r\n * @note This method is guaranteed to return the same object for all models in the same group, at least between calls to `update`.\r\n */\r\n public getDisplayTransform(modelId: Id64String): ModelDisplayTransform | undefined {\r\n return this._state.transforms.find((x) => x.modelIds.has(modelId))?.transform;\r\n }\r\n\r\n // Update the display transforms and the model groupings based on the transforms supplied by `provider`.\r\n // Return `true` if the groupings changed as a result.\r\n public update(provider: ModelDisplayTransformProvider | undefined): boolean {\r\n const prevState = this._state;\r\n this._state = this.computeState(provider);\r\n return this._state.guid !== prevState.guid;\r\n }\r\n\r\n private computeState(provider: ModelDisplayTransformProvider | undefined): ModelGroupDisplayTransformsState {\r\n if (!provider)\r\n return emptyState;\r\n\r\n const transforms: ModelGroupDisplayTransform[] = [];\r\n for (const modelId of this._modelIds) {\r\n const transform = provider.getModelDisplayTransform(modelId);\r\n if (transform) {\r\n let entry = transforms.find((x) => equalDisplayTransforms(transform, x.transform));\r\n if (!entry)\r\n transforms.push(entry = { transform, modelIds: new Set() });\r\n\r\n entry.modelIds.add(modelId);\r\n }\r\n }\r\n\r\n if (transforms.length === 0)\r\n return emptyState;\r\n\r\n const guid = transforms.map((x) => CompressedId64Set.compressSet(x.modelIds)).sort().join(\"_\");\r\n return { transforms, guid };\r\n }\r\n}\r\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@itwin/frontend-tiles",
3
- "version": "4.4.0-dev.21",
3
+ "version": "4.4.0-dev.25",
4
4
  "description": "Experimental alternative technique for visualizing the contents of iModels",
5
5
  "main": "lib/cjs/frontend-tiles.js",
6
6
  "module": "lib/esm/frontend-tiles.js",
@@ -14,19 +14,17 @@
14
14
  "keywords": [
15
15
  "Bentley",
16
16
  "BIM",
17
- "iModel",
18
- "UI",
19
- "Widget"
17
+ "iModel"
20
18
  ],
21
19
  "author": {
22
20
  "name": "Bentley Systems, Inc.",
23
21
  "url": "http://www.bentley.com"
24
22
  },
25
23
  "peerDependencies": {
26
- "@itwin/core-bentley": "4.4.0-dev.21",
27
- "@itwin/core-common": "4.4.0-dev.21",
28
- "@itwin/core-frontend": "4.4.0-dev.21",
29
- "@itwin/core-geometry": "4.4.0-dev.21"
24
+ "@itwin/core-bentley": "4.4.0-dev.25",
25
+ "@itwin/core-common": "4.4.0-dev.25",
26
+ "@itwin/core-frontend": "4.4.0-dev.25",
27
+ "@itwin/core-geometry": "4.4.0-dev.25"
30
28
  },
31
29
  "devDependencies": {
32
30
  "@itwin/eslint-plugin": "4.0.0-dev.44",
@@ -47,12 +45,12 @@
47
45
  "source-map-loader": "^4.0.0",
48
46
  "typescript": "~5.0.2",
49
47
  "webpack": "^5.76.0",
50
- "@itwin/build-tools": "4.4.0-dev.21",
51
- "@itwin/core-bentley": "4.4.0-dev.21",
52
- "@itwin/certa": "4.4.0-dev.21",
53
- "@itwin/core-common": "4.4.0-dev.21",
54
- "@itwin/core-frontend": "4.4.0-dev.21",
55
- "@itwin/core-geometry": "4.4.0-dev.21"
48
+ "@itwin/build-tools": "4.4.0-dev.25",
49
+ "@itwin/core-bentley": "4.4.0-dev.25",
50
+ "@itwin/certa": "4.4.0-dev.25",
51
+ "@itwin/core-common": "4.4.0-dev.25",
52
+ "@itwin/core-frontend": "4.4.0-dev.25",
53
+ "@itwin/core-geometry": "4.4.0-dev.25"
56
54
  },
57
55
  "scripts": {
58
56
  "build": "npm run -s build:cjs && npm run -s build:esm",