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

world/layer: introduce LayerData struct to fix clippy type complexity warning

Browse source
This commit is contained in:
Matthias Schiffer 2023-05-05 23:04:06 +02:00
parent b66bdf5ce1
commit 924ee01f91
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
2 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/bin/minedmap/region_processor.rs
View file

@ -2,7 +2,12 @@ use std::{fs, path::Path};
use anyhow::{Context, Result};
use minedmap::{io::storage, resource, types::*, world};
use minedmap::{
io::storage,
resource,
types::*,
world::{self, layer::LayerData},
};
use super::common::*;
@ -34,18 +39,7 @@ impl<'a> RegionProcessor<'a> {
}
/// Processes a single chunk
fn process_chunk(
&self,
data: world::de::Chunk,
) -> Result<
Option<(
(
Box<world::layer::BlockInfoArray>,
Box<world::layer::BiomeArray>,
),
Box<world::layer::BlockLightArray>,
)>,
> {
fn process_chunk(&self, data: world::de::Chunk) -> Result<Option<LayerData>> {
let chunk = world::chunk::Chunk::new(&data, &self.block_types, &self.biome_types)?;
world::layer::top_layer(&chunk)
}
@ -110,15 +104,15 @@ impl<'a> RegionProcessor<'a> {
minedmap::io::region::from_file(path)?.foreach_chunk(
|chunk_coords, data: world::de::Chunk| {
let Some((processed_chunk, block_light)) = self
let Some(layer_data) = self
.process_chunk(data)
.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
else {
return Ok(());
};
processed_region[chunk_coords] = Some(processed_chunk);
processed_region[chunk_coords] = Some((layer_data.blocks, layer_data.biomes));
let chunk_lightmap = Self::render_chunk_lightmap(block_light);
let chunk_lightmap = Self::render_chunk_lightmap(layer_data.block_light);
overlay_chunk(&mut lightmap, &chunk_lightmap, chunk_coords);
Ok(())