bruce-cesium 4.2.1 → 4.2.3
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/dist/bruce-cesium.es5.js +31 -14
- package/dist/bruce-cesium.es5.js.map +1 -1
- package/dist/bruce-cesium.umd.js +30 -13
- package/dist/bruce-cesium.umd.js.map +1 -1
- package/dist/lib/bruce-cesium.js +1 -1
- package/dist/lib/rendering/render-managers/tilesets/tileset-arb-render-manager.js +2 -1
- package/dist/lib/rendering/render-managers/tilesets/tileset-arb-render-manager.js.map +1 -1
- package/dist/lib/rendering/render-managers/tilesets/tileset-cad-render-manager.js +2 -1
- package/dist/lib/rendering/render-managers/tilesets/tileset-cad-render-manager.js.map +1 -1
- package/dist/lib/rendering/render-managers/tilesets/tileset-entities-render-manager.js +2 -1
- package/dist/lib/rendering/render-managers/tilesets/tileset-entities-render-manager.js.map +1 -1
- package/dist/lib/rendering/render-managers/tilesets/tileset-pointcloud-render-manager.js +4 -3
- package/dist/lib/rendering/render-managers/tilesets/tileset-pointcloud-render-manager.js.map +1 -1
- package/dist/lib/rendering/tileset-render-engine.js +19 -6
- package/dist/lib/rendering/tileset-render-engine.js.map +1 -1
- package/dist/types/bruce-cesium.d.ts +1 -1
- package/dist/types/rendering/tileset-render-engine.d.ts +2 -0
- package/package.json +2 -2
package/dist/bruce-cesium.umd.js
CHANGED
|
@@ -13672,8 +13672,17 @@
|
|
|
13672
13672
|
pos3d.z += offset.z;
|
|
13673
13673
|
}
|
|
13674
13674
|
if (legacy_1.rotate) {
|
|
13675
|
+
// HPR at the current position.
|
|
13675
13676
|
var hpr = Cesium.HeadingPitchRoll.fromDegrees(EnsureNumber(transform.heading), EnsureNumber(transform.pitch), EnsureNumber(transform.roll), new Cesium.HeadingPitchRoll());
|
|
13676
|
-
|
|
13677
|
+
var rotationMatrix = Cesium.Transforms.headingPitchRollToFixedFrame(pos3d, hpr);
|
|
13678
|
+
// Scale.
|
|
13679
|
+
var scale = EnsureNumber(transform === null || transform === void 0 ? void 0 : transform.scale, 1);
|
|
13680
|
+
var scaleMatrix = transform.scale
|
|
13681
|
+
? Cesium.Matrix4.fromUniformScale(scale, new Cesium.Matrix4())
|
|
13682
|
+
: Cesium.Matrix4.IDENTITY.clone(new Cesium.Matrix4());
|
|
13683
|
+
// HPR + scale.
|
|
13684
|
+
var combinedMatrix = Cesium.Matrix4.multiply(rotationMatrix, scaleMatrix, new Cesium.Matrix4());
|
|
13685
|
+
root.transform = combinedMatrix;
|
|
13677
13686
|
root.updateTransform();
|
|
13678
13687
|
}
|
|
13679
13688
|
var curPos3d = getCurPos3d();
|
|
@@ -13767,7 +13776,9 @@
|
|
|
13767
13776
|
if (!isAlive$2(params.viewer, cTileset_1)) {
|
|
13768
13777
|
return;
|
|
13769
13778
|
}
|
|
13770
|
-
|
|
13779
|
+
if (params.noMemoryLimit != true) {
|
|
13780
|
+
(_a = GetMemoryWatcher(params.viewer)) === null || _a === void 0 ? void 0 : _a.Watch(cTileset_1);
|
|
13781
|
+
}
|
|
13771
13782
|
var settings = params.tileset.settings;
|
|
13772
13783
|
ApplySettings({
|
|
13773
13784
|
cTileset: cTileset_1,
|
|
@@ -13855,11 +13866,11 @@
|
|
|
13855
13866
|
TilesetRenderEngine.Render = Render;
|
|
13856
13867
|
function RenderLegacy(params) {
|
|
13857
13868
|
return __awaiter(this, void 0, void 0, function () {
|
|
13858
|
-
var apiGetter, viewer, tileset, ionId, loadUrl, viaCdn, accountId, settings, visual, etc, api, api, cTileset;
|
|
13869
|
+
var apiGetter, viewer, tileset, ionId, loadUrl, viaCdn, accountId, noMemoryLimit, settings, visual, etc, api, api, cTileset;
|
|
13859
13870
|
return __generator(this, function (_a) {
|
|
13860
13871
|
switch (_a.label) {
|
|
13861
13872
|
case 0:
|
|
13862
|
-
apiGetter = params.apiGetter, viewer = params.viewer, tileset = params.tileset, ionId = params.ionId, loadUrl = params.loadUrl, viaCdn = params.viaCdn, accountId = params.accountId;
|
|
13873
|
+
apiGetter = params.apiGetter, viewer = params.viewer, tileset = params.tileset, ionId = params.ionId, loadUrl = params.loadUrl, viaCdn = params.viaCdn, accountId = params.accountId, noMemoryLimit = params.noMemoryLimit;
|
|
13863
13874
|
settings = tileset === null || tileset === void 0 ? void 0 : tileset.Settings;
|
|
13864
13875
|
settings = __assign({}, settings);
|
|
13865
13876
|
visual = settings.visual;
|
|
@@ -13927,7 +13938,9 @@
|
|
|
13927
13938
|
if (!isAlive$2(viewer, cTileset)) {
|
|
13928
13939
|
return;
|
|
13929
13940
|
}
|
|
13930
|
-
(
|
|
13941
|
+
if (noMemoryLimit != true) {
|
|
13942
|
+
(_a = GetMemoryWatcher(params.viewer)) === null || _a === void 0 ? void 0 : _a.Watch(cTileset);
|
|
13943
|
+
}
|
|
13931
13944
|
if (tileset) {
|
|
13932
13945
|
var settings_1 = tileset.Settings;
|
|
13933
13946
|
settings_1 = __assign({}, settings_1);
|
|
@@ -13954,7 +13967,7 @@
|
|
|
13954
13967
|
heading: rotation.z,
|
|
13955
13968
|
pitch: rotation.x,
|
|
13956
13969
|
roll: rotation.y,
|
|
13957
|
-
scale: 1,
|
|
13970
|
+
scale: EnsureNumber(origin_1 === null || origin_1 === void 0 ? void 0 : origin_1.scale, 1),
|
|
13958
13971
|
z: EnsureNumber(positionOffset === null || positionOffset === void 0 ? void 0 : positionOffset.altitude),
|
|
13959
13972
|
x: EnsureNumber(positionOffset === null || positionOffset === void 0 ? void 0 : positionOffset.latitude),
|
|
13960
13973
|
y: EnsureNumber(positionOffset === null || positionOffset === void 0 ? void 0 : positionOffset.longitude)
|
|
@@ -14690,7 +14703,8 @@
|
|
|
14690
14703
|
viewer: this.viewer,
|
|
14691
14704
|
coords: coords,
|
|
14692
14705
|
accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.getters.GetAccountId(),
|
|
14693
|
-
viaCdn: this.item.cdnEnabled
|
|
14706
|
+
viaCdn: this.item.cdnEnabled,
|
|
14707
|
+
noMemoryLimit: this.item["noMaximumMemory"]
|
|
14694
14708
|
})];
|
|
14695
14709
|
case 3:
|
|
14696
14710
|
cTileset = _a.cTileset = _d.sent();
|
|
@@ -16142,7 +16156,8 @@
|
|
|
16142
16156
|
tileset: tileset,
|
|
16143
16157
|
viewer: this.viewer,
|
|
16144
16158
|
accountId: accountId,
|
|
16145
|
-
viaCdn: this.item.cdnEnabled
|
|
16159
|
+
viaCdn: this.item.cdnEnabled,
|
|
16160
|
+
noMemoryLimit: this.item["noMaximumMemory"]
|
|
16146
16161
|
})];
|
|
16147
16162
|
case 8:
|
|
16148
16163
|
cTileset = _a.cTileset = _g.sent();
|
|
@@ -16327,7 +16342,7 @@
|
|
|
16327
16342
|
return;
|
|
16328
16343
|
}
|
|
16329
16344
|
(function () { return __awaiter(_this, void 0, void 0, function () {
|
|
16330
|
-
var canAccess, e_1, accountId, api, tileset,
|
|
16345
|
+
var canAccess, e_1, accountId, api, tileset, _a;
|
|
16331
16346
|
var _this = this;
|
|
16332
16347
|
var _b, _c, _d, _e;
|
|
16333
16348
|
return __generator(this, function (_f) {
|
|
@@ -16381,10 +16396,11 @@
|
|
|
16381
16396
|
viewer: this.viewer,
|
|
16382
16397
|
coords: null,
|
|
16383
16398
|
accountId: accountId,
|
|
16384
|
-
viaCdn: this.item.cdnEnabled
|
|
16399
|
+
viaCdn: this.item.cdnEnabled,
|
|
16400
|
+
noMemoryLimit: this.item["noMaximumMemory"]
|
|
16385
16401
|
})];
|
|
16386
16402
|
case 8:
|
|
16387
|
-
|
|
16403
|
+
_a.cTileset = _f.sent();
|
|
16388
16404
|
if (this.disposed) {
|
|
16389
16405
|
this.doDispose();
|
|
16390
16406
|
return [2 /*return*/];
|
|
@@ -16773,7 +16789,8 @@
|
|
|
16773
16789
|
ionAccessToken: (_l = this.item.IonResource) === null || _l === void 0 ? void 0 : _l.AccessToken,
|
|
16774
16790
|
loadUrl: loadUrlOverride,
|
|
16775
16791
|
accountId: accountId,
|
|
16776
|
-
viaCdn: true
|
|
16792
|
+
viaCdn: true,
|
|
16793
|
+
noMemoryLimit: this.item["noMaximumMemory"]
|
|
16777
16794
|
})];
|
|
16778
16795
|
case 13:
|
|
16779
16796
|
_d.cTileset = _p.sent();
|
|
@@ -25685,7 +25702,7 @@
|
|
|
25685
25702
|
ViewRenderEngine.Render = Render;
|
|
25686
25703
|
})(exports.ViewRenderEngine || (exports.ViewRenderEngine = {}));
|
|
25687
25704
|
|
|
25688
|
-
var VERSION = "4.2.
|
|
25705
|
+
var VERSION = "4.2.3";
|
|
25689
25706
|
|
|
25690
25707
|
exports.VERSION = VERSION;
|
|
25691
25708
|
exports.CesiumParabola = CesiumParabola;
|