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.
@@ -1,6 +1,6 @@
1
1
  import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ProjectViewTile, DelayQueue, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, Api, EntityRelationType, ENVIRONMENT, EntityHistoricData, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, AbstractApi, ProjectViewBookmark, EntityAttachment, EntityAttachmentType, EntityAttribute, ProjectView, ProjectViewLegacyTile, Camera } from 'bruce-models';
2
2
  import * as Cesium from 'cesium';
3
- import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, DistanceDisplayCondition, NearFarScalar, Model, ColorMaterialProperty, Entity, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorBlendMode, HeadingPitchRoll, Transforms, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, HeadingPitchRange, Ion, Cesium3DTileStyle, Cesium3DTileColorBlendMode, KmlDataSource, OrthographicFrustum, EasingFunction, SceneTransforms, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Quaternion, Intersect } from 'cesium';
3
+ import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, SceneMode, DistanceDisplayCondition, NearFarScalar, Model, ColorMaterialProperty, Entity, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorBlendMode, HeadingPitchRoll, Transforms, GeoJsonDataSource, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Quaternion, Intersect } from 'cesium';
4
4
 
5
5
  /*! *****************************************************************************
6
6
  Copyright (c) Microsoft Corporation. All rights reserved.
@@ -13714,8 +13714,17 @@ var TilesetRenderEngine;
13714
13714
  pos3d.z += offset.z;
13715
13715
  }
13716
13716
  if (legacy_1.rotate) {
13717
+ // HPR at the current position.
13717
13718
  var hpr = HeadingPitchRoll.fromDegrees(EnsureNumber(transform.heading), EnsureNumber(transform.pitch), EnsureNumber(transform.roll), new HeadingPitchRoll());
13718
- root.transform = Transforms.headingPitchRollToFixedFrame(pos3d, hpr);
13719
+ var rotationMatrix = Transforms.headingPitchRollToFixedFrame(pos3d, hpr);
13720
+ // Scale.
13721
+ var scale = EnsureNumber(transform === null || transform === void 0 ? void 0 : transform.scale, 1);
13722
+ var scaleMatrix = transform.scale
13723
+ ? Matrix4.fromUniformScale(scale, new Matrix4())
13724
+ : Matrix4.IDENTITY.clone(new Matrix4());
13725
+ // HPR + scale.
13726
+ var combinedMatrix = Matrix4.multiply(rotationMatrix, scaleMatrix, new Matrix4());
13727
+ root.transform = combinedMatrix;
13719
13728
  root.updateTransform();
13720
13729
  }
13721
13730
  var curPos3d = getCurPos3d();
@@ -13809,7 +13818,9 @@ var TilesetRenderEngine;
13809
13818
  if (!isAlive$2(params.viewer, cTileset_1)) {
13810
13819
  return;
13811
13820
  }
13812
- (_a = GetMemoryWatcher(params.viewer)) === null || _a === void 0 ? void 0 : _a.Watch(cTileset_1);
13821
+ if (params.noMemoryLimit != true) {
13822
+ (_a = GetMemoryWatcher(params.viewer)) === null || _a === void 0 ? void 0 : _a.Watch(cTileset_1);
13823
+ }
13813
13824
  var settings = params.tileset.settings;
13814
13825
  ApplySettings({
13815
13826
  cTileset: cTileset_1,
@@ -13897,11 +13908,11 @@ var TilesetRenderEngine;
13897
13908
  TilesetRenderEngine.Render = Render;
13898
13909
  function RenderLegacy(params) {
13899
13910
  return __awaiter(this, void 0, void 0, function () {
13900
- var apiGetter, viewer, tileset, ionId, loadUrl, viaCdn, accountId, settings, visual, etc, api, api, cTileset;
13911
+ var apiGetter, viewer, tileset, ionId, loadUrl, viaCdn, accountId, noMemoryLimit, settings, visual, etc, api, api, cTileset;
13901
13912
  return __generator(this, function (_a) {
13902
13913
  switch (_a.label) {
13903
13914
  case 0:
13904
- apiGetter = params.apiGetter, viewer = params.viewer, tileset = params.tileset, ionId = params.ionId, loadUrl = params.loadUrl, viaCdn = params.viaCdn, accountId = params.accountId;
13915
+ apiGetter = params.apiGetter, viewer = params.viewer, tileset = params.tileset, ionId = params.ionId, loadUrl = params.loadUrl, viaCdn = params.viaCdn, accountId = params.accountId, noMemoryLimit = params.noMemoryLimit;
13905
13916
  settings = tileset === null || tileset === void 0 ? void 0 : tileset.Settings;
13906
13917
  settings = __assign({}, settings);
13907
13918
  visual = settings.visual;
@@ -13969,7 +13980,9 @@ var TilesetRenderEngine;
13969
13980
  if (!isAlive$2(viewer, cTileset)) {
13970
13981
  return;
13971
13982
  }
13972
- (_a = GetMemoryWatcher(params.viewer)) === null || _a === void 0 ? void 0 : _a.Watch(cTileset);
13983
+ if (noMemoryLimit != true) {
13984
+ (_a = GetMemoryWatcher(params.viewer)) === null || _a === void 0 ? void 0 : _a.Watch(cTileset);
13985
+ }
13973
13986
  if (tileset) {
13974
13987
  var settings_1 = tileset.Settings;
13975
13988
  settings_1 = __assign({}, settings_1);
@@ -13996,7 +14009,7 @@ var TilesetRenderEngine;
13996
14009
  heading: rotation.z,
13997
14010
  pitch: rotation.x,
13998
14011
  roll: rotation.y,
13999
- scale: 1,
14012
+ scale: EnsureNumber(origin_1 === null || origin_1 === void 0 ? void 0 : origin_1.scale, 1),
14000
14013
  z: EnsureNumber(positionOffset === null || positionOffset === void 0 ? void 0 : positionOffset.altitude),
14001
14014
  x: EnsureNumber(positionOffset === null || positionOffset === void 0 ? void 0 : positionOffset.latitude),
14002
14015
  y: EnsureNumber(positionOffset === null || positionOffset === void 0 ? void 0 : positionOffset.longitude)
@@ -14737,7 +14750,8 @@ var TilesetCadRenderManager;
14737
14750
  viewer: this.viewer,
14738
14751
  coords: coords,
14739
14752
  accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.getters.GetAccountId(),
14740
- viaCdn: this.item.cdnEnabled
14753
+ viaCdn: this.item.cdnEnabled,
14754
+ noMemoryLimit: this.item["noMaximumMemory"]
14741
14755
  })];
14742
14756
  case 3:
14743
14757
  cTileset = _a.cTileset = _d.sent();
@@ -16192,7 +16206,8 @@ var TilesetEntitiesRenderManager;
16192
16206
  tileset: tileset,
16193
16207
  viewer: this.viewer,
16194
16208
  accountId: accountId,
16195
- viaCdn: this.item.cdnEnabled
16209
+ viaCdn: this.item.cdnEnabled,
16210
+ noMemoryLimit: this.item["noMaximumMemory"]
16196
16211
  })];
16197
16212
  case 8:
16198
16213
  cTileset = _a.cTileset = _g.sent();
@@ -16378,7 +16393,7 @@ var TilesetPointcloudRenderManager;
16378
16393
  return;
16379
16394
  }
16380
16395
  (function () { return __awaiter(_this, void 0, void 0, function () {
16381
- var canAccess, e_1, accountId, api, tileset, cTileset, _a;
16396
+ var canAccess, e_1, accountId, api, tileset, _a;
16382
16397
  var _this = this;
16383
16398
  var _b, _c, _d, _e;
16384
16399
  return __generator(this, function (_f) {
@@ -16432,10 +16447,11 @@ var TilesetPointcloudRenderManager;
16432
16447
  viewer: this.viewer,
16433
16448
  coords: null,
16434
16449
  accountId: accountId,
16435
- viaCdn: this.item.cdnEnabled
16450
+ viaCdn: this.item.cdnEnabled,
16451
+ noMemoryLimit: this.item["noMaximumMemory"]
16436
16452
  })];
16437
16453
  case 8:
16438
- cTileset = _a.cTileset = _f.sent();
16454
+ _a.cTileset = _f.sent();
16439
16455
  if (this.disposed) {
16440
16456
  this.doDispose();
16441
16457
  return [2 /*return*/];
@@ -16826,7 +16842,8 @@ var TilesetArbRenderManager;
16826
16842
  ionAccessToken: (_l = this.item.IonResource) === null || _l === void 0 ? void 0 : _l.AccessToken,
16827
16843
  loadUrl: loadUrlOverride,
16828
16844
  accountId: accountId,
16829
- viaCdn: true
16845
+ viaCdn: true,
16846
+ noMemoryLimit: this.item["noMaximumMemory"]
16830
16847
  })];
16831
16848
  case 13:
16832
16849
  _d.cTileset = _p.sent();
@@ -25752,7 +25769,7 @@ var ViewRenderEngine;
25752
25769
  ViewRenderEngine.Render = Render;
25753
25770
  })(ViewRenderEngine || (ViewRenderEngine = {}));
25754
25771
 
25755
- var VERSION = "4.2.1";
25772
+ var VERSION = "4.2.3";
25756
25773
 
25757
25774
  export { VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline };
25758
25775
  //# sourceMappingURL=bruce-cesium.es5.js.map