bruce-cesium 6.9.3 → 6.9.5

package/dist/bruce-cesium.umd.js

@@ -1717,6 +1717,13 @@
         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];
+    }
     /**
      * Returns a color property from a graphic.
      * This will turn materials properties into colors before returning them.
@@ -1808,6 +1815,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 +1907,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) {
@@ -37079,7 +37105,13 @@
      */
     async function resolveTexturedFill(params) {
         const { api, style, entity, tags } = params;
-        const textureTrace = style.texture ? BModels.Calculator.TraceGetString(style.texture, entity, tags) : { value: null, effective: null };
+        let textureRows = style.texture == null ? [] : style.texture;
+        textureRows.forEach((row) => {
+            if (row.type == BModels.Calculator.EValueType.Color) {
+                row.type = BModels.Calculator.EValueType.Input;
+            }
+        });
+        const textureTrace = textureRows.length ? BModels.Calculator.TraceGetString(textureRows, entity, tags) : { value: null, effective: null };
         const raw = textureTrace.value;
         if (!raw || typeof raw != "string" || !api) {
             return { dataUri: null, effective: textureTrace.effective };
@@ -38437,7 +38469,7 @@
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.StyleUtils = {}));
 
-    const VERSION = "6.9.3";
+    const VERSION = "6.9.5";
     /**
      * 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.