bruce-cesium 6.5.7 → 6.5.9

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
-import { Cartes, Entity as Entity$1, Calculator, EntityRelationType, EntityType, Style, ENVIRONMENT, ProjectViewTile, DelayQueue, LRUCache, BruceEvent, ObjectUtils, Geometry, EntityHistoricData, EntityLod, ZoomControl, EntityTag, Tileset, Api, EntityCoords, DataLab, EntitySource, ClientFile, MenuItem, EntityRelation, ProgramKey, Bounds, Carto, ProjectView, ProjectViewBookmark, ProjectViewLegacyTile, Camera, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, Session } from 'bruce-models';
+import { Cartes, Entity as Entity$1, Calculator, EntityRelationType, EntityType, Style, ENVIRONMENT, ProjectViewTile, DelayQueue, LRUCache, BruceEvent, ObjectUtils, Geometry, EntityHistoricData, EntityLod, ZoomControl, EntityTag, Tileset, Api, EntityCoords, DataLab, EntitySource, ClientFile, MenuItem, EntityRelation, ProgramKey, Carto, Bounds, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, Session } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, DistanceDisplayCondition, HeightReference, ColorBlendMode, ShadowMode, ClassificationType, Model, HorizontalOrigin, VerticalOrigin, ConstantPositionProperty, PolygonHierarchy, PolylineGraphics, ArcType, CornerType, Cartesian2, SceneTransforms, NearFarScalar, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, IonResource, Cesium3DTileset, OrthographicFrustum, EasingFunction, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, PolygonPipeline, BoundingSphere, GeometryInstance, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, HeightReference, ColorBlendMode, HeadingPitchRoll, Math as Math$1, Transforms, ShadowMode, Cartesian3, ClassificationType, Model, HorizontalOrigin, VerticalOrigin, ConstantPositionProperty, ArcType, CornerType, PolygonHierarchy, PolylineGraphics, Cartesian2, SceneTransforms, NearFarScalar, JulianDate, Quaternion, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, Cesium3DTileset, Matrix4, IonResource, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, PolygonPipeline, BoundingSphere, GeometryInstance, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
 
 /**
  * Ensures a number is returned from a given value.
@@ -16364,6 +16364,36 @@ var XGridsRenderEngine;
         LCCRender.unload(renderObject);
     }
     XGridsRenderEngine.Remove = Remove;
+    /**
+     * Applies position, rotation, and scale to a live XGrids render object.
+     */
+    function ApplyPosition(params) {
+        const { renderObject, origin, rotation, dontRotate, dontTransform } = params;
+        if (!renderObject) {
+            return;
+        }
+        const lat = EnsureNumber(origin === null || origin === void 0 ? void 0 : origin.latitude, 0);
+        const lon = EnsureNumber(origin === null || origin === void 0 ? void 0 : origin.longitude, 0);
+        const alt = EnsureNumber(origin === null || origin === void 0 ? void 0 : origin.altitude, 0);
+        const scale = EnsureNumber((origin === null || origin === void 0 ? void 0 : origin.scale) || 1, 1);
+        if (!dontTransform) {
+            const pos = Cartesian3.fromDegrees(lon, lat, alt);
+            if (typeof renderObject.setTranslation === 'function') {
+                renderObject.setTranslation(pos);
+            }
+        }
+        if (!dontRotate && !dontTransform) {
+            const hpr = HeadingPitchRoll.fromDegrees(EnsureNumber(rotation === null || rotation === void 0 ? void 0 : rotation.z), EnsureNumber(rotation === null || rotation === void 0 ? void 0 : rotation.x), EnsureNumber(rotation === null || rotation === void 0 ? void 0 : rotation.y), new HeadingPitchRoll());
+            const rotMatrix = Matrix3.fromHeadingPitchRoll(hpr);
+            if (typeof renderObject.setRotation === 'function') {
+                renderObject.setRotation(rotMatrix);
+            }
+            if (typeof renderObject.setScale === 'function') {
+                renderObject.setScale(new Cartesian3(scale, scale, scale));
+            }
+        }
+    }
+    XGridsRenderEngine.ApplyPosition = ApplyPosition;
 })(XGridsRenderEngine || (XGridsRenderEngine = {}));
 
 async function getLegacyTileset(params) {
@@ -16422,6 +16452,9 @@ var TilesetArbRenderManager;
         get RenderTypeChanged() {
             return this.renderTypeChanged;
         }
+        get LccObject() {
+            return this.lccObject;
+        }
         constructor(params) {
             this.disposed = false;
             this.cTileset = null;
@@ -16547,6 +16580,57 @@ var TilesetArbRenderManager;
                         tileset: tileset,
                         flyTo: this.item.FlyTo
                     });
+                    if (this.lccObject) {
+                        const lccSettings = tileset.settings;
+                        const origin = lccSettings === null || lccSettings === void 0 ? void 0 : lccSettings.origin;
+                        const rotation = lccSettings === null || lccSettings === void 0 ? void 0 : lccSettings.rotation;
+                        this.lccObject._isXGridsLCC = true;
+                        this.lccObject._bruceCoords = {
+                            location: {
+                                latitude: +(origin === null || origin === void 0 ? void 0 : origin.latitude) || 0,
+                                longitude: +(origin === null || origin === void 0 ? void 0 : origin.longitude) || 0,
+                                altitude: +(origin === null || origin === void 0 ? void 0 : origin.altitude) || 0
+                            },
+                            transform: {
+                                heading: +(rotation === null || rotation === void 0 ? void 0 : rotation.z) || 0,
+                                pitch: +(rotation === null || rotation === void 0 ? void 0 : rotation.x) || 0,
+                                roll: +(rotation === null || rotation === void 0 ? void 0 : rotation.y) || 0,
+                                scale: +(origin === null || origin === void 0 ? void 0 : origin.scale) || 1
+                            },
+                            isLegacy: true,
+                            legacyProps: {
+                                rotate: !(lccSettings === null || lccSettings === void 0 ? void 0 : lccSettings.dontRotate),
+                                transform: !(lccSettings === null || lccSettings === void 0 ? void 0 : lccSettings.dontTransform),
+                                usingBoundingBox: true
+                            }
+                        };
+                        // Attach a position-update callback so app-editors can update easier.
+                        const capturedSettings = lccSettings;
+                        const capturedObj = this.lccObject;
+                        this.lccObject._applyPosition = (coords) => {
+                            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+                            if (!capturedObj) {
+                                return;
+                            }
+                            const loc = (_b = (_a = coords === null || coords === void 0 ? void 0 : coords.ucs) === null || _a === void 0 ? void 0 : _a.location) !== null && _b !== void 0 ? _b : coords === null || coords === void 0 ? void 0 : coords.location;
+                            XGridsRenderEngine.ApplyPosition({
+                                renderObject: capturedObj,
+                                origin: {
+                                    latitude: loc === null || loc === void 0 ? void 0 : loc.latitude,
+                                    longitude: loc === null || loc === void 0 ? void 0 : loc.longitude,
+                                    altitude: loc === null || loc === void 0 ? void 0 : loc.altitude,
+                                    scale: (_d = (_c = coords === null || coords === void 0 ? void 0 : coords.transform) === null || _c === void 0 ? void 0 : _c.scale) !== null && _d !== void 0 ? _d : 1
+                                },
+                                rotation: {
+                                    z: (_f = (_e = coords === null || coords === void 0 ? void 0 : coords.transform) === null || _e === void 0 ? void 0 : _e.heading) !== null && _f !== void 0 ? _f : 0,
+                                    x: (_h = (_g = coords === null || coords === void 0 ? void 0 : coords.transform) === null || _g === void 0 ? void 0 : _g.pitch) !== null && _h !== void 0 ? _h : 0,
+                                    y: (_k = (_j = coords === null || coords === void 0 ? void 0 : coords.transform) === null || _j === void 0 ? void 0 : _j.roll) !== null && _k !== void 0 ? _k : 0
+                                },
+                                dontRotate: capturedSettings === null || capturedSettings === void 0 ? void 0 : capturedSettings.dontRotate,
+                                dontTransform: capturedSettings === null || capturedSettings === void 0 ? void 0 : capturedSettings.dontTransform
+                            });
+                        };
+                    }
                     // Disposed while it was loading so we'll remove it now.
                     if (this.Disposed && this.lccObject) {
                         XGridsRenderEngine.Remove(this.viewer, this.lccObject);
@@ -28838,8 +28922,9 @@ function calcEntityLocation(entity, modelSpace) {
         rootPos = Cartesian3.fromDegrees(EnsureNumber(rootLoc === null || rootLoc === void 0 ? void 0 : rootLoc.longitude), EnsureNumber(rootLoc === null || rootLoc === void 0 ? void 0 : rootLoc.latitude), EnsureNumber(rootLoc === null || rootLoc === void 0 ? void 0 : rootLoc.altitude));
     }
     const enuFrame = Transforms.eastNorthUpToFixedFrame(rootPos);
-    // Rotate using root hpr before we apply the local offset.
-    const rootTransform = (_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c.AssemblyRootTransform;
+    // Rotate using the assembly's accumulated world h/p/r before applying the local offset,
+    // matching how tilesets apply the root transform.
+    const rootTransform = (_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c.AssemblyWorldTransform;
     if (rootTransform) {
         const rootHpr = new HeadingPitchRoll(Math$1.toRadians(EnsureNumber(rootTransform.heading)), Math$1.toRadians(EnsureNumber(rootTransform.pitch)), Math$1.toRadians(EnsureNumber(rootTransform.roll)));
         const hprMat4 = Matrix4.fromRotationTranslation(Matrix3.fromHeadingPitchRoll(rootHpr), Cartesian3.ZERO, new Matrix4());
@@ -29719,9 +29804,9 @@ var EntityUtils;
         let rotmat = new Matrix3();
         rotmat = Matrix4.getRotation(mawp, rotmat);
         const q = Quaternion.fromRotationMatrix(rotmat);
-        // Build root-HPR orientation in ECEF at the entity's position, then compose the
-        // entity's local rotation on top — matching how tilesets apply the root transform.
-        const rootTransform = (_b = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _b === void 0 ? void 0 : _b.AssemblyRootTransform;
+        // Apply world transform prior to axis.
+        // This accounts for UCS/root being rotated.
+        const rootTransform = (_b = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _b === void 0 ? void 0 : _b.AssemblyWorldTransform;
         const rootHpr = new HeadingPitchRoll(Math$1.toRadians(EnsureNumber(rootTransform === null || rootTransform === void 0 ? void 0 : rootTransform.heading)), Math$1.toRadians(EnsureNumber(rootTransform === null || rootTransform === void 0 ? void 0 : rootTransform.pitch)), Math$1.toRadians(EnsureNumber(rootTransform === null || rootTransform === void 0 ? void 0 : rootTransform.roll)));
         const rootOrientation = Transforms.headingPitchRollQuaternion(pos3d, rootHpr);
         const combined = Quaternion.multiply(rootOrientation, q, new Quaternion());
@@ -35275,7 +35360,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "6.5.7";
+const VERSION = "6.5.9";
 /**
  * Updates the environment instance used by bruce-cesium to one specified.
  * This can be used to ensure that the instance a parent is referencing is shared between bruce-cesium, bruce-models, and the parent app.