From 51252db7530bff4b0ef56eef016c3016f67586ba Mon Sep 17 00:00:00 2001
From: Rekai Musuka <rekai@musuka.dev>
Date: Fri, 30 Apr 2021 00:24:22 -0500
Subject: [PATCH] chore(ppu): rename select structs

---
 src/ppu.rs           | 22 ++++++++++------------
 src/ppu/registers.rs |  4 ++--
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/ppu.rs b/src/ppu.rs
index cb7700e..8c843ce 100644
--- a/src/ppu.rs
+++ b/src/ppu.rs
@@ -6,7 +6,7 @@ use std::convert::TryInto;
 
 use registers::{
     BackgroundPalette, GrayShade, LCDControl, LCDStatus, ObjectFlags, ObjectPalette,
-    ObjectPaletteId, PpuMode, RenderPriority, TileDataAddress, TwoBitsPerPixel,
+    ObjectPaletteId, Pixel, PpuMode, RenderPriority, TileDataAddress,
 };
 
 mod registers;
@@ -249,7 +249,7 @@ impl Ppu {
                         .zip(maybe_high)
                         .expect("Low & High Bytes in TileBuilder were unexpectedly missing.");
 
-                    let tbpp = TwoBitsPerPixel::from_bytes(high, low);
+                    let tbpp = Pixel::from_bytes(high, low);
 
                     let palette = match attr.flags.palette() {
                         ObjectPaletteId::Zero => self.monochrome.obj_palette_0,
@@ -267,7 +267,7 @@ impl Ppu {
                         let priority = attr.flags.priority();
                         let shade = palette.shade(tbpp.shade_id(x));
 
-                        let fifo_info = ObjectFifoPixel {
+                        let fifo_info = ObjectFifoInfo {
                             shade,
                             palette,
                             priority,
@@ -679,14 +679,14 @@ impl PixelFetcher {
             .zip(maybe_high)
             .expect("Low & High Bytes in TileBuilder were unexpectedly missing.");
 
-        let tbpp = TwoBitsPerPixel::from_bytes(high, low);
+        let tbpp = Pixel::from_bytes(high, low);
 
         if fifo.background.is_empty() {
             for x in 0..8 {
                 let shade = palette.shade(tbpp.shade_id(x));
 
-                let fifo_pixel = BackgroundFifoPixel { shade };
-                fifo.background.push_back(fifo_pixel);
+                let fifo_info = BackgroundFifoInfo { shade };
+                fifo.background.push_back(fifo_info);
             }
         }
 
@@ -762,7 +762,6 @@ impl Default for BackgroundFetcher {
 struct ObjectFetcher {
     state: FetcherState,
     tile: TileBuilder,
-    fifo_count: u8,
     enabled: bool,
 }
 
@@ -772,7 +771,6 @@ impl Fetcher for ObjectFetcher {
     }
 
     fn reset(&mut self) {
-        self.fifo_count = 0;
         self.state = FetcherState::TileNumber;
     }
 
@@ -838,12 +836,12 @@ impl Default for FetcherState {
 }
 
 #[derive(Debug, Clone, Copy, Default)]
-struct BackgroundFifoPixel {
+struct BackgroundFifoInfo {
     shade: GrayShade,
 }
 
 #[derive(Debug, Clone, Copy, Default)]
-struct ObjectFifoPixel {
+struct ObjectFifoInfo {
     shade: Option<GrayShade>,
     palette: ObjectPalette,
     priority: RenderPriority,
@@ -853,8 +851,8 @@ struct ObjectFifoPixel {
 // really necessary here?
 #[derive(Debug, Clone)]
 struct FifoRenderer {
-    background: VecDeque<BackgroundFifoPixel>,
-    object: VecDeque<ObjectFifoPixel>,
+    background: VecDeque<BackgroundFifoInfo>,
+    object: VecDeque<ObjectFifoInfo>,
     enabled: bool,
 }
 
diff --git a/src/ppu/registers.rs b/src/ppu/registers.rs
index 168e614..3e96f58 100644
--- a/src/ppu/registers.rs
+++ b/src/ppu/registers.rs
@@ -303,9 +303,9 @@ impl From<ObjectPalette> for u8 {
     }
 }
 
-pub struct TwoBitsPerPixel(u8, u8);
+pub struct Pixel(u8, u8);
 
-impl TwoBitsPerPixel {
+impl Pixel {
     pub fn from_bytes(higher: u8, lower: u8) -> Self {
         Self(higher, lower)
     }