From 82a9c1755885ef2f5e5a6d18c0a1f7092db1fcd8 Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Sat, 25 Apr 2020 11:23:46 +0100 Subject: [PATCH] Added reseeding for sites --- voxygen/src/scene/figure/mod.rs | 4 ++-- world/src/civ/mod.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs index 8f228bb773..497d8077fe 100644 --- a/voxygen/src/scene/figure/mod.rs +++ b/voxygen/src/scene/figure/mod.rs @@ -156,8 +156,8 @@ impl FigureMgr { // TODO: Investigate passing the velocity into the shader so we can at least // interpolate motion const MIN_PERFECT_RATE_DIST: f32 = 50.0; - if (i as u64 + tick) % (1 - + ((pos.0.distance_squared(camera.get_focus_pos()).powf(0.25) + if (i as u64 + tick) + % (1 + ((pos.0.distance_squared(camera.get_focus_pos()).powf(0.25) - MIN_PERFECT_RATE_DIST.powf(0.5)) .max(0.0) / 3.0) as u64) diff --git a/world/src/civ/mod.rs b/world/src/civ/mod.rs index a8a9d83846..ec945e0d13 100644 --- a/world/src/civ/mod.rs +++ b/world/src/civ/mod.rs @@ -142,10 +142,10 @@ impl Civs { let world_site = match &site.kind { SiteKind::Settlement => { - WorldSite::from(Settlement::generate(wpos, Some(ctx.sim), &mut ctx.rng)) + WorldSite::from(Settlement::generate(wpos, Some(ctx.sim), &mut ctx.reseed().rng)) }, SiteKind::Dungeon => { - WorldSite::from(Dungeon::generate(wpos, Some(ctx.sim), &mut ctx.rng)) + WorldSite::from(Dungeon::generate(wpos, Some(ctx.sim), &mut ctx.reseed().rng)) }, };