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

Compare commits

base: projects:45ab161f22f23eb55ff32c00d689c69aa1defe94
Branches Tags
projects:main
projects:avian
..
compare: projects:4480b335554ce12c3d21ccc062044a59edd1d39a
Branches Tags
projects:avian
projects:main

No commits in common. "45ab161f22f23eb55ff32c00d689c69aa1defe94" and "4480b335554ce12c3d21ccc062044a59edd1d39a" have entirely different histories.
45ab161f22 ... 4480b33555

2 changed files with 4 additions and 5 deletions
Show Stats Expand all files Collapse all files

2
Cargo.toml
View File

@ -31,7 +31,7 @@ coord_2d = "0.3"
futures-lite = "1" futures-lite = "1"
gilrs = "0.10" gilrs = "0.10"
here_be_dragons = { version = "0.3", features = ["serde"] } here_be_dragons = { version = "0.3", features = ["serde"] }
leafwing-input-manager = { git = "https://github.com/ndarilek/leafwing-input-manager", branch = "consume" } leafwing-input-manager = "0.9"
maze_generator = "2" maze_generator = "2"
once_cell = "1" once_cell = "1"
pathfinding = "4" pathfinding = "4"

7
src/navigation.rs
View File

@ -217,8 +217,7 @@ 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 = actions.action_data_mut(NavigationAction::Move).axis_pair = None;
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) {
@ -233,7 +232,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 = Some(DualAxisData::from_xy(Vec2::ZERO)); .axis_pair = None;
} }
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) {
@ -247,7 +246,7 @@ fn controls(
} }
actions actions
.action_data_mut(NavigationAction::Translate) .action_data_mut(NavigationAction::Translate)
.axis_pair = Some(DualAxisData::from_xy(Vec2::ZERO)); .axis_pair = None;
} }
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 {