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

chore(ppu): rename ppu property

This commit is contained in:
Rekai Nyangadzayi Musuka 2021-05-05 20:25:15 -05:00
parent f6cf5393b6
commit a67aec55e2
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/ppu.rs
View File

@ -46,7 +46,7 @@ pub struct Ppu {
frame_buf: Box<[u8; GB_WIDTH * GB_HEIGHT * 4]>, frame_buf: Box<[u8; GB_WIDTH * GB_HEIGHT * 4]>,
window_stat: WindowStatus, window_stat: WindowStatus,
x_pos: u8, x_pos: u8,
cycles: Cycle, // TODO: Rename this to Cycle cycle: Cycle,
} }
impl Ppu { impl Ppu {
@ -61,15 +61,15 @@ impl Ppu {
impl Ppu { impl Ppu {
pub fn step(&mut self, cycles: Cycle) { pub fn step(&mut self, cycles: Cycle) {
let start: u32 = self.cycles.into(); let start: u32 = self.cycle.into();
let end: u32 = cycles.into(); let end: u32 = cycles.into();
for _ in start..(start + end) { for _ in start..(start + end) {
self.cycles += 1; self.cycle += 1;
match self.stat.mode() { match self.stat.mode() {
PpuMode::OamScan => { PpuMode::OamScan => {
if self.cycles >= 80.into() { if self.cycle >= 80.into() {
self.stat.set_mode(PpuMode::Drawing); self.stat.set_mode(PpuMode::Drawing);
} }
@ -91,7 +91,7 @@ impl Ppu {
self.stat.set_mode(PpuMode::HBlank); self.stat.set_mode(PpuMode::HBlank);
} else if self.control.lcd_enabled() { } else if self.control.lcd_enabled() {
// Only Draw when the LCD Is Enabled // Only Draw when the LCD Is Enabled
self.draw(self.cycles.into()); self.draw(self.cycle.into());
} else { } else {
self.reset(); self.reset();
} }
@ -99,8 +99,8 @@ impl Ppu {
PpuMode::HBlank => { PpuMode::HBlank => {
// This mode will always end at 456 cycles // This mode will always end at 456 cycles
if self.cycles >= 456.into() { if self.cycle >= 456.into() {
self.cycles %= 456; self.cycle %= 456;
self.pos.line_y += 1; self.pos.line_y += 1;
// Update LY==LYC bit // Update LY==LYC bit
@ -139,8 +139,8 @@ impl Ppu {
} }
} }
PpuMode::VBlank => { PpuMode::VBlank => {
if self.cycles > 456.into() { if self.cycle > 456.into() {
self.cycles %= 456; self.cycle %= 456;
self.pos.line_y += 1; self.pos.line_y += 1;
// Update LY==LYC bit // Update LY==LYC bit
@ -413,7 +413,7 @@ impl Ppu {
// FIXME: Discover what actually is supposed to be reset here // FIXME: Discover what actually is supposed to be reset here
self.scan_state = Default::default(); self.scan_state = Default::default();
self.cycles = Cycle::new(0); self.cycle = Cycle::new(0);
self.x_pos = 0; self.x_pos = 0;
self.window_stat = Default::default(); self.window_stat = Default::default();
@ -434,7 +434,7 @@ impl Default for Ppu {
fn default() -> Self { fn default() -> Self {
Self { Self {
vram: Box::new([0u8; VRAM_SIZE]), vram: Box::new([0u8; VRAM_SIZE]),
cycles: Cycle::new(0), cycle: Cycle::new(0),
frame_buf: Box::new([0; GB_WIDTH * GB_HEIGHT * 4]), frame_buf: Box::new([0; GB_WIDTH * GB_HEIGHT * 4]),
int: Default::default(), int: Default::default(),
control: Default::default(), control: Default::default(),