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

Simpler terrain spiral rendering

Browse Source
This commit is contained in:
Joshua Barretto 2020-02-23 18:13:51 +00:00
parent 255f450ae9
commit a3e36a50ab
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
voxygen/src/scene/terrain.rs
View File

@ -1399,20 +1399,12 @@ impl<V: RectRasterableVol> Terrain<V> {
(e as i32).div_euclid(sz as i32) (e as i32).div_euclid(sz as i32)
}); });
let chunks = &self.chunks;
let chunk_iter = Spiral2d::new() let chunk_iter = Spiral2d::new()
.scan(0, |n, rpos| { .filter_map(|rpos| {
if *n >= chunks.len() {
None
} else {
let pos = focus_chunk + rpos; let pos = focus_chunk + rpos;
Some(chunks.get(&pos).map(|c| { self.chunks.get(&pos).map(|c| (pos, c))
*n += 1;
(pos, c)
}))
}
}) })
.filter_map(|x| x); .take(self.chunks.len());
// Opaque // Opaque
for (_, chunk) in chunk_iter.clone() { for (_, chunk) in chunk_iter.clone() {
@ -1440,20 +1432,12 @@ impl<V: RectRasterableVol> Terrain<V> {
(e as i32).div_euclid(sz as i32) (e as i32).div_euclid(sz as i32)
}); });
let chunks = &self.chunks;
let chunk_iter = Spiral2d::new() let chunk_iter = Spiral2d::new()
.scan(0, |n, rpos| { .filter_map(|rpos| {
if *n >= chunks.len() {
None
} else {
let pos = focus_chunk + rpos; let pos = focus_chunk + rpos;
Some(chunks.get(&pos).map(|c| { self.chunks.get(&pos).map(|c| (pos, c))
*n += 1;
(pos, c)
}))
}
}) })
.filter_map(|x| x); .take(self.chunks.len());
// Terrain sprites // Terrain sprites
for (pos, chunk) in chunk_iter.clone() { for (pos, chunk) in chunk_iter.clone() {