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 'zesterer/waystones' into 'master'

Browse Source 
Patched waypoint spawning

See merge request veloren/veloren!758
This commit is contained in:
Joshua Barretto 2020-01-26 14:27:46 +00:00
commit fda29cd8e9
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1461,17 +1461,25 @@ impl WorldSim {
.into_par_iter() .into_par_iter()
.filter_map(|(i, j)| { .filter_map(|(i, j)| {
let mut pos = Vec2::new(i as i32, j as i32); let mut pos = Vec2::new(i as i32, j as i32);
let mut chunk = this.get(pos)?;
// Slide the waypoints down hills // Slide the waypoints down hills
const MAX_ITERS: usize = 64; const MAX_ITERS: usize = 64;
for _ in 0..MAX_ITERS { for _ in 0..MAX_ITERS {
match this.get(pos)?.downhill { let downhill_pos = match chunk.downhill {
Some(downhill) => { Some(downhill) => downhill
pos = downhill .map2(Vec2::from(TerrainChunkSize::RECT_SIZE), |e, sz: u32| {
.map2(Vec2::from(TerrainChunkSize::RECT_SIZE), |e, sz: u32| { e / (sz as i32)
e / (sz as i32) }),
})
}
None => return Some(pos), None => return Some(pos),
};
let new_chunk = this.get(downhill_pos)?;
const SLIDE_THRESHOLD: f32 = 5.0;
if new_chunk.is_underwater || new_chunk.alt + SLIDE_THRESHOLD < chunk.alt {
break;
} else {
chunk = new_chunk;
pos = downhill_pos;
} }
} }
Some(pos) Some(pos)