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

core/region_processor: make logic for skipping updates more fine-grained

Browse source 
Allow skipping parts of the processing separately for processed region
and lightmap files.
This commit is contained in:
Matthias Schiffer 2023-11-25 22:16:56 +01:00
parent a5ad057e0c
commit 25f675bd3b
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
1 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/core/region_processor.rs
View file

@ -65,6 +65,10 @@ struct SingleRegionProcessor<'a> {
output_timestamp: Option<SystemTime>, output_timestamp: Option<SystemTime>,
/// Timestamp of last modification of lightmap output file (if valid) /// Timestamp of last modification of lightmap output file (if valid)
lightmap_timestamp: Option<SystemTime>, lightmap_timestamp: Option<SystemTime>,
/// True if processed region output file needs to be updated
output_needed: bool,
/// True if lightmap output file needs to be updated
lightmap_needed: bool,
/// Processed region intermediate data /// Processed region intermediate data
processed_region: ProcessedRegion, processed_region: ProcessedRegion,
/// Lightmap intermediate data /// Lightmap intermediate data
@ -85,6 +89,9 @@ impl<'a> SingleRegionProcessor<'a> {
let lightmap_path = processor.config.tile_path(TileKind::Lightmap, 0, coords); let lightmap_path = processor.config.tile_path(TileKind::Lightmap, 0, coords);
let lightmap_timestamp = fs::read_timestamp(&lightmap_path, LIGHTMAP_FILE_META_VERSION); let lightmap_timestamp = fs::read_timestamp(&lightmap_path, LIGHTMAP_FILE_META_VERSION);
let output_needed = Some(input_timestamp) > output_timestamp;
let lightmap_needed = Some(input_timestamp) > lightmap_timestamp;
let processed_region = ProcessedRegion::default(); let processed_region = ProcessedRegion::default();
let lightmap = image::GrayAlphaImage::new(N, N); let lightmap = image::GrayAlphaImage::new(N, N);
@ -98,6 +105,8 @@ impl<'a> SingleRegionProcessor<'a> {
input_timestamp, input_timestamp,
output_timestamp, output_timestamp,
lightmap_timestamp, lightmap_timestamp,
output_needed,
lightmap_needed,
processed_region, processed_region,
lightmap, lightmap,
}) })
@ -148,9 +157,7 @@ impl<'a> SingleRegionProcessor<'a> {
/// Processes the region /// Processes the region
fn run(mut self) -> Result<RegionProcessorStatus> { fn run(mut self) -> Result<RegionProcessorStatus> {
if Some(self.input_timestamp) <= self.output_timestamp if !self.output_needed && !self.lightmap_needed {
&& Some(self.input_timestamp) <= self.lightmap_timestamp
{
debug!( debug!(
"Skipping unchanged region r.{}.{}.mca", "Skipping unchanged region r.{}.{}.mca",
self.coords.x, self.coords.z self.coords.x, self.coords.z
@ -178,14 +185,20 @@ impl<'a> SingleRegionProcessor<'a> {
else { else {
return Ok(()); return Ok(());
}; };
self.processed_region.chunks[chunk_coords] = Some(Box::new(ProcessedChunk {
blocks,
biomes,
depths,
}));
let chunk_lightmap = Self::render_chunk_lightmap(block_light); if self.output_needed {
overlay_chunk(&mut self.lightmap, &chunk_lightmap, chunk_coords); self.processed_region.chunks[chunk_coords] =
Some(Box::new(ProcessedChunk {
blocks,
biomes,
depths,
}));
}
if self.lightmap_needed {
let chunk_lightmap = Self::render_chunk_lightmap(block_light);
overlay_chunk(&mut self.lightmap, &chunk_lightmap, chunk_coords);
}
Ok(()) Ok(())
}, },
@ -206,14 +219,14 @@ impl<'a> SingleRegionProcessor<'a> {
} }
} }
if Some(self.input_timestamp) > self.output_timestamp { if self.output_needed {
Self::save_region( Self::save_region(
&self.output_path, &self.output_path,
&self.processed_region, &self.processed_region,
self.input_timestamp, self.input_timestamp,
)?; )?;
} }
if Some(self.input_timestamp) > self.lightmap_timestamp { if self.lightmap_needed {
Self::save_lightmap(&self.lightmap_path, &self.lightmap, self.input_timestamp)?; Self::save_lightmap(&self.lightmap_path, &self.lightmap, self.input_timestamp)?;
} }