Noratrieb/game-wip-dontplay
1
0
Fork 0
mirror of https://github.com/Noratrieb/game-wip-dontplay.git synced 2026-01-17 04:45:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Put Chunk::load_from_region into serialization module

Browse source
This commit is contained in:
crumblingstatue 2023-04-14 22:22:45 +02:00
parent fbc6aacce5
commit c93e2b7ed8
2 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/world.rs
View file

@ -253,18 +253,6 @@ impl Chunk {
fn at_mut(&mut self, local: ChunkLocalTilePos) -> &mut Tile { fn at_mut(&mut self, local: ChunkLocalTilePos) -> &mut Tile {
&mut self.tiles[CHUNK_EXTENT as usize * local.y as usize + local.x as usize] &mut self.tiles[CHUNK_EXTENT as usize * local.y as usize + local.x as usize]
} }
fn load_from_region(data: &[u8], x: u8, y: u8) -> Self {
let byte_idx = loc_byte_idx_xy(x, y);
let mut tiles = default_chunk_tiles();
for (i, t) in tiles.iter_mut().enumerate() {
let off = byte_idx + (i * TILE_BYTES);
t.bg = u16::from_le_bytes(data[off..off + 2].try_into().unwrap());
t.mid = u16::from_le_bytes(data[off + 2..off + 4].try_into().unwrap());
t.fg = u16::from_le_bytes(data[off + 4..off + 6].try_into().unwrap());
}
Self { tiles }
}
} }
fn chunk_exists(reg_filename: &str, pos: ChunkPos) -> bool { fn chunk_exists(reg_filename: &str, pos: ChunkPos) -> bool {

16
src/world/serialization.rs
View file

@ -9,7 +9,7 @@ use crate::world::{
REGION_BYTES, TILE_BYTES, REGION_BYTES, TILE_BYTES,
}; };
use super::{Chunk, ChunkPos}; use super::{default_chunk_tiles, loc_byte_idx_xy, Chunk, ChunkPos};
pub(super) fn save_chunk(pos: &ChunkPos, chk: &Chunk) { pub(super) fn save_chunk(pos: &ChunkPos, chk: &Chunk) {
let reg_file_name = format_reg_file_name(pos.region()); let reg_file_name = format_reg_file_name(pos.region());
@ -61,6 +61,20 @@ pub(super) fn save_chunk(pos: &ChunkPos, chk: &Chunk) {
const COMP_LEVEL: i32 = 9; const COMP_LEVEL: i32 = 9;
impl Chunk {
pub fn load_from_region(data: &[u8], x: u8, y: u8) -> Self {
let byte_idx = loc_byte_idx_xy(x, y);
let mut tiles = default_chunk_tiles();
for (i, t) in tiles.iter_mut().enumerate() {
let off = byte_idx + (i * TILE_BYTES);
t.bg = u16::from_le_bytes(data[off..off + 2].try_into().unwrap());
t.mid = u16::from_le_bytes(data[off + 2..off + 4].try_into().unwrap());
t.fg = u16::from_le_bytes(data[off + 4..off + 6].try_into().unwrap());
}
Self { tiles }
}
}
#[test] #[test]
fn test_chunk_seri() { fn test_chunk_seri() {
env_logger::builder() env_logger::builder()