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

main: store biome data in processed data files

Browse source
This commit is contained in:
Matthias Schiffer 2023-04-09 23:20:20 +02:00
parent e912f60ba3
commit 0d81dfa35b
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main.rs
View file

@ -25,7 +25,12 @@ struct Args {
} }
type RegionCoords = (i32, i32); type RegionCoords = (i32, i32);
type ProcessedRegion = ChunkArray<Option<Box<world::layer::BlockInfoArray>>>; type ProcessedRegion = ChunkArray<
Option<(
Box<world::layer::BlockInfoArray>,
Box<world::layer::BiomeArray>,
)>,
>;
struct Config { struct Config {
region_dir: PathBuf, region_dir: PathBuf,
@ -195,7 +200,7 @@ impl<'a> RegionProcessor<'a> {
minedmap::io::region::from_file(path)?.foreach_chunk( minedmap::io::region::from_file(path)?.foreach_chunk(
|chunk_coords, data: world::de::Chunk| { |chunk_coords, data: world::de::Chunk| {
let Some(((processed_chunk, _), block_light)) = self let Some((processed_chunk, block_light)) = self
.process_chunk(data) .process_chunk(data)
.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))? .with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
else { else {
@ -299,13 +304,14 @@ impl<'a> TileRenderer<'a> {
fn render_chunk( fn render_chunk(
image: &mut image::RgbaImage, image: &mut image::RgbaImage,
coords: ChunkCoords, coords: ChunkCoords,
chunk: &world::layer::BlockInfoArray, blocks: &world::layer::BlockInfoArray,
_biomes: &world::layer::BiomeArray,
) { ) {
const N: u32 = BLOCKS_PER_CHUNK as u32; const N: u32 = BLOCKS_PER_CHUNK as u32;
let chunk_image = image::RgbaImage::from_fn(N, N, |x, z| { let chunk_image = image::RgbaImage::from_fn(N, N, |x, z| {
image::Rgba( image::Rgba(
match &chunk[LayerBlockCoords { match &blocks[LayerBlockCoords {
x: BlockX(x as u8), x: BlockX(x as u8),
z: BlockZ(z as u8), z: BlockZ(z as u8),
}] { }] {
@ -319,11 +325,11 @@ impl<'a> TileRenderer<'a> {
fn render_region(image: &mut image::RgbaImage, region: &ProcessedRegion) { fn render_region(image: &mut image::RgbaImage, region: &ProcessedRegion) {
for (coords, chunk) in region.iter() { for (coords, chunk) in region.iter() {
let Some(chunk) = chunk else { let Some((blocks, biomes)) = chunk else {
continue; continue;
}; };
Self::render_chunk(image, coords, chunk); Self::render_chunk(image, coords, blocks, biomes);
} }
} }

6
src/resource/biomes.rs
View file

@ -1,12 +1,14 @@
use serde::{Deserialize, Serialize};
use super::Color; use super::Color;
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
pub enum BiomeGrassColorModifier { pub enum BiomeGrassColorModifier {
DarkForest, DarkForest,
Swamp, Swamp,
} }
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
pub struct Biome { pub struct Biome {
pub temp: i8, pub temp: i8,
pub downfall: i8, pub downfall: i8,