diff options
| author | mat <github@matdoes.dev> | 2022-05-05 22:12:54 -0500 |
|---|---|---|
| committer | mat <github@matdoes.dev> | 2022-05-05 22:12:54 -0500 |
| commit | 4dac004635e50682d9ebe8812fdf654a0c1808f1 (patch) | |
| tree | 46257a144ec069ba3e0a812eabca6e9ed246db6b /azalea-world/src/bit_storage.rs | |
| parent | 57b76ef52b7a9b516710aea5ba5d6f0141c8d6cf (diff) | |
| download | azalea-drasl-4dac004635e50682d9ebe8812fdf654a0c1808f1.tar.xz | |
Fix chunk decoding
Diffstat (limited to 'azalea-world/src/bit_storage.rs')
| -rw-r--r-- | azalea-world/src/bit_storage.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/azalea-world/src/bit_storage.rs b/azalea-world/src/bit_storage.rs index 5ced67fe..9cc3a053 100644 --- a/azalea-world/src/bit_storage.rs +++ b/azalea-world/src/bit_storage.rs @@ -1,4 +1,4 @@ -use std::{error::Error, fmt, ops::Index}; +use std::{error::Error, fmt}; // this is from minecraft's code // yeah idk either @@ -70,6 +70,7 @@ const MAGIC: [(i32, i32, i32); 64] = [ ]; /// A compact list of integers with the given number of bits per entry. +#[derive(Clone)] pub struct BitStorage { data: Vec<u64>, bits: usize, @@ -135,7 +136,7 @@ impl BitStorage { pub fn cell_index(&self, index: u64) -> usize { let first = self.divide_mul as u64; - let second = self.divide_mul as u64; + let second = self.divide_add as u64; (index * first + second >> 32 >> self.divide_shift) .try_into() @@ -182,8 +183,8 @@ mod tests { let data = [ 1, 2, 2, 3, 4, 4, 5, 6, 6, 4, 8, 0, 7, 4, 3, 13, 15, 16, 9, 14, 10, 12, 0, 2, ]; - let expected_compact: [u64; 2] = [0x0020863148418841, 0x01018A7260F68C87]; - let storage = BitStorage::new(5, data.len(), Some(expected_compact.to_vec())).unwrap(); + let compact_data: [u64; 2] = [0x0020863148418841, 0x01018A7260F68C87]; + let storage = BitStorage::new(5, data.len(), Some(compact_data.to_vec())).unwrap(); for (i, expected) in data.iter().enumerate() { assert_eq!(storage.get(i), *expected); |
