gered/ggdt
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

add checks for valid rect dimensions in BitmapAtlas

Browse source
This commit is contained in:
Gered 2023-05-26 13:22:26 -04:00
parent b03b8f4915
commit afa7a92709
1 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
ggdt/src/graphics/bitmapatlas.rs
View file

@ -12,6 +12,9 @@ pub enum BitmapAtlasError {
#[error("Tile index {0} is invalid / out of range")] #[error("Tile index {0} is invalid / out of range")]
InvalidTileIndex(usize), InvalidTileIndex(usize),
#[error("Invalid dimensions for region")]
InvalidDimensions,
} }
#[derive(Debug, Clone, Eq, PartialEq)] #[derive(Debug, Clone, Eq, PartialEq)]
@ -38,6 +41,9 @@ where
} }
pub fn add(&mut self, rect: Rect) -> Result<usize, BitmapAtlasError> { pub fn add(&mut self, rect: Rect) -> Result<usize, BitmapAtlasError> {
if rect.width == 0 || rect.height == 0 {
return Err(BitmapAtlasError::InvalidDimensions);
}
if !self.bounds.contains_rect(&rect) { if !self.bounds.contains_rect(&rect) {
return Err(BitmapAtlasError::OutOfBounds); return Err(BitmapAtlasError::OutOfBounds);
} }
@ -47,6 +53,9 @@ where
} }
pub fn add_grid(&mut self, tile_width: u32, tile_height: u32) -> Result<usize, BitmapAtlasError> { pub fn add_grid(&mut self, tile_width: u32, tile_height: u32) -> Result<usize, BitmapAtlasError> {
if tile_width == 0 || tile_height == 0 {
return Err(BitmapAtlasError::InvalidDimensions);
}
if self.bounds.width < tile_width || self.bounds.height < tile_height { if self.bounds.width < tile_width || self.bounds.height < tile_height {
return Err(BitmapAtlasError::OutOfBounds); return Err(BitmapAtlasError::OutOfBounds);
} }
@ -73,6 +82,10 @@ where
y_tiles: u32, y_tiles: u32,
border: u32, border: u32,
) -> Result<usize, BitmapAtlasError> { ) -> Result<usize, BitmapAtlasError> {
if tile_width == 0 || tile_height == 0 {
return Err(BitmapAtlasError::InvalidDimensions);
}
// figure out of the grid properties given would result in us creating any // figure out of the grid properties given would result in us creating any
// rects that lie out of the bounds of this bitmap // rects that lie out of the bounds of this bitmap
let grid_region = Rect::new( let grid_region = Rect::new(
@ -210,4 +223,26 @@ mod tests {
assert_eq!(Rect::new(0, 9, 4, 8), atlas[2]); assert_eq!(Rect::new(0, 9, 4, 8), atlas[2]);
assert_eq!(Rect::new(5, 9, 4, 8), atlas[3]); assert_eq!(Rect::new(5, 9, 4, 8), atlas[3]);
} }
#[test]
pub fn adding_with_invalid_dimensions_fails() {
let bmp = IndexedBitmap::new(64, 64).unwrap();
let mut atlas = BitmapAtlas::new(bmp);
assert_matches!(atlas.add(Rect::new(0, 0, 0, 0)), Err(BitmapAtlasError::InvalidDimensions));
assert_matches!(atlas.add(Rect::new(16, 16, 0, 0)), Err(BitmapAtlasError::InvalidDimensions));
assert_matches!(atlas.add(Rect::new(16, 16, 8, 0)), Err(BitmapAtlasError::InvalidDimensions));
assert_matches!(atlas.add(Rect::new(16, 16, 0, 8)), Err(BitmapAtlasError::InvalidDimensions));
assert_eq!(0, atlas.len());
assert_matches!(atlas.add_grid(0, 0), Err(BitmapAtlasError::InvalidDimensions));
assert_matches!(atlas.add_grid(8, 0), Err(BitmapAtlasError::InvalidDimensions));
assert_matches!(atlas.add_grid(0, 8), Err(BitmapAtlasError::InvalidDimensions));
assert_eq!(0, atlas.len());
assert_matches!(atlas.add_custom_grid(0, 0, 0, 0, 2, 2, 1), Err(BitmapAtlasError::InvalidDimensions));
assert_matches!(atlas.add_custom_grid(0, 0, 8, 0, 2, 2, 1), Err(BitmapAtlasError::InvalidDimensions));
assert_matches!(atlas.add_custom_grid(0, 0, 0, 8, 2, 2, 1), Err(BitmapAtlasError::InvalidDimensions));
assert_eq!(0, atlas.len());
}
} }