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

io/region: use ChunkArray to parse region header

Browse source 
A layout of a ChunkArray::<u32> matches the binary format of the region
header.
This commit is contained in:
Matthias Schiffer 2023-01-27 22:12:02 +01:00
parent 28b22ce423
commit daa188eb1d
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
3 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/io/region.rs
View file

@ -19,20 +19,18 @@ struct ChunkDesc {
len: u8,
}
fn parse_header(header: &[u8; BLOCKSIZE]) -> HashMap<u32, ChunkDesc> {
fn parse_header(header: &ChunkArray<u32>) -> HashMap<u32, ChunkDesc> {
let mut map = HashMap::new();
for coords in ChunkArray::<()>::keys() {
let chunk = &header[(4
* (usize::from(CHUNKS_PER_REGION) * usize::from(coords.z.0)
+ usize::from(coords.x.0)))..];
for (coords, &chunk) in header.iter() {
let offset_len = u32::from_be(chunk);
let offset = u32::from(chunk[0]) << 16 | u32::from(chunk[1]) << 8 | u32::from(chunk[2]);
let offset = offset_len >> 8;
if offset == 0 {
continue;
}
let len = chunk[3];
let len = offset_len as u8;
map.insert(offset, ChunkDesc { coords, len });
}
@ -81,9 +79,9 @@ impl<R: Read + Seek> Region<R> {
let Region { mut reader } = self;
let mut chunk_map = {
let mut header = [0u8; BLOCKSIZE];
let mut header = ChunkArray::<u32>::default();
reader
.read_exact(&mut header)
.read_exact(bytemuck::cast_mut::<_, [u8; BLOCKSIZE]>(&mut header.0))
.context("Failed to read region header")?;
parse_header(&header)