Skip to content

FIX: ISXB-1127 2D Vector Composite returns "IsPressed()" incorrectly when moving the joy stick #2034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

FIX: ISXB-1127 2D Vector Composite returns "IsPressed()" incorrectly when moving the joy stick #2034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 0 additions & 95 deletions Assets/Tests/InputSystem/CoreTests_Actions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12405,99 +12405,4 @@ public void Actions_ActionMapDisabledDuringOnAfterSerialization()
Assert.That(map.enabled, Is.True);
Assert.That(map.FindAction("MyAction", true).enabled, Is.True);
}

// ResetDevice wasn't properly clearly Composite key state, i.e. BindingState.pressTime
// https://jira.unity3d.com/browse/ISXB-746
[Test]
[TestCase(false)]
[TestCase(true)]
[Category("Actions")]
public void Actions_CompositeBindingResetWhenResetDeviceCalledWhileExecutingAction(bool useTwoModifierComposite)
{
var keyboard = InputSystem.AddDevice<Keyboard>();
bool actionPerformed;

// Enables "Modifier must be pressed first" behavior on all Composite Bindings
InputSystem.settings.shortcutKeysConsumeInput = true;

const string modifier1 = "<Keyboard>/shift";
const string modifier2 = "<Keyboard>/ctrl";
const string key = "<Keyboard>/F1";

var map = new InputActionMap();
var resetAction = map.AddAction("resetAction");

if (!useTwoModifierComposite)
{
resetAction.AddCompositeBinding("OneModifier")
.With("Modifier", modifier1)
.With("Binding", key);
}
else
{
resetAction.AddCompositeBinding("TwoModifiers")
.With("Modifier1", modifier1)
.With("Modifier2", modifier2)
.With("Binding", key);
}

resetAction.performed += (InputAction.CallbackContext ctx) =>
{
// Disable the Keyboard while action is being performed.
// This simulates an "OnFocusLost" event occurring while processing the Action, e.g. when switching primary displays or moving the main window
actionPerformed = true;
InputSystem.s_Manager.EnableOrDisableDevice(keyboard.device, false, InputManager.DeviceDisableScope.TemporaryWhilePlayerIsInBackground);
};

map.Enable();

actionPerformed = false;
Press(keyboard.leftShiftKey);
Press(keyboard.leftCtrlKey);
Press(keyboard.f1Key);

Assert.IsTrue(actionPerformed);

// Re enable the Keyboard (before keys are released) and execute Action again
InputSystem.s_Manager.EnableOrDisableDevice(keyboard.device, true, InputManager.DeviceDisableScope.TemporaryWhilePlayerIsInBackground);

actionPerformed = false;
Release(keyboard.leftShiftKey);
Release(keyboard.leftCtrlKey);
Release(keyboard.f1Key);

Press(keyboard.leftCtrlKey);
Press(keyboard.leftShiftKey);
Press(keyboard.f1Key);

Assert.IsTrue(actionPerformed);

actionPerformed = false;
Release(keyboard.leftCtrlKey);
Release(keyboard.leftShiftKey);
Release(keyboard.f1Key);

// Re enable the Keyboard (after keys are released) and execute Action one more time
InputSystem.s_Manager.EnableOrDisableDevice(keyboard.device, true, InputManager.DeviceDisableScope.TemporaryWhilePlayerIsInBackground);

Press(keyboard.leftCtrlKey);
Press(keyboard.leftShiftKey);
Press(keyboard.f1Key);

Assert.IsTrue(actionPerformed);

actionPerformed = false;
Press(keyboard.leftShiftKey);
Press(keyboard.leftCtrlKey);
Press(keyboard.f1Key);

// Re enable the Keyboard (before keys are released) and verify Action isn't triggered when Key pressed first
InputSystem.s_Manager.EnableOrDisableDevice(keyboard.device, true, InputManager.DeviceDisableScope.TemporaryWhilePlayerIsInBackground);

Press(keyboard.f1Key);
Press(keyboard.leftCtrlKey);
Press(keyboard.leftShiftKey);

Assert.IsFalse(actionPerformed);
}
}
Loading