bruce-cesium 7.1.7 → 7.1.9

package/dist/bruce-cesium.umd.js

@@ -2970,6 +2970,8 @@
     const CESIUM_MODEL_SPACE_KEY = "_nextspace_model_space";
     const DEFAULT_LIVE_PADDING_SECONDS = 30 * 60;
     const DEFAULT_BRIGHTNESS_SHIFT = 0.2;
+    const DEFAULT_LIGHT_INTENSITY = 3;
+    const LIGHTING_SETTINGS_VERSION = 2;
     (function (ViewUtils) {
         function GatherLegacyMapTiles(params) {
             const viewer = params.viewer;
@@ -3320,23 +3322,50 @@
          */
         function ApplyDefaultBrightness(viewer, shift = DEFAULT_BRIGHTNESS_SHIFT) {
             const scene = viewer === null || viewer === void 0 ? void 0 : viewer.scene;
-            if (!scene || !(shift > 0)) {
+            if (!scene) {
                 return;
             }
             // Atmosphere settings moved from Globe onto Scene, and the sky keeps its own copy, so each is
             // probed rather than version checked: host apps bring their own CesiumJS.
             const SCENE = scene;
-            if (SCENE.atmosphere && typeof SCENE.atmosphere.brightnessShift === "number") {
-                SCENE.atmosphere.brightnessShift = shift;
-            }
-            if (SCENE.globe && typeof SCENE.globe.atmosphereBrightnessShift === "number") {
-                SCENE.globe.atmosphereBrightnessShift = shift;
-            }
-            if (SCENE.skyAtmosphere && typeof SCENE.skyAtmosphere.brightnessShift === "number") {
-                SCENE.skyAtmosphere.brightnessShift = shift;
+            if (shift > 0) {
+                if (SCENE.atmosphere && typeof SCENE.atmosphere.brightnessShift === "number") {
+                    SCENE.atmosphere.brightnessShift = shift;
+                }
+                if (SCENE.globe && typeof SCENE.globe.atmosphereBrightnessShift === "number") {
+                    SCENE.globe.atmosphereBrightnessShift = shift;
+                }
+                if (SCENE.skyAtmosphere && typeof SCENE.skyAtmosphere.brightnessShift === "number") {
+                    SCENE.skyAtmosphere.brightnessShift = shift;
+                }
             }
         }
         ViewUtils.ApplyDefaultBrightness = ApplyDefaultBrightness;
+        /**
+         * Resolves the sun colour and intensity to apply for a bookmark's lighting settings.
+         * @param lighting the bookmark's lighting settings, or null when it carries none.
+         * @returns the colour and intensity to put on the scene light.
+         */
+        function ResolveLightSettings(lighting) {
+            const raw = lighting === null || lighting === void 0 ? void 0 : lighting.color;
+            // An unreadable or missing colour would otherwise leave the light undefined.
+            const parsed = raw ? Cesium.Color.fromCssColorString(raw) : null;
+            const version = Number(lighting === null || lighting === void 0 ? void 0 : lighting.lightingVer);
+            const stale = !Number.isFinite(version) || version <= 1;
+            const intensity = Number(lighting === null || lighting === void 0 ? void 0 : lighting.intensity);
+            return {
+                color: parsed || Cesium.Color.WHITE,
+                intensity: stale || !Number.isFinite(intensity) ? DEFAULT_LIGHT_INTENSITY : intensity
+            };
+        }
+        ViewUtils.ResolveLightSettings = ResolveLightSettings;
+        /**
+         * Options handed to every tileset and model this library creates.
+         */
+        function DefaultEnvironmentMapOptions() {
+            return { enabled: false };
+        }
+        ViewUtils.DefaultEnvironmentMapOptions = DefaultEnvironmentMapOptions;
         function SetGlobeDetails(params) {
             let { viewer, hidden, baseColor } = params;
             const scene = viewer === null || viewer === void 0 ? void 0 : viewer.scene;
@@ -14661,6 +14690,7 @@
         const defaultProps = {
             // "Optimization option. Reduce the screen space error for tiles that are further away from the camera.".
             dynamicScreenSpaceError: true,
+            environmentMapOptions: exports.ViewUtils.DefaultEnvironmentMapOptions()
         };
         if (noMemoryLimit != true) {
             // "The maximum amount of memory in MB that can be used by the tileset.".
@@ -21376,7 +21406,8 @@
                                     return;
                                 }
                                 this.cTileset = await CESIUM.Cesium3DTileset.fromUrl(proxyRootUrl, {
-                                    showCreditsOnScreen: true
+                                    showCreditsOnScreen: true,
+                                    environmentMapOptions: exports.ViewUtils.DefaultEnvironmentMapOptions()
                                 });
                             }
                             else {
@@ -22912,6 +22943,7 @@
                         const cEntity = this.viewer.entities.add({
                             model: {
                                 uri: lod["ClientFile"].URL,
+                                environmentMapOptions: exports.ViewUtils.DefaultEnvironmentMapOptions(),
                                 heightReference: Cesium.HeightReference.NONE
                             },
                             // point: {
@@ -28969,13 +29001,15 @@
         if (lighting == null) {
             lighting = {
                 color: Cesium.Color.WHITE.toCssColorString(),
-                intensity: 2
+                intensity: DEFAULT_LIGHT_INTENSITY,
+                lightingVer: LIGHTING_SETTINGS_VERSION
             };
         }
         const light = viewer.scene.light;
         if (light) {
-            light.color = Cesium.Color.fromCssColorString(lighting.color);
-            light.intensity = EnsureNumber(lighting.intensity);
+            const resolved = exports.ViewUtils.ResolveLightSettings(lighting);
+            light.color = resolved.color;
+            light.intensity = resolved.intensity;
         }
         exports.ViewUtils.ApplyDefaultBrightness(viewer, EnsureNumber(lighting.brightnessShift, DEFAULT_BRIGHTNESS_SHIFT));
         let quality = bSettings === null || bSettings === void 0 ? void 0 : bSettings.quality;
@@ -38626,6 +38660,7 @@
                     id: BModels.ObjectUtils.UId(15),
                     model: {
                         uri: params.lodUrl,
+                        environmentMapOptions: exports.ViewUtils.DefaultEnvironmentMapOptions(),
                         heightReference: heightRef,
                         scale: new Cesium.CallbackProperty(() => scale * styleScale, true),
                         shadows: Cesium.ShadowMode.ENABLED,
@@ -39267,7 +39302,8 @@
             return await CESIUM.Model.fromGltfAsync({
                 url: url,
                 asynchronous: true,
-                scale: scale
+                scale: scale,
+                environmentMapOptions: exports.ViewUtils.DefaultEnvironmentMapOptions()
             });
         }
         // Older versions of Cesium have a fromGltf method.
@@ -43404,7 +43440,7 @@ void main() {
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.StyleUtils = {}));
 
-    const VERSION = "7.1.7";
+    const VERSION = "7.1.9";
     /**
      * 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.
@@ -43436,6 +43472,8 @@ void main() {
     exports.CESIUM_MODEL_SPACE_KEY = CESIUM_MODEL_SPACE_KEY;
     exports.DEFAULT_LIVE_PADDING_SECONDS = DEFAULT_LIVE_PADDING_SECONDS;
     exports.DEFAULT_BRIGHTNESS_SHIFT = DEFAULT_BRIGHTNESS_SHIFT;
+    exports.DEFAULT_LIGHT_INTENSITY = DEFAULT_LIGHT_INTENSITY;
+    exports.LIGHTING_SETTINGS_VERSION = LIGHTING_SETTINGS_VERSION;
     exports.Draw3dPolygon = Draw3dPolygon;
     exports.Draw3dPolyline = Draw3dPolyline;
     exports.WidgetControlViewBarSearch = WidgetControlViewBarSearch;