Dolda2000 GitWeb
/
kaka
/
rust-sdl-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Limit stick point to unit vector
[kaka/rust-sdl-test.git]
/
src
/
core
/
game.rs
diff --git
a/src/core/game.rs
b/src/core/game.rs
index
8474fab
..
f48d9b3
100644
(file)
--- a/
src/core/game.rs
+++ b/
src/core/game.rs
@@
-170,7
+170,7
@@
impl Object for Character {
for _i in 0..100 {
objects.push(Box::new(Boll {
pos: self.pos,
for _i in 0..100 {
objects.push(Box::new(Boll {
pos: self.pos,
- vel: ctrl.aim.to_
adjusted_
point() * (3.0 + rand::random::<f64>()) + point!(normal.sample(&mut rand::thread_rng()), normal.sample(&mut rand::thread_rng())) + self.vel,
+ vel: ctrl.aim.to_point() * (3.0 + rand::random::<f64>()) + point!(normal.sample(&mut rand::thread_rng()), normal.sample(&mut rand::thread_rng())) + self.vel,
bounces: 2,
}));
}
bounces: 2,
}));
}
@@
-207,12
+207,12
@@
impl Object for Character {
let l = 300.0;
let pos = (self.pos.x as i32, self.pos.y as i32);
// axis values
let l = 300.0;
let pos = (self.pos.x as i32, self.pos.y as i32);
// axis values
- let p = (self.pos + ctrl.aim.to_point() * l).to_i32().into();
+ let p = (self.pos + ctrl.aim.to_
axis_
point() * l).to_i32().into();
canvas.set_draw_color((0, 255, 0));
canvas.draw_line(pos, p).unwrap();
draw_cross(canvas, p);
canvas.set_draw_color((0, 255, 0));
canvas.draw_line(pos, p).unwrap();
draw_cross(canvas, p);
- //
adjusted values
- let p = (self.pos + ctrl.aim.to_
adjusted_
point() * l).to_i32().into();
+ //
values limited to unit vector
+ let p = (self.pos + ctrl.aim.to_point() * l).to_i32().into();
canvas.set_draw_color((255, 0, 0));
canvas.draw_line(pos, p).unwrap();
draw_cross(canvas, p);
canvas.set_draw_color((255, 0, 0));
canvas.draw_line(pos, p).unwrap();
draw_cross(canvas, p);