test tspin rendering is correct

Author: kirjavascript

tests/src/main.rs

@@ -13,6 +13,7 @@ mod rng;
 mod score;
 mod sps;
 mod toprow;
+mod tspins;
 
 use gumdrop::Options;
 
@@ -45,6 +46,8 @@ fn main() {
     if options.test {
         floor::test();
         println!(">> floor ✅");
+        tspins::test();
+        println!(">> tspins ✅");
         toprow::test();
         println!(">> top row bug ✅");
         score::test();
@@ -125,8 +128,7 @@ fn main() {
                 emu.run_until_vblank();
             }
 
-            emu.ppu.render_ntsc(video::WIDTH);
-            view.update(&emu.ppu.filtered_screen);
+            view.render(&mut emu);
         });
         loop {}
     }

tests/src/tspins.rs

@@ -0,0 +1,38 @@
+use crate::{util, labels, playfield};
+
+pub fn test() {
+    let mut emu = util::emulator(None);
+
+    for _ in 0..4 {
+        emu.run_until_vblank();
+    }
+
+    let practise_type = labels::get("practiseType") as usize;
+    let game_mode = labels::get("gameMode") as usize;
+    let main_loop = labels::get("mainLoop");
+    let level_number = labels::get("levelNumber") as usize;
+
+
+    emu.memory.iram_raw[practise_type] = labels::get("MODE_TSPINS") as _;
+    emu.memory.iram_raw[level_number] = 18;
+    emu.memory.iram_raw[game_mode] = 4;
+
+    emu.registers.pc = main_loop;
+
+    for _ in 0..10 {
+        emu.run_until_vblank();
+    }
+
+    let offset = |x, y| x + (y * 256);
+
+    // check playfield
+    assert_eq!(r##"
+######  ##
+#####   ##
+###### ###
+##########
+    "##.trim(), playfield::get_str(&emu).trim());
+
+    // check pixel is actually rendered
+    assert_eq!(emu.ppu.screen[offset(96, 176) as usize], 0x30);
+}

tests/src/video.rs

@@ -1,3 +1,4 @@
+use rusticnes_core::nes::NesState;
 use minifb::{Window, WindowOptions};
 
 pub const WIDTH: usize = 256;
@@ -24,7 +25,8 @@ impl Video {
         }
     }
 
-    pub fn update(&mut self, screen: &Vec<u32>) {
-        self.window.update_with_buffer(screen, WIDTH, HEIGHT).unwrap();
+    pub fn render(&mut self, emu: &mut NesState) {
+        emu.ppu.render_ntsc(WIDTH);
+        self.window.update_with_buffer(&emu.ppu.filtered_screen, WIDTH, HEIGHT).unwrap();
     }
 }