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

Ran fmt.

Browse Source
This commit is contained in:
Acrimon 2019-08-19 00:20:56 +02:00
parent 6b59f0bc9a
commit f8d14bdfd5
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,14 +56,14 @@ pub struct WorldSim {
impl WorldSim { impl WorldSim {
pub fn generate(mut seed: u32) -> Self { pub fn generate(mut seed: u32) -> Self {
seed = seed_expan::diffuse(seed); seed = seed_expan::diffuse(seed);
let mut gen_seed = |seed: &mut u32| { let mut gen_seed = |seed: &mut u32| std::mem::replace(seed, seed_expan::diffuse(*seed + 1));
std::mem::replace(seed, seed_expan::diffuse(*seed + 1))
};
let mut gen_ctx = GenCtx { let mut gen_ctx = GenCtx {
turb_x_nz: SuperSimplex::new().set_seed(gen_seed(&mut seed)), turb_x_nz: SuperSimplex::new().set_seed(gen_seed(&mut seed)),
turb_y_nz: SuperSimplex::new().set_seed(gen_seed(&mut seed)), turb_y_nz: SuperSimplex::new().set_seed(gen_seed(&mut seed)),
chaos_nz: RidgedMulti::new().set_octaves(7).set_seed(gen_seed(&mut seed)), chaos_nz: RidgedMulti::new()
.set_octaves(7)
.set_seed(gen_seed(&mut seed)),
hill_nz: SuperSimplex::new().set_seed(gen_seed(&mut seed)), hill_nz: SuperSimplex::new().set_seed(gen_seed(&mut seed)),
alt_nz: HybridMulti::new() alt_nz: HybridMulti::new()
.set_octaves(8) .set_octaves(8)
@ -71,10 +71,18 @@ impl WorldSim {
.set_seed(gen_seed(&mut seed)), .set_seed(gen_seed(&mut seed)),
temp_nz: SuperSimplex::new().set_seed(gen_seed(&mut seed)), temp_nz: SuperSimplex::new().set_seed(gen_seed(&mut seed)),
dry_nz: BasicMulti::new().set_seed(gen_seed(&mut seed)), dry_nz: BasicMulti::new().set_seed(gen_seed(&mut seed)),
small_nz: BasicMulti::new().set_octaves(2).set_seed(gen_seed(&mut seed)), small_nz: BasicMulti::new()
rock_nz: HybridMulti::new().set_persistence(0.3).set_seed(gen_seed(&mut seed)), .set_octaves(2)
cliff_nz: HybridMulti::new().set_persistence(0.3).set_seed(gen_seed(&mut seed)), .set_seed(gen_seed(&mut seed)),
warp_nz: BasicMulti::new().set_octaves(3).set_seed(gen_seed(&mut seed)), rock_nz: HybridMulti::new()
.set_persistence(0.3)
.set_seed(gen_seed(&mut seed)),
cliff_nz: HybridMulti::new()
.set_persistence(0.3)
.set_seed(gen_seed(&mut seed)),
warp_nz: BasicMulti::new()
.set_octaves(3)
.set_seed(gen_seed(&mut seed)),
tree_nz: BasicMulti::new() tree_nz: BasicMulti::new()
.set_octaves(12) .set_octaves(12)
.set_persistence(0.75) .set_persistence(0.75)