neocturne/MinedMap
1
0
Fork 0
mirror of https://github.com/neocturne/MinedMap.git synced 2025-03-04 17:23:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

minedmap/region_group: make indexing into the neighbor array more uniform

Browse source 
Add a 9th element, so the 3x3 entries can always be indexed the same way,
leading to a slight performance improvement.

The center element is always None.
This commit is contained in:
Matthias Schiffer 2023-08-05 14:36:59 +02:00
parent 7b46adf6e7
commit 521e799d4b
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
1 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/bin/minedmap/region_group.rs
View file

@ -11,7 +11,7 @@ use anyhow::Result;
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy)]
pub struct RegionGroup<T> { pub struct RegionGroup<T> {
center: T, center: T,
neighs: [Option<T>; 8], neighs: [Option<T>; 9],
} }
impl<T> RegionGroup<T> { impl<T> RegionGroup<T> {
@ -26,6 +26,7 @@ impl<T> RegionGroup<T> {
Some((-1, 0)), Some((-1, 0)),
Some((-1, 1)), Some((-1, 1)),
Some((0, -1)), Some((0, -1)),
None,
Some((0, 1)), Some((0, 1)),
Some((1, -1)), Some((1, -1)),
Some((1, 0)), Some((1, 0)),
@ -40,23 +41,13 @@ impl<T> RegionGroup<T> {
} }
pub fn get(&self, x: i8, z: i8) -> Option<&T> { pub fn get(&self, x: i8, z: i8) -> Option<&T> {
let index = match (x, z) { if (x, z) == (0, 0) {
(0, 0) => { return Some(&self.center);
return Some(&self.center); }
} if !(-1..=1).contains(&x) || !(-1..=1).contains(&z) {
(-1, -1) => 0, return None;
(-1, 0) => 1, }
(-1, 1) => 2, self.neighs.get((3 * x + z + 4) as usize)?.as_ref()
(0, -1) => 3,
(0, 1) => 4,
(1, -1) => 5,
(1, 0) => 6,
(1, 1) => 7,
_ => {
return None;
}
};
self.neighs[index].as_ref()
} }
pub fn map<U, F>(self, mut f: F) -> RegionGroup<U> pub fn map<U, F>(self, mut f: F) -> RegionGroup<U>