neocturne/MinedMap
1
0
Fork 0
mirror of https://github.com/neocturne/MinedMap.git synced 2025-07-04 06:39:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Store per-region biome list in IndexSet

Browse source 
Index into the biome list instead of duplicating the biome data for each
coordinate. This reduces the size of the processed data and speeds up
encoding/decoding.
This commit is contained in:
Matthias Schiffer 2023-08-03 21:27:08 +02:00
parent c38f00e411
commit fb712cd2f5
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
8 changed files with 70 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/world/layer.rs
View file

@ -1,4 +1,7 @@
use std::num::NonZeroU16;
use anyhow::{Context, Result};
use indexmap::IndexSet;
use serde::{Deserialize, Serialize};
use super::chunk::{Chunk, SectionIterItem};
@ -26,13 +29,13 @@ impl BlockHeight {
}
pub type BlockArray = LayerBlockArray<Option<BlockType>>;
pub type BiomeArray = LayerBlockArray<Option<Biome>>;
pub type BiomeArray = LayerBlockArray<Option<NonZeroU16>>;
pub type BlockLightArray = LayerBlockArray<u8>;
pub type DepthArray = LayerBlockArray<Option<BlockHeight>>;
struct LayerEntry<'a> {
block: &'a mut Option<BlockType>,
biome: &'a mut Option<Biome>,
biome: &'a mut Option<NonZeroU16>,
block_light: &'a mut u8,
depth: &'a mut Option<BlockHeight>,
}
@ -46,7 +49,12 @@ impl<'a> LayerEntry<'a> {
self.depth.is_some()
}
fn fill(&mut self, section: SectionIterItem, coords: SectionBlockCoords) -> Result<bool> {
fn fill(
&mut self,
biome_list: &mut IndexSet<Biome>,
section: SectionIterItem,
coords: SectionBlockCoords,
) -> Result<bool> {
let Some(block_type) = section.section.block_at(coords)?
.filter(|block_type| block_type.is(BlockFlag::Opaque))
else {
@ -59,7 +67,14 @@ impl<'a> LayerEntry<'a> {
if self.is_empty() {
*self.block = Some(block_type);
*self.biome = section.biomes.biome_at(section.y, coords)?.copied();
if let Some(biome) = section.biomes.biome_at(section.y, coords)? {
let (biome_index, _) = biome_list.insert_full(*biome);
*self.biome = NonZeroU16::new(
(biome_index + 1)
.try_into()
.expect("biome index not in range"),
);
}
}
if block_type.is(BlockFlag::Water) {
@ -99,7 +114,7 @@ impl LayerData {
/// determined as the block that should be visible on the rendered
/// map. For water blocks, the height of the first non-water block
/// is additionally filled in as the water depth.
pub fn top_layer(chunk: &Chunk) -> Result<Option<LayerData>> {
pub fn top_layer(biome_list: &mut IndexSet<Biome>, chunk: &Chunk) -> Result<Option<LayerData>> {
use BLOCKS_PER_CHUNK as N;
if chunk.is_empty() {
@ -121,7 +136,7 @@ pub fn top_layer(chunk: &Chunk) -> Result<Option<LayerData>> {
}
let coords = SectionBlockCoords { xz, y };
if !entry.fill(section, coords)? {
if !entry.fill(biome_list, section, coords)? {
continue;
}