osmarks/ewo3
1
0
Fork 0
mirror of https://github.com/osmarks/ewo3.git synced 2025-10-31 15:33:00 +00:00
Code Issues Releases Wiki Activity

Ground salt

Browse Source
This commit is contained in:
osmarks
2024-07-22 13:58:24 +01:00
parent 995dda3ce7
commit 32a1a69db4
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/worldgen.rs
View File

@@ -338,7 +338,10 @@ pub fn get_sea(heightmap: &Map<f32>) -> (HashSet<Coord>, HashSet<Coord>) {
(sinks, sea) (sinks, sea)
} }
pub fn simulate_water(heightmap: &mut Map<f32>, rain_map: &Map<f32>, sea: &HashSet<Coord>, sinks: &HashSet<Coord>) -> Map<f32> { const SALT_REMOVAL: f32 = 0.13;
const SALT_RANGE: f32 = 0.33;
pub fn simulate_water(heightmap: &mut Map<f32>, rain_map: &Map<f32>, sea: &HashSet<Coord>, sinks: &HashSet<Coord>) -> (Map<f32>, Map<f32>) {
let mut watermap = Map::<f32>::new(heightmap.radius, 0.0); let mut watermap = Map::<f32>::new(heightmap.radius, 0.0);
let sources = generate_separated_high_points(WATER_SOURCES, WORLD_RADIUS / 10, &rain_map); let sources = generate_separated_high_points(WATER_SOURCES, WORLD_RADIUS / 10, &rain_map);
@@ -363,6 +366,16 @@ pub fn simulate_water(heightmap: &mut Map<f32>, rain_map: &Map<f32>, sea: &HashS
} }
} }
let mut salt = distance_map(watermap.radius, sea.iter().copied());
normalize(&mut salt, |x| (SALT_RANGE - x).max(0.0) / SALT_RANGE);
for (coord, rain) in rain_map.iter() {
if *rain > 0.0 {
salt[coord] -= *rain * 0.3;
salt[coord] = salt[coord].max(0.0);
}
}
for sink in sinks.iter() { for sink in sinks.iter() {
watermap[*sink] = 10.0; watermap[*sink] = 10.0;
} }
@@ -409,15 +422,19 @@ pub fn simulate_water(heightmap: &mut Map<f32>, rain_map: &Map<f32>, sea: &HashS
if !watermap.in_range(point + nearby) { if !watermap.in_range(point + nearby) {
continue; continue;
} }
// Erode ground (down to sea level at most)
if this_range > 0 { if this_range > 0 {
heightmap[point + nearby] -= EROSION * watermap[point] / (this_range as f32) / erosion_range_raw.max(1.0).powf(EROSION_EXPONENT); let water_rate = watermap[point] / (this_range as f32) / erosion_range_raw.max(1.0).powf(EROSION_EXPONENT);
heightmap[point + nearby] -= EROSION * water_rate;
heightmap[point + nearby] = heightmap[point + nearby].max(SEA_LEVEL); heightmap[point + nearby] = heightmap[point + nearby].max(SEA_LEVEL);
salt[point + nearby] -= SALT_REMOVAL * water_rate; // freshwater rivers reduce salt nearby
salt[point + nearby] = salt[point + nearby].max(0.0);
} }
} }
} }
} }
watermap (watermap, salt)
} }
struct WindSlice { struct WindSlice {
@@ -554,7 +571,7 @@ pub fn generate_world() -> GeneratedWorld {
let (rain, temperature, atmo_humidity) = simulate_air(&heightmap, &sea, CoordVec::new(0, -1), CoordVec::new(1, 0)); let (rain, temperature, atmo_humidity) = simulate_air(&heightmap, &sea, CoordVec::new(0, -1), CoordVec::new(1, 0));
let water = simulate_water(&mut heightmap, &rain, &sea, &sinks); let (water, salt) = simulate_water(&mut heightmap, &rain, &sea, &sinks);
let contours = generate_contours(&heightmap, 0.15); let contours = generate_contours(&heightmap, 0.15);

4
src/worldgen_test.rs
View File

@@ -16,7 +16,7 @@ fn main() -> Result<()> {
let (rain, temperature, atmo_humidity) = simulate_air(&heightmap, &sea, CoordVec::new(0, -1), CoordVec::new(1, 0)); let (rain, temperature, atmo_humidity) = simulate_air(&heightmap, &sea, CoordVec::new(0, -1), CoordVec::new(1, 0));
println!("hydro..."); println!("hydro...");
let water = simulate_water(&mut heightmap, &rain, &sea, &sinks); let (water, salt) = simulate_water(&mut heightmap, &rain, &sea, &sinks);
println!("contours..."); println!("contours...");
let contours = generate_contours(&heightmap, 0.15); let contours = generate_contours(&heightmap, 0.15);
@@ -39,7 +39,7 @@ fn main() -> Result<()> {
let row = position.y + WORLD_RADIUS; let row = position.y + WORLD_RADIUS;
//let height = ((*value + 1.0) * 127.5) as u8; //let height = ((*value + 1.0) * 127.5) as u8;
let green_channel = groundwater[position]; let green_channel = groundwater[position];
let red_channel = temperature[position]; let red_channel = salt[position];
let blue_channel = water[position].min(1.0); let blue_channel = water[position].min(1.0);
image.put_pixel(col as u32, row as u32, Rgb::from([(red_channel * 255.0) as u8, (green_channel * 255.0) as u8, (blue_channel * 255.0) as u8])); image.put_pixel(col as u32, row as u32, Rgb::from([(red_channel * 255.0) as u8, (green_channel * 255.0) as u8, (blue_channel * 255.0) as u8]));
} }