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

Smoother blending into sand.

Browse Source
This commit is contained in:
Joshua Yanovski
2019-08-19 19:46:47 +02:00
parent 97eaeddd78
commit 405f55d725
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -299,11 +299,11 @@ impl<'a> Sampler for ColumnGen<'a> {
), ),
// above desert_temp // above desert_temp
sand, sand,
temp.sub(CONFIG.desert_temp).mul(4.0), temp.sub(CONFIG.desert_temp).mul(0.5),
), ),
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))
.mul(4.0) .mul(1.0)
); );
// From forest to jungle humidity, we go from snow to moss to grass to tropics to sand // From forest to jungle humidity, we go from snow to moss to grass to tropics to sand
// depending on temperature. // depending on temperature.
@ -333,11 +333,11 @@ impl<'a> Sampler for ColumnGen<'a> {
), ),
// above desert_temp // above desert_temp
sand, sand,
temp.sub(CONFIG.desert_temp).mul(4.0), temp.sub(CONFIG.desert_temp).mul(0.5),
), ),
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))
.mul(4.0) .mul(1.0)
); );
// From jungle humidity upwards, we go from snow to grass to rainforest to tropics to sand. // From jungle humidity upwards, we go from snow to grass to rainforest to tropics to sand.
let ground = Rgb::lerp( let ground = Rgb::lerp(
@ -366,9 +366,9 @@ impl<'a> Sampler for ColumnGen<'a> {
), ),
// above desert_temp // above desert_temp
sand, sand,
temp.sub(CONFIG.desert_temp).mul(4.0), temp.sub(CONFIG.desert_temp).mul(0.5),
), ),
humidity.sub(CONFIG.jungle_hum).mul(4.0) humidity.sub(CONFIG.jungle_hum).mul(1.0)
); );
/* let ground = Rgb::lerp( /* let ground = Rgb::lerp(