@itwin/ecschema-rpcinterface-tests 5.1.4 → 5.1.6
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.
- package/lib/dist/bundled-tests.js +76 -31
- package/lib/dist/bundled-tests.js.map +1 -1
- package/package.json +15 -15
|
@@ -90827,6 +90827,7 @@ class PlanarClipMaskState {
|
|
|
90827
90827
|
_tileTreeRefs;
|
|
90828
90828
|
_allLoaded = false;
|
|
90829
90829
|
_usingViewportOverrides = false;
|
|
90830
|
+
_overridesModelVisibility = false;
|
|
90830
90831
|
_maskRange = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_2__.Range3d.createNull();
|
|
90831
90832
|
constructor(settings) {
|
|
90832
90833
|
this.settings = settings;
|
|
@@ -90839,6 +90840,8 @@ class PlanarClipMaskState {
|
|
|
90839
90840
|
}
|
|
90840
90841
|
get usingViewportOverrides() { return this._usingViewportOverrides; }
|
|
90841
90842
|
;
|
|
90843
|
+
/** @internal */
|
|
90844
|
+
get overridesModelVisibility() { return this._overridesModelVisibility; }
|
|
90842
90845
|
discloseTileTrees(trees) {
|
|
90843
90846
|
if (this._tileTreeRefs)
|
|
90844
90847
|
this._tileTreeRefs.forEach((treeRef) => treeRef.discloseTileTrees(trees));
|
|
@@ -90874,7 +90877,7 @@ class PlanarClipMaskState {
|
|
|
90874
90877
|
}
|
|
90875
90878
|
// Returns any potential FeatureSymbology overrides for drawing the planar clip mask.
|
|
90876
90879
|
getPlanarClipMaskSymbologyOverrides(context, featureSymbologySource) {
|
|
90877
|
-
this._usingViewportOverrides = false;
|
|
90880
|
+
this._usingViewportOverrides = this._overridesModelVisibility = false;
|
|
90878
90881
|
// First obtain a list of models that will need to be turned off for drawing the planar clip mask (only used for batched tile trees).
|
|
90879
90882
|
const overrideModels = context.viewport.view.isSpatialView() ? context.viewport.view.getModelsNotInMask(this.settings.modelIds, _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.PlanarClipMaskMode.Priority === this.settings.mode) : undefined;
|
|
90880
90883
|
const noSubCategoryOrElementIds = !this.settings.subCategoryOrElementIds;
|
|
@@ -90884,6 +90887,7 @@ class PlanarClipMaskState {
|
|
|
90884
90887
|
const viewport = overrideModels && ovrBasedOnContext ? context.viewport : undefined;
|
|
90885
90888
|
const overrides = _render_FeatureSymbology__WEBPACK_IMPORTED_MODULE_1__.FeatureSymbology.Overrides.withSource(featureSymbologySource, viewport);
|
|
90886
90889
|
if (overrideModels) {
|
|
90890
|
+
this._overridesModelVisibility = true;
|
|
90887
90891
|
// overrideModels is used for batched models. For those, we need to create model overrides to turn off models that are
|
|
90888
90892
|
// not wanted in the mask (using transparency) no matter what mask mode is being used.
|
|
90889
90893
|
const appOff = _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.FeatureAppearance.fromTransparency(1.0);
|
|
@@ -94924,10 +94928,21 @@ class RenderContext {
|
|
|
94924
94928
|
class DynamicsContext extends RenderContext {
|
|
94925
94929
|
_foreground;
|
|
94926
94930
|
_overlay;
|
|
94927
|
-
/** Add a graphic to the list of dynamic graphics to be drawn in this context's [[Viewport]].
|
|
94931
|
+
/** Add a graphic to the list of dynamic graphics to be drawn in this context's [[Viewport]].
|
|
94932
|
+
* These graphics are drawn as [[GraphicType.Scene]].
|
|
94933
|
+
* @see [[addOverlay]] to add a graphic to be drawn as an overlay instead.
|
|
94934
|
+
*/
|
|
94928
94935
|
addGraphic(graphic) {
|
|
94929
94936
|
this.add(graphic, false);
|
|
94930
94937
|
}
|
|
94938
|
+
/** Add a graphic to the list of dynamic graphics to be drawn in this context's [[Viewport]].
|
|
94939
|
+
* These graphics are drawn as part of the viewport's scene as described by [[GraphicType.Scene]], except
|
|
94940
|
+
* that they always draw on top of other graphics as with [[GraphicType.WorldOverlay]].
|
|
94941
|
+
* @see [[addGraphic]] to add an ordinary scene graphic instead.
|
|
94942
|
+
*/
|
|
94943
|
+
addOverlay(graphic) {
|
|
94944
|
+
this.add(graphic, true);
|
|
94945
|
+
}
|
|
94931
94946
|
/** @internal */
|
|
94932
94947
|
add(graphic, isOverlay) {
|
|
94933
94948
|
const key = isOverlay ? "_overlay" : "_foreground";
|
|
@@ -114540,6 +114555,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
114540
114555
|
/* harmony export */ BatchUniforms: () => (/* binding */ BatchUniforms)
|
|
114541
114556
|
/* harmony export */ });
|
|
114542
114557
|
/* harmony import */ var _Sync__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Sync */ "../../core/frontend/lib/esm/internal/render/webgl/Sync.js");
|
|
114558
|
+
/* harmony import */ var _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @itwin/core-bentley */ "../../core/bentley/lib/esm/core-bentley.js");
|
|
114543
114559
|
/*---------------------------------------------------------------------------------------------
|
|
114544
114560
|
* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
|
|
114545
114561
|
* See LICENSE.md in the project root for license terms and full copyright notice.
|
|
@@ -114548,6 +114564,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
114548
114564
|
* @module WebGL
|
|
114549
114565
|
*/
|
|
114550
114566
|
|
|
114567
|
+
|
|
114551
114568
|
const scratchRgb = new Float32Array(3);
|
|
114552
114569
|
const noOverrideRgb = new Float32Array([-1.0, -1.0, -1.0]);
|
|
114553
114570
|
/** Maintains uniform variable state associated with the Batch currently being drawn by a Target.
|
|
@@ -114568,19 +114585,29 @@ class BatchUniforms {
|
|
|
114568
114585
|
this.state = batchState;
|
|
114569
114586
|
this._target = target;
|
|
114570
114587
|
}
|
|
114571
|
-
|
|
114588
|
+
clearCurrentBatch() {
|
|
114589
|
+
this._setCurrentBatch(undefined, undefined);
|
|
114590
|
+
}
|
|
114591
|
+
setCurrentBatch(batch, provider) {
|
|
114592
|
+
this._setCurrentBatch(batch, provider);
|
|
114593
|
+
}
|
|
114594
|
+
_setCurrentBatch(batch, provider) {
|
|
114572
114595
|
(0,_Sync__WEBPACK_IMPORTED_MODULE_0__.desync)(this);
|
|
114573
|
-
|
|
114596
|
+
let overrides;
|
|
114597
|
+
if (undefined !== batch) {
|
|
114598
|
+
(0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_1__.assert)(undefined !== provider);
|
|
114599
|
+
overrides = batch.getOverrides(this._target, provider);
|
|
114574
114600
|
this.state.push(batch, false);
|
|
114575
|
-
|
|
114601
|
+
}
|
|
114602
|
+
else {
|
|
114576
114603
|
this.state.pop();
|
|
114604
|
+
}
|
|
114577
114605
|
const batchId = this.state.currentBatchId;
|
|
114578
114606
|
this._scratchUint32[0] = batchId;
|
|
114579
114607
|
this._batchId[0] = this._scratchBytes[0];
|
|
114580
114608
|
this._batchId[1] = this._scratchBytes[1];
|
|
114581
114609
|
this._batchId[2] = this._scratchBytes[2];
|
|
114582
114610
|
this._batchId[3] = this._scratchBytes[3];
|
|
114583
|
-
const overrides = undefined !== batch ? batch.getOverrides(this._target) : undefined;
|
|
114584
114611
|
this._overrides = (undefined !== overrides && overrides.anyOverridden) ? overrides : undefined;
|
|
114585
114612
|
let sensors;
|
|
114586
114613
|
if (undefined !== batch && this._target.wantThematicSensors) {
|
|
@@ -118037,7 +118064,7 @@ class FeatureOverrides {
|
|
|
118037
118064
|
(0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(undefined !== this._lut.dataBytes);
|
|
118038
118065
|
return this._lut.dataBytes;
|
|
118039
118066
|
}
|
|
118040
|
-
_initialize(map, ovrs, pickExcludes, hilite, flashed) {
|
|
118067
|
+
_initialize(provider, map, ovrs, pickExcludes, hilite, flashed) {
|
|
118041
118068
|
const nFeatures = map.numFeatures;
|
|
118042
118069
|
const dims = (0,_common_internal_render_VertexTable__WEBPACK_IMPORTED_MODULE_9__.computeDimensions)(nFeatures, 3, 0, _System__WEBPACK_IMPORTED_MODULE_6__.System.instance.maxTextureSize);
|
|
118043
118070
|
const width = dims.width;
|
|
@@ -118047,17 +118074,17 @@ class FeatureOverrides {
|
|
|
118047
118074
|
this._lutParams[1] = height;
|
|
118048
118075
|
const data = new Uint8Array(width * height * 4);
|
|
118049
118076
|
const creator = new _Texture__WEBPACK_IMPORTED_MODULE_7__.Texture2DDataUpdater(data);
|
|
118050
|
-
this.buildLookupTable(creator, map, ovrs, pickExcludes, flashed, hilite);
|
|
118077
|
+
this.buildLookupTable(provider, creator, map, ovrs, pickExcludes, flashed, hilite);
|
|
118051
118078
|
return _Texture__WEBPACK_IMPORTED_MODULE_7__.TextureHandle.createForData(width, height, data, true, _GL__WEBPACK_IMPORTED_MODULE_3__.GL.Texture.WrapMode.ClampToEdge);
|
|
118052
118079
|
}
|
|
118053
|
-
_update(map, lut, pickExcludes, flashed, hilites, ovrs) {
|
|
118080
|
+
_update(provider, map, lut, pickExcludes, flashed, hilites, ovrs) {
|
|
118054
118081
|
const updater = new _Texture__WEBPACK_IMPORTED_MODULE_7__.Texture2DDataUpdater(lut.dataBytes);
|
|
118055
118082
|
if (undefined === ovrs) {
|
|
118056
118083
|
this.updateFlashedAndHilited(updater, map, pickExcludes, flashed, hilites);
|
|
118057
118084
|
}
|
|
118058
118085
|
else {
|
|
118059
118086
|
(0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(undefined !== hilites);
|
|
118060
|
-
this.buildLookupTable(updater, map, ovrs, pickExcludes, flashed, hilites);
|
|
118087
|
+
this.buildLookupTable(provider, updater, map, ovrs, pickExcludes, flashed, hilites);
|
|
118061
118088
|
}
|
|
118062
118089
|
lut.update(updater);
|
|
118063
118090
|
}
|
|
@@ -118080,7 +118107,7 @@ class FeatureOverrides {
|
|
|
118080
118107
|
}
|
|
118081
118108
|
return curFlags;
|
|
118082
118109
|
}
|
|
118083
|
-
buildLookupTable(data, map, ovr, pickExclude, flashedIdParts, hilites) {
|
|
118110
|
+
buildLookupTable(provider, data, map, ovr, pickExclude, flashedIdParts, hilites) {
|
|
118084
118111
|
const allowHilite = true !== this._options.noHilite;
|
|
118085
118112
|
const allowFlash = true !== this._options.noFlash;
|
|
118086
118113
|
const allowEmphasis = true !== this._options.noEmphasis;
|
|
@@ -118108,7 +118135,7 @@ class FeatureOverrides {
|
|
|
118108
118135
|
prevModelId.upper = feature.modelId.upper;
|
|
118109
118136
|
isModelHilited = allowHilite && hilites.models.hasPair(feature.modelId);
|
|
118110
118137
|
}
|
|
118111
|
-
const app =
|
|
118138
|
+
const app = provider.getFeatureAppearance(ovr, feature.elementId.lower, feature.elementId.upper, feature.subCategoryId.lower, feature.subCategoryId.upper, feature.geometryClass, feature.modelId.lower, feature.modelId.upper, map.type, feature.animationNodeId);
|
|
118112
118139
|
// NB: If the appearance is fully transparent, then:
|
|
118113
118140
|
// - For normal ("primary") models, getAppearance() returns undefined.
|
|
118114
118141
|
// - For classifier models, getAppearance() returns the appearance, and classification shader will discard fully-transparent classified pixels.
|
|
@@ -118268,19 +118295,19 @@ class FeatureOverrides {
|
|
|
118268
118295
|
this._cleanup = undefined;
|
|
118269
118296
|
}
|
|
118270
118297
|
}
|
|
118271
|
-
initFromMap(map) {
|
|
118298
|
+
initFromMap(map, provider) {
|
|
118272
118299
|
const nFeatures = map.numFeatures;
|
|
118273
118300
|
(0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(0 < nFeatures);
|
|
118274
118301
|
this._lut = (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.dispose)(this._lut);
|
|
118275
118302
|
const ovrs = this.target.currentFeatureSymbologyOverrides;
|
|
118276
118303
|
this._mostRecentSymbologyOverrides = ovrs;
|
|
118277
118304
|
const hilite = this.target.hilites;
|
|
118278
|
-
this._lut = this._initialize(map, ovrs, this.target.pickExclusions, hilite, this.target.flashed);
|
|
118305
|
+
this._lut = this._initialize(provider, map, ovrs, this.target.pickExclusions, hilite, this.target.flashed);
|
|
118279
118306
|
this._lastFlashId = _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.Id64.invalid;
|
|
118280
118307
|
this._hiliteSyncObserver = {};
|
|
118281
118308
|
this._pickExclusionsSyncObserver = {};
|
|
118282
118309
|
}
|
|
118283
|
-
update(features) {
|
|
118310
|
+
update(features, provider) {
|
|
118284
118311
|
let ovrs = this.target.currentFeatureSymbologyOverrides;
|
|
118285
118312
|
const ovrsUpdated = ovrs !== this._mostRecentSymbologyOverrides;
|
|
118286
118313
|
if (ovrsUpdated)
|
|
@@ -118294,7 +118321,7 @@ class FeatureOverrides {
|
|
|
118294
118321
|
if (ovrsUpdated || hiliteUpdated || flashedId !== this._lastFlashId || pickExcludesUpdated) {
|
|
118295
118322
|
// _lut can be undefined if context was lost, (gl.createTexture returns null)
|
|
118296
118323
|
if (this._lut) {
|
|
118297
|
-
this._update(features, this._lut, undefined !== ovrs || pickExcludesUpdated ? this.target.pickExclusions : undefined, this.target.flashed, undefined !== ovrs || hiliteUpdated ? hilite : undefined, ovrs);
|
|
118324
|
+
this._update(provider, features, this._lut, undefined !== ovrs || pickExcludesUpdated ? this.target.pickExclusions : undefined, this.target.flashed, undefined !== ovrs || hiliteUpdated ? hilite : undefined, ovrs);
|
|
118298
118325
|
}
|
|
118299
118326
|
this._lastFlashId = flashedId;
|
|
118300
118327
|
}
|
|
@@ -119566,15 +119593,15 @@ class PerTargetBatchData {
|
|
|
119566
119593
|
this._thematicSensors.update(this.target.uniforms.frustum.viewMatrix);
|
|
119567
119594
|
return this._thematicSensors;
|
|
119568
119595
|
}
|
|
119569
|
-
getFeatureOverrides(batch) {
|
|
119596
|
+
getFeatureOverrides(batch, provider) {
|
|
119570
119597
|
const source = this.target.currentFeatureSymbologyOverrides?.source;
|
|
119571
119598
|
let ovrs = this._featureOverrides.get(source);
|
|
119572
119599
|
if (!ovrs) {
|
|
119573
119600
|
const cleanup = source ? source.onSourceDisposed.addOnce(() => this.onSourceDisposed(source)) : undefined;
|
|
119574
119601
|
this._featureOverrides.set(source, ovrs = _FeatureOverrides__WEBPACK_IMPORTED_MODULE_7__.FeatureOverrides.createFromTarget(this.target, batch.options, cleanup));
|
|
119575
|
-
ovrs.initFromMap(batch.featureTable);
|
|
119602
|
+
ovrs.initFromMap(batch.featureTable, provider);
|
|
119576
119603
|
}
|
|
119577
|
-
ovrs.update(batch.featureTable);
|
|
119604
|
+
ovrs.update(batch.featureTable, provider);
|
|
119578
119605
|
return ovrs;
|
|
119579
119606
|
}
|
|
119580
119607
|
getContours(batch) {
|
|
@@ -119641,8 +119668,8 @@ class PerTargetData {
|
|
|
119641
119668
|
getThematicSensors(target) {
|
|
119642
119669
|
return this.getBatchData(target).getThematicSensors(this._batch);
|
|
119643
119670
|
}
|
|
119644
|
-
getFeatureOverrides(target) {
|
|
119645
|
-
return this.getBatchData(target).getFeatureOverrides(this._batch);
|
|
119671
|
+
getFeatureOverrides(target, provider) {
|
|
119672
|
+
return this.getBatchData(target).getFeatureOverrides(this._batch, provider);
|
|
119646
119673
|
}
|
|
119647
119674
|
getContours(target) {
|
|
119648
119675
|
return this.getBatchData(target).getContours(this._batch);
|
|
@@ -119729,8 +119756,8 @@ class Batch extends Graphic {
|
|
|
119729
119756
|
(0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(target.plan.thematic.sensorSettings.sensors.length > 0, "must have at least one sensor to process");
|
|
119730
119757
|
return this.perTargetData.getThematicSensors(target);
|
|
119731
119758
|
}
|
|
119732
|
-
getOverrides(target) {
|
|
119733
|
-
return this.perTargetData.getFeatureOverrides(target);
|
|
119759
|
+
getOverrides(target, provider) {
|
|
119760
|
+
return this.perTargetData.getFeatureOverrides(target, provider);
|
|
119734
119761
|
}
|
|
119735
119762
|
getContours(target) {
|
|
119736
119763
|
return this.perTargetData.getContours(target);
|
|
@@ -122475,6 +122502,7 @@ class PlanarClassifier extends _RenderPlanarClassifier__WEBPACK_IMPORTED_MODULE_
|
|
|
122475
122502
|
_planarClipMask;
|
|
122476
122503
|
_classifierTreeRef;
|
|
122477
122504
|
_planarClipMaskOverrides;
|
|
122505
|
+
_overridesDirty = true;
|
|
122478
122506
|
_contentMode = PlanarClassifierContent.None;
|
|
122479
122507
|
_removeMe;
|
|
122480
122508
|
_featureSymbologySource = {
|
|
@@ -122613,14 +122641,17 @@ class PlanarClassifier extends _RenderPlanarClassifier__WEBPACK_IMPORTED_MODULE_
|
|
|
122613
122641
|
this._projectionMatrix = projection.projectionMatrix;
|
|
122614
122642
|
this._frustum = projection.textureFrustum;
|
|
122615
122643
|
this._debugFrustum = projection.debugFrustum;
|
|
122616
|
-
|
|
122644
|
+
if (this._overridesDirty) {
|
|
122645
|
+
this._overridesDirty = false;
|
|
122646
|
+
this._planarClipMaskOverrides = this._planarClipMask?.getPlanarClipMaskSymbologyOverrides(context, this._featureSymbologySource);
|
|
122647
|
+
}
|
|
122617
122648
|
if (!this._planarClipMask?.usingViewportOverrides && this._removeMe) {
|
|
122618
122649
|
this._removeMe();
|
|
122619
122650
|
this._removeMe = undefined;
|
|
122620
122651
|
}
|
|
122621
122652
|
else if (this._planarClipMask?.usingViewportOverrides && !this._removeMe) {
|
|
122622
122653
|
this._removeMe = context.viewport.onFeatureOverridesChanged.addListener(() => {
|
|
122623
|
-
this.
|
|
122654
|
+
this._overridesDirty = true;
|
|
122624
122655
|
context.viewport.requestRedraw();
|
|
122625
122656
|
});
|
|
122626
122657
|
}
|
|
@@ -122749,6 +122780,16 @@ class PlanarClassifier extends _RenderPlanarClassifier__WEBPACK_IMPORTED_MODULE_
|
|
|
122749
122780
|
const getDrawCommands = (graphics) => {
|
|
122750
122781
|
this._batchState.reset();
|
|
122751
122782
|
renderCommands.reset(target, this._branchStack, this._batchState);
|
|
122783
|
+
if (this._planarClipMask?.overridesModelVisibility) {
|
|
122784
|
+
// We're using batched tiles and the mask is overriding which models are visible versus those visible in the view.
|
|
122785
|
+
// We don't want the BatchedTileTreeReference to hide models that belong in the mask.
|
|
122786
|
+
// The target's root branch's symbology overrides are set up correctly for the mask, and we never push branches to the target
|
|
122787
|
+
// (we have a separate branch stack), so just use the root branch as the appearance provider instead of the branch stack.
|
|
122788
|
+
// NOTE: this doesn't work if we're inside a GraphicalEditingScope displaying temporary graphics for some elements, because those
|
|
122789
|
+
// elements are hidden in the tiles by a FeatureAppearanceProvider. But we'll never use a GraphicalEditingScope with batched tiles,
|
|
122790
|
+
// and non-batched tiles never hide models using symbology overrides.
|
|
122791
|
+
renderCommands.appearanceProvider = target.currentBranch;
|
|
122792
|
+
}
|
|
122752
122793
|
renderCommands.collectGraphicsForPlanarProjection(graphics);
|
|
122753
122794
|
// Draw the classifiers into our attachments.
|
|
122754
122795
|
// When using Display.ElementColor, the color and transparency come from the classifier geometry. Therefore we may need to draw the classified geometry
|
|
@@ -122775,8 +122816,10 @@ class PlanarClassifier extends _RenderPlanarClassifier__WEBPACK_IMPORTED_MODULE_
|
|
|
122775
122816
|
this._classifierBuffers.drawHilite(hiliteCommands, target);
|
|
122776
122817
|
}
|
|
122777
122818
|
if (this._maskGraphics.length > 0 && this._maskBuffer) {
|
|
122778
|
-
if (this._planarClipMaskOverrides)
|
|
122819
|
+
if (this._planarClipMaskOverrides) {
|
|
122779
122820
|
target.overrideFeatureSymbology(this._planarClipMaskOverrides);
|
|
122821
|
+
this._branchStack.setSymbologyOverrides(this._planarClipMaskOverrides);
|
|
122822
|
+
}
|
|
122780
122823
|
if (this._planarClipMask && this._planarClipMask.settings.transparency !== undefined && this._planarClipMask.settings.transparency > 0.0)
|
|
122781
122824
|
this._anyTranslucent = true;
|
|
122782
122825
|
this._maskBuffer.draw(getDrawCommands(this._maskGraphics), target);
|
|
@@ -124227,6 +124270,7 @@ class RenderCommands {
|
|
|
124227
124270
|
_translucentOverrides = false;
|
|
124228
124271
|
_addTranslucentAsOpaque = false; // true when rendering for _ReadPixels to force translucent items to be drawn in opaque pass.
|
|
124229
124272
|
_layers;
|
|
124273
|
+
appearanceProvider;
|
|
124230
124274
|
get target() { return this._target; }
|
|
124231
124275
|
[Symbol.iterator]() {
|
|
124232
124276
|
return this._commands[Symbol.iterator]();
|
|
@@ -124273,6 +124317,7 @@ class RenderCommands {
|
|
|
124273
124317
|
this._target = target;
|
|
124274
124318
|
this._stack = stack;
|
|
124275
124319
|
this._batchState = batchState;
|
|
124320
|
+
this.appearanceProvider = undefined;
|
|
124276
124321
|
this.clear();
|
|
124277
124322
|
}
|
|
124278
124323
|
collectGraphicsForPlanarProjection(scene) {
|
|
@@ -124713,7 +124758,7 @@ class RenderCommands {
|
|
|
124713
124758
|
(0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(!this._opaqueOverrides && !this._translucentOverrides);
|
|
124714
124759
|
(0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(undefined === this._curBatch);
|
|
124715
124760
|
// If all features are overridden to be invisible, draw no graphics in this batch
|
|
124716
|
-
const overrides = batch.getOverrides(this.target);
|
|
124761
|
+
const overrides = batch.getOverrides(this.target, this.appearanceProvider ?? this._stack.top);
|
|
124717
124762
|
if (overrides.allHidden)
|
|
124718
124763
|
return;
|
|
124719
124764
|
if (!batch.range.isNull) {
|
|
@@ -131516,10 +131561,10 @@ class Target extends _render_RenderTarget__WEBPACK_IMPORTED_MODULE_7__.RenderTar
|
|
|
131516
131561
|
return this.isRangeOutsideActiveVolume(range);
|
|
131517
131562
|
}
|
|
131518
131563
|
pushBatch(batch) {
|
|
131519
|
-
this.uniforms.batch.setCurrentBatch(batch);
|
|
131564
|
+
this.uniforms.batch.setCurrentBatch(batch, this.currentBranch);
|
|
131520
131565
|
}
|
|
131521
131566
|
popBatch() {
|
|
131522
|
-
this.uniforms.batch.
|
|
131567
|
+
this.uniforms.batch.clearCurrentBatch();
|
|
131523
131568
|
}
|
|
131524
131569
|
addBatch(batch) {
|
|
131525
131570
|
(0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(this._batches.indexOf(batch) < 0);
|
|
@@ -135446,7 +135491,7 @@ function* commandIterator(features, pass) {
|
|
|
135446
135491
|
command.execute(executor);
|
|
135447
135492
|
if (command.opcode !== "pushBatch")
|
|
135448
135493
|
continue;
|
|
135449
|
-
const ovrs = command.batch.getOverrides(features.target);
|
|
135494
|
+
const ovrs = command.batch.getOverrides(features.target, features.target.currentBranch);
|
|
135450
135495
|
if (ovrs.allHidden)
|
|
135451
135496
|
continue;
|
|
135452
135497
|
const scratchFeature = _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.PackedFeature.createWithIndex();
|
|
@@ -318314,7 +318359,7 @@ var loadLanguages = instance.loadLanguages;
|
|
|
318314
318359
|
/***/ ((module) => {
|
|
318315
318360
|
|
|
318316
318361
|
"use strict";
|
|
318317
|
-
module.exports = /*#__PURE__*/JSON.parse('{"name":"@itwin/core-frontend","version":"5.1.
|
|
318362
|
+
module.exports = /*#__PURE__*/JSON.parse('{"name":"@itwin/core-frontend","version":"5.1.6","description":"iTwin.js frontend components","main":"lib/cjs/core-frontend.js","module":"lib/esm/core-frontend.js","typings":"lib/cjs/core-frontend","license":"MIT","scripts":{"build":"npm run -s copy:public && npm run -s build:cjs && npm run -s build:esm && npm run -s webpackWorkers && npm run -s copy:workers","build:cjs":"npm run -s copy:js:cjs && tsc 1>&2 --outDir lib/cjs","build:esm":"npm run -s copy:js:esm && tsc 1>&2 --module ES2022 --outDir lib/esm","clean":"rimraf -g lib .rush/temp/package-deps*.json","copy:public":"cpx \\"./src/public/**/*\\" ./lib/public","copy:js:cjs":"cpx \\"./src/**/*.js\\" ./lib/cjs","copy:js:esm":"cpx \\"./src/**/*.js\\" ./lib/esm","copy:workers":"cpx \\"./lib/workers/webpack/parse-imdl-worker.js\\" ./lib/public/scripts","docs":"betools docs --json=../../generated-docs/core/core-frontend/file.json --tsIndexFile=./core-frontend.ts --onlyJson --excludes=webgl/**/*,**/map/*.d.ts,**/tile/*.d.ts,**/*-css.ts","extract-api":"betools extract-api --entry=core-frontend && npm run extract-extension-api","extract-extension-api":"eslint --no-inline-config -c extraction.eslint.config.js \\"./src/**/*.ts\\" 1>&2","lint":"eslint \\"./src/**/*.ts\\" 1>&2","lint-fix":"eslint --fix -f visualstudio \\"./src/**/*.ts\\" 1>&2","lint-deprecation":"eslint --fix -f visualstudio --no-inline-config -c ../../common/config/eslint/eslint.config.deprecation-policy.js \\"./src/**/*.ts\\"","pseudolocalize":"betools pseudolocalize --englishDir ./src/public/locales/en --out ./public/locales/en-PSEUDO","test":"npm run webpackTestWorker && vitest --run","cover":"npm run webpackTestWorker && vitest --run","webpackTests":"webpack --config ./src/test/utils/webpack.config.js 1>&2 && npm run -s webpackTestWorker","webpackTestWorker":"webpack --config ./src/test/worker/webpack.config.js 1>&2 && cpx \\"./lib/test/test-worker.js\\" ./lib/test","webpackWorkers":"webpack --config ./src/workers/ImdlParser/webpack.config.js 1>&2"},"repository":{"type":"git","url":"https://github.com/iTwin/itwinjs-core.git","directory":"core/frontend"},"keywords":["Bentley","BIM","iModel","digital-twin","iTwin"],"author":{"name":"Bentley Systems, Inc.","url":"http://www.bentley.com"},"peerDependencies":{"@itwin/appui-abstract":"workspace:*","@itwin/core-bentley":"workspace:*","@itwin/core-common":"workspace:*","@itwin/core-geometry":"workspace:*","@itwin/core-orbitgt":"workspace:*","@itwin/core-quantity":"workspace:*","@itwin/ecschema-metadata":"workspace:*","@itwin/ecschema-rpcinterface-common":"workspace:*"},"//devDependencies":["NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install","NOTE: All tools used by scripts in this package must be listed as devDependencies"],"devDependencies":{"@itwin/appui-abstract":"workspace:*","@itwin/build-tools":"workspace:*","@itwin/core-bentley":"workspace:*","@itwin/core-common":"workspace:*","@itwin/core-geometry":"workspace:*","@itwin/core-orbitgt":"workspace:*","@itwin/core-quantity":"workspace:*","@itwin/ecschema-metadata":"workspace:*","@itwin/ecschema-rpcinterface-common":"workspace:*","@itwin/eslint-plugin":"5.2.2-dev.2","@types/chai-as-promised":"^7","@types/sinon":"^17.0.2","@vitest/browser":"^3.0.6","@vitest/coverage-v8":"^3.0.6","cpx2":"^8.0.0","eslint":"^9.31.0","glob":"^10.3.12","playwright":"~1.47.1","rimraf":"^6.0.1","sinon":"^17.0.2","source-map-loader":"^5.0.0","typescript":"~5.6.2","typemoq":"^2.1.0","vitest":"^3.0.6","vite-multiple-assets":"^1.3.1","vite-plugin-static-copy":"2.2.0","webpack":"^5.97.1"},"//dependencies":["NOTE: these dependencies should be only for things that DO NOT APPEAR IN THE API","NOTE: core-frontend should remain UI technology agnostic, so no react/angular dependencies are allowed"],"dependencies":{"@itwin/cloud-agnostic-core":"^2.2.4","@itwin/object-storage-core":"^2.3.0","@itwin/core-i18n":"workspace:*","@itwin/webgl-compatibility":"workspace:*","@loaders.gl/core":"^3.1.6","@loaders.gl/draco":"^3.1.6","fuse.js":"^3.3.0","wms-capabilities":"0.4.0"}}');
|
|
318318
318363
|
|
|
318319
318364
|
/***/ })
|
|
318320
318365
|
|