toby/worlds-history-sim-rs
1
Fork 0
Code Issues Pull requests Releases Activity

Tweak rain gen

Browse source 
c1d6e373680566d005177b6b85d26135c4f0d5f6
This commit is contained in:
Tobias Berger 2022-09-18 18:07:55 +02:00
parent 8df06365a7
commit 6a17e6df7b
Signed by: toby
GPG key ID: 2D05EFAB764D6A88
3 changed files with 400444 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

400410
planet.ron
View file

File diff suppressed because one or more lines are too long

38
planet/src/world.rs
View file

@ -325,33 +325,49 @@ impl World {
fn generate_rainfall(&mut self) -> Result<(), CartesianError> { fn generate_rainfall(&mut self) -> Result<(), CartesianError> {
info!("Generating rainfall"); info!("Generating rainfall");
// let offset = World::random_offset_vector(&mut self.rng); const RADIUS: f32 = 2.0;
let offset = World::random_offset_vector(&mut self.rng);
let height = self.terrain.len(); let height = self.terrain.len();
for y in 0..height { for y in 0..height {
info!("Rainfall: {}/{}", y, height); info!("Rainfall: {}/{}", y, height);
let alpha = (y as f32 / self.height as f32) * PI; let alpha = (y as f32 / self.height as f32) * PI;
let latitude_modifier = f32::sin(2.0 * alpha);
let width = self.terrain[y].len(); let width = self.terrain[y].len();
for x in 0..width { for x in 0..width {
// let beta = (x as f32 / self.width as f32) * TAU; let beta = (x as f32 / self.width as f32) * TAU;
let diff_cell_x = let random_noise =
(width + x + f32::floor(latitude_modifier * width as f32 / 50.0) as usize) self.random_noise_from_polar_coordinates(alpha, beta, RADIUS, offset)?;
let latitude_factor = (alpha * 0.9) + (random_noise * 0.2 * PI) - 0.1;
let latitude_modifier_1 = (1.5 * f32::sin(latitude_factor)) - 0.5;
let latitude_modifier_2 = f32::cos(latitude_factor);
let offset_cell_x =
(width + x + f32::floor(latitude_modifier_2 * width as f32 / 20.0) as usize)
% width;
let offset_cell_2_x =
(width + x + f32::floor(latitude_modifier_2 * width as f32 / 10.0) as usize)
% width; % width;
let diff_cell = &self.terrain[y][diff_cell_x];
let diff_altitude = f32::max(0.0, diff_cell.altitude);
let mut cell = &mut self.terrain[y][x]; let offset_cell = &self.terrain[y][offset_cell_x];
let offset_altitude = f32::max(0.0, offset_cell.altitude);
let offset_cell_2 = &self.terrain[y][offset_cell_2_x];
let offset_altitude_2 = f32::max(0.0, offset_cell_2.altitude);
let cell = &mut self.terrain[y][x];
let altitude = f32::max(0.0, cell.altitude); let altitude = f32::max(0.0, cell.altitude);
let altitude_factor = let altitude_modifier =
f32::max(0.0, 2.0 * (altitude - diff_altitude) / World::MAX_ALTITUDE); (altitude - (offset_altitude * 1.5) - (offset_altitude_2 * 1.5))
/ World::MAX_ALTITUDE;
let normalized_rainfall = mix_values(latitude_modifier_1, altitude_modifier, 0.6);
let rainfall = f32::min( let rainfall = f32::min(
World::MAX_RAINFALL, World::MAX_RAINFALL,
World::calculate_rainfall(altitude_factor), World::calculate_rainfall(normalized_rainfall),
); );
cell.rainfall = rainfall; cell.rainfall = rainfall;

13
planet/src/world_manager.rs
View file

@ -308,11 +308,14 @@ impl WorldManager {
#[cfg(feature = "render")] #[cfg(feature = "render")]
fn rainfall_contour_color(&self, rainfall: f32) -> Color { fn rainfall_contour_color(&self, rainfall: f32) -> Color {
Color::rgb( let mut shade_value = 1.0;
0.0, let value = rainfall / self.world().max_rainfall;
f32::floor((rainfall / self.world().max_rainfall) / 0.1),
0.0, while shade_value > value {
) shade_value -= 0.1;
}
Color::rgb(0.0, shade_value, 0.0)
} }
#[cfg(feature = "render")] #[cfg(feature = "render")]