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

Smoothed some things out.

Browse Source
This commit is contained in:
Joshua Yanovski 2019-08-19 05:22:39 +02:00
parent 1c9be67516
commit fa35f9932e
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,8 @@ impl<'a> ColumnGen<'a> {
}); });
let chunk = self.world.sim().get(chunk_pos)?; let chunk = self.world.sim().get(chunk_pos)?;
if seed % 5 == 2 && chunk.temp > CONFIG.desert_temp && chunk.alt > CONFIG.sea_level + 5.0 { if seed % 5 == 2 && chunk.temp > CONFIG.desert_temp && chunk.humidity < CONFIG.desert_hum &&
chunk.alt > CONFIG.sea_level + 5.0 {
Some(StructureData { Some(StructureData {
pos, pos,
seed, seed,
@ -230,7 +231,7 @@ impl<'a> Sampler for ColumnGen<'a> {
); );
// For desert humidity, we are always sand or rock, depending on altitude. // For desert humidity, we are always sand or rock, depending on altitude.
let ground = Rgb::lerp(sand, cliff, alt.sub(CONFIG.mountain_scale * 0.25)); let ground = Rgb::lerp(sand, cliff, alt.sub(CONFIG.mountain_scale * 0.25).div(CONFIG.mountain_scale * 0.125));
// At forest humidity, we go from dirt to grass to moss to sand depending on temperature. // At forest humidity, we go from dirt to grass to moss to sand depending on temperature.
let ground = Rgb::lerp( let ground = Rgb::lerp(
ground, ground,
@ -244,10 +245,10 @@ impl<'a> Sampler for ColumnGen<'a> {
.mul(256.0) .mul(256.0)
), ),
moss, moss,
temp.sub(CONFIG.tropical_temp).mul(32.0), temp.sub(CONFIG.tropical_temp).mul(4.0),
), ),
sand, sand,
temp.sub(CONFIG.desert_temp).mul(16.0), temp.sub(CONFIG.desert_temp).mul(4.0),
), ),
humidity.sub(CONFIG.desert_hum).mul(4.0) humidity.sub(CONFIG.desert_hum).mul(4.0)
); );
@ -264,10 +265,10 @@ impl<'a> Sampler for ColumnGen<'a> {
.mul(256.0) .mul(256.0)
), ),
moss, moss,
temp.sub(CONFIG.tropical_temp).mul(32.0), temp.sub(CONFIG.tropical_temp).mul(4.0),
), ),
sand, sand,
temp.sub(CONFIG.desert_temp).mul(16.0), temp.sub(CONFIG.desert_temp).mul(4.0),
), ),
humidity.sub(CONFIG.forest_hum).mul(4.0) humidity.sub(CONFIG.forest_hum).mul(4.0)
); );
@ -392,7 +393,7 @@ impl<'a> Sampler for ColumnGen<'a> {
/ 12.0, / 12.0,
), ),
(alt - CONFIG.sea_level - 0.25 * CONFIG.mountain_scale + marble * 128.0) (alt - CONFIG.sea_level - 0.25 * CONFIG.mountain_scale + marble * 128.0)
/ 100.0, / (0.25 * CONFIG.mountain_scale),
), ),
// Beach // Beach
((alt - CONFIG.sea_level - 1.0) / 2.0) ((alt - CONFIG.sea_level - 1.0) / 2.0)

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

@ -94,7 +94,7 @@ impl WorldSim {
cliff_gen: StructureGen2d::new(gen_seed(), 80, 56), cliff_gen: StructureGen2d::new(gen_seed(), 80, 56),
humid_nz: Billow::new() humid_nz: Billow::new()
.set_octaves(12) .set_octaves(12)
.set_persistence(0.25) .set_persistence(0.125)
// .set_octaves(6) // .set_octaves(6)
// .set_persistence(0.5) // .set_persistence(0.5)
.set_seed(gen_seed()), .set_seed(gen_seed()),