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

chore(ppu): rename window_stat to win_stat

This commit is contained in:
Rekai Nyangadzayi Musuka 2021-10-20 03:16:37 -03:00
parent 37cf3d92e4
commit 67e2447d3f
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

@ -50,7 +50,7 @@ pub struct Ppu {
fifo: PixelFifo, fifo: PixelFifo,
obj_buffer: ObjectBuffer, obj_buffer: ObjectBuffer,
frame_buf: Box<[u8; GB_WIDTH * GB_HEIGHT * 4]>, frame_buf: Box<[u8; GB_WIDTH * GB_HEIGHT * 4]>,
window_stat: WindowStatus, win_stat: WindowStatus,
scanline_start: bool, scanline_start: bool,
to_discard: u8, to_discard: u8,
@ -104,7 +104,7 @@ impl Ppu {
// Increment Window line counter if scanline had any window pixels on it // Increment Window line counter if scanline had any window pixels on it
// only increment once per scanline though // only increment once per scanline though
if self.window_stat.should_draw() { if self.win_stat.should_draw() {
self.fetch.back.window_line.increment(); self.fetch.back.window_line.increment();
} }
@ -113,7 +113,7 @@ impl Ppu {
self.to_discard = 0; self.to_discard = 0;
self.fetch.hblank_reset(); self.fetch.hblank_reset();
self.window_stat.hblank_reset(); self.win_stat.hblank_reset();
self.obj_buffer.clear(); self.obj_buffer.clear();
self.fifo.back.clear(); self.fifo.back.clear();
@ -145,7 +145,7 @@ impl Ppu {
// Reset Window Line Counter in Fetcher // Reset Window Line Counter in Fetcher
self.fetch.vblank_reset(); self.fetch.vblank_reset();
// Reset WY=LY coincidence flag // Reset WY=LY coincidence flag
self.window_stat.vblank_reset(); self.win_stat.vblank_reset();
if self.stat.vblank_int() { if self.stat.vblank_int() {
// Enable Vblank LCDStat Interrupt // Enable Vblank LCDStat Interrupt
@ -202,8 +202,8 @@ impl Ppu {
return; return;
} }
if !self.window_stat.coincidence() && self.scan_cycle == 0 { if !self.win_stat.coincidence() && self.scan_cycle == 0 {
self.window_stat self.win_stat
.set_coincidence(self.pos.line_y == self.pos.window_y); .set_coincidence(self.pos.line_y == self.pos.window_y);
} }
@ -317,11 +317,11 @@ impl Ppu {
} }
if self.ctrl.window_enabled() if self.ctrl.window_enabled()
&& !self.window_stat.should_draw() && !self.win_stat.should_draw()
&& self.window_stat.coincidence() && self.win_stat.coincidence()
&& self.x_pos as i16 >= self.pos.window_x as i16 - 7 && self.x_pos as i16 >= self.pos.window_x as i16 - 7
{ {
self.window_stat.set_should_draw(true); self.win_stat.set_should_draw(true);
self.fetch.back.reset(); self.fetch.back.reset();
self.fetch.x_pos = 0; self.fetch.x_pos = 0;
self.fifo.back.clear(); self.fifo.back.clear();
@ -334,7 +334,7 @@ impl Ppu {
self.fetch self.fetch
.back .back
.should_render_window(self.window_stat.should_draw()); .should_render_window(self.win_stat.should_draw());
let addr = self.fetch.bg_tile_num_addr(&self.ctrl, &self.pos, x_pos); let addr = self.fetch.bg_tile_num_addr(&self.ctrl, &self.pos, x_pos);
@ -476,7 +476,7 @@ impl Default for Ppu {
fetch: Default::default(), fetch: Default::default(),
fifo: Default::default(), fifo: Default::default(),
obj_buffer: Default::default(), obj_buffer: Default::default(),
window_stat: Default::default(), win_stat: Default::default(),
dma: Default::default(), dma: Default::default(),
x_pos: 0, x_pos: 0,
scanline_start: true, scanline_start: true,