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

chore(ppu): change signature of get_obj_low_addr

This commit is contained in:
Rekai Nyangadzayi Musuka 2021-05-05 00:14:14 -05:00
parent 2cf85b0add
commit b36f4441fa
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ppu.rs
View File

@ -4,9 +4,9 @@ use crate::GB_WIDTH;
use std::collections::VecDeque; use std::collections::VecDeque;
use std::convert::TryInto; use std::convert::TryInto;
use registers::{ use self::registers::{
BackgroundPalette, GrayShade, LCDControl, LCDStatus, ObjectFlags, ObjectPalette, BackgroundPalette, GrayShade, LCDControl, LCDStatus, ObjectFlags, ObjectPalette,
ObjectPaletteId, Pixels, PpuMode, RenderPriority, TileDataAddress, ObjectPaletteId, ObjectSize, Pixels, PpuMode, RenderPriority, TileDataAddress,
}; };
mod registers; mod registers;
@ -216,7 +216,7 @@ impl Ppu {
} }
ToLowByteSleep => self.fetcher.obj.next(TileLowByte), ToLowByteSleep => self.fetcher.obj.next(TileLowByte),
TileLowByte => { TileLowByte => {
let obj_size = self.control.obj_size().as_u8(); let obj_size = self.control.obj_size();
let addr = PixelFetcher::get_obj_low_addr(&attr, &self.pos, obj_size); let addr = PixelFetcher::get_obj_low_addr(&attr, &self.pos, obj_size);
@ -227,7 +227,7 @@ impl Ppu {
} }
ToHighByteSleep => self.fetcher.obj.next(TileHighByte), ToHighByteSleep => self.fetcher.obj.next(TileHighByte),
TileHighByte => { TileHighByte => {
let obj_size = self.control.obj_size().as_u8(); let obj_size = self.control.obj_size();
let addr = PixelFetcher::get_obj_low_addr(&attr, &self.pos, obj_size); let addr = PixelFetcher::get_obj_low_addr(&attr, &self.pos, obj_size);
@ -722,12 +722,17 @@ impl PixelFetcher {
self.x_pos += 1; self.x_pos += 1;
} }
pub fn get_obj_low_addr(attr: &ObjectAttribute, pos: &ScreenPosition, obj_size: u8) -> u16 { pub fn get_obj_low_addr(attr: &ObjectAttribute, pos: &ScreenPosition, size: ObjectSize) -> u16 {
let line_y = pos.line_y; let line_y = pos.line_y;
let scroll_y = pos.scroll_y; let scroll_y = pos.scroll_y;
let tile_number = match size {
ObjectSize::Eight => attr.tile_index,
ObjectSize::Sixteen => attr.tile_index & !0x01,
};
let offset = 2 * if attr.flags.y_flip() { let offset = 2 * if attr.flags.y_flip() {
(obj_size - 1) - (line_y + scroll_y) % 8 (size.as_u8() - 1) - (line_y + scroll_y) % 8
} else { } else {
(line_y + scroll_y) % 8 (line_y + scroll_y) % 8
}; };