paoda
/
gb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat(ppu): account for OBJ ENABLE bit in LCDC

This commit is contained in:
Rekai Nyangadzayi Musuka 2021-06-03 02:16:03 -05:00
parent aeaaee8c6c
commit 778e04e645
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/ppu.rs
View File

@ -373,6 +373,7 @@ impl Ppu {
// Handle Background Pixel and Sprite FIFO // Handle Background Pixel and Sprite FIFO
let bg_enabled = self.control.bg_win_enabled(); let bg_enabled = self.control.bg_win_enabled();
let obj_enabled = self.control.obj_enabled();
let i0_colour = self.monochrome.bg_palette.i0_colour(); let i0_colour = self.monochrome.bg_palette.i0_colour();
// FIXME: Is this the correct behaviour // FIXME: Is this the correct behaviour
@ -380,14 +381,20 @@ impl Ppu {
let bg_shade = if bg_enabled { bg_info.shade } else { i0_colour }; let bg_shade = if bg_enabled { bg_info.shade } else { i0_colour };
match self.fifo.obj.pop_front() { match self.fifo.obj.pop_front() {
Some(obj_info) => match (obj_info.shade, obj_info.priority) { Some(obj_info) => {
(Some(obj_shade), BackgroundAndWindow) => match bg_info.shade { if obj_enabled {
GrayShade::White => obj_shade.into_rgba(), match (obj_info.shade, obj_info.priority) {
_ => bg_shade.into_rgba(), (Some(obj_shade), BackgroundAndWindow) => match bg_info.shade {
}, GrayShade::White => obj_shade.into_rgba(),
(Some(obj_shade), Object) => obj_shade.into_rgba(), _ => bg_shade.into_rgba(),
(None, _) => bg_shade.into_rgba(), },
}, (Some(obj_shade), Object) => obj_shade.into_rgba(),
(None, _) => bg_shade.into_rgba(),
}
} else {
bg_shade.into_rgba()
}
}
None => bg_shade.into_rgba(), None => bg_shade.into_rgba(),
} }
}); });