mirror of
https://github.com/Noratrieb/game-wip-dontplay.git
synced 2026-01-15 20:25:00 +01:00
Put save_chunk fn in serialization module
This commit is contained in:
crumblingstatue
parent
fd42272155
commit
fbc6aacce5
2 changed files with 85 additions and 75 deletions
79
src/world.rs
79
src/world.rs
|
|
@ -1,11 +1,7 @@
|
|||
mod reg_chunk_existence;
|
||||
mod serialization;
|
||||
|
||||
use std::{
|
||||
fmt::Debug,
|
||||
fs::{File, OpenOptions},
|
||||
io::{Seek, SeekFrom, Write},
|
||||
path::Path,
|
||||
};
|
||||
use std::{fmt::Debug, fs::File, io::Seek, path::Path};
|
||||
|
||||
use egui_inspect::derive::Inspect;
|
||||
use fnv::FnvHashMap;
|
||||
|
|
@ -15,6 +11,8 @@ use crate::{
|
|||
math::WorldPos, player::Player, world::reg_chunk_existence::ExistenceBitset, worldgen::Worldgen,
|
||||
};
|
||||
|
||||
use self::serialization::save_chunk;
|
||||
|
||||
pub type ChkPosSc = u16;
|
||||
|
||||
#[derive(Hash, PartialEq, Eq, Debug, Clone, Copy, Inspect)]
|
||||
|
|
@ -51,8 +49,6 @@ pub struct World {
|
|||
pub name: String,
|
||||
}
|
||||
|
||||
const COMP_LEVEL: i32 = 9;
|
||||
|
||||
impl World {
|
||||
pub fn new(spawn_point: WorldPos, name: &str) -> Self {
|
||||
Self {
|
||||
|
|
@ -96,54 +92,6 @@ impl World {
|
|||
}
|
||||
}
|
||||
|
||||
fn save_chunk(pos: &ChunkPos, chk: &Chunk) {
|
||||
let reg_file_name = format_reg_file_name(pos.region());
|
||||
dbg!(®_file_name);
|
||||
let reg_file_exists = Path::new(®_file_name).exists();
|
||||
if !reg_file_exists {
|
||||
log::warn!("Region file doesn't exist. Going to create one.");
|
||||
}
|
||||
let mut f = OpenOptions::new()
|
||||
.read(true)
|
||||
.write(true)
|
||||
.create(true)
|
||||
.open(®_file_name)
|
||||
.unwrap();
|
||||
let mut existence_bitset = if reg_file_exists {
|
||||
ExistenceBitset::read_from_file(&mut f)
|
||||
} else {
|
||||
ExistenceBitset::EMPTY
|
||||
};
|
||||
dbg!(existence_bitset);
|
||||
let _ = dbg!(f.stream_position());
|
||||
let mut region_tile_data = if reg_file_exists {
|
||||
zstd::decode_all(&mut f).unwrap()
|
||||
} else {
|
||||
vec![0; REGION_BYTES]
|
||||
};
|
||||
// Even the zstd decompressed data should be exactly REGION_BYTES size
|
||||
assert_eq!(region_tile_data.len(), REGION_BYTES);
|
||||
let (loc_x, loc_y) = pos.local();
|
||||
dbg!(loc_x, loc_y);
|
||||
let loc_idx = loc_idx(loc_y, loc_x);
|
||||
crate::bitmanip::set_nth_bit(&mut existence_bitset.0, loc_idx as usize, true);
|
||||
let byte_idx = loc_byte_idx(loc_idx);
|
||||
dbg!(byte_idx);
|
||||
for (i, tile) in chk.tiles.iter().enumerate() {
|
||||
let off = byte_idx + (i * TILE_BYTES);
|
||||
region_tile_data[off..off + 2].copy_from_slice(&tile.bg.to_le_bytes());
|
||||
region_tile_data[off + 2..off + 4].copy_from_slice(&tile.mid.to_le_bytes());
|
||||
region_tile_data[off + 4..off + 6].copy_from_slice(&tile.fg.to_le_bytes());
|
||||
}
|
||||
f.seek(SeekFrom::Start(0)).unwrap();
|
||||
f.write_all(&u64::to_le_bytes(existence_bitset.0)[..])
|
||||
.unwrap();
|
||||
assert_eq!(f.stream_position().unwrap(), 8);
|
||||
assert_eq!(region_tile_data.len(), REGION_BYTES);
|
||||
let result = f.write_all(&zstd::encode_all(®ion_tile_data[..], COMP_LEVEL).unwrap());
|
||||
log::info!("{result:?}");
|
||||
}
|
||||
|
||||
fn loc_byte_idx_xy(x: u8, y: u8) -> usize {
|
||||
loc_byte_idx(loc_idx(y, x))
|
||||
}
|
||||
|
|
@ -356,22 +304,3 @@ const _: () = assert!(
|
|||
REGION_N_CHUNKS <= 64,
|
||||
"A region file uses an existence bitset that's a 64 bit integer"
|
||||
);
|
||||
|
||||
#[test]
|
||||
fn test_chunk_seri() {
|
||||
env_logger::builder()
|
||||
.filter_level(log::LevelFilter::Info)
|
||||
.init();
|
||||
let result = std::fs::remove_file("0.0.rgn");
|
||||
log::info!("File del result: {result:?}");
|
||||
let mut chk = Chunk {
|
||||
tiles: default_chunk_tiles(),
|
||||
};
|
||||
for t in &mut chk.tiles {
|
||||
t.bg = 1;
|
||||
}
|
||||
save_chunk(&ChunkPos { x: 2, y: 0 }, &chk);
|
||||
save_chunk(&ChunkPos { x: 3, y: 0 }, &chk);
|
||||
let raw = std::fs::read("0.0.rgn").unwrap();
|
||||
zstd::decode_all(&raw[8..]).unwrap();
|
||||
}
|
||||
|
|
|
|||
81
src/world/serialization.rs
Normal file
81
src/world/serialization.rs
Normal file
|
|
@ -0,0 +1,81 @@
|
|||
use std::{
|
||||
fs::OpenOptions,
|
||||
io::{Seek, SeekFrom, Write},
|
||||
path::Path,
|
||||
};
|
||||
|
||||
use crate::world::{
|
||||
format_reg_file_name, loc_byte_idx, loc_idx, reg_chunk_existence::ExistenceBitset,
|
||||
REGION_BYTES, TILE_BYTES,
|
||||
};
|
||||
|
||||
use super::{Chunk, ChunkPos};
|
||||
|
||||
pub(super) fn save_chunk(pos: &ChunkPos, chk: &Chunk) {
|
||||
let reg_file_name = format_reg_file_name(pos.region());
|
||||
dbg!(®_file_name);
|
||||
let reg_file_exists = Path::new(®_file_name).exists();
|
||||
if !reg_file_exists {
|
||||
log::warn!("Region file doesn't exist. Going to create one.");
|
||||
}
|
||||
let mut f = OpenOptions::new()
|
||||
.read(true)
|
||||
.write(true)
|
||||
.create(true)
|
||||
.open(®_file_name)
|
||||
.unwrap();
|
||||
let mut existence_bitset = if reg_file_exists {
|
||||
ExistenceBitset::read_from_file(&mut f)
|
||||
} else {
|
||||
ExistenceBitset::EMPTY
|
||||
};
|
||||
dbg!(existence_bitset);
|
||||
let _ = dbg!(f.stream_position());
|
||||
let mut region_tile_data = if reg_file_exists {
|
||||
zstd::decode_all(&mut f).unwrap()
|
||||
} else {
|
||||
vec![0; REGION_BYTES]
|
||||
};
|
||||
// Even the zstd decompressed data should be exactly REGION_BYTES size
|
||||
assert_eq!(region_tile_data.len(), REGION_BYTES);
|
||||
let (loc_x, loc_y) = pos.local();
|
||||
dbg!(loc_x, loc_y);
|
||||
let loc_idx = loc_idx(loc_y, loc_x);
|
||||
crate::bitmanip::set_nth_bit(&mut existence_bitset.0, loc_idx as usize, true);
|
||||
let byte_idx = loc_byte_idx(loc_idx);
|
||||
dbg!(byte_idx);
|
||||
for (i, tile) in chk.tiles.iter().enumerate() {
|
||||
let off = byte_idx + (i * TILE_BYTES);
|
||||
region_tile_data[off..off + 2].copy_from_slice(&tile.bg.to_le_bytes());
|
||||
region_tile_data[off + 2..off + 4].copy_from_slice(&tile.mid.to_le_bytes());
|
||||
region_tile_data[off + 4..off + 6].copy_from_slice(&tile.fg.to_le_bytes());
|
||||
}
|
||||
f.seek(SeekFrom::Start(0)).unwrap();
|
||||
f.write_all(&u64::to_le_bytes(existence_bitset.0)[..])
|
||||
.unwrap();
|
||||
assert_eq!(f.stream_position().unwrap(), 8);
|
||||
assert_eq!(region_tile_data.len(), REGION_BYTES);
|
||||
let result = f.write_all(&zstd::encode_all(®ion_tile_data[..], COMP_LEVEL).unwrap());
|
||||
log::info!("{result:?}");
|
||||
}
|
||||
|
||||
const COMP_LEVEL: i32 = 9;
|
||||
|
||||
#[test]
|
||||
fn test_chunk_seri() {
|
||||
env_logger::builder()
|
||||
.filter_level(log::LevelFilter::Info)
|
||||
.init();
|
||||
let result = std::fs::remove_file("0.0.rgn");
|
||||
log::info!("File del result: {result:?}");
|
||||
let mut chk = Chunk {
|
||||
tiles: super::default_chunk_tiles(),
|
||||
};
|
||||
for t in &mut chk.tiles {
|
||||
t.bg = 1;
|
||||
}
|
||||
save_chunk(&ChunkPos { x: 2, y: 0 }, &chk);
|
||||
save_chunk(&ChunkPos { x: 3, y: 0 }, &chk);
|
||||
let raw = std::fs::read("0.0.rgn").unwrap();
|
||||
zstd::decode_all(&raw[8..]).unwrap();
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue