Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing a few visual issues.

Browse Source
This commit is contained in:
Joshua Yanovski
2019-08-21 23:36:43 +02:00
parent bd8a0be0fb
commit d174dd99b4
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
world/src/column/mod.rs
View File

@ -291,7 +291,9 @@ impl<'a> Sampler for ColumnGen<'a> {
), ),
// above desert_temp // above desert_temp
sand, sand,
temp.sub(CONFIG.desert_temp).mul(0.5), temp.sub(CONFIG.desert_temp)
.div(1.0 - CONFIG.desert_temp)
.mul(4.0)
), ),
humidity.sub(CONFIG.desert_hum) humidity.sub(CONFIG.desert_hum)
.div(CONFIG.forest_hum.sub(CONFIG.desert_hum)) .div(CONFIG.forest_hum.sub(CONFIG.desert_hum))
@ -325,7 +327,9 @@ impl<'a> Sampler for ColumnGen<'a> {
), ),
// above desert_temp // above desert_temp
sand, sand,
temp.sub(CONFIG.desert_temp).mul(0.5), temp.sub(CONFIG.desert_temp)
.div(1.0 - CONFIG.desert_temp)
.mul(4.0),
), ),
humidity.sub(CONFIG.forest_hum) humidity.sub(CONFIG.forest_hum)
.div(CONFIG.jungle_hum.sub(CONFIG.forest_hum)) .div(CONFIG.jungle_hum.sub(CONFIG.forest_hum))
@ -358,7 +362,9 @@ impl<'a> Sampler for ColumnGen<'a> {
), ),
// above desert_temp // above desert_temp
sand, sand,
temp.sub(CONFIG.desert_temp).mul(0.5), temp.sub(CONFIG.desert_temp)
.div(1.0 - CONFIG.desert_temp)
.mul(4.0),
), ),
humidity.sub(CONFIG.jungle_hum).mul(1.0) humidity.sub(CONFIG.jungle_hum).mul(1.0)
); );

4
world/src/sim/mod.rs
View File

@ -647,7 +647,7 @@ impl SimChunk {
1.0 - alt_uniform, 1.0 - alt_uniform,
]); ]);
let (temp_base, _) = gen_cdf.temp_base[posi]; let (temp_base, temp_old) = gen_cdf.temp_base[posi];
// We also correlate temperature negatively with altitude using different weighting than we // We also correlate temperature negatively with altitude using different weighting than we
// use for humidity. // use for humidity.
@ -668,7 +668,7 @@ impl SimChunk {
// Sharply decreases (towards 0.35) when temperature is near desert_temp (from below), // Sharply decreases (towards 0.35) when temperature is near desert_temp (from below),
// then saturates just before it actually becomes desert. Otherwise stays at 1. // then saturates just before it actually becomes desert. Otherwise stays at 1.
.mul( .mul(
temp.sub(CONFIG.desert_temp) temp_old.sub(CONFIG.desert_temp)
.neg() .neg()
.mul(12.0) .mul(12.0)
.max(0.35) .max(0.35)