paddle collision

Author: kirjavascript

src/game.rs

@@ -151,9 +151,9 @@ impl Game {
 
         let buttons = io::controller_buttons();
 
-        if buttons & io::Left != 0 && self.paddle.x > 1 {
+        if buttons & io::LEFT != 0 && self.paddle.x > 1 {
             self.paddle.x -= 2;
-        } else if buttons & io::Right != 0 {
+        } else if buttons & io::RIGHT != 0  && self.paddle.x + self.paddle.width * 8 < 0xe0 {
             self.paddle.x += 2;
         }
 
@@ -189,7 +189,7 @@ impl Game {
                     let hit_bottom = dist_bottom < r;
 
                     if hit_left || hit_right {
-                        self.ball.dx = -self.ball.dx;
+                        // self.ball.dx = -self.ball.dx;
                     }
                     if hit_top || hit_bottom {
                         self.ball.dy = -self.ball.dy;
@@ -214,16 +214,20 @@ impl Game {
             self.ball.dx = -self.ball.dx;
             apu::play_sfx(apu::Sfx::Lock);
         }
-        if self.ball.y == 0 || self.ball.y + BALL_DIAMETER >= HEIGHT {
+        if self.ball.y == 0  {
             self.ball.dy = -self.ball.dy;
             apu::play_sfx(apu::Sfx::Lock);
         }
+        // paddle collision
+        if self.ball.y + BALL_DIAMETER >= self.paddle.y {
+            if self.ball.x > self.paddle.x && self.ball.x + BALL_DIAMETER < self.paddle.x + (self.paddle.width * 8) {
+                self.ball.dy = -self.ball.dy;
+                apu::play_sfx(apu::Sfx::Lock);
+            } else {
+                self.ball.dx = 0;
+                self.ball.dy = 0;
+                apu::play_sfx(apu::Sfx::Topout);
+            }
+        }
     }
 }
-
-
-//         // 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/io.rs

@@ -11,12 +11,12 @@ 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 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;
 

src/main.rs

@@ -1,6 +1,6 @@
 #![no_std]
 #![feature(start)]
-#![allow(unused_imports)]
+#![allow(unused_imports, dead_code)]
 
 mod apu;
 mod io;