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

Remove custom for_each_in from Chonk

Browse Source
This commit is contained in:
Imbris 2021-10-10 01:29:05 -04:00
parent f65399eb00
commit 5777486f5c
1 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
common/src/terrain/chonk.rs
View File

@ -166,57 +166,6 @@ impl<V, S: RectVolSize, M: Clone> ReadVol for Chonk<V, S, M> {
.map_err(Self::Error::SubChunkError)
}
}
/// Call provided closure with each block in the supplied Aabb
/// Portions of the Aabb outside this chonk are ignored
#[inline]
fn for_each_in(&self, aabb: Aabb<i32>, mut f: impl FnMut(Vec3<i32>, V))
where
V: Copy,
{
// Iterate through blocks in above terrain
if aabb.max.z >= self.get_max_z() {
let min_z = aabb.min.z.max(self.get_max_z());
for x in aabb.min.x..aabb.max.x + 1 {
for y in aabb.min.y..aabb.max.y + 1 {
for z in min_z..aabb.max.z + 1 {
f(Vec3::new(x, y, z), self.above);
}
}
}
}
// Iterate through blocks in subchunks
// Compute lowest & highest subchunks
{
let min_z = self.get_min_z().max(aabb.min.z);
let max_z = (self.get_max_z() - 1).min(aabb.max.z);
let min_sub_chunk_idx = self.sub_chunk_idx(min_z);
let max_sub_chunk_idx = self.sub_chunk_idx(max_z);
for sub_chunk_idx in min_sub_chunk_idx..max_sub_chunk_idx + 1 {
let z_offset = -Vec3::unit_z()
* (self.z_offset + sub_chunk_idx * SubChunkSize::<S>::SIZE.z as i32);
let relative_aabb = Aabb {
min: aabb.min + z_offset,
max: aabb.max + z_offset,
};
self.sub_chunks[sub_chunk_idx as usize]
.for_each_in(relative_aabb, |relative_pos, block| {
f(relative_pos - z_offset, block)
});
}
}
// Iterate through bloks in below terrain
if aabb.min.z > self.get_min_z() {
let max_z = aabb.max.z.min(self.get_min_z() - 1);
for x in aabb.min.x..aabb.max.x + 1 {
for y in aabb.min.y..aabb.max.y + 1 {
for z in aabb.min.z..max_z + 1 {
f(Vec3::new(x, y, z), self.below);
}
}
}
}
}
}
impl<V: Clone + PartialEq, S: RectVolSize, M: Clone> WriteVol for Chonk<V, S, M> {