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

world/layer: introduce LayerEntry struct

Browse source
This commit is contained in:
Matthias Schiffer 2023-05-05 23:57:14 +02:00
parent 2d5eec13c2
commit 0437ec70b6
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
1 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/world/layer.rs
View file

@ -35,9 +35,16 @@ pub type BlockInfoArray = LayerBlockArray<BlockInfo>;
pub type BiomeArray = LayerBlockArray<Option<Biome>>; pub type BiomeArray = LayerBlockArray<Option<Biome>>;
pub type BlockLightArray = LayerBlockArray<u8>; pub type BlockLightArray = LayerBlockArray<u8>;
impl BlockInfo { struct LayerEntry<'a> {
block: &'a mut Option<BlockType>,
biome: &'a mut Option<Biome>,
block_light: &'a mut u8,
depth: &'a mut Option<BlockHeight>,
}
impl<'a> LayerEntry<'a> {
fn is_empty(&self) -> bool { fn is_empty(&self) -> bool {
self.block_type.is_none() self.block.is_none()
} }
fn done(&self) -> bool { fn done(&self) -> bool {
@ -49,15 +56,15 @@ impl BlockInfo {
return false; return false;
} }
if self.block_type.is_none() { if self.block.is_none() {
self.block_type = Some(block_type); *self.block = Some(block_type);
} }
if block_type.is(BlockFlag::Water) { if block_type.is(BlockFlag::Water) {
return false; return false;
} }
self.depth = Some(y); *self.depth = Some(y);
true true
} }
@ -70,6 +77,18 @@ pub struct LayerData {
pub block_light: Box<BlockLightArray>, pub block_light: Box<BlockLightArray>,
} }
impl LayerData {
fn entry(&mut self, coords: LayerBlockCoords) -> LayerEntry {
let block_info = &mut self.blocks[coords];
LayerEntry {
block: &mut block_info.block_type,
biome: &mut self.biomes[coords],
block_light: &mut self.block_light[coords],
depth: &mut block_info.depth,
}
}
}
/// Fills in a [BlockInfoArray] with the information of the chunk's top /// Fills in a [BlockInfoArray] with the information of the chunk's top
/// block layer /// block layer
/// ///
@ -96,7 +115,7 @@ pub fn top_layer(chunk: &Chunk) -> Result<Option<LayerData>> {
{ {
for y in BlockY::iter().rev() { for y in BlockY::iter().rev() {
for xz in BlockInfoArray::keys() { for xz in BlockInfoArray::keys() {
let entry = &mut ret.blocks[xz]; let mut entry = ret.entry(xz);
if entry.done() { if entry.done() {
continue; continue;
} }
@ -117,13 +136,12 @@ pub fn top_layer(chunk: &Chunk) -> Result<Option<LayerData>> {
done += 1; done += 1;
}; };
let biome_entry = &mut ret.biomes[xz]; if !entry.is_empty() && entry.biome.is_none() {
if !entry.is_empty() && biome_entry.is_none() { *entry.biome = biomes.biome_at(section_y, coords)?.copied();
*biome_entry = biomes.biome_at(section_y, coords)?.copied();
} }
if entry.is_empty() { if entry.is_empty() {
ret.block_light[xz] = block_light.block_light_at(coords); *entry.block_light = block_light.block_light_at(coords);
} }
if done == N * N { if done == N * N {