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

Rescaled mountains

Browse Source
This commit is contained in:
Joshua Barretto 2019-07-08 00:50:23 +01:00
parent 44b5473a82
commit c6e24b593e
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@ impl<'a> Sampler for ColumnGen<'a> {
let water_level = (riverless_alt - 4.0 - 5.0 * chaos).max(CONFIG.sea_level); let water_level = (riverless_alt - 4.0 - 5.0 * chaos).max(CONFIG.sea_level);
let rock = (sim.gen_ctx.small_nz.get( let rock = (sim.gen_ctx.small_nz.get(
Vec3::new(wposf.x, wposf.y, alt as f64) Vec3::new(wposf.x, wposf.y, alt as f64 * 3.0)
.div(100.0) .div(100.0)
.into_array(), .into_array(),
) as f32) ) as f32)

2
world/src/config.rs
View File

@ -8,7 +8,7 @@ pub struct Config {
pub const CONFIG: Config = Config { pub const CONFIG: Config = Config {
sea_level: 140.0, sea_level: 140.0,
mountain_scale: 1200.0, mountain_scale: 1000.0,
snow_temp: -0.4, snow_temp: -0.4,
tropical_temp: 0.25, tropical_temp: 0.25,
desert_temp: 0.45, desert_temp: 0.45,

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

@ -368,20 +368,22 @@ impl SimChunk {
.into_array(), .into_array(),
) as f32; ) as f32;
let chaos = (gen_ctx.chaos_nz.get((wposf.div(6_000.0)).into_array()) as f32) let chaos = (gen_ctx.chaos_nz.get((wposf.div(3_000.0)).into_array()) as f32)
.add(1.0) .add(1.0)
.mul(0.5) .mul(0.5)
.mul( .mul(
(gen_ctx.chaos_nz.get((wposf.div(4_000.0)).into_array()) as f32) (gen_ctx.chaos_nz.get((wposf.div(6_000.0)).into_array()) as f32)
.powf(2.0) .abs()
.add(0.5)
.min(1.0), .min(1.0),
) )
.add(0.1 * hill) .add(0.15 * hill)
.mul(temp.mul(4.0).sub(1.0).neg().add(1.25).max(0.15).min(1.0)) .mul(
.powf(1.5); temp.sub(CONFIG.desert_temp)
.neg()
let chaos = chaos + chaos.mul(16.0).sin().mul(0.02); .mul(12.0)
.max(0.35)
.min(1.0),
);
let alt_base = gen_ctx.alt_nz.get((wposf.div(6_000.0)).into_array()) as f32; let alt_base = gen_ctx.alt_nz.get((wposf.div(6_000.0)).into_array()) as f32;
let alt_base = alt_base let alt_base = alt_base
@ -391,7 +393,7 @@ impl SimChunk {
let alt_main = (gen_ctx.alt_nz.get((wposf.div(2_000.0)).into_array()) as f32) let alt_main = (gen_ctx.alt_nz.get((wposf.div(2_000.0)).into_array()) as f32)
.abs() .abs()
.powf(1.8); .powf(1.35);
let alt = CONFIG.sea_level let alt = CONFIG.sea_level
+ alt_base + alt_base