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

core/common: separate FileMetaVersion for different outputs

Browse source
This commit is contained in:
Matthias Schiffer 2023-11-25 22:11:44 +01:00
parent 4574c06f5d
commit fa15a4e6e5
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
4 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/core/region_processor.rs
View file

@ -126,7 +126,7 @@ impl<'a> RegionProcessor<'a> {
processed_region: &ProcessedRegion,
timestamp: SystemTime,
) -> Result<()> {
storage::write(path, processed_region, FILE_META_VERSION, timestamp)
storage::write(path, processed_region, REGION_FILE_META_VERSION, timestamp)
}
/// Saves a lightmap tile
@ -137,7 +137,7 @@ impl<'a> RegionProcessor<'a> {
lightmap: &image::GrayAlphaImage,
timestamp: SystemTime,
) -> Result<()> {
fs::create_with_timestamp(path, FILE_META_VERSION, timestamp, |file| {
fs::create_with_timestamp(path, LIGHTMAP_FILE_META_VERSION, timestamp, |file| {
lightmap
.write_to(file, image::ImageFormat::Png)
.context("Failed to save image")
@ -156,9 +156,9 @@ impl<'a> RegionProcessor<'a> {
let input_timestamp = fs::modified_timestamp(&input_path)?;
let output_path = self.config.processed_path(coords);
let output_timestamp = fs::read_timestamp(&output_path, FILE_META_VERSION);
let output_timestamp = fs::read_timestamp(&output_path, REGION_FILE_META_VERSION);
let lightmap_path = self.config.tile_path(TileKind::Lightmap, 0, coords);
let lightmap_timestamp = fs::read_timestamp(&lightmap_path, FILE_META_VERSION);
let lightmap_timestamp = fs::read_timestamp(&lightmap_path, LIGHTMAP_FILE_META_VERSION);
if Some(input_timestamp) <= output_timestamp && Some(input_timestamp) <= lightmap_timestamp
{