# HG changeset patch
# User unC0Rr
# Date 1672825240 -3600
# Node ID 230dc46487eab58dbc8d163624f9bfed428f98f8
# Parent  9b73594ac98626c00123bce23230a5872c46e4d4
Update mapgen to take into account actual values for 'zero' and 'basic' colors

diff -r 9b73594ac986 -r 230dc46487ea rust/landgen/src/lib.rs
--- a/rust/landgen/src/lib.rs	Wed Jan 04 10:37:12 2023 +0100
+++ b/rust/landgen/src/lib.rs	Wed Jan 04 10:40:40 2023 +0100
@@ -26,6 +26,14 @@
             skip_bezier,
         }
     }
+
+    pub fn zero(&self) -> T {
+        self.zero
+    }
+
+    pub fn basic(&self) -> T {
+        self.basic
+    }
 }
 
 pub trait LandGenerator {
diff -r 9b73594ac986 -r 230dc46487ea rust/mapgen/Cargo.toml
--- a/rust/mapgen/Cargo.toml	Wed Jan 04 10:37:12 2023 +0100
+++ b/rust/mapgen/Cargo.toml	Wed Jan 04 10:40:40 2023 +0100
@@ -11,7 +11,7 @@
 lfprng = { path = "../lfprng" }
 integral-geometry = { path = "../integral-geometry" }
 
-rand = "0.5"
+rand = "0.8"
 serde = "1.0"
 serde_yaml = "0.8"
 serde_derive = "1.0"
diff -r 9b73594ac986 -r 230dc46487ea rust/mapgen/src/lib.rs
--- a/rust/mapgen/src/lib.rs	Wed Jan 04 10:37:12 2023 +0100
+++ b/rust/mapgen/src/lib.rs	Wed Jan 04 10:40:40 2023 +0100
@@ -3,12 +3,12 @@
 use self::theme::Theme;
 use integral_geometry::{Point, Rect, Size};
 use land2d::Land2D;
-use landgen::outline_template::OutlineTemplate;
-use rand::{thread_rng, Rng};
+use landgen::{outline_template::OutlineTemplate, LandGenerationParameters};
 use serde_derive::Deserialize;
 use serde_yaml;
 use std::{borrow::Borrow, collections::hash_map::HashMap, mem::replace};
 use vec2d::Vec2D;
+use rand::{Rng, seq::SliceRandom};
 
 #[derive(Deserialize)]
 struct PointDesc {
@@ -111,13 +111,18 @@
             .collect();
     }
 
-    pub fn get_template(&self, template_type: &str) -> Option<&OutlineTemplate> {
+    pub fn get_template<R: Rng>(&self, template_type: &str, rng: &mut R) -> Option<&OutlineTemplate> {
         self.templates
             .get(template_type)
-            .and_then(|t| thread_rng().choose(t))
+            .and_then(|t| t.as_slice().choose(rng))
     }
 
-    pub fn make_texture<LandT>(&self, land: &Land2D<LandT>, theme: &Theme) -> Vec2D<u32>
+    pub fn make_texture<LandT>(
+        &self,
+        land: &Land2D<LandT>,
+        parameters: &LandGenerationParameters<LandT>,
+        theme: &Theme,
+    ) -> Vec2D<u32>
     where
         LandT: Copy + Default + PartialEq,
     {
@@ -131,6 +136,7 @@
                 while sprite_row.len() < land.width() - x_offset {
                     let copy_range = x_offset..x_offset + sprite_row.len();
                     tex_row_copy(
+                        parameters.basic(),
                         &land_row[copy_range.clone()],
                         &mut tex_row[copy_range],
                         sprite_row,
@@ -142,6 +148,7 @@
                 if x_offset < land.width() {
                     let final_range = x_offset..land.width();
                     tex_row_copy(
+                        parameters.basic(),
                         &land_row[final_range.clone()],
                         &mut tex_row[final_range],
                         &sprite_row[..land.width() - x_offset],
@@ -158,6 +165,7 @@
             let mut offsets = vec![255u8; land.width()];
 
             land_border_pass(
+                parameters.basic(),
                 land.rows().rev().zip(texture.rows_mut().rev()),
                 &mut offsets,
                 border_width,
@@ -170,6 +178,7 @@
             offsets.iter_mut().for_each(|v| *v = 255);
 
             land_border_pass(
+                parameters.basic(),
                 land.rows().zip(texture.rows_mut()),
                 &mut offsets,
                 border_width,
@@ -222,8 +231,13 @@
     (red as u32) << 0 | (green as u32) << 8 | (blue as u32) << 16 | (alpha as u32) << 24
 }
 
-fn land_border_pass<'a, LandT, T, F>(rows: T, offsets: &mut [u8], border_width: u8, pixel_getter: F)
-where
+fn land_border_pass<'a, LandT, T, F>(
+    basic_value: LandT,
+    rows: T,
+    offsets: &mut [u8],
+    border_width: u8,
+    pixel_getter: F,
+) where
     LandT: Default + PartialEq + 'a,
     T: Iterator<Item = (&'a [LandT], &'a mut [u32])>,
     F: (Fn(usize, usize) -> u32),
@@ -235,7 +249,7 @@
             .zip(offsets.iter_mut())
             .enumerate()
         {
-            *offset_v = if *land_v == LandT::default() {
+            *offset_v = if *land_v == basic_value {
                 if *offset_v < border_width {
                     *tex_v = blend(pixel_getter(x, *offset_v as usize), *tex_v)
                 }
@@ -247,16 +261,16 @@
     }
 }
 
-fn tex_row_copy<LandT>(land_row: &[LandT], tex_row: &mut [u32], sprite_row: &[u32])
-where
+fn tex_row_copy<LandT>(
+    basic_value: LandT,
+    land_row: &[LandT],
+    tex_row: &mut [u32],
+    sprite_row: &[u32],
+) where
     LandT: Default + PartialEq,
 {
     for ((land_v, tex_v), sprite_v) in land_row.iter().zip(tex_row.iter_mut()).zip(sprite_row) {
-        *tex_v = if *land_v == LandT::default() {
-            *sprite_v
-        } else {
-            0
-        }
+        *tex_v = if *land_v == basic_value { *sprite_v } else { 0 }
     }
 }