alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-23 08:11:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

Minor optimisation for the show entire screen case

Browse source
This commit is contained in:
Gwilym Inzani 2023-08-31 07:53:01 +01:00
parent 4642a74a0f
commit d3c32ce351
1 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
agb/src/display/tiled/map.rs
View file

@ -195,14 +195,23 @@ impl RegularMap {
"Don't have a full screen's worth of tile data" "Don't have a full screen's worth of tile data"
); );
for y in 0..20u16 { assert_eq!(
for x in 0..30u16 { tile_data.tiles.format(),
self.colours(),
"Cannot set a {:?} colour tile on a {:?} colour background",
tile_data.tiles.format(),
self.colours()
);
for y in 0..20 {
for x in 0..30 {
let tile_id = y * 30 + x; let tile_id = y * 30 + x;
self.set_tile( let tile_pos = y * 32 + x;
self.set_tile_at_pos(
vram, vram,
(x, y).into(), tile_pos,
&tile_data.tiles, &tile_data.tiles,
tile_data.tile_settings[tile_id as usize], tile_data.tile_settings[tile_id],
); );
} }
} }
@ -215,20 +224,28 @@ impl RegularMap {
tileset: &TileSet<'_>, tileset: &TileSet<'_>,
tile_setting: TileSetting, tile_setting: TileSetting,
) { ) {
let colours = self.colours(); assert_eq!(
if tileset.format() != colours { tileset.format(),
panic!( self.colours(),
"Cannot set a {:?} colour tile on a {:?} colour background", "Cannot set a {:?} colour tile on a {:?} colour background",
tileset.format(), tileset.format(),
colours self.colours()
); );
}
let pos = self.map_size().gba_offset(pos); let pos = self.map_size().gba_offset(pos);
self.set_tile_at_pos(vram, pos, tileset, tile_setting);
}
fn set_tile_at_pos(
&mut self,
vram: &mut VRamManager,
pos: usize,
tileset: &TileSet<'_>,
tile_setting: TileSetting,
) {
let old_tile = self.tiles_mut()[pos]; let old_tile = self.tiles_mut()[pos];
if old_tile != Tile::default() { if old_tile != Tile::default() {
vram.remove_tile(old_tile.tile_index(colours)); vram.remove_tile(old_tile.tile_index(self.colours()));
} }
let tile_index = tile_setting.index(); let tile_index = tile_setting.index();