@itwin/rpcinterface-full-stack-tests 5.2.0-dev.21 → 5.2.0-dev.23
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 +65 -31
- package/lib/dist/bundled-tests.js.map +1 -1
- package/package.json +14 -14
|
@@ -120837,6 +120837,7 @@ class PlanarClipMaskState {
|
|
|
120837
120837
|
_tileTreeRefs;
|
|
120838
120838
|
_allLoaded = false;
|
|
120839
120839
|
_usingViewportOverrides = false;
|
|
120840
|
+
_overridesModelVisibility = false;
|
|
120840
120841
|
_maskRange = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_2__.Range3d.createNull();
|
|
120841
120842
|
constructor(settings) {
|
|
120842
120843
|
this.settings = settings;
|
|
@@ -120849,6 +120850,8 @@ class PlanarClipMaskState {
|
|
|
120849
120850
|
}
|
|
120850
120851
|
get usingViewportOverrides() { return this._usingViewportOverrides; }
|
|
120851
120852
|
;
|
|
120853
|
+
/** @internal */
|
|
120854
|
+
get overridesModelVisibility() { return this._overridesModelVisibility; }
|
|
120852
120855
|
discloseTileTrees(trees) {
|
|
120853
120856
|
if (this._tileTreeRefs)
|
|
120854
120857
|
this._tileTreeRefs.forEach((treeRef) => treeRef.discloseTileTrees(trees));
|
|
@@ -120884,7 +120887,7 @@ class PlanarClipMaskState {
|
|
|
120884
120887
|
}
|
|
120885
120888
|
// Returns any potential FeatureSymbology overrides for drawing the planar clip mask.
|
|
120886
120889
|
getPlanarClipMaskSymbologyOverrides(context, featureSymbologySource) {
|
|
120887
|
-
this._usingViewportOverrides = false;
|
|
120890
|
+
this._usingViewportOverrides = this._overridesModelVisibility = false;
|
|
120888
120891
|
// 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).
|
|
120889
120892
|
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;
|
|
120890
120893
|
const noSubCategoryOrElementIds = !this.settings.subCategoryOrElementIds;
|
|
@@ -120894,6 +120897,7 @@ class PlanarClipMaskState {
|
|
|
120894
120897
|
const viewport = overrideModels && ovrBasedOnContext ? context.viewport : undefined;
|
|
120895
120898
|
const overrides = _render_FeatureSymbology__WEBPACK_IMPORTED_MODULE_1__.FeatureSymbology.Overrides.withSource(featureSymbologySource, viewport);
|
|
120896
120899
|
if (overrideModels) {
|
|
120900
|
+
this._overridesModelVisibility = true;
|
|
120897
120901
|
// overrideModels is used for batched models. For those, we need to create model overrides to turn off models that are
|
|
120898
120902
|
// not wanted in the mask (using transparency) no matter what mask mode is being used.
|
|
120899
120903
|
const appOff = _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.FeatureAppearance.fromTransparency(1.0);
|
|
@@ -144610,6 +144614,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
144610
144614
|
/* harmony export */ BatchUniforms: () => (/* binding */ BatchUniforms)
|
|
144611
144615
|
/* harmony export */ });
|
|
144612
144616
|
/* harmony import */ var _Sync__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Sync */ "../../core/frontend/lib/esm/internal/render/webgl/Sync.js");
|
|
144617
|
+
/* harmony import */ var _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @itwin/core-bentley */ "../../core/bentley/lib/esm/core-bentley.js");
|
|
144613
144618
|
/*---------------------------------------------------------------------------------------------
|
|
144614
144619
|
* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
|
|
144615
144620
|
* See LICENSE.md in the project root for license terms and full copyright notice.
|
|
@@ -144618,6 +144623,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
144618
144623
|
* @module WebGL
|
|
144619
144624
|
*/
|
|
144620
144625
|
|
|
144626
|
+
|
|
144621
144627
|
const scratchRgb = new Float32Array(3);
|
|
144622
144628
|
const noOverrideRgb = new Float32Array([-1.0, -1.0, -1.0]);
|
|
144623
144629
|
/** Maintains uniform variable state associated with the Batch currently being drawn by a Target.
|
|
@@ -144638,19 +144644,29 @@ class BatchUniforms {
|
|
|
144638
144644
|
this.state = batchState;
|
|
144639
144645
|
this._target = target;
|
|
144640
144646
|
}
|
|
144641
|
-
|
|
144647
|
+
clearCurrentBatch() {
|
|
144648
|
+
this._setCurrentBatch(undefined, undefined);
|
|
144649
|
+
}
|
|
144650
|
+
setCurrentBatch(batch, provider) {
|
|
144651
|
+
this._setCurrentBatch(batch, provider);
|
|
144652
|
+
}
|
|
144653
|
+
_setCurrentBatch(batch, provider) {
|
|
144642
144654
|
(0,_Sync__WEBPACK_IMPORTED_MODULE_0__.desync)(this);
|
|
144643
|
-
|
|
144655
|
+
let overrides;
|
|
144656
|
+
if (undefined !== batch) {
|
|
144657
|
+
(0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_1__.assert)(undefined !== provider);
|
|
144658
|
+
overrides = batch.getOverrides(this._target, provider);
|
|
144644
144659
|
this.state.push(batch, false);
|
|
144645
|
-
|
|
144660
|
+
}
|
|
144661
|
+
else {
|
|
144646
144662
|
this.state.pop();
|
|
144663
|
+
}
|
|
144647
144664
|
const batchId = this.state.currentBatchId;
|
|
144648
144665
|
this._scratchUint32[0] = batchId;
|
|
144649
144666
|
this._batchId[0] = this._scratchBytes[0];
|
|
144650
144667
|
this._batchId[1] = this._scratchBytes[1];
|
|
144651
144668
|
this._batchId[2] = this._scratchBytes[2];
|
|
144652
144669
|
this._batchId[3] = this._scratchBytes[3];
|
|
144653
|
-
const overrides = undefined !== batch ? batch.getOverrides(this._target) : undefined;
|
|
144654
144670
|
this._overrides = (undefined !== overrides && overrides.anyOverridden) ? overrides : undefined;
|
|
144655
144671
|
let sensors;
|
|
144656
144672
|
if (undefined !== batch && this._target.wantThematicSensors) {
|
|
@@ -148109,7 +148125,7 @@ class FeatureOverrides {
|
|
|
148109
148125
|
(0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(undefined !== this._lut.dataBytes);
|
|
148110
148126
|
return this._lut.dataBytes;
|
|
148111
148127
|
}
|
|
148112
|
-
_initialize(map, ovrs, pickExcludes, hilite, flashed) {
|
|
148128
|
+
_initialize(provider, map, ovrs, pickExcludes, hilite, flashed) {
|
|
148113
148129
|
const nFeatures = map.numFeatures;
|
|
148114
148130
|
const dims = (0,_common_internal_render_VertexTable__WEBPACK_IMPORTED_MODULE_9__.computeDimensions)(nFeatures, 3, 0, _System__WEBPACK_IMPORTED_MODULE_6__.System.instance.maxTextureSize);
|
|
148115
148131
|
const width = dims.width;
|
|
@@ -148119,17 +148135,17 @@ class FeatureOverrides {
|
|
|
148119
148135
|
this._lutParams[1] = height;
|
|
148120
148136
|
const data = new Uint8Array(width * height * 4);
|
|
148121
148137
|
const creator = new _Texture__WEBPACK_IMPORTED_MODULE_7__.Texture2DDataUpdater(data);
|
|
148122
|
-
this.buildLookupTable(creator, map, ovrs, pickExcludes, flashed, hilite);
|
|
148138
|
+
this.buildLookupTable(provider, creator, map, ovrs, pickExcludes, flashed, hilite);
|
|
148123
148139
|
return _Texture__WEBPACK_IMPORTED_MODULE_7__.TextureHandle.createForData(width, height, data, true, _GL__WEBPACK_IMPORTED_MODULE_3__.GL.Texture.WrapMode.ClampToEdge);
|
|
148124
148140
|
}
|
|
148125
|
-
_update(map, lut, pickExcludes, flashed, hilites, ovrs) {
|
|
148141
|
+
_update(provider, map, lut, pickExcludes, flashed, hilites, ovrs) {
|
|
148126
148142
|
const updater = new _Texture__WEBPACK_IMPORTED_MODULE_7__.Texture2DDataUpdater((0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.expectDefined)(lut.dataBytes));
|
|
148127
148143
|
if (undefined === ovrs) {
|
|
148128
148144
|
this.updateFlashedAndHilited(updater, map, pickExcludes, flashed, hilites);
|
|
148129
148145
|
}
|
|
148130
148146
|
else {
|
|
148131
148147
|
(0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(undefined !== hilites);
|
|
148132
|
-
this.buildLookupTable(updater, map, ovrs, pickExcludes, flashed, hilites);
|
|
148148
|
+
this.buildLookupTable(provider, updater, map, ovrs, pickExcludes, flashed, hilites);
|
|
148133
148149
|
}
|
|
148134
148150
|
lut.update(updater);
|
|
148135
148151
|
}
|
|
@@ -148152,7 +148168,7 @@ class FeatureOverrides {
|
|
|
148152
148168
|
}
|
|
148153
148169
|
return curFlags;
|
|
148154
148170
|
}
|
|
148155
|
-
buildLookupTable(data, map, ovr, pickExclude, flashedIdParts, hilites) {
|
|
148171
|
+
buildLookupTable(provider, data, map, ovr, pickExclude, flashedIdParts, hilites) {
|
|
148156
148172
|
const allowHilite = true !== this._options.noHilite;
|
|
148157
148173
|
const allowFlash = true !== this._options.noFlash;
|
|
148158
148174
|
const allowEmphasis = true !== this._options.noEmphasis;
|
|
@@ -148180,7 +148196,7 @@ class FeatureOverrides {
|
|
|
148180
148196
|
prevModelId.upper = feature.modelId.upper;
|
|
148181
148197
|
isModelHilited = allowHilite && hilites.models.hasPair(feature.modelId);
|
|
148182
148198
|
}
|
|
148183
|
-
const app =
|
|
148199
|
+
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);
|
|
148184
148200
|
// NB: If the appearance is fully transparent, then:
|
|
148185
148201
|
// - For normal ("primary") models, getAppearance() returns undefined.
|
|
148186
148202
|
// - For classifier models, getAppearance() returns the appearance, and classification shader will discard fully-transparent classified pixels.
|
|
@@ -148340,19 +148356,19 @@ class FeatureOverrides {
|
|
|
148340
148356
|
this._cleanup = undefined;
|
|
148341
148357
|
}
|
|
148342
148358
|
}
|
|
148343
|
-
initFromMap(map) {
|
|
148359
|
+
initFromMap(map, provider) {
|
|
148344
148360
|
const nFeatures = map.numFeatures;
|
|
148345
148361
|
(0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(0 < nFeatures);
|
|
148346
148362
|
this._lut = (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.dispose)(this._lut);
|
|
148347
148363
|
const ovrs = this.target.currentFeatureSymbologyOverrides;
|
|
148348
148364
|
this._mostRecentSymbologyOverrides = ovrs;
|
|
148349
148365
|
const hilite = this.target.hilites;
|
|
148350
|
-
this._lut = this._initialize(map, ovrs, this.target.pickExclusions, hilite, this.target.flashed);
|
|
148366
|
+
this._lut = this._initialize(provider, map, ovrs, this.target.pickExclusions, hilite, this.target.flashed);
|
|
148351
148367
|
this._lastFlashId = _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.Id64.invalid;
|
|
148352
148368
|
this._hiliteSyncObserver = {};
|
|
148353
148369
|
this._pickExclusionsSyncObserver = {};
|
|
148354
148370
|
}
|
|
148355
|
-
update(features) {
|
|
148371
|
+
update(features, provider) {
|
|
148356
148372
|
let ovrs = this.target.currentFeatureSymbologyOverrides;
|
|
148357
148373
|
const ovrsUpdated = ovrs !== this._mostRecentSymbologyOverrides;
|
|
148358
148374
|
if (ovrsUpdated)
|
|
@@ -148366,7 +148382,7 @@ class FeatureOverrides {
|
|
|
148366
148382
|
if (ovrsUpdated || hiliteUpdated || flashedId !== this._lastFlashId || pickExcludesUpdated) {
|
|
148367
148383
|
// _lut can be undefined if context was lost, (gl.createTexture returns null)
|
|
148368
148384
|
if (this._lut) {
|
|
148369
|
-
this._update(features, this._lut, undefined !== ovrs || pickExcludesUpdated ? this.target.pickExclusions : undefined, this.target.flashed, undefined !== ovrs || hiliteUpdated ? hilite : undefined, ovrs);
|
|
148385
|
+
this._update(provider, features, this._lut, undefined !== ovrs || pickExcludesUpdated ? this.target.pickExclusions : undefined, this.target.flashed, undefined !== ovrs || hiliteUpdated ? hilite : undefined, ovrs);
|
|
148370
148386
|
}
|
|
148371
148387
|
this._lastFlashId = flashedId;
|
|
148372
148388
|
}
|
|
@@ -149642,15 +149658,15 @@ class PerTargetBatchData {
|
|
|
149642
149658
|
this._thematicSensors.update(this.target.uniforms.frustum.viewMatrix);
|
|
149643
149659
|
return this._thematicSensors;
|
|
149644
149660
|
}
|
|
149645
|
-
getFeatureOverrides(batch) {
|
|
149661
|
+
getFeatureOverrides(batch, provider) {
|
|
149646
149662
|
const source = this.target.currentFeatureSymbologyOverrides?.source;
|
|
149647
149663
|
let ovrs = this._featureOverrides.get(source);
|
|
149648
149664
|
if (!ovrs) {
|
|
149649
149665
|
const cleanup = source ? source.onSourceDisposed.addOnce(() => this.onSourceDisposed(source)) : undefined;
|
|
149650
149666
|
this._featureOverrides.set(source, ovrs = _FeatureOverrides__WEBPACK_IMPORTED_MODULE_7__.FeatureOverrides.createFromTarget(this.target, batch.options, cleanup));
|
|
149651
|
-
ovrs.initFromMap(batch.featureTable);
|
|
149667
|
+
ovrs.initFromMap(batch.featureTable, provider);
|
|
149652
149668
|
}
|
|
149653
|
-
ovrs.update(batch.featureTable);
|
|
149669
|
+
ovrs.update(batch.featureTable, provider);
|
|
149654
149670
|
return ovrs;
|
|
149655
149671
|
}
|
|
149656
149672
|
getContours(batch) {
|
|
@@ -149717,8 +149733,8 @@ class PerTargetData {
|
|
|
149717
149733
|
getThematicSensors(target) {
|
|
149718
149734
|
return this.getBatchData(target).getThematicSensors(this._batch);
|
|
149719
149735
|
}
|
|
149720
|
-
getFeatureOverrides(target) {
|
|
149721
|
-
return this.getBatchData(target).getFeatureOverrides(this._batch);
|
|
149736
|
+
getFeatureOverrides(target, provider) {
|
|
149737
|
+
return this.getBatchData(target).getFeatureOverrides(this._batch, provider);
|
|
149722
149738
|
}
|
|
149723
149739
|
getContours(target) {
|
|
149724
149740
|
return this.getBatchData(target).getContours(this._batch);
|
|
@@ -149805,8 +149821,8 @@ class Batch extends Graphic {
|
|
|
149805
149821
|
(0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(target.plan.thematic.sensorSettings.sensors.length > 0, "must have at least one sensor to process");
|
|
149806
149822
|
return this.perTargetData.getThematicSensors(target);
|
|
149807
149823
|
}
|
|
149808
|
-
getOverrides(target) {
|
|
149809
|
-
return this.perTargetData.getFeatureOverrides(target);
|
|
149824
|
+
getOverrides(target, provider) {
|
|
149825
|
+
return this.perTargetData.getFeatureOverrides(target, provider);
|
|
149810
149826
|
}
|
|
149811
149827
|
getContours(target) {
|
|
149812
149828
|
return this.perTargetData.getContours(target);
|
|
@@ -152551,6 +152567,7 @@ class PlanarClassifier extends _RenderPlanarClassifier__WEBPACK_IMPORTED_MODULE_
|
|
|
152551
152567
|
_planarClipMask;
|
|
152552
152568
|
_classifierTreeRef;
|
|
152553
152569
|
_planarClipMaskOverrides;
|
|
152570
|
+
_overridesDirty = true;
|
|
152554
152571
|
_contentMode = PlanarClassifierContent.None;
|
|
152555
152572
|
_removeMe;
|
|
152556
152573
|
_featureSymbologySource = {
|
|
@@ -152689,14 +152706,17 @@ class PlanarClassifier extends _RenderPlanarClassifier__WEBPACK_IMPORTED_MODULE_
|
|
|
152689
152706
|
this._projectionMatrix = projection.projectionMatrix;
|
|
152690
152707
|
this._frustum = projection.textureFrustum;
|
|
152691
152708
|
this._debugFrustum = projection.debugFrustum;
|
|
152692
|
-
|
|
152709
|
+
if (this._overridesDirty) {
|
|
152710
|
+
this._overridesDirty = false;
|
|
152711
|
+
this._planarClipMaskOverrides = this._planarClipMask?.getPlanarClipMaskSymbologyOverrides(context, this._featureSymbologySource);
|
|
152712
|
+
}
|
|
152693
152713
|
if (!this._planarClipMask?.usingViewportOverrides && this._removeMe) {
|
|
152694
152714
|
this._removeMe();
|
|
152695
152715
|
this._removeMe = undefined;
|
|
152696
152716
|
}
|
|
152697
152717
|
else if (this._planarClipMask?.usingViewportOverrides && !this._removeMe) {
|
|
152698
152718
|
this._removeMe = context.viewport.onFeatureOverridesChanged.addListener(() => {
|
|
152699
|
-
this.
|
|
152719
|
+
this._overridesDirty = true;
|
|
152700
152720
|
context.viewport.requestRedraw();
|
|
152701
152721
|
});
|
|
152702
152722
|
}
|
|
@@ -152825,6 +152845,16 @@ class PlanarClassifier extends _RenderPlanarClassifier__WEBPACK_IMPORTED_MODULE_
|
|
|
152825
152845
|
const getDrawCommands = (graphics) => {
|
|
152826
152846
|
this._batchState.reset();
|
|
152827
152847
|
renderCommands.reset(target, this._branchStack, this._batchState);
|
|
152848
|
+
if (this._planarClipMask?.overridesModelVisibility) {
|
|
152849
|
+
// We're using batched tiles and the mask is overriding which models are visible versus those visible in the view.
|
|
152850
|
+
// We don't want the BatchedTileTreeReference to hide models that belong in the mask.
|
|
152851
|
+
// The target's root branch's symbology overrides are set up correctly for the mask, and we never push branches to the target
|
|
152852
|
+
// (we have a separate branch stack), so just use the root branch as the appearance provider instead of the branch stack.
|
|
152853
|
+
// NOTE: this doesn't work if we're inside a GraphicalEditingScope displaying temporary graphics for some elements, because those
|
|
152854
|
+
// elements are hidden in the tiles by a FeatureAppearanceProvider. But we'll never use a GraphicalEditingScope with batched tiles,
|
|
152855
|
+
// and non-batched tiles never hide models using symbology overrides.
|
|
152856
|
+
renderCommands.appearanceProvider = target.currentBranch;
|
|
152857
|
+
}
|
|
152828
152858
|
renderCommands.collectGraphicsForPlanarProjection(graphics);
|
|
152829
152859
|
// Draw the classifiers into our attachments.
|
|
152830
152860
|
// When using Display.ElementColor, the color and transparency come from the classifier geometry. Therefore we may need to draw the classified geometry
|
|
@@ -152851,8 +152881,10 @@ class PlanarClassifier extends _RenderPlanarClassifier__WEBPACK_IMPORTED_MODULE_
|
|
|
152851
152881
|
this._classifierBuffers.drawHilite(hiliteCommands, target);
|
|
152852
152882
|
}
|
|
152853
152883
|
if (this._maskGraphics.length > 0 && this._maskBuffer) {
|
|
152854
|
-
if (this._planarClipMaskOverrides)
|
|
152884
|
+
if (this._planarClipMaskOverrides) {
|
|
152855
152885
|
target.overrideFeatureSymbology(this._planarClipMaskOverrides);
|
|
152886
|
+
this._branchStack.setSymbologyOverrides(this._planarClipMaskOverrides);
|
|
152887
|
+
}
|
|
152856
152888
|
if (this._planarClipMask && this._planarClipMask.settings.transparency !== undefined && this._planarClipMask.settings.transparency > 0.0)
|
|
152857
152889
|
this._anyTranslucent = true;
|
|
152858
152890
|
this._maskBuffer.draw(getDrawCommands(this._maskGraphics), target);
|
|
@@ -154305,6 +154337,7 @@ class RenderCommands {
|
|
|
154305
154337
|
_translucentOverrides = false;
|
|
154306
154338
|
_addTranslucentAsOpaque = false; // true when rendering for _ReadPixels to force translucent items to be drawn in opaque pass.
|
|
154307
154339
|
_layers;
|
|
154340
|
+
appearanceProvider;
|
|
154308
154341
|
get target() { return this._target; }
|
|
154309
154342
|
[Symbol.iterator]() {
|
|
154310
154343
|
return this._commands[Symbol.iterator]();
|
|
@@ -154351,6 +154384,7 @@ class RenderCommands {
|
|
|
154351
154384
|
this._target = target;
|
|
154352
154385
|
this._stack = stack;
|
|
154353
154386
|
this._batchState = batchState;
|
|
154387
|
+
this.appearanceProvider = undefined;
|
|
154354
154388
|
this.clear();
|
|
154355
154389
|
}
|
|
154356
154390
|
collectGraphicsForPlanarProjection(scene) {
|
|
@@ -154791,7 +154825,7 @@ class RenderCommands {
|
|
|
154791
154825
|
(0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(!this._opaqueOverrides && !this._translucentOverrides);
|
|
154792
154826
|
(0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(undefined === this._curBatch);
|
|
154793
154827
|
// If all features are overridden to be invisible, draw no graphics in this batch
|
|
154794
|
-
const overrides = batch.getOverrides(this.target);
|
|
154828
|
+
const overrides = batch.getOverrides(this.target, this.appearanceProvider ?? this._stack.top);
|
|
154795
154829
|
if (overrides.allHidden)
|
|
154796
154830
|
return;
|
|
154797
154831
|
if (!batch.range.isNull) {
|
|
@@ -161632,10 +161666,10 @@ class Target extends _render_RenderTarget__WEBPACK_IMPORTED_MODULE_7__.RenderTar
|
|
|
161632
161666
|
return this.isRangeOutsideActiveVolume(range);
|
|
161633
161667
|
}
|
|
161634
161668
|
pushBatch(batch) {
|
|
161635
|
-
this.uniforms.batch.setCurrentBatch(batch);
|
|
161669
|
+
this.uniforms.batch.setCurrentBatch(batch, this.currentBranch);
|
|
161636
161670
|
}
|
|
161637
161671
|
popBatch() {
|
|
161638
|
-
this.uniforms.batch.
|
|
161672
|
+
this.uniforms.batch.clearCurrentBatch();
|
|
161639
161673
|
}
|
|
161640
161674
|
addBatch(batch) {
|
|
161641
161675
|
(0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(this._batches.indexOf(batch) < 0);
|
|
@@ -165567,7 +165601,7 @@ function* commandIterator(features, pass) {
|
|
|
165567
165601
|
command.execute(executor);
|
|
165568
165602
|
if (command.opcode !== "pushBatch")
|
|
165569
165603
|
continue;
|
|
165570
|
-
const ovrs = command.batch.getOverrides(features.target);
|
|
165604
|
+
const ovrs = command.batch.getOverrides(features.target, features.target.currentBranch);
|
|
165571
165605
|
if (ovrs.allHidden)
|
|
165572
165606
|
continue;
|
|
165573
165607
|
const scratchFeature = _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.PackedFeature.createWithIndex();
|
|
@@ -335983,7 +336017,7 @@ class TestContext {
|
|
|
335983
336017
|
this.initializeRpcInterfaces({ title: this.settings.Backend.name, version: this.settings.Backend.version });
|
|
335984
336018
|
const iModelClient = new imodels_client_management_1.IModelsClient({ api: { baseUrl: `https://${process.env.IMJS_URL_PREFIX ?? ""}api.bentley.com/imodels` } });
|
|
335985
336019
|
await core_frontend_1.NoRenderApp.startup({
|
|
335986
|
-
applicationVersion: "5.2.0-dev.
|
|
336020
|
+
applicationVersion: "5.2.0-dev.23",
|
|
335987
336021
|
applicationId: this.settings.gprid,
|
|
335988
336022
|
authorizationClient: new frontend_1.TestFrontendAuthorizationClient(this.serviceAuthToken),
|
|
335989
336023
|
hubAccess: new imodels_access_frontend_1.FrontendIModelsAccess(iModelClient),
|
|
@@ -361113,7 +361147,7 @@ var loadLanguages = instance.loadLanguages;
|
|
|
361113
361147
|
/***/ ((module) => {
|
|
361114
361148
|
|
|
361115
361149
|
"use strict";
|
|
361116
|
-
module.exports = /*#__PURE__*/JSON.parse('{"name":"@itwin/core-frontend","version":"5.2.0-dev.
|
|
361150
|
+
module.exports = /*#__PURE__*/JSON.parse('{"name":"@itwin/core-frontend","version":"5.2.0-dev.23","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 && npm run -s copy:draco","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","copy:draco":"cpx \\"./node_modules/draco3d/draco_decoder.wasm\\" ./lib/public","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/draco3d":"^1.4.10","@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":"^4.3.4","@loaders.gl/draco":"^4.3.4","draco3d":"^1.5.1","fuse.js":"^3.3.0","wms-capabilities":"0.4.0"}}');
|
|
361117
361151
|
|
|
361118
361152
|
/***/ }),
|
|
361119
361153
|
|