Skip to content

Commit 83f651f

Browse files
Made the wave y velocity scale with movement speed
this is how it works in gd
1 parent 3ff0677 commit 83f651f

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/game/playing/physics/wave.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ use macroquad::prelude::*;
55
pub fn physics_handle(
66
velocity_y: &Cell<f32>,
77
gravity: &Cell<f32>,
8-
vertical_wave_speed: &Cell<f32>
8+
vertical_wave_speed: &Cell<f32>,
9+
movement_speed: f32
910
) {
1011
let wave_go_up_or_down: f32 = if gravity.get() > 0.0 {
1112
-vertical_wave_speed.get()
@@ -16,8 +17,8 @@ pub fn physics_handle(
1617
if is_mouse_button_down(MouseButton::Left)
1718
|| is_key_down(KeyCode::Space)
1819
|| is_key_down(KeyCode::Up) {
19-
velocity_y.set(wave_go_up_or_down);
20+
velocity_y.set(wave_go_up_or_down * movement_speed);
2021
} else {
21-
velocity_y.set(-wave_go_up_or_down);
22+
velocity_y.set(-(wave_go_up_or_down * movement_speed));
2223
}
2324
}

src/main.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ async fn main() {
293293
let default_movement_speed: Shared<f32> = Shared::<f32>(Rc::new(Cell::new(movement_speed.0.get())));
294294
let ship_power: Shared<f32> = Shared::<f32>(Rc::new(Cell::new(0.7)));
295295
let ship_falling_speed: Shared<f32> = Shared::<f32>(Rc::new(Cell::new(0.5)));
296-
let vertical_wave_speed: Shared<f32> = Shared::<f32>(Rc::new(Cell::new(7.0)));
296+
let vertical_wave_speed: Shared<f32> = Shared::<f32>(Rc::new(Cell::new(1.1)));
297297
let game_tps: Shared<f32> = Shared::<f32>(Rc::new(Cell::new(60.0)));
298298

299299
println!("Setting up editor stuff..");
@@ -660,7 +660,8 @@ async fn main() {
660660
playing::physics::wave::physics_handle(
661661
&velocity_y.0,
662662
&gravity.0,
663-
&vertical_wave_speed.0
663+
&vertical_wave_speed.0,
664+
movement_speed.0.get()
664665
);
665666
}
666667
}

0 commit comments

Comments
 (0)