Skip to content

Commit

Permalink
Merge branch 'main' into accessible-deadzones
Browse files Browse the repository at this point in the history
  • Loading branch information
alice-i-cecile authored Jan 6, 2024
2 parents e8ea096 + 351e629 commit fd330ce
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/clashing_inputs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ impl<A: Actionlike> InputMap<A> {
let mut clashes = Vec::default();

for action_pair in A::variants().combinations(2) {
let action_a = action_pair.get(0).unwrap().clone();
let action_a = action_pair.first().unwrap().clone();
let action_b = action_pair.get(1).unwrap().clone();

if let Some(clash) = self.possible_clash(action_a, action_b) {
Expand Down
4 changes: 2 additions & 2 deletions src/plugin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use bevy::ui::UiSystem;
/// Each variant represents a "virtual button" whose state is stored in an [`ActionState`] struct.
///
/// Each [`InputManagerBundle`](crate::InputManagerBundle) contains:
/// - an [`InputMap`](crate::input_map::InputMap) component, which stores an entity-specific mapping between the assorted input streams and an internal representation of "actions"
/// - an [`InputMap`] component, which stores an entity-specific mapping between the assorted input streams and an internal representation of "actions"
/// - an [`ActionState`] component, which stores the current input state for that entity in an source-agnostic fashion
///
/// If you have more than one distinct type of action (e.g. menu actions, camera actions and player actions), consider creating multiple `Actionlike` enums
Expand Down Expand Up @@ -185,7 +185,7 @@ impl<A: Actionlike + TypePath> Plugin for InputManagerPlugin<A> {
}
}

/// Controls whether or not the [`ActionState`] / [`InputMap`](crate::input_map::InputMap) pairs of type `A` are active
/// Controls whether or not the [`ActionState`] / [`InputMap`] pairs of type `A` are active
///
/// If this resource does not exist, actions work normally, as if `ToggleActions::enabled == true`.
#[derive(Resource)]
Expand Down

0 comments on commit fd330ce

Please sign in to comment.