majjo/Pumpkin
1
0
Fork 0
mirror of https://github.com/Pumpkin-MC/Pumpkin.git synced 2026-08-30 20:14:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Harden palette (de)serialization (#733)

Browse Source 
* initial_commit

* double check palette data
This commit is contained in:
kralverde
2025-04-18 06:26:34 -10:00
committed by GitHub
parent 7f800c768a
commit fbf18cc16d
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pumpkin-util/src/lib.rs
View File

@@ -43,7 +43,11 @@ macro_rules! read_data_from_file {
/// The minimum number of bits required to represent this number
#[inline]
pub fn encompassing_bits(count: usize) -> u8 {
count.ilog2() as u8 + if count.is_power_of_two() { 0 } else { 1 }
if count == 1 {
1
} else {
count.ilog2() as u8 + if count.is_power_of_two() { 0 } else { 1 }
}
}
#[derive(PartialEq, Serialize, Deserialize, Clone)]

35
pumpkin-world/src/chunk/palette.rs
View File

@@ -26,19 +26,6 @@ pub struct HeterogeneousPaletteData<V: Hash + Eq + Copy, const DIM: usize> {
}
impl<V: Hash + Eq + Copy, const DIM: usize> HeterogeneousPaletteData<V, DIM> {
fn from_cube(cube: Box<AbstractCube<V, DIM>>) -> Self {
let counts =
cube.as_flattened()
.as_flattened()
.iter()
.fold(HashMap::new(), |mut acc, key| {
acc.entry(*key).and_modify(|count| *count += 1).or_insert(1);
acc
});
Self { cube, counts }
}
fn get(&self, x: usize, y: usize, z: usize) -> V {
debug_assert!(x < DIM);
debug_assert!(y < DIM);
@@ -81,6 +68,23 @@ impl<V: Hash + Eq + Copy + Default, const DIM: usize> PalettedContainer<V, DIM>
pub const SIZE: usize = DIM;
pub const VOLUME: usize = DIM * DIM * DIM;
fn from_cube(cube: Box<AbstractCube<V, DIM>>) -> Self {
let counts =
cube.as_flattened()
.as_flattened()
.iter()
.fold(HashMap::new(), |mut acc, key| {
acc.entry(*key).and_modify(|count| *count += 1).or_insert(1);
acc
});
if counts.len() == 1 {
Self::Homogeneous(*counts.keys().next().unwrap())
} else {
Self::Heterogeneous(Box::new(HeterogeneousPaletteData { cube, counts }))
}
}
fn bits_per_entry(&self) -> u8 {
match self {
Self::Homogeneous(_) => 0,
@@ -181,7 +185,7 @@ impl<V: Hash + Eq + Copy + Default, const DIM: usize> PalettedContainer<V, DIM>
});
});
Self::Heterogeneous(Box::new(HeterogeneousPaletteData::from_cube(cube)))
Self::from_cube(cube)
}
}
@@ -202,8 +206,7 @@ impl<V: Hash + Eq + Copy + Default, const DIM: usize> PalettedContainer<V, DIM>
if value != *original {
let mut cube = Box::new([[[*original; DIM]; DIM]; DIM]);
cube[y][z][x] = value;
let data = HeterogeneousPaletteData::from_cube(cube);
*self = Self::Heterogeneous(Box::new(data));
*self = Self::from_cube(cube);
}
}
Self::Heterogeneous(data) => {