bruce-cesium 6.9.4 → 6.9.6

package/dist/bruce-cesium.umd.js

@@ -1717,6 +1717,16 @@
         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.
@@ -1808,6 +1818,9 @@
                 if (color) {
                     storeColor(key, color, graphic);
                 }
+                if (graphic instanceof Cesium.PolygonGraphics && graphic.material instanceof Cesium.ImageMaterialProperty) {
+                    storeDefaultTextureImage(graphic, graphic.material.image);
+                }
             }
             else if (key == "highlight") {
                 color = _highlightColor;
@@ -1897,11 +1910,27 @@
                 }
             }
             else if (graphic instanceof Cesium.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 Cesium.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 Cesium.ImageMaterialProperty;
+                    const currentAlpha = currentIsSameImage ? getCesiumColorValue(viewer, currentMaterial).alpha : null;
+                    if (!currentIsSameImage || currentAlpha == null || Math.abs(currentAlpha - tintAlpha) > 0.001) {
+                        graphic.material = new Cesium.ImageMaterialProperty({
+                            image: storedTextureImage,
+                            color: Cesium.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 Cesium.ColorMaterialProperty(color);
+                    }
                 }
             }
             else if (graphic instanceof Cesium.PolylineGraphics) {
@@ -2230,6 +2259,39 @@
             }
         }
         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 = exports.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 Cesium.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.
@@ -36728,9 +36790,23 @@
                 cEntity.polygon.classificationType = new Cesium.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;
+                    exports.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.
+                    exports.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?).
                     exports.CesiumEntityStyler.SetDefaultColor({
@@ -38443,7 +38519,7 @@
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.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.