bruce-cesium 7.7.5 → 7.7.7

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import * as Cesium from 'cesium';
-import { Cartographic, Entity, ConstantPositionProperty, HeightReference, Color, DistanceDisplayCondition, ColorMaterialProperty, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, ColorBlendMode, HeadingPitchRoll, Math as Math$1, Transforms, ShadowMode, Cartesian3, Model, ClassificationType, Matrix4, JulianDate, Quaternion, ArcType, CornerType, ShaderSource, Ellipsoid, Geometry, GeometryAttribute, ComponentDatatype, PrimitiveType, BoundingSphere, GeometryPipeline, Cartesian2, Cartesian4, sampleTerrain, Texture, PixelFormat, Sampler, TextureWrap, TextureMinificationFilter, TextureMagnificationFilter, PixelDatatype, VertexArray, BufferUsage, ShaderProgram, RenderState, BlendingState, DrawCommand, Pass, HorizontalOrigin, VerticalOrigin, SceneMode, IntersectionTests, Ray, SceneTransforms, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, Rectangle, NearFarScalar, Matrix3, KmlDataSource, GeoJsonDataSource, FeatureDetection, Cesium3DTileStyle, HeadingPitchRange, Ion, IonResource, Cesium3DTileColorBlendMode, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, Cesium3DTileset, OrthographicFrustum, EasingFunction, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, WebGLConstants, Intersect, PolygonPipeline, CustomDataSource, CesiumInspector, ClockRange, DynamicEnvironmentMapManager, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, CzmlDataSource } from 'cesium';
-import { Cartes, LRUCache, Carto, ProjectViewTile, EntityHistoricData, BruceEvent, DelayQueue, Entity as Entity$1, EntityTag, ClientFile, ENVIRONMENT, EntityAttachmentType, EntityRelationType, EntityType, Tileset, Calculator, DataLab, Style, ObjectUtils, MenuItem, AccountConcept, RecordChangeFeed, EntityLod, UrlUtils, Geometry as Geometry$1, Api, ClientFileValueMap, Color as Color$1, Bounds, ZoomControl, Assembly, EntityCoords, ProjectView, ProjectViewBookmark, EntityRelation, BruceApi, EntitySource, ProgramKey, ProjectViewLegacyTile, Camera, Account, AccountLimits, Session, EntityAttachment, EntityAttribute, MathUtils, ProjectViewBookmarkGroup } from 'bruce-models';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, ShaderSource, Cartesian3, Math as Math$1, Ellipsoid, Transforms, Matrix4, Geometry, GeometryAttribute, ComponentDatatype, PrimitiveType, BoundingSphere, GeometryPipeline, Cartesian2, Cartesian4, sampleTerrain, Texture, PixelFormat, Sampler, TextureWrap, TextureMinificationFilter, TextureMagnificationFilter, PixelDatatype, VertexArray, BufferUsage, ShaderProgram, RenderState, BlendingState, DrawCommand, Pass, ConstantPositionProperty, HeightReference, DistanceDisplayCondition, JulianDate, Quaternion, HeadingPitchRoll, ColorBlendMode, ShadowMode, Model, ClassificationType, HorizontalOrigin, VerticalOrigin, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, ArcType, CornerType, Rectangle, SceneMode, IntersectionTests, Ray, SceneTransforms, FeatureDetection, Matrix3, NearFarScalar, KmlDataSource, GeoJsonDataSource, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, IonResource, Cesium3DTileset, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, OrthographicFrustum, EasingFunction, Intersect, CustomDataSource, WebGLConstants, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, PolygonPipeline, CesiumInspector, ClockRange, DynamicEnvironmentMapManager, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, CzmlDataSource } from 'cesium';
+import { Cartes, LRUCache, Carto, ProjectViewTile, EntityHistoricData, BruceEvent, DelayQueue, Entity as Entity$1, EntityTag, ClientFile, ENVIRONMENT, EntityAttachmentType, EntityRelationType, EntityType, Tileset, Calculator, DataLab, Style, ObjectUtils, MenuItem, AccountConcept, RecordChangeFeed, EntityLod, UrlUtils, Api, Bounds, ClientFileValueMap, Color as Color$1, Geometry as Geometry$1, ProjectView, ProjectViewBookmark, ZoomControl, Assembly, EntityCoords, BruceApi, EntityRelation, EntitySource, ProgramKey, ProjectViewLegacyTile, Camera, Account, AccountLimits, Session, EntityAttachment, EntityAttribute, MathUtils, ProjectViewBookmarkGroup } from 'bruce-models';
 
 /**
  * Ensures a number is returned from a given value.
@@ -28652,26 +28652,38 @@ var XGridsRenderEngine;
      */
     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 = Transforms.eastNorthUpToFixedFrame(Cartesian3.fromDegrees(lon, lat, alt));
+            if (!dontRotate) {
+                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));
+                const local = Matrix4.fromRotation(Matrix3.fromHeadingPitchRoll(hpr));
+                Matrix4.multiply(matrix, local, matrix);
+                Matrix4.multiplyByUniformScale(matrix, scale, matrix);
+            }
+            renderObject.setModelMatrix(matrix);
+            return;
+        }
         if (!dontTransform) {
             const pos = Cartesian3.fromDegrees(lon, lat, alt);
-            if (typeof renderObject.setTranslation === 'function') {
+            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') {
+            if (typeof renderObject.setRotation === "function") {
                 renderObject.setRotation(rotMatrix);
             }
-            if (typeof renderObject.setScale === 'function') {
+            if (typeof renderObject.setScale === "function") {
                 renderObject.setScale(new Cartesian3(scale, scale, scale));
             }
         }
@@ -54995,6 +55007,12 @@ var EntityRenderEnginePolygon;
                 ? Geometry$1.ParsePoints(ring.LinearRing).map((point) => point.altitude)
                 : [])
         });
+        const drapesOnGround = (heightRef === HeightReference.CLAMP_TO_GROUND &&
+            extrusion.value == undefined &&
+            !drawsDisplacedSurface);
+        if (drapesOnGround) {
+            posses = groundPosses(posses);
+        }
         posses = CullDuplicateCPosses(posses);
         if (posses.length < 4) {
             return null;
@@ -55003,6 +55021,9 @@ var EntityRenderEnginePolygon;
         const holePosses = holeRings.map((x) => {
             const points = Geometry$1.ParsePoints(x.LinearRing);
             let holePosses = points.map(x => Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(x.altitude)));
+            if (drapesOnGround) {
+                holePosses = groundPosses(holePosses);
+            }
             holePosses = CullDuplicateCPosses(holePosses);
             Cartes.CloseRing3(holePosses);
             return holePosses;
@@ -55789,6 +55810,18 @@ function waterFor(style) {
 /*
  * 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 = Cartographic.fromCartesian(pos);
+        if (!carto) {
+            return pos;
+        }
+        return Cartesian3.fromRadians(carto.longitude, carto.latitude, 0);
+    });
+}
 function polygonBbox(posses) {
     if (!posses || posses.length === 0) {
         return undefined;
@@ -57715,7 +57748,7 @@ var StyleUtils;
     StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
 })(StyleUtils || (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.