fix: ensure pixel brightness is using the same palette

lukexor · Jun 17, 2024 · ad2f873 · ad2f873
1 parent 8b04288
commit ad2f873
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/tetanes-core/src/ppu.rs b/tetanes-core/src/ppu.rs
@@ -280,13 +280,6 @@ impl Ppu {
         ppu
     }
 
-    /// Return the system palette color for the given pixel.
-    #[inline]
-    #[must_use]
-    pub const fn system_palette(pixel: u16) -> (u8, u8, u8) {
-        Self::SYSTEM_PALETTE[(pixel as usize) & (Self::SYSTEM_PALETTE.len() - 1)]
-    }
-
     /// Return the current frame buffer.
     #[inline]
     #[must_use]

diff --git a/tetanes-core/src/ppu/frame.rs b/tetanes-core/src/ppu/frame.rs
@@ -77,7 +77,10 @@ impl Frame {
     #[must_use]
     pub fn pixel_brightness(&self, x: u32, y: u32) -> u32 {
         let pixel = self.pixel(x, y);
-        let (red, green, blue) = Ppu::system_palette(pixel);
+        let index = (pixel as usize) * 3;
+        let red = Ppu::NTSC_PALETTE[index];
+        let green = Ppu::NTSC_PALETTE[index + 1];
+        let blue = Ppu::NTSC_PALETTE[index + 2];
         u32::from(red) + u32::from(green) + u32::from(blue)
     }