paddle stuff

Author: kirjavascript

Cargo.toml

@@ -14,9 +14,6 @@ codegen-units = 1
 [build-dependencies]
 cc = { version = "1.0"}
 
-[dependencies]
-numtoa = "0.2.4"
-
 [features]
 skip-legal = []
 stress = []

src/chr/tiles.chr

@@ -1,4 +1,4 @@
-use crate::{ppu, sprites, apu};
+use crate::{ppu, sprites, apu, io};
 
 // statically allocated memory
 static mut STATE: Option<Game> = None;
@@ -36,6 +36,9 @@ pub fn frame() {
     game.step();
 
     sprites::add(TOP_MARGIN + game.ball.x, LEFT_MARGIN + game.ball.y -1, 0x80, 0);
+    for i in 0..game.paddle.width {
+        sprites::add(TOP_MARGIN + game.paddle.x + (i * 8), LEFT_MARGIN + game.paddle.y -1, 0x87, 0);
+    }
 }
 
 pub fn render() {
@@ -73,15 +76,16 @@ fn get_rng() -> u8 {
 const WIDTH: u8 = 224;
 const HEIGHT: u8 = 208;
 const BRICKS_WIDE: usize = 14;
-const TOP_BRICK_MARGIN: usize = 2;
-const BALL_DIAMETER: u8 = 6;
 const BRICK_WIDTH: u8 = 16;
 const BRICK_HEIGHT: u8 = 8;
+const TOP_BRICK_MARGIN: usize = 2;
+const BALL_DIAMETER: u8 = 6;
+const BALL_RADIUS: u8 = BALL_DIAMETER / 2;
 const LEFT_MARGIN: u8 = 16;
 const TOP_MARGIN: u8 = 16;
 
 struct Ball { x: u8, y: u8, dx: i8, dy: i8 }
-struct Paddle { x: u8, y: u8, width: u8, height: u8 }
+struct Paddle { x: u8, y: u8, width: u8 }
 
 #[derive(Copy, Clone, PartialEq)]
 enum Brick { Empty, A, B, C }
@@ -125,7 +129,7 @@ impl Game {
     fn new() -> Self {
         let mut game = Self {
             ball: Ball { x: 0, y: HEIGHT / 2, dx: 2, dy: -1 },
-            paddle: Paddle { x: WIDTH / 2, y: HEIGHT - 10, width: 8, height: 6 },
+            paddle: Paddle { x: WIDTH / 2, y: HEIGHT - 10, width: 7 },
             bricks: [Brick::Empty; 140],
             destroyed: [None; 4],
         };
@@ -144,24 +148,62 @@ impl Game {
     }
 
     fn step(&mut self) {
+
+        let buttons = io::controller_buttons();
+
+        if buttons & io::Left != 0 && self.paddle.x > 1 {
+            self.paddle.x -= 2;
+        } else if buttons & io::Right != 0 {
+            self.paddle.x += 2;
+        }
+
+        // collision
+        let old_x = self.ball.x;
+        let old_y = self.ball.y;
         self.ball.x = (self.ball.x as i8 + self.ball.dx) as u8;
         self.ball.y = (self.ball.y as i8 + self.ball.dy) as u8;
 
+
         // brick collision
         for (i, brick) in self.bricks.iter_mut().enumerate() {
             if *brick != Brick::Empty {
                 let (brick_x, brick_y) = BRICKS_POS[i];
 
                 if self.ball.y > brick_y && self.ball.y < brick_y + BRICK_HEIGHT &&
                 self.ball.x >= brick_x && self.ball.x <= brick_x + BRICK_WIDTH {
-                    *brick = Brick::Empty;
+
+                    let brick_x = brick_x as i16;
+                    let brick_y = brick_y as i16;
+                    let x = self.ball.x as i16;
+                    let y = self.ball.y as i16;
+                    let r = BALL_RADIUS as i16;
+
+                    let dist_left = (x + r) - brick_x;
+                    let dist_right = brick_x + BRICK_WIDTH as i16 - (x + r);
+                    let dist_top = (y + r) - brick_y;
+                    let dist_bottom = brick_y + BRICK_HEIGHT as i16 - (y + r);
+
+                    let hit_left = dist_left < r;
+                    let hit_right = dist_right < r;
+                    let hit_top = dist_top < r;
+                    let hit_bottom = dist_bottom < r;
+
+                    if hit_left || hit_right {
+                        self.ball.dx = -self.ball.dx;
+                    }
+                    if hit_top || hit_bottom {
+                        self.ball.dy = -self.ball.dy;
+                    }
 
                     let pos = self.destroyed.iter()
                         .position(|&item| item == None)
                         .unwrap_or(0);
 
                     self.destroyed[pos] = Some(i as u8);
-                    self.ball.dy = -self.ball.dy;
+                    *brick = Brick::Empty;
+                    // rollback if collide
+                    self.ball.x = old_x;
+                    self.ball.y = old_y;
                     apu::play_sfx(apu::Sfx::MenuBoop);
                 }
             }
@@ -178,3 +220,10 @@ impl Game {
         }
     }
 }
+
+
+//         // Paddle collision
+//         if self.ball.y >= self.paddle.y && self.ball.y <= self.paddle.y + self.paddle.height &&
+//             self.ball.x >= self.paddle.x && self.ball.x <= self.paddle.x + self.paddle.width {
+//                 self.ball.dy = -self.ball.dy;
+//         }

src/chr/tiles.png

@@ -11,6 +11,15 @@ pub fn _set_chr_bank(bank: u8) {
     unsafe { *(0x8000 as *mut u8) = bank; }
 }
 
+pub const Right: u8 = 0x01;
+pub const Left: u8 = 0x02;
+pub const Down: u8 = 0x04;
+pub const Up: u8 = 0x08;
+pub const Start: u8 = 0x10;
+pub const Select: u8 = 0x20;
+pub const B: u8 = 0x40;
+pub const A: u8 = 0x80;
+
 static JOYPAD1: u16 = 0x4016;
 static mut BUTTONS: u8 = 0;