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

Zero out vectors instead of setting to None.

Browse Source
This commit is contained in:
Nolan Darilek 2023-05-09 08:43:31 -05:00
parent 4480b33555
commit 5a3ce9b790
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/navigation.rs
View File

@ -217,7 +217,8 @@ fn controls(
trace!("{entity:?}: Stopped moving"); trace!("{entity:?}: Stopped moving");
actions.release(NavigationAction::SetLinearVelocity); actions.release(NavigationAction::SetLinearVelocity);
actions.release(NavigationAction::Translate); actions.release(NavigationAction::Translate);
actions.action_data_mut(NavigationAction::Move).axis_pair = None; actions.action_data_mut(NavigationAction::Move).axis_pair =
Some(DualAxisData::from_xy(Vec2::ZERO));
} }
if actions.pressed(NavigationAction::SetLinearVelocity) { if actions.pressed(NavigationAction::SetLinearVelocity) {
if let Some(pair) = actions.axis_pair(NavigationAction::SetLinearVelocity) { if let Some(pair) = actions.axis_pair(NavigationAction::SetLinearVelocity) {
@ -232,7 +233,7 @@ fn controls(
velocity.linvel = Vec2::ZERO; velocity.linvel = Vec2::ZERO;
actions actions
.action_data_mut(NavigationAction::SetLinearVelocity) .action_data_mut(NavigationAction::SetLinearVelocity)
.axis_pair = None; .axis_pair = Some(DualAxisData::from_xy(Vec2::ZERO));
} }
if actions.pressed(NavigationAction::Translate) { if actions.pressed(NavigationAction::Translate) {
if let Some(pair) = actions.axis_pair(NavigationAction::Translate) { if let Some(pair) = actions.axis_pair(NavigationAction::Translate) {
@ -246,7 +247,7 @@ fn controls(
} }
actions actions
.action_data_mut(NavigationAction::Translate) .action_data_mut(NavigationAction::Translate)
.axis_pair = None; .axis_pair = Some(DualAxisData::from_xy(Vec2::ZERO));
} }
if !snap_timers.contains_key(&entity) { if !snap_timers.contains_key(&entity) {
if let Some(rotation_speed) = rotation_speed { if let Some(rotation_speed) = rotation_speed {