bruce-cesium 6.9.4 → 6.9.6

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import * as Cesium from 'cesium';
-import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, HeightReference, ColorBlendMode, HeadingPitchRoll, Math as Math$1, Transforms, ShadowMode, Cartesian3, ClassificationType, Model, ArcType, CornerType, ConstantPositionProperty, HorizontalOrigin, VerticalOrigin, JulianDate, Quaternion, Matrix4, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, Cartesian2, SceneTransforms, NearFarScalar, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Ion, IonResource, Cesium3DTileColorBlendMode, Cesium3DTileset, 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, CesiumInspector, ClockRange, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, Intersect, CzmlDataSource } from 'cesium';
-import { Cartes, Entity as Entity$1, ENVIRONMENT, Calculator, ClientFile, EntityLod, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Carto, Geometry, Api, Bounds, Color as Color$1, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, BruceEvent, EntityCoords, DataLab, DelayQueue, EntityHistoricData, AccountConcept, RecordChangeFeed, BruceApi, EntityRelation, ProgramKey, EntitySource, Camera, ProjectViewTile, ProjectViewLegacyTile, Session, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, EntityRelationType } from 'bruce-models';
+import { Cartographic, Entity, DistanceDisplayCondition, Color, HeightReference, CallbackProperty, HorizontalOrigin, VerticalOrigin, ConstantProperty, Cartesian3, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, Cartesian2, Math as Math$1, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, SceneTransforms, NearFarScalar, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, Primitive, Cesium3DTileFeature, Cesium3DTileStyle, HeadingPitchRange, SceneMode, Ion, IonResource, ColorBlendMode, Model, Cesium3DTileColorBlendMode, OrthographicFrustum, EasingFunction, EllipsoidGeodesic, EllipsoidTerrainProvider, sampleTerrainMostDetailed, defined, Cesium3DTileset, PolygonPipeline, CesiumInspector, ClockRange, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, ScreenSpaceEventHandler, ScreenSpaceEventType, BoundingSphere, GeometryInstance, Fullscreen, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, CzmlDataSource, Intersect } from 'cesium';
+import { Cartes, Entity as Entity$1, ENVIRONMENT, Api, Calculator, ClientFile, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Carto, Geometry, Bounds, Color as Color$1, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, BruceEvent, EntityCoords, DataLab, DelayQueue, EntityHistoricData, EntityLod, EntityRelation, BruceApi, AccountConcept, RecordChangeFeed, ProgramKey, EntitySource, Camera, ProjectViewTile, Session, ProjectViewLegacyTile, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, EntityRelationType } from 'bruce-models';
 
 /**
  * Ensures a number is returned from a given value.
@@ -1718,6 +1718,16 @@ function getStoreStateKey(key) {
     return STORE_KEY_STATE_PREFIX + key;
 }
 const LAST_APPLIED_OPACITY_KEY = "_lastAppliedOpacityKey";
+const STORE_TEXTURE_IMAGE_KEY = "_storeTextureImage_default";
+function storeDefaultTextureImage(graphic, image) {
+    graphic[STORE_TEXTURE_IMAGE_KEY] = image;
+}
+function getDefaultTextureImage(graphic) {
+    return graphic[STORE_TEXTURE_IMAGE_KEY];
+}
+function clearDefaultTextureImage(graphic) {
+    delete graphic[STORE_TEXTURE_IMAGE_KEY];
+}
 /**
  * Returns a color property from a graphic.
  * This will turn materials properties into colors before returning them.
@@ -1809,6 +1819,9 @@ function getColor$1(viewer, key, graphic) {
             if (color) {
                 storeColor(key, color, graphic);
             }
+            if (graphic instanceof PolygonGraphics && graphic.material instanceof ImageMaterialProperty) {
+                storeDefaultTextureImage(graphic, graphic.material.image);
+            }
         }
         else if (key == "highlight") {
             color = _highlightColor;
@@ -1898,11 +1911,27 @@ function refreshColor(viewer, graphic, opacity) {
             }
         }
         else if (graphic instanceof PolygonGraphics) {
-            // See if it's changed before applying.
-            // Applying a new material to a polygon causes a flicker we want to avoid when possible.
-            const currentColor = calculateCurColor(viewer, graphic);
-            if (currentColor == null || !currentColor.equals(color)) {
-                graphic.material = new ColorMaterialProperty(color);
+            const storedTextureImage = key == "default" ? getDefaultTextureImage(graphic) : undefined;
+            if (storedTextureImage) {
+                const tintAlpha = opacity != null ? opacity : 1;
+                const currentMaterial = graphic.material;
+                const currentIsSameImage = currentMaterial instanceof ImageMaterialProperty;
+                const currentAlpha = currentIsSameImage ? getCesiumColorValue(viewer, currentMaterial).alpha : null;
+                if (!currentIsSameImage || currentAlpha == null || Math.abs(currentAlpha - tintAlpha) > 0.001) {
+                    graphic.material = new ImageMaterialProperty({
+                        image: storedTextureImage,
+                        color: Color.WHITE.withAlpha(tintAlpha),
+                        transparent: true
+                    });
+                }
+            }
+            else {
+                // See if it's changed before applying.
+                // Applying a new material to a polygon causes a flicker we want to avoid when possible.
+                const currentColor = calculateCurColor(viewer, graphic);
+                if (currentColor == null || !currentColor.equals(color)) {
+                    graphic.material = new ColorMaterialProperty(color);
+                }
             }
         }
         else if (graphic instanceof PolylineGraphics) {
@@ -2236,6 +2265,39 @@ var CesiumEntityStyler;
         }
     }
     CesiumEntityStyler.SetDefaultColor = SetDefaultColor;
+    /*
+     * Updates (or clears) the baked default texture image for a graphic's polygon parts.
+     */
+    function SetDefaultTextureImage(params) {
+        const { viewer, entity, image, requestRender } = params;
+        if (!entity) {
+            return;
+        }
+        const parts = EntityUtils.GatherEntity({
+            entity: entity,
+            selectable: true
+        });
+        for (let i = 0; i < parts.length; i++) {
+            const part = parts[i];
+            if (!isAlive(viewer, part)) {
+                continue;
+            }
+            // Texture fill only applies to polygons.
+            if (part instanceof Entity && part.polygon) {
+                if (image == null) {
+                    clearDefaultTextureImage(part.polygon);
+                }
+                else {
+                    storeDefaultTextureImage(part.polygon, image);
+                }
+                refreshColor(viewer, part.polygon, getAppliedOpacity(part.polygon));
+            }
+        }
+        if (requestRender != false) {
+            viewer.scene.requestRender();
+        }
+    }
+    CesiumEntityStyler.SetDefaultTextureImage = SetDefaultTextureImage;
     /**
      * Updates the opacity of the graphic.
      * This will multiply against the current colour's opacity before applying.
@@ -36835,9 +36897,23 @@ var EntityRenderEnginePolygon;
             cEntity.polygon.classificationType = new ConstantProperty(classification);
             // TODO: animate the texture!
             if (textureDataUri) {
+                // Rebaking texture to ensure we don't revert to the wrong one later.
                 cEntity.polygon.material = fillMaterial;
+                CesiumEntityStyler.SetDefaultTextureImage({
+                    entity: cEntity,
+                    image: textureDataUri,
+                    viewer: params.viewer,
+                    requestRender: false
+                });
             }
             else {
+                // Clear any baked texture from a previous textured style so reverting to default uses the colour fill.
+                CesiumEntityStyler.SetDefaultTextureImage({
+                    entity: cEntity,
+                    image: null,
+                    viewer: params.viewer,
+                    requestRender: false
+                });
                 // We'll use "SetDefaultColor" to updating the internal reference and to allow for an animation.
                 // WARNING: polygon does not support animation (yet?).
                 CesiumEntityStyler.SetDefaultColor({
@@ -38565,7 +38641,7 @@ var StyleUtils;
     StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
 })(StyleUtils || (StyleUtils = {}));
 
-const VERSION = "6.9.4";
+const VERSION = "6.9.6";
 /**
  * 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.