projects/blackout
1
0
Fork 0
Code Pull Requests Projects Releases Wiki Activity

Remove sprinting hack.

Browse Source
This commit is contained in:
Nolan Darilek 2022-12-21 08:12:25 -06:00
parent 4ecacb73ad
commit a4908fda80
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/navigation.rs
View File

@ -25,7 +25,6 @@ pub enum NavigationAction {
SnapRight, SnapRight,
SnapCardinal, SnapCardinal,
SnapReverse, SnapReverse,
Sprint,
} }
#[derive(Component, Clone, Copy, Debug, Deref, DerefMut, Reflect)] #[derive(Component, Clone, Copy, Debug, Deref, DerefMut, Reflect)]
@ -78,7 +77,6 @@ fn movement_controls<State>(
for (entity, mut actions, mut velocity, mut speed, max_speed, rotation_speed, transform) in for (entity, mut actions, mut velocity, mut speed, max_speed, rotation_speed, transform) in
&mut query &mut query
{ {
let sprinting = actions.pressed(NavigationAction::Sprint);
let mut cleanup = false; let mut cleanup = false;
if actions.pressed(NavigationAction::Move) { if actions.pressed(NavigationAction::Move) {
if let Some(pair) = actions.clamped_axis_pair(NavigationAction::Move) { if let Some(pair) = actions.clamped_axis_pair(NavigationAction::Move) {
@ -100,11 +98,7 @@ fn movement_controls<State>(
} else { } else {
forward_backward_movement_factor forward_backward_movement_factor
}; };
let mut s = if sprinting { let mut s = **max_speed;
**max_speed
} else {
**max_speed / config.sprint_movement_factor
};
s *= movement_factor; s *= movement_factor;
**speed = s; **speed = s;
let mut v = direction * **speed; let mut v = direction * **speed;
@ -340,7 +334,6 @@ pub struct NavigationPlugin<State> {
pub forward_movement_factor: f32, pub forward_movement_factor: f32,
pub backward_movement_factor: f32, pub backward_movement_factor: f32,
pub strafe_movement_factor: f32, pub strafe_movement_factor: f32,
pub sprint_movement_factor: f32,
pub states: Vec<State>, pub states: Vec<State>,
pub describe_undescribed_areas: bool, pub describe_undescribed_areas: bool,
pub log_area_descriptions: bool, pub log_area_descriptions: bool,
@ -352,7 +345,6 @@ impl<State> Default for NavigationPlugin<State> {
forward_movement_factor: 1., forward_movement_factor: 1.,
backward_movement_factor: 1., backward_movement_factor: 1.,
strafe_movement_factor: 1., strafe_movement_factor: 1.,
sprint_movement_factor: 3.,
states: vec![], states: vec![],
describe_undescribed_areas: false, describe_undescribed_areas: false,
log_area_descriptions: true, log_area_descriptions: true,