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

Rename TileReference to VRamState

Browse source
This commit is contained in:
Gwilym Kuiper 2022-01-31 20:01:26 +00:00
parent 5533c9c052
commit 2a04ebd884
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
agb/src/display/background.rs
View file

@ -53,7 +53,7 @@ pub struct TileSetReference {
#[derive(Debug)] #[derive(Debug)]
pub struct TileIndex(u16); pub struct TileIndex(u16);
enum TileReference { enum VRamState {
ReferenceCounted(u16, (u16, u16)), ReferenceCounted(u16, (u16, u16)),
Free(u16), Free(u16),
} }
@ -70,7 +70,7 @@ pub struct VRamManager<'a> {
free_pointer: Option<usize>, free_pointer: Option<usize>,
tile_set_to_vram: HashMap<(u16, u16), u16>, tile_set_to_vram: HashMap<(u16, u16), u16>,
references: Vec<TileReference>, references: Vec<VRamState>,
vram_free_pointer: Option<usize>, vram_free_pointer: Option<usize>,
} }
@ -84,7 +84,7 @@ impl<'a> VRamManager<'a> {
free_pointer: None, free_pointer: None,
tile_set_to_vram: HashMap::new(), tile_set_to_vram: HashMap::new(),
references: vec![TileReference::Free(0)], references: vec![VRamState::Free(0)],
vram_free_pointer: None, vram_free_pointer: None,
} }
} }
@ -141,11 +141,11 @@ impl<'a> VRamManager<'a> {
fn add_tile(&mut self, tile_set_ref: TileSetReference, tile: u16) -> TileIndex { fn add_tile(&mut self, tile_set_ref: TileSetReference, tile: u16) -> TileIndex {
let tile_ref = (tile_set_ref.id, tile); let tile_ref = (tile_set_ref.id, tile);
if let Some(&reference) = self.tile_set_to_vram.get(&tile_ref) { if let Some(&reference) = self.tile_set_to_vram.get(&tile_ref) {
if let TileReference::ReferenceCounted(count, tile_ref) = if let VRamState::ReferenceCounted(count, tile_ref) =
self.references[reference as usize] self.references[reference as usize]
{ {
self.references[reference as usize] = self.references[reference as usize] =
TileReference::ReferenceCounted(count + 1, tile_ref); VRamState::ReferenceCounted(count + 1, tile_ref);
} else { } else {
panic!("Corrupted tile reference state"); panic!("Corrupted tile reference state");
} }
@ -155,19 +155,19 @@ impl<'a> VRamManager<'a> {
let index_to_copy_into = if let Some(ptr) = self.vram_free_pointer.take() { let index_to_copy_into = if let Some(ptr) = self.vram_free_pointer.take() {
match self.references[ptr] { match self.references[ptr] {
TileReference::Free(next_free) => { VRamState::Free(next_free) => {
if next_free != END_OF_FREE_LIST_MARKER { if next_free != END_OF_FREE_LIST_MARKER {
self.vram_free_pointer = Some(next_free as usize); self.vram_free_pointer = Some(next_free as usize);
} }
} }
TileReference::ReferenceCounted(_, _) => panic!("Corrupted tile reference state"), VRamState::ReferenceCounted(_, _) => panic!("Corrupted tile reference state"),
} }
self.references[ptr] = TileReference::ReferenceCounted(1, tile_ref); self.references[ptr] = VRamState::ReferenceCounted(1, tile_ref);
ptr ptr
} else { } else {
self.references self.references
.push(TileReference::ReferenceCounted(1, tile_ref)); .push(VRamState::ReferenceCounted(1, tile_ref));
self.references.len() - 1 self.references.len() - 1
}; };
@ -201,8 +201,8 @@ impl<'a> VRamManager<'a> {
let index = tile_index.0 as usize; let index = tile_index.0 as usize;
let (new_count, tile_ref) = match self.references[index] { let (new_count, tile_ref) = match self.references[index] {
TileReference::ReferenceCounted(count, tile_ref) => { VRamState::ReferenceCounted(count, tile_ref) => {
self.references[index] = TileReference::ReferenceCounted(count - 1, tile_ref); self.references[index] = VRamState::ReferenceCounted(count - 1, tile_ref);
(count - 1, tile_ref) (count - 1, tile_ref)
} }
_ => panic!("Corrupted tile reference state"), _ => panic!("Corrupted tile reference state"),
@ -213,9 +213,9 @@ impl<'a> VRamManager<'a> {
} }
if let Some(ptr) = self.vram_free_pointer { if let Some(ptr) = self.vram_free_pointer {
self.references[index] = TileReference::Free(ptr as u16); self.references[index] = VRamState::Free(ptr as u16);
} else { } else {
self.references[index] = TileReference::Free(END_OF_FREE_LIST_MARKER); self.references[index] = VRamState::Free(END_OF_FREE_LIST_MARKER);
} }
self.tile_set_to_vram.remove(&tile_ref); self.tile_set_to_vram.remove(&tile_ref);