Visualize signal strengths by location

emergence_lib/src/asset_management/palette.rs

@@ -1,105 +1,124 @@
 //! A central source of truth for the game and UI's color palettes.
 
-use bevy::prelude::Color;
-
-/// The alpha value used for selection/hovering/other UI overlay
-const OVERLAY_ALPHA: f32 = 0.5;
-
-/// The hue of selected objects
-pub(crate) const SELECTION_HUE: f32 = 100.;
-/// The saturation of selected objects
-pub(crate) const SELECTION_SATURATION: f32 = 0.5;
-/// The lightness of selected objects
-pub(crate) const SELECTION_LIGHTNESS: f32 = 0.6;
-/// The color used to tint selected objects.
-pub(crate) const SELECTION_COLOR: Color = Color::hsla(
-    SELECTION_HUE,
-    SELECTION_SATURATION,
-    SELECTION_LIGHTNESS,
-    OVERLAY_ALPHA,
-);
-
-/// The hue used to indicate that an action is forbidden.
-pub(crate) const FORBIDDEN_HUE: f32 = 0.;
-
-/// The hue of selected objects
-pub(crate) const HOVER_HUE: f32 = 55.;
-/// The saturation of selected objects
-pub(crate) const HOVER_SATURATION: f32 = 0.5;
-/// The lightness of selected objects
-pub(crate) const HOVER_LIGHTNESS: f32 = 0.6;
-
-/// The color used to tint hovered objects.
-pub(crate) const HOVER_COLOR: Color =
-    Color::hsla(HOVER_HUE, HOVER_SATURATION, HOVER_LIGHTNESS, OVERLAY_ALPHA);
-
-/// The hue value of ghost-like materials.
-pub(crate) const GHOST_HUE: f32 = 0.0;
-/// The saturation value of ghost-like materials.
-pub(crate) const GHOST_SATURATION: f32 = 0.;
-/// The lightness value of ghost-like materials.
-pub(crate) const GHOST_LIGHTNESS: f32 = 0.9;
-/// The alpha value of ghost-like materials.
-pub(crate) const GHOST_ALPHA: f32 = 0.7;
-/// The color used to tint ghosts
-pub(crate) const GHOST_COLOR: Color =
-    Color::hsla(GHOST_HUE, GHOST_SATURATION, GHOST_LIGHTNESS, GHOST_ALPHA);
-/// The color used to tint selected ghosts
-pub(crate) const SELECTED_GHOST_COLOR: Color = Color::hsla(
-    SELECTION_HUE,
-    SELECTION_SATURATION,
-    SELECTION_LIGHTNESS,
-    GHOST_ALPHA,
-);
-
-/// The color used to tint previews
-pub(crate) const PREVIEW_COLOR: Color =
-    Color::hsla(HOVER_HUE, HOVER_SATURATION, HOVER_LIGHTNESS, GHOST_ALPHA);
-/// The color used to tint previews that cannot be built
-pub(crate) const FORBIDDEN_PREVIEW_COLOR: Color = Color::hsla(
-    FORBIDDEN_HUE,
-    HOVER_SATURATION,
-    HOVER_LIGHTNESS,
-    GHOST_ALPHA,
-);
-
-/// The color used to tint objects that are both selected and hovered.
-pub(crate) const SELECTION_AND_HOVER_COLOR: Color = Color::hsla(
-    (SELECTION_HUE + HOVER_HUE) / 2.,
-    (SELECTION_SATURATION + HOVER_SATURATION) / 2.,
-    (SELECTION_LIGHTNESS + HOVER_LIGHTNESS) / 2.,
-    OVERLAY_ALPHA,
-);
-
-/// The color used for columns of dirt underneath tiles
-pub(crate) const COLUMN_COLOR: Color = Color::hsl(21., 0.6, 0.15);
-
-/// The color of daylight
-pub(crate) const LIGHT_SUN: Color = Color::Hsla {
-    hue: 30.,
-    saturation: 1.0,
-    lightness: 1.,
-    alpha: 1.,
-};
-
-/// The color of moonlight
-pub(crate) const LIGHT_MOON: Color = Color::Hsla {
-    hue: 198.,
-    saturation: 1.0,
-    lightness: 1.,
-    alpha: 1.,
-};
-
-/// The color of a clear and sunny sky.
-pub(crate) const SKY_SUNNY: Color = Color::Hsla {
-    hue: 202.,
-    saturation: 0.8,
-    lightness: 0.8,
-    alpha: 1.0,
-};
-
-/// The color of starlight
-pub(crate) const LIGHT_STARS: Color = Color::WHITE;
+/// Colors used for visualizing information about the world.
+pub(crate) mod infovis {
+    use bevy::prelude::Color;
+
+    /// The alpha value used for selection/hovering/other UI overlay
+    const OVERLAY_ALPHA: f32 = 0.5;
+
+    /// The hue of selected objects
+    pub(crate) const SELECTION_HUE: f32 = 100.;
+    /// The saturation of selected objects
+    pub(crate) const SELECTION_SATURATION: f32 = 0.5;
+    /// The lightness of selected objects
+    pub(crate) const SELECTION_LIGHTNESS: f32 = 0.6;
+    /// The color used to tint selected objects.
+    pub(crate) const SELECTION_COLOR: Color = Color::hsla(
+        SELECTION_HUE,
+        SELECTION_SATURATION,
+        SELECTION_LIGHTNESS,
+        OVERLAY_ALPHA,
+    );
+
+    /// The hue used to indicate that an action is forbidden.
+    pub(crate) const FORBIDDEN_HUE: f32 = 0.;
+
+    /// The hue of selected objects
+    pub(crate) const HOVER_HUE: f32 = 55.;
+    /// The saturation of selected objects
+    pub(crate) const HOVER_SATURATION: f32 = 0.5;
+    /// The lightness of selected objects
+    pub(crate) const HOVER_LIGHTNESS: f32 = 0.6;
+
+    /// The color used to tint hovered objects.
+    pub(crate) const HOVER_COLOR: Color =
+        Color::hsla(HOVER_HUE, HOVER_SATURATION, HOVER_LIGHTNESS, OVERLAY_ALPHA);
+
+    /// The hue value of ghost-like materials.
+    pub(crate) const GHOST_HUE: f32 = 0.0;
+    /// The saturation value of ghost-like materials.
+    pub(crate) const GHOST_SATURATION: f32 = 0.;
+    /// The lightness value of ghost-like materials.
+    pub(crate) const GHOST_LIGHTNESS: f32 = 0.9;
+    /// The alpha value of ghost-like materials.
+    pub(crate) const GHOST_ALPHA: f32 = 0.7;
+    /// The color used to tint ghosts
+    pub(crate) const GHOST_COLOR: Color =
+        Color::hsla(GHOST_HUE, GHOST_SATURATION, GHOST_LIGHTNESS, GHOST_ALPHA);
+    /// The color used to tint selected ghosts
+    pub(crate) const SELECTED_GHOST_COLOR: Color = Color::hsla(
+        SELECTION_HUE,
+        SELECTION_SATURATION,
+        SELECTION_LIGHTNESS,
+        GHOST_ALPHA,
+    );
+
+    /// The color used to tint previews
+    pub(crate) const PREVIEW_COLOR: Color =
+        Color::hsla(HOVER_HUE, HOVER_SATURATION, HOVER_LIGHTNESS, GHOST_ALPHA);
+    /// The color used to tint previews that cannot be built
+    pub(crate) const FORBIDDEN_PREVIEW_COLOR: Color = Color::hsla(
+        FORBIDDEN_HUE,
+        HOVER_SATURATION,
+        HOVER_LIGHTNESS,
+        GHOST_ALPHA,
+    );
+
+    /// The color used to tint objects that are both selected and hovered.
+    pub(crate) const SELECTION_AND_HOVER_COLOR: Color = Color::hsla(
+        (SELECTION_HUE + HOVER_HUE) / 2.,
+        (SELECTION_SATURATION + HOVER_SATURATION) / 2.,
+        (SELECTION_LIGHTNESS + HOVER_LIGHTNESS) / 2.,
+        OVERLAY_ALPHA,
+    );
+
+    /// The color used to indicate that the signal strength is low.
+    ///
+    /// Beginning at a low lightness means that the effect will be very translucent when the signal strength is low.
+    pub(crate) const SIGNAL_OVERLAY_LOW: Color = Color::hsla(300., 0.0, 0., OVERLAY_ALPHA);
+    /// The color used to indicate that the signal strength is high.
+    pub(crate) const SIGNAL_OVERLAY_HIGH: Color = Color::hsla(300., 1., 1.0, OVERLAY_ALPHA);
+}
+
+/// Colors used for the world's environment
+pub(crate) mod environment {
+    use bevy::prelude::Color;
+
+    /// The color used for columns of dirt underneath tiles
+    pub(crate) const COLUMN_COLOR: Color = Color::hsl(21., 0.6, 0.15);
+    /// The color of a clear and sunny sky.
+    pub(crate) const SKY_SUNNY: Color = Color::Hsla {
+        hue: 202.,
+        saturation: 0.8,
+        lightness: 0.8,
+        alpha: 1.0,
+    };
+}
+
+/// Colors used for lighting
+pub(crate) mod lighting {
+    use bevy::prelude::Color;
+
+    /// The color of daylight
+    pub(crate) const LIGHT_SUN: Color = Color::Hsla {
+        hue: 30.,
+        saturation: 1.0,
+        lightness: 1.,
+        alpha: 1.,
+    };
+
+    /// The color of moonlight
+    pub(crate) const LIGHT_MOON: Color = Color::Hsla {
+        hue: 198.,
+        saturation: 1.0,
+        lightness: 1.,
+        alpha: 1.,
+    };
+
+    /// The color of starlight
+    pub(crate) const LIGHT_STARS: Color = Color::WHITE;
+}
 
 /// Colors used in the UI
 pub(crate) mod ui {

emergence_lib/src/asset_management/terrain.rs

@@ -11,7 +11,7 @@ use crate::{
 use super::{
     hexagonal_column,
     manifest::{Id, Terrain, TerrainManifest},
-    palette::COLUMN_COLOR,
+    palette::environment::COLUMN_COLOR,
     Loadable,
 };
 

emergence_lib/src/graphics/atmosphere.rs

@@ -2,7 +2,7 @@
 
 use bevy::prelude::*;
 
-use crate::asset_management::palette::SKY_SUNNY;
+use crate::asset_management::palette::environment::SKY_SUNNY;
 
 /// Logic and resources to modify the sky and atmosphere.
 pub(super) struct AtmospherePlugin;

emergence_lib/src/graphics/lighting.rs

@@ -8,7 +8,7 @@ use bevy::{
 };
 
 use crate::{
-    asset_management::palette::{LIGHT_MOON, LIGHT_STARS, LIGHT_SUN},
+    asset_management::palette::lighting::{LIGHT_MOON, LIGHT_STARS, LIGHT_SUN},
     player_interaction::camera::CameraSettings,
     simulation::{geometry::Height, light::Illuminance},
 };

emergence_lib/src/graphics/mod.rs

@@ -2,16 +2,14 @@
 
 use bevy::prelude::*;
 
-use crate::{asset_management::AssetState, player_interaction::InteractionSystem};
+use crate::asset_management::AssetState;
 
 use self::{
-    atmosphere::AtmospherePlugin, lighting::LightingPlugin, selection::display_tile_overlay,
-    structures::remove_ghostly_shadows,
+    atmosphere::AtmospherePlugin, lighting::LightingPlugin, structures::remove_ghostly_shadows,
 };
 
 mod atmosphere;
 pub(crate) mod lighting;
-mod selection;
 mod structures;
 mod units;
 
@@ -28,8 +26,7 @@ impl Plugin for GraphicsPlugin {
             // Run these after Update to avoid panics due to despawned entities
             .add_systems(
                 (inherit_materials, remove_ghostly_shadows).in_base_set(CoreSet::PostUpdate),
-            )
-            .add_system(display_tile_overlay.after(InteractionSystem::SelectTiles));
+            );
     }
 }