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

Adjusted mountain steepness

Browse Source
This commit is contained in:
Joshua Barretto 2019-06-09 22:58:09 +01:00
parent f62725135a
commit 264b1efdff
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ impl<'a> Sampler for BlockGen<'a> {
.get((wposf.div(Vec3::new(120.0, 120.0, 140.0))).into_array()) .get((wposf.div(Vec3::new(120.0, 120.0, 140.0))).into_array())
as f32) as f32)
.mul((chaos - 0.1).max(0.0)) .mul((chaos - 0.1).max(0.0))
.mul(100.0); .mul(90.0);
let height = alt + warp; let height = alt + warp;

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

@ -115,7 +115,7 @@ impl<'a> Sampler for ColumnGen<'a> {
cliff, cliff,
snow, snow,
(alt - CONFIG.sea_level (alt - CONFIG.sea_level
- 0.3 * CONFIG.mountain_scale - 0.35 * CONFIG.mountain_scale
- alt_base - alt_base
- temp * 96.0 - temp * 96.0
- marble * 24.0) - marble * 24.0)

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

@ -158,20 +158,20 @@ impl SimChunk {
let hill = (0.0 let hill = (0.0
+ gen_ctx + gen_ctx
.hill_nz .hill_nz
.get((wposf.div(3_500.0)).into_array()) .get((wposf.div(1_500.0)).into_array())
.mul(1.0) as f32 .mul(1.0) as f32
+ gen_ctx + gen_ctx
.hill_nz .hill_nz
.get((wposf.div(1_000.0)).into_array()) .get((wposf.div(500.0)).into_array())
.mul(0.3) as f32) .mul(0.3) as f32)
.add(0.3) .add(0.3)
.max(0.0); .max(0.0);
let chaos = (gen_ctx.chaos_nz.get((wposf.div(5_000.0)).into_array()) as f32) let chaos = (gen_ctx.chaos_nz.get((wposf.div(6_000.0)).into_array()) as f32)
.add(1.0) .add(1.0)
.mul(0.5) .mul(0.5)
.powf(1.6) .powf(1.4)
.add(0.1 * hill); .add(0.05 * hill);
let chaos = chaos + chaos.mul(16.0).sin().mul(0.02); let chaos = chaos + chaos.mul(16.0).sin().mul(0.02);
@ -181,9 +181,9 @@ impl SimChunk {
.add(alt_base.mul(128.0).sin().mul(0.005)) .add(alt_base.mul(128.0).sin().mul(0.005))
.mul(800.0); .mul(800.0);
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(1_200.0)).into_array()) as f32)
.abs() .abs()
.powf(1.4); .powf(1.5);
let alt = CONFIG.sea_level let alt = CONFIG.sea_level
+ alt_base + alt_base