Bounce bolls off of walls in a proper angle

[kaka/rust-sdl-test.git] / src / core / game.rs

diff --git a/src/core/game.rs b/src/core/game.rs
index e8893de..39af2e1 100644 (file)
--- a/src/core/game.rs
+++ b/src/core/game.rs
@@ -1,10 +1,10 @@
-use ActiveState;
+use teststate::TestState;
 use AppState;
-use common::{Point2D, Radians};
+use common::{Point, Radians};
 use core::app::StateChange;
 use core::controller::Controller;
 use core::controller::ControllerManager;
-use core::level::{Level, LevelGenerator};
+use core::level::{Level, LevelGenerator, Wall, IntersectResult::Intersection};
 use core::render::Renderer;
 use point;
 use sdl2::event::Event;
@@ -26,7 +26,7 @@ pub struct GameState {
 
 impl GameState {
     pub fn new() -> Self {
-       let lvlgen = LevelGenerator::new(0, 5);
+       let lvlgen = LevelGenerator::new(0);
        GameState {
            world: World::new(lvlgen.generate()),
            lvlgen,
@@ -58,7 +58,7 @@ impl AppState for GameState {
                return Some(StateChange::Pop)
             }
            Event::KeyDown { keycode: Some(Keycode::Return), .. } => {
-               return Some(StateChange::Push(Box::new(ActiveState::new((800, 600)))))
+               return Some(StateChange::Push(Box::new(TestState::new())))
             }
            Event::KeyDown { keycode: Some(Keycode::Space), .. } => {
                self.lvlgen.seed = std::time::UNIX_EPOCH.elapsed().unwrap().as_secs() as u32;
@@ -66,14 +66,24 @@ impl AppState for GameState {
            }
            Event::KeyDown { keycode: Some(Keycode::KpPlus), .. } => {
                self.lvlgen.iterations += 1;
-               println!("{} iteration(s) of cellular automata", self.lvlgen.iterations);
                self.world.level = self.lvlgen.generate();
            }
            Event::KeyDown { keycode: Some(Keycode::KpMinus), .. } => {
-               self.lvlgen.iterations = 1.max(self.lvlgen.iterations - 1);
-               println!("{} iteration(s) of cellular automata", self.lvlgen.iterations);
+               if self.lvlgen.iterations > 0 {
+                   self.lvlgen.iterations -= 1;
+                   self.world.level = self.lvlgen.generate();
+               }
+           }
+           Event::KeyDown { keycode: Some(Keycode::KpMultiply), .. } => {
+               self.lvlgen.wall_smooth_radius += 1;
                self.world.level = self.lvlgen.generate();
            }
+           Event::KeyDown { keycode: Some(Keycode::KpDivide), .. } => {
+               if self.lvlgen.wall_smooth_radius > 0 {
+                   self.lvlgen.wall_smooth_radius -= 1;
+                   self.world.level = self.lvlgen.generate();
+               }
+           }
            _ => {}
        }
        None
@@ -145,8 +155,8 @@ pub trait Drawable {}
 
 pub struct Character {
     ctrl: Rc<RefCell<Controller>>,
-    pos: Point2D<f64>,
-    vel: Point2D<f64>,
+    pos: Point<f64>,
+    vel: Point<f64>,
 }
 
 impl Character {
@@ -163,13 +173,14 @@ impl Object for Character {
     fn update(&mut self, objects: &mut Objects, lvl: &Level, dt: Duration) -> ObjectState {
        let ctrl = self.ctrl.borrow();
 
-       let x = (self.pos.x / lvl.grid.cell_size as f64).min(lvl.grid.width as f64 - 1.0).max(0.0) as usize;
-       let y = (self.pos.y / lvl.grid.cell_size as f64).min(lvl.grid.height as f64 - 1.0).max(0.0) as usize;
+       let x = (self.pos.x / lvl.grid.scale.width as f64).min(lvl.grid.size.width as f64 - 1.0).max(0.0) as usize;
+       let y = (self.pos.y / lvl.grid.scale.height as f64).min(lvl.grid.size.height as f64 - 1.0).max(0.0) as usize;
+       self.vel += lvl.gravity;
        if lvl.grid.cells[x][y] {
-           self.vel += lvl.gravity;
            if self.vel.y > 0.0 && !(ctrl.mov.down() && ctrl.jump.is_pressed) {
                self.vel.y = 0.0;
                self.vel.x *= 0.9;
+               self.pos.y -= 1.0;
            }
 
            if !ctrl.mov.down() {
@@ -177,8 +188,6 @@ impl Object for Character {
                    self.vel.y = -5.0;
                }
            }
-       } else {
-           self.vel += lvl.gravity;
        }
        self.pos += self.vel;
 
@@ -238,7 +247,7 @@ impl Object for Character {
        renderer.draw_line(pos, p, (0, 255, 0));
        draw_cross(renderer, p);
        // // circle values
-       // let p = (self.pos + Point2D::from(ctrl.aim.a) * l).to_i32().into();
+       // let p = (self.pos + Point::from(ctrl.aim.a) * l).to_i32().into();
        // renderer.draw_line(pos, p, (0, 0, 255));
        // draw_cross(renderer, p);
     }
@@ -252,8 +261,8 @@ fn draw_cross(renderer: &mut Renderer, p: (i32, i32)) {
 ////////// BOLL ////////////////////////////////////////////////////////////////
 
 pub struct Boll {
-    pos: Point2D<f64>,
-    vel: Point2D<f64>,
+    pos: Point<f64>,
+    vel: Point<f64>,
     bounces: u8,
 }
 
@@ -262,20 +271,23 @@ impl Object for Boll {
        self.vel += lvl.gravity;
        self.pos += self.vel;
 
-       let x = (self.pos.x / lvl.grid.cell_size as f64).min(lvl.grid.width as f64 - 1.0).max(0.0) as usize;
-       let y = (self.pos.y / lvl.grid.cell_size as f64).min(lvl.grid.height as f64 - 1.0).max(0.0) as usize;
-       if lvl.grid.cells[x][y] {
+       if let Intersection(wall, pos) = lvl.intersect_walls(self.pos - self.vel, self.pos) {
            if self.bounces == 0 {
                return Dead
            }
-           self.vel *= -0.25;
-           self.pos += self.vel;
            self.bounces -= 1;
+           let mut a = wall.normal().mirror(self.vel.to_radians()); // TODO interpolera normalen mellan närliggande väggdelar? bollarna studsar väldigt "kantigt" nu
+           self.pos = pos;
+           self.vel = Point::from(a) * self.vel.length() * 0.35;
+           self.pos += self.vel; // TODO det här kan få bollen att åka igenom en närliggande vägg utan att kollisionstestas, men behövs just nu för att inte kollidera med samma vägg bakifrån
+
+           // create another boll
            use rand::distributions::{Distribution, Normal};
            let mut rng = rand::thread_rng();
-           let a = Radians(self.vel.to_radians().0 + Normal::new(0.0, 0.75).sample(&mut rng));
+           a.0 += Normal::new(0.0, 0.1).sample(&mut rng); // TODO slumpen kan ge en vinkel som är under tangenten. vinkel-metoder på väggen istället kanske?
+           use rand::Rng;
            objects.push(Box::new(Boll {
-               vel: Point2D::from(a) * Normal::new(1.0, 0.25).sample(&mut rng) * self.vel.length(),
+               vel: Point::from(a) * Normal::new(1.0, 0.25).sample(&mut rng) * self.vel.length() * rng.gen_range(0.25, 1.0),
                ..*self
            }));
        }