From e9510f2d7c114860fb5f202343158420b89488df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Magalh=C3=A3es?= <joamag@gmail.com> Date: Tue, 8 Aug 2023 15:37:36 +0100 Subject: [PATCH] chore: moved position of setter --- src/ppu.rs | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/ppu.rs b/src/ppu.rs index 43234b92..b5ca06c4 100644 --- a/src/ppu.rs +++ b/src/ppu.rs @@ -1065,6 +1065,18 @@ impl Ppu { self.palette_obj_1 } + pub fn palettes_color(&self) -> &[[u8; 64]; 2] { + &self.palettes_color + } + + pub fn set_palettes_color(&mut self, palettes_color: [[u8; 64]; 2]) { + self.palettes_color = palettes_color; + Self::compute_palettes_color( + &mut [&mut self.palettes_color_bg, &mut self.palettes_color_obj], + &self.palettes_color, + ); + } + pub fn ly(&self) -> u8 { self.ly } @@ -1792,19 +1804,6 @@ impl Ppu { || self.stat_hblank && self.mode == PpuMode::HBlank } - //@TOD check the best place to place this in the code - pub fn palettes_color(&self) -> &[[u8; 64]; 2] { - &self.palettes_color - } - - pub fn set_palettes_color(&mut self, palettes_color: [[u8; 64]; 2]) { - self.palettes_color = palettes_color; - Self::compute_palettes_color( - &mut [&mut self.palettes_color_bg, &mut self.palettes_color_obj], - &self.palettes_color, - ); - } - /// Computes the values for all of the palettes, this method /// is useful to "flush" color computation whenever the base /// palette colors are changed. -- GitLab