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

Merge branch 'xacrimon/worldgen-seed-expansion' into 'master'

Browse Source 
Better worldgen seed expansion

See merge request veloren/veloren!410
This commit is contained in:
Joshua Barretto 2019-08-11 11:59:51 +00:00
commit 4b333ed89f
4 changed files with 47 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/lib.rs
View File

@ -89,7 +89,7 @@ impl Server {
let mut state = State::default(); let mut state = State::default();
state state
.ecs_mut() .ecs_mut()
.add_resource(SpawnPoint(Vec3::new(16_384.0, 16_384.0, 380.0))); .add_resource(SpawnPoint(Vec3::new(16_384.0, 16_384.0, 512.0)));
state.ecs_mut().add_resource(EventBus::default()); state.ecs_mut().add_resource(EventBus::default());
// Set starting time for the server. // Set starting time for the server.

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

@ -7,7 +7,7 @@ pub use self::settlement::Settlement;
use crate::{ use crate::{
all::ForestKind, all::ForestKind,
util::{Sampler, StructureGen2d}, util::{seed_expan, Sampler, StructureGen2d},
CONFIG, CONFIG,
}; };
use common::{ use common::{
@ -54,32 +54,37 @@ pub struct WorldSim {
} }
impl WorldSim { impl WorldSim {
pub fn generate(seed: u32) -> Self { pub fn generate(mut seed: u32) -> Self {
let mut gen_seed = || {
seed = seed_expan::diffuse(seed + 1);
seed
};
let mut gen_ctx = GenCtx { let mut gen_ctx = GenCtx {
turb_x_nz: SuperSimplex::new().set_seed(seed + 0), turb_x_nz: SuperSimplex::new().set_seed(gen_seed()),
turb_y_nz: SuperSimplex::new().set_seed(seed + 1), turb_y_nz: SuperSimplex::new().set_seed(gen_seed()),
chaos_nz: RidgedMulti::new().set_octaves(7).set_seed(seed + 2), chaos_nz: RidgedMulti::new().set_octaves(7).set_seed(gen_seed()),
hill_nz: SuperSimplex::new().set_seed(seed + 3), hill_nz: SuperSimplex::new().set_seed(gen_seed()),
alt_nz: HybridMulti::new() alt_nz: HybridMulti::new()
.set_octaves(8) .set_octaves(8)
.set_persistence(0.1) .set_persistence(0.1)
.set_seed(seed + 4), .set_seed(gen_seed()),
temp_nz: SuperSimplex::new().set_seed(seed + 5), temp_nz: SuperSimplex::new().set_seed(gen_seed()),
dry_nz: BasicMulti::new().set_seed(seed + 6), dry_nz: BasicMulti::new().set_seed(gen_seed()),
small_nz: BasicMulti::new().set_octaves(2).set_seed(seed + 7), small_nz: BasicMulti::new().set_octaves(2).set_seed(gen_seed()),
rock_nz: HybridMulti::new().set_persistence(0.3).set_seed(seed + 8), rock_nz: HybridMulti::new().set_persistence(0.3).set_seed(gen_seed()),
cliff_nz: HybridMulti::new().set_persistence(0.3).set_seed(seed + 9), cliff_nz: HybridMulti::new().set_persistence(0.3).set_seed(gen_seed()),
warp_nz: BasicMulti::new().set_octaves(3).set_seed(seed + 10), warp_nz: BasicMulti::new().set_octaves(3).set_seed(gen_seed()),
tree_nz: BasicMulti::new() tree_nz: BasicMulti::new()
.set_octaves(12) .set_octaves(12)
.set_persistence(0.75) .set_persistence(0.75)
.set_seed(seed + 12), .set_seed(gen_seed()),
cave_0_nz: SuperSimplex::new().set_seed(seed + 13), cave_0_nz: SuperSimplex::new().set_seed(gen_seed()),
cave_1_nz: SuperSimplex::new().set_seed(seed + 14), cave_1_nz: SuperSimplex::new().set_seed(gen_seed()),
structure_gen: StructureGen2d::new(seed, 32, 24), structure_gen: StructureGen2d::new(gen_seed(), 32, 24),
region_gen: StructureGen2d::new(seed + 1, 400, 96), region_gen: StructureGen2d::new(gen_seed(), 400, 96),
cliff_gen: StructureGen2d::new(seed + 2, 80, 56), cliff_gen: StructureGen2d::new(gen_seed(), 80, 56),
}; };
let mut chunks = Vec::new(); let mut chunks = Vec::new();
@ -94,40 +99,7 @@ impl WorldSim {
chunks, chunks,
locations: Vec::new(), locations: Vec::new(),
gen_ctx, gen_ctx,
rng: ChaChaRng::from_seed([ rng: ChaChaRng::from_seed(seed_expan::rng_state(seed)),
(seed >> 0) as u8,
0,
0,
0,
0,
0,
0,
0,
(seed >> 8) as u8,
0,
0,
0,
0,
0,
0,
0,
(seed >> 16) as u8,
0,
0,
0,
0,
0,
0,
0,
(seed >> 24) as u8,
0,
0,
0,
0,
0,
0,
0,
]),
}; };
this.seed_elements(); this.seed_elements();

1
world/src/util/mod.rs
View File

@ -1,6 +1,7 @@
pub mod hash_cache; pub mod hash_cache;
pub mod random; pub mod random;
pub mod sampler; pub mod sampler;
pub mod seed_expan;
pub mod structure; pub mod structure;
pub mod unit_chooser; pub mod unit_chooser;

20
world/src/util/seed_expan.rs Normal file
View File

@ -0,0 +1,20 @@
/// Simple non-cryptographic diffusion function.
pub fn diffuse(mut x: u32) -> u32 {
x = x.wrapping_add(0x7ed55d16).wrapping_add(x << 12);
x = (x ^ 0xc761c23c) ^ (x >> 19);
x = x.wrapping_add(0x165667b1).wrapping_add(x << 5);
x = x.wrapping_add(0xd3a2646c) ^ (x << 9);
x = x.wrapping_add(0xfd7046c5).wrapping_add(x << 3);
x = (x ^ 0xb55a4f09) ^ (x >> 16);
x
}
/// Expand a 32 bit seed into a 32 byte RNG state.
pub fn rng_state(mut x: u32) -> [u8; 32] {
let mut r: [u32; 8] = [0; 8];
for s in &mut r {
x = diffuse(x);
*s = x;
}
unsafe { std::mem::transmute(r) }
}