bruce-cesium 7.7.5 → 7.7.7

package/dist/bruce-cesium.umd.js

@@ -28584,26 +28584,38 @@
          */
         function ApplyPosition(params) {
             const { renderObject, origin, rotation, dontRotate, dontTransform } = params;
-            if (!renderObject) {
+            if (!renderObject || dontTransform) {
                 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);
+            // A complete matrix avoids SDK setters whose translation, rotation and scale contracts differ.
+            if (typeof renderObject.setModelMatrix === "function") {
+                const matrix = Cesium.Transforms.eastNorthUpToFixedFrame(Cesium.Cartesian3.fromDegrees(lon, lat, alt));
+                if (!dontRotate) {
+                    const hpr = Cesium.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));
+                    const local = Cesium.Matrix4.fromRotation(Cesium.Matrix3.fromHeadingPitchRoll(hpr));
+                    Cesium.Matrix4.multiply(matrix, local, matrix);
+                    Cesium.Matrix4.multiplyByUniformScale(matrix, scale, matrix);
+                }
+                renderObject.setModelMatrix(matrix);
+                return;
+            }
             if (!dontTransform) {
                 const pos = Cesium.Cartesian3.fromDegrees(lon, lat, alt);
-                if (typeof renderObject.setTranslation === 'function') {
+                if (typeof renderObject.setTranslation === "function") {
                     renderObject.setTranslation(pos);
                 }
             }
             if (!dontRotate && !dontTransform) {
                 const hpr = Cesium.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 Cesium.HeadingPitchRoll());
                 const rotMatrix = Cesium.Matrix3.fromHeadingPitchRoll(hpr);
-                if (typeof renderObject.setRotation === 'function') {
+                if (typeof renderObject.setRotation === "function") {
                     renderObject.setRotation(rotMatrix);
                 }
-                if (typeof renderObject.setScale === 'function') {
+                if (typeof renderObject.setScale === "function") {
                     renderObject.setScale(new Cesium.Cartesian3(scale, scale, scale));
                 }
             }
@@ -54858,6 +54870,12 @@ void main() {
                     ? BModels.Geometry.ParsePoints(ring.LinearRing).map((point) => point.altitude)
                     : [])
             });
+            const drapesOnGround = (heightRef === Cesium.HeightReference.CLAMP_TO_GROUND &&
+                extrusion.value == undefined &&
+                !drawsDisplacedSurface);
+            if (drapesOnGround) {
+                posses = groundPosses(posses);
+            }
             posses = CullDuplicateCPosses(posses);
             if (posses.length < 4) {
                 return null;
@@ -54866,6 +54884,9 @@ void main() {
             const holePosses = holeRings.map((x) => {
                 const points = BModels.Geometry.ParsePoints(x.LinearRing);
                 let holePosses = points.map(x => Cesium.Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(x.altitude)));
+                if (drapesOnGround) {
+                    holePosses = groundPosses(holePosses);
+                }
                 holePosses = CullDuplicateCPosses(holePosses);
                 BModels.Cartes.CloseRing3(holePosses);
                 return holePosses;
@@ -55652,6 +55673,18 @@ void main() {
     /*
      * The lon/lat bounding rectangle of a ring, which is the frame Cesium drapes an image material in.
      */
+    /*
+     * Moves a ring onto the ellipsoid, as Cesium fills only a strip of a ground polygon with high vertices.
+     */
+    function groundPosses(posses) {
+        return posses.map((pos) => {
+            const carto = Cesium.Cartographic.fromCartesian(pos);
+            if (!carto) {
+                return pos;
+            }
+            return Cesium.Cartesian3.fromRadians(carto.longitude, carto.latitude, 0);
+        });
+    }
     function polygonBbox(posses) {
         if (!posses || posses.length === 0) {
             return undefined;
@@ -57563,7 +57596,7 @@ void main() {
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.StyleUtils = {}));
 
-    const VERSION = "7.7.5";
+    const VERSION = "7.7.7";
     /**
      * 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.