github/wasm-pong
1
0
Fork 0
mirror of https://github.com/thilo-behnke/wasm-pong.git synced 2026-05-14 07:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

wip collision handling

Browse Source
This commit is contained in:
Thilo Behnke
2022-04-23 00:32:57 +02:00
parent 7e5b928caa
commit 4be19aa5bb
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pong/src/game_field.rs
View File

@@ -131,17 +131,20 @@ impl Field {
}
collision => objs.iter().find(|o| o.id == collision.0).unwrap(),
};
ball.obj.vel.add(&other.vel);
ball.obj.vel.invert();
// let dot = ball.obj.vel.dot(&other.vel);
// if dot == 0. {
// ball.obj.vel.invert();
// } else {
// let angle = ball.obj.vel.angle(&other.vel);
// ball.obj.vel.rotate(FRAC_PI_2 - angle);
// ball.obj.vel.invert();
// }
if other.vel == Vector::zero() {
let dot = ball.obj.vel.dot(&other.orientation);
if dot >= - 0.000001 && dot <= 0.000001 {
ball.obj.vel.invert();
} else {
let angle = ball.obj.vel.angle(&other.orientation);
ball.obj.vel.rotate(FRAC_PI_2 - angle);
ball.obj.vel.invert();
}
} else {
ball.obj.vel.add(&other.vel);
ball.obj.vel.invert();
}
}
}
@@ -165,6 +168,7 @@ impl Player {
obj: GameObject {
id,
pos: Vector {x: x as f64, y: y as f64},
orientation: Vector::new(0., 1.),
shape: Shape::Rect,
shape_params: vec![field.width / 25, field.height / 5],
vel: Vector::zero(),
@@ -185,6 +189,7 @@ impl Ball {
obj: GameObject {
id,
pos: Vector {x: x as f64, y: y as f64},
orientation: Vector::zero(),
shape: Shape::Circle,
shape_params: vec![field.width / 80],
vel: Vector::zero(),
@@ -203,9 +208,11 @@ impl Bounds {
pub fn new(width: u16, height: u16) -> Bounds {
Bounds {
objs: vec![
// top
GameObject {
id: 90,
pos: Vector {x: (width / 2) as f64, y: 0 as f64},
orientation: Vector::new(1., 0.),
shape: Shape::Rect,
shape_params: vec![width, 2],
is_static: true,
@@ -215,6 +222,7 @@ impl Bounds {
GameObject {
id: 91,
pos: Vector {x: (width / 2) as f64, y: height as f64},
orientation: Vector::new(-1., 0.),
shape: Shape::Rect,
shape_params: vec![width, 2],
is_static: true,
@@ -224,6 +232,7 @@ impl Bounds {
GameObject {
id: 92,
pos: Vector {x: 0 as f64, y: (height / 2) as f64},
orientation: Vector::new(0., 1.),
shape: Shape::Rect,
shape_params: vec![2, height],
is_static: true,
@@ -233,6 +242,7 @@ impl Bounds {
GameObject {
id: 93,
pos: Vector {x: width as f64, y: (height / 2) as f64},
orientation: Vector::new(0., -1.),
shape: Shape::Rect,
shape_params: vec![2, height],
is_static: true,

4
pong/src/game_object.rs
View File

@@ -11,6 +11,7 @@ pub mod game_object {
pub struct GameObject {
pub id: u16,
pub pos: Vector,
pub orientation: Vector,
pub shape: Shape,
pub shape_params: Vec<u16>,
pub vel: Vector,
@@ -21,6 +22,9 @@ pub mod game_object {
pub fn update_pos(&mut self) {
self.pos.add(&self.vel);
let mut orientation = self.pos.clone();
orientation.invert();
self.orientation = orientation;
}
pub fn set_vel_x(&mut self, x: f64) {