bruce-cesium 6.1.6 → 6.1.7

package/dist/bruce-cesium.umd.js

@@ -16835,11 +16835,12 @@
         }
         TilesetRenderEngine.OnTilesetReady = OnTilesetReady;
         function ApplyPosition(params) {
-            var _a;
+            var _a, _b;
             const cTileset = params.cTileset;
             const root = cTileset.root;
             const position = params.position;
-            let location = ((_a = position.ucs) === null || _a === void 0 ? void 0 : _a.location) ? position.ucs.location : position.location;
+            const ucsTransform = ((_a = position.ucs) === null || _a === void 0 ? void 0 : _a.transform) || {};
+            let location = ((_b = position.ucs) === null || _b === void 0 ? void 0 : _b.location) ? position.ucs.location : position.location;
             let transform = position.transform;
             transform = {
                 heading: 0,
@@ -16852,24 +16853,33 @@
                 ...transform
             };
             transform.scale = EnsureNumber(transform.scale);
-            if (transform.scale <= 0) {
-                transform.scale = 0.000001;
-            }
-            // If we're in model-space we'll just go at 0,0 lat/lon and no h/p/r from the coords.
+            // In model-space we focus on the UCS.
+            // There's no location as we center the view around it.
+            // TODO: although we should render the model relative to the UCS.
             if (params.modelSpace) {
                 location = null;
                 transform = {
-                    heading: 0,
-                    pitch: 0,
-                    roll: 0,
-                    scale: EnsureNumber(transform.scale, 1),
-                    x: 0,
-                    y: 0,
-                    z: 0
+                    heading: EnsureNumber(ucsTransform.heading, 0),
+                    pitch: EnsureNumber(ucsTransform.pitch, 0),
+                    roll: EnsureNumber(ucsTransform.roll, 0),
+                    scale: EnsureNumber(ucsTransform.scale, 1),
+                    x: EnsureNumber(ucsTransform.x, 0),
+                    y: EnsureNumber(ucsTransform.y, 0),
+                    z: EnsureNumber(ucsTransform.z, 0)
                 };
-                if (transform.scale <= 0) {
-                    transform.scale = 0.000001;
-                }
+            }
+            // If not in model-space then scale/add UCS transform to the entity transform.
+            else {
+                transform.scale *= EnsureNumber(ucsTransform.scale, 1);
+                transform.heading += EnsureNumber(ucsTransform.heading, 0);
+                transform.pitch += EnsureNumber(ucsTransform.pitch, 0);
+                transform.roll += EnsureNumber(ucsTransform.roll, 0);
+                transform.x += EnsureNumber(ucsTransform.x, 0);
+                transform.y += EnsureNumber(ucsTransform.y, 0);
+                transform.z += EnsureNumber(ucsTransform.z, 0);
+            }
+            if (transform.scale <= 0) {
+                transform.scale = 0.000001;
             }
             /**
              * Very cursed.
@@ -33652,7 +33662,7 @@
         }
     }
 
-    const VERSION = "6.1.6";
+    const VERSION = "6.1.7";
 
     exports.VERSION = VERSION;
     exports.isOutlineChanged = isOutlineChanged;