Add staggered water texture based on distance from land

TruncateGame · Oct 26, 2024 · 7e53dc1 · 7e53dc1
1 parent d2b92ca
commit 7e53dc1
Show file tree

Hide file tree

Showing 8 changed files with 478 additions and 361 deletions.
diff --git a/truncate_client/img/tile_order b/truncate_client/img/tile_order
@@ -17,6 +17,7 @@ CHECKERBOARD_NW
 CHECKERBOARD_NE
 CHECKERBOARD_SW
 CHECKERBOARD_SE
+BASE_WATER_WAVES
 BASE_WATER
 WATER_WITH_LAND_SE
 WATER_WITH_LAND_S

diff --git a/truncate_client/img/truncate.aseprite b/truncate_client/img/truncate.aseprite
diff --git a/truncate_client/img/truncate_packed.png b/truncate_client/img/truncate_packed.png
diff --git a/truncate_client/src/utils/mapper/mod.rs b/truncate_client/src/utils/mapper/mod.rs
@@ -4,7 +4,7 @@ use eframe::egui;
 use epaint::{hex_color, pos2, Color32, ColorImage, Mesh, Rect, Shape, TextureHandle};
 use instant::Duration;
 use truncate_core::{
-    board::{Board, Coordinate, Direction, SignedCoordinate, Square},
+    board::{Board, BoardDistances, Coordinate, Direction, SignedCoordinate, Square},
     reporting::Change,
 };
 
@@ -123,6 +123,7 @@ pub struct MappedBoard {
     forecasted_wind: u8,
     incoming_wind: u8,
     winds: VecDeque<u8>,
+    distance_to_land: BoardDistances,
 }
 
 impl MappedBoard {
@@ -156,6 +157,7 @@ impl MappedBoard {
             forecasted_wind: 0,
             incoming_wind: 0,
             winds: vec![0; board.width() + board.height()].into(),
+            distance_to_land: board.flood_fill_water_from_land(),
         };
 
         mapper.remap_texture(ctx, aesthetics, &TimingDepot::default(), None, None, board);
@@ -313,7 +315,9 @@ impl MappedBoard {
             seed_at_coord,
             tick,
             wind_at_coord,
-            dest_coord,
+            coord,
+            (board.width(), board.height()),
+            &self.distance_to_land,
         );
 
         if square.is_foggy() {
@@ -934,6 +938,7 @@ impl MappedBoard {
 
             if !board_eq {
                 memory.prev_board = board.clone();
+                self.distance_to_land = board.flood_fill_water_from_land();
             }
             if !selected_tile_eq {
                 memory.prev_selected_tile = selected_tile;
@@ -1026,6 +1031,7 @@ impl MappedBoard {
                 }
 
                 let source_coord = SignedCoordinate::new(source_col, source_row);
+
                 let square = source_coord
                     .real_coord()
                     .and_then(|c| board.get(c).ok())

diff --git a/truncate_client/src/utils/tex/mod.rs b/truncate_client/src/utils/tex/mod.rs
@@ -3,7 +3,7 @@ use epaint::{
     hex_color, pos2, vec2, Color32, ColorImage, Mesh, Pos2, Rect, Shape, TextureHandle, TextureId,
     Vec2,
 };
-use truncate_core::board::{Coordinate, Direction, Square};
+use truncate_core::board::{BoardDistances, Coordinate, Direction, SignedCoordinate, Square};
 
 use crate::{app_outer::TEXTURE_MEASUREMENT, regions::lobby::BoardEditingMode};
 
@@ -607,6 +607,54 @@ impl Tex {
             .with_piece_texture(tinted, Some(color))
     }
 
+    fn water(
+        seed: usize,
+        source_coord: SignedCoordinate,
+        board_size: (usize, usize),
+        distance_to_land: &BoardDistances,
+    ) -> Tex {
+        let mut added_distance = 0;
+        let mut lookup_x = 0;
+        let mut lookup_y = 0;
+
+        if source_coord.x < 0 {
+            added_distance += source_coord.x.unsigned_abs();
+        } else if source_coord.x as usize >= board_size.0 {
+            lookup_x = board_size.0 - 1;
+            added_distance += source_coord.x as usize - lookup_x;
+        } else {
+            lookup_x = source_coord.x as _;
+        }
+
+        if source_coord.y < 0 {
+            added_distance += source_coord.y.unsigned_abs();
+        } else if source_coord.y as usize >= board_size.1 {
+            lookup_y = board_size.1 - 1;
+            added_distance += source_coord.y as usize - lookup_y;
+        } else {
+            lookup_y = source_coord.y as _;
+        }
+
+        let dist = distance_to_land
+            .direct_distance(&Coordinate::new(lookup_x, lookup_y))
+            .unwrap_or_default()
+            + added_distance;
+
+        let rand = quickrand(seed + 1982367);
+        let threshold = match dist {
+            0 => 100,
+            1 => 70,
+            2 => 30,
+            _ => 0,
+        };
+
+        if threshold > rand {
+            tiles::BASE_WATER_WAVES
+        } else {
+            tiles::BASE_WATER
+        }
+    }
+
     /// Determine the tiles to use based on a given square and its neighbors,
     /// provided clockwise from northwest.
     pub fn terrain(
@@ -616,7 +664,9 @@ impl Tex {
         seed: usize,
         tick: u64,
         wind_at_coord: u8,
-        coord: Coordinate,
+        coord: SignedCoordinate,
+        board_size: (usize, usize),
+        distance_to_land: &BoardDistances,
     ) -> TexLayers {
         debug_assert_eq!(neighbors.len(), 8);
         if neighbors.len() != 8 {
@@ -669,7 +719,9 @@ impl Tex {
                 (Land, Land | WaterOrFog, WaterOrFog) => tiles::WATER_WITH_LAND_W,
                 (WaterOrFog, Land | WaterOrFog, Land) => tiles::WATER_WITH_LAND_N,
                 (WaterOrFog, Land, WaterOrFog) => tiles::WATER_WITH_LAND_NW,
-                (WaterOrFog, WaterOrFog, WaterOrFog) => tiles::BASE_WATER,
+                (WaterOrFog, WaterOrFog, WaterOrFog) => {
+                    Tex::water(seed, coord, board_size, distance_to_land)
+                }
             },
         };
 
@@ -680,7 +732,9 @@ impl Tex {
                 (Land, Land | WaterOrFog, WaterOrFog) => tiles::WATER_WITH_LAND_N,
                 (WaterOrFog, Land | WaterOrFog, Land) => tiles::WATER_WITH_LAND_E,
                 (WaterOrFog, Land, WaterOrFog) => tiles::WATER_WITH_LAND_NE,
-                (WaterOrFog, WaterOrFog, WaterOrFog) => tiles::BASE_WATER,
+                (WaterOrFog, WaterOrFog, WaterOrFog) => {
+                    Tex::water(seed + 1, coord, board_size, distance_to_land)
+                }
             },
         };
 
@@ -691,7 +745,9 @@ impl Tex {
                 (Land, Land | WaterOrFog, WaterOrFog) => tiles::WATER_WITH_LAND_E,
                 (WaterOrFog, Land | WaterOrFog, Land) => tiles::WATER_WITH_LAND_S,
                 (WaterOrFog, Land, WaterOrFog) => tiles::WATER_WITH_LAND_SE,
-                (WaterOrFog, WaterOrFog, WaterOrFog) => tiles::BASE_WATER,
+                (WaterOrFog, WaterOrFog, WaterOrFog) => {
+                    Tex::water(seed + 2, coord, board_size, distance_to_land)
+                }
             },
         };
 
@@ -702,7 +758,9 @@ impl Tex {
                 (Land, Land | WaterOrFog, WaterOrFog) => tiles::WATER_WITH_LAND_S,
                 (WaterOrFog, Land | WaterOrFog, Land) => tiles::WATER_WITH_LAND_W,
                 (WaterOrFog, Land, WaterOrFog) => tiles::WATER_WITH_LAND_SW,
-                (WaterOrFog, WaterOrFog, WaterOrFog) => tiles::BASE_WATER,
+                (WaterOrFog, WaterOrFog, WaterOrFog) => {
+                    Tex::water(seed + 3, coord, board_size, distance_to_land)
+                }
             },
         };