From ec2d1c9ce6b29a6372550ed44f928e4c6caedb35 Mon Sep 17 00:00:00 2001 From: Rene Damm Date: Fri, 10 Dec 2021 16:47:10 +0100 Subject: [PATCH 01/53] FIX: InputAction.GetTimeoutCompletionPercentage() skipping to 100% (case 1377009, #1480). --- Assets/Tests/InputSystem/CoreTestsFixture.cs | 19 ++ Assets/Tests/InputSystem/CoreTests_Actions.cs | 206 ++++++------------ .../CoreTests_Actions_Interactions.cs | 28 ++- .../Tests/InputSystem/CoreTests_Controls.cs | 2 +- Assets/Tests/InputSystem/CoreTests_Devices.cs | 32 +-- Assets/Tests/InputSystem/CoreTests_Events.cs | 7 +- .../Tests/InputSystem/CoreTests_Remoting.cs | 2 + Assets/Tests/InputSystem/CoreTests_State.cs | 38 ++-- .../InputSystem/Plugins/EnhancedTouchTests.cs | 28 ++- Assets/Tests/InputSystem/Plugins/UITests.cs | 2 + Packages/com.unity.inputsystem/CHANGELOG.md | 8 + .../InputSystem/Actions/InputAction.cs | 2 +- .../Actions/InputActionRebindingExtensions.cs | 10 +- .../InputSystem/Actions/InputActionState.cs | 4 +- .../Devices/Remote/InputRemoting.cs | 4 +- .../Tests/TestFixture/InputTestFixture.cs | 11 +- 16 files changed, 186 insertions(+), 217 deletions(-) diff --git a/Assets/Tests/InputSystem/CoreTestsFixture.cs b/Assets/Tests/InputSystem/CoreTestsFixture.cs index db98a7bf98..82a050f5b7 100644 --- a/Assets/Tests/InputSystem/CoreTestsFixture.cs +++ b/Assets/Tests/InputSystem/CoreTestsFixture.cs @@ -3,6 +3,18 @@ public class CoreTestsFixture : InputTestFixture { + public override void Setup() + { + base.Setup(); + + // https://fogbugz.unity3d.com/f/cases/1377009/ + // Make sure the runtime's timeline has an offset compared to the input timeline. + // This ensures that we're tapping the right timeline in the code as in practice, + // the runtime's timeline will always have an offset. + runtime.currentTimeOffsetToRealtimeSinceStartup += 10; + runtime.currentTime = 20; + } + public override void TearDown() { // Unload any additional scenes. @@ -31,4 +43,11 @@ public override void TearDown() base.TearDown(); } + + public void ResetTime() + { + runtime.currentTimeOffsetToRealtimeSinceStartup = default; + runtime.currentTimeForFixedUpdate = default; + currentTime = default; + } } diff --git a/Assets/Tests/InputSystem/CoreTests_Actions.cs b/Assets/Tests/InputSystem/CoreTests_Actions.cs index f2c0250b05..4fb7e4b1ae 100644 --- a/Assets/Tests/InputSystem/CoreTests_Actions.cs +++ b/Assets/Tests/InputSystem/CoreTests_Actions.cs @@ -52,6 +52,8 @@ public void Actions_DoNotGetTriggeredByEditorUpdates() [Category("Actions")] public void Actions_TimeoutsDoNotGetTriggeredInEditorUpdates() { + ResetTime(); + var gamepad = InputSystem.AddDevice(); // Devices get reset when losing focus so when we switch from the player to the editor, @@ -74,7 +76,7 @@ public void Actions_TimeoutsDoNotGetTriggeredInEditorUpdates() trace.Clear(); runtime.PlayerFocusLost(); - runtime.currentTime = 10; + currentTime = 10; InputSystem.Update(InputUpdateType.Editor); @@ -290,6 +292,8 @@ public void Actions_CanDetermineIfMapIsUsableWithGivenDevice() [Category("Actions")] public void Actions_WhenDisabled_CancelAllStartedInteractions() { + ResetTime(); + var gamepad = InputSystem.AddDevice(); var action1 = new InputAction("action1", InputActionType.Button, binding: "/buttonSouth", interactions: "Hold"); @@ -309,7 +313,7 @@ public void Actions_WhenDisabled_CancelAllStartedInteractions() trace.SubscribeTo(action2); trace.SubscribeTo(action3); - runtime.currentTime = 0.234f; + currentTime = 0.234f; runtime.advanceTimeEachDynamicUpdate = 0; action1.Disable(); @@ -338,7 +342,7 @@ public void Actions_WhenDisabled_CancelAllStartedInteractions() Assert.That(action1.phase, Is.EqualTo(InputActionPhase.Waiting)); - runtime.currentTime = 0.345f; + currentTime = 0.345f; Release(gamepad.buttonSouth); Press(gamepad.buttonSouth); @@ -354,7 +358,7 @@ public void Actions_WhenDisabled_CancelAllStartedInteractions() trace.Clear(); - runtime.currentTime = 1; + currentTime = 1; InputSystem.Update(); actions = trace.ToArray(); @@ -1626,6 +1630,7 @@ public void Actions_CanCreateActionAssetWithMultipleActionMaps() asset.AddActionMap(map3); asset.AddActionMap(map4); + var startTime = currentTime; using (var trace = new InputActionTrace()) { trace.SubscribeToAll(); @@ -1633,103 +1638,50 @@ public void Actions_CanCreateActionAssetWithMultipleActionMaps() // Enable only map1. map1.Enable(); - Set(gamepad.leftStick, new Vector2(0.123f, 0.234f), 0.123); - - var actions = trace.ToArray(); + Set(gamepad.leftStick, new Vector2(0.123f, 0.234f), startTime + 0.123); // map1/action1 should have been started and performed. - Assert.That(actions.Length, Is.EqualTo(2)); - Assert.That(actions[0].phase, Is.EqualTo(InputActionPhase.Started)); - Assert.That(actions[0].action, Is.SameAs(action1)); - Assert.That(actions[0].ReadValue, - Is.EqualTo(new StickDeadzoneProcessor().Process(new Vector2(0.123f, 0.234f)) * new Vector2(-1, 1)) - .Using(Vector2EqualityComparer.Instance)); - Assert.That(actions[0].interaction, Is.Null); - Assert.That(actions[0].control, Is.SameAs(gamepad.leftStick)); - Assert.That(actions[0].time, Is.EqualTo(0.123).Within(0.00001)); - Assert.That(actions[1].phase, Is.EqualTo(InputActionPhase.Performed)); - Assert.That(actions[1].action, Is.SameAs(action1)); - Assert.That(actions[1].ReadValue, - Is.EqualTo(new StickDeadzoneProcessor().Process(new Vector2(0.123f, 0.234f)) * new Vector2(-1, 1)) - .Using(Vector2EqualityComparer.Instance)); - Assert.That(actions[1].interaction, Is.Null); - Assert.That(actions[1].control, Is.SameAs(gamepad.leftStick)); - Assert.That(actions[1].time, Is.EqualTo(0.123).Within(0.00001)); + Assert.That(trace, + Started(action1, value: new StickDeadzoneProcessor().Process(new Vector2(0.123f, 0.234f)) * new Vector2(-1, 1), + control: gamepad.leftStick, time: startTime + 0.123) + .AndThen(Performed(action1, + value: new StickDeadzoneProcessor().Process(new Vector2(0.123f, 0.234f)) * new Vector2(-1, 1), + control: gamepad.leftStick, time: startTime + 0.123))); trace.Clear(); - runtime.currentTime = 0.234f; + currentTime = startTime + 0.234f; // Disable map1 and enable map2+map3. map1.Disable(); map2.Enable(); map3.Enable(); - Press(gamepad.buttonSouth, 0.345f); - Set(gamepad.leftStick, new Vector2(0.234f, 0.345f), 0.456f); + Press(gamepad.buttonSouth, startTime + 0.345f); + Set(gamepad.leftStick, new Vector2(0.234f, 0.345f), startTime + 0.456f); - actions = trace.ToArray(); - Assert.That(actions.Length, Is.EqualTo(6)); - - // map1/action1 should have been canceled. - Assert.That(actions[0].phase, Is.EqualTo(InputActionPhase.Canceled)); - Assert.That(actions[0].action, Is.SameAs(action1)); - Assert.That(actions[0].ReadValue(), - Is.EqualTo(default(Vector2)) - .Using(Vector2EqualityComparer.Instance)); - Assert.That(actions[0].interaction, Is.Null); - Assert.That(actions[0].control, Is.SameAs(gamepad.leftStick)); - Assert.That(actions[0].time, Is.EqualTo(0.234f)); - - // map3/action4 should immediately start as the stick was already actuated - // when we enabled the action. - // NOTE: We get a different value here than what action1 got as we have a different - // processor on the binding. - Assert.That(actions[1].phase, Is.EqualTo(InputActionPhase.Started)); - Assert.That(actions[1].action, Is.SameAs(action4)); - Assert.That(actions[1].ReadValue, - Is.EqualTo(new StickDeadzoneProcessor().Process(new Vector2(0.123f, 0.234f)) * new Vector2(1, -1)) - .Using(Vector2EqualityComparer.Instance)); - Assert.That(actions[1].interaction, Is.Null); - Assert.That(actions[1].control, Is.SameAs(gamepad.leftStick)); - Assert.That(actions[1].time, Is.EqualTo(0.234).Within(0.00001)); - - Assert.That(actions[2].phase, Is.EqualTo(InputActionPhase.Performed)); - Assert.That(actions[2].action, Is.SameAs(action4)); - Assert.That(actions[2].ReadValue, - Is.EqualTo(new StickDeadzoneProcessor().Process(new Vector2(0.123f, 0.234f)) * new Vector2(1, -1)) - .Using(Vector2EqualityComparer.Instance)); - Assert.That(actions[2].interaction, Is.Null); - Assert.That(actions[2].control, Is.SameAs(gamepad.leftStick)); - Assert.That(actions[2].time, Is.EqualTo(0.234).Within(0.00001)); - - // map2/action3 should have been started. - Assert.That(actions[3].phase, Is.EqualTo(InputActionPhase.Started)); - Assert.That(actions[3].action, Is.SameAs(action3)); - Assert.That(actions[3].ReadValue(), Is.EqualTo(1).Within(0.00001)); - Assert.That(actions[3].interaction, Is.TypeOf()); - Assert.That(actions[3].control, Is.SameAs(gamepad.buttonSouth)); - Assert.That(actions[3].time, Is.EqualTo(0.345).Within(0.00001)); - - // map3/action5 should have been started. - Assert.That(actions[4].phase, Is.EqualTo(InputActionPhase.Started)); - Assert.That(actions[4].action, Is.SameAs(action5)); - Assert.That(actions[4].ReadValue(), Is.EqualTo(1).Within(0.00001)); - Assert.That(actions[4].interaction, Is.TypeOf()); - Assert.That(actions[4].interaction, Is.Not.SameAs(actions[1].interaction)); - Assert.That(actions[4].control, Is.SameAs(gamepad.buttonSouth)); - Assert.That(actions[4].time, Is.EqualTo(0.345).Within(0.00001)); - - // map3/action4 should have been performed as the stick has been moved - // beyond where it had already moved. - Assert.That(actions[5].phase, Is.EqualTo(InputActionPhase.Performed)); - Assert.That(actions[5].action, Is.SameAs(action4)); - Assert.That(actions[5].ReadValue, - Is.EqualTo(new StickDeadzoneProcessor().Process(new Vector2(0.234f, 0.345f)) * new Vector2(1, -1)) - .Using(Vector2EqualityComparer.Instance)); - Assert.That(actions[5].interaction, Is.Null); - Assert.That(actions[5].control, Is.SameAs(gamepad.leftStick)); - Assert.That(actions[5].time, Is.EqualTo(0.456).Within(0.00001)); + Assert.That(trace, + // map1/action1 should have been canceled. + Canceled(action1, value: default(Vector2), control: gamepad.leftStick, time: startTime + 0.234) + // map3/action4 should immediately start as the stick was already actuated + // when we enabled the action. + // NOTE: We get a different value here than what action1 got as we have a different + // processor on the binding. + .AndThen(Started(action4, + value: new StickDeadzoneProcessor().Process(new Vector2(0.123f, 0.234f)) * new Vector2(1, -1), + control: gamepad.leftStick, time: startTime + 0.234)) + .AndThen(Performed(action4, + value: new StickDeadzoneProcessor().Process(new Vector2(0.123f, 0.234f)) * new Vector2(1, -1), + control: gamepad.leftStick, time: startTime + 0.234)) + // map2/action3 should have been started. + .AndThen(Started(action3, value: 1f, control: gamepad.buttonSouth, time: startTime + 0.345)) + // map3/action5 should have been started. + .AndThen(Started(action5, value: 1f, control: gamepad.buttonSouth, time: startTime + 0.345)) + // map3/action4 should have been performed as the stick has been moved + // beyond where it had already moved. + .AndThen(Performed(action4, + value: new StickDeadzoneProcessor().Process(new Vector2(0.234f, 0.345f)) * new Vector2(1, -1), + control: gamepad.leftStick, time: startTime + 0.456))); trace.Clear(); @@ -1737,40 +1689,19 @@ public void Actions_CanCreateActionAssetWithMultipleActionMaps() map2.Disable(); map3.Disable(); - actions = trace.ToArray(); - Assert.That(actions, Has.Length.EqualTo(3)); - - // map2/action3 should have been canceled. - Assert.That(actions[0].phase, Is.EqualTo(InputActionPhase.Canceled)); - Assert.That(actions[0].action, Is.SameAs(action3)); - Assert.That(actions[0].ReadValue(), Is.EqualTo(0)); - Assert.That(actions[0].interaction, Is.TypeOf()); - Assert.That(actions[0].control, Is.SameAs(gamepad.buttonSouth)); - Assert.That(actions[0].time, Is.EqualTo(runtime.currentTime).Within(0.00001)); - - // map3/action3 should have been canceled. - Assert.That(actions[1].phase, Is.EqualTo(InputActionPhase.Canceled)); - Assert.That(actions[1].action, Is.SameAs(action4)); - Assert.That(actions[1].ReadValue, - Is.EqualTo(default(Vector2)) - .Using(Vector2EqualityComparer.Instance)); - Assert.That(actions[1].interaction, Is.Null); - Assert.That(actions[1].control, Is.SameAs(gamepad.leftStick)); - Assert.That(actions[1].time, Is.EqualTo(runtime.currentTime).Within(0.00001)); - - // map3/action5 should have been canceled. - Assert.That(actions[2].phase, Is.EqualTo(InputActionPhase.Canceled)); - Assert.That(actions[2].action, Is.SameAs(action5)); - Assert.That(actions[2].ReadValue(), Is.EqualTo(0)); - Assert.That(actions[2].interaction, Is.TypeOf()); - Assert.That(actions[2].interaction, Is.Not.SameAs(actions[1].interaction)); - Assert.That(actions[2].control, Is.SameAs(gamepad.buttonSouth)); - Assert.That(actions[2].time, Is.EqualTo(runtime.currentTime).Within(0.00001)); + Assert.That(trace, + // map2/action3 should have been canceled. + Canceled(action3, value: 0f, control: gamepad.buttonSouth, time: currentTime) + // map3/action4 should have been canceled. + .AndThen(Canceled(action4, value: default(Vector2), control: gamepad.leftStick, + time: currentTime)) + // map3/action5 should have been canceled. + .AndThen(Canceled(action5, value: 0f, control: gamepad.buttonSouth, time: currentTime))); trace.Clear(); - Set(gamepad.buttonSouth, 0, 1.23); - Set(gamepad.buttonSouth, 0, 1.34); + Set(gamepad.buttonSouth, 0, startTime + 1.23); + Set(gamepad.buttonSouth, 0, startTime + 1.34); Assert.That(trace, Is.Empty); } @@ -3537,8 +3468,9 @@ public void Actions_CanAddInteractionsToActions() wasPerformed = true; }; - Press(gamepad.buttonSouth, time: 0); - Release(gamepad.buttonSouth, time: 0.1); + Press(gamepad.buttonSouth); + currentTime += 0.1f; + Release(gamepad.buttonSouth); Assert.That(wasPerformed, Is.True); } @@ -4204,6 +4136,8 @@ public void Actions_WithoutInteraction_TriggerInResponseToMagnitude() [Category("Actions")] public void Actions_CanPerformHoldOnTrigger() { + ResetTime(); + InputSystem.settings.defaultButtonPressPoint = 0.1f; var gamepad = InputSystem.AddDevice(); @@ -4211,35 +4145,23 @@ public void Actions_CanPerformHoldOnTrigger() var action = new InputAction(binding: "/leftTrigger", interactions: "hold(duration=0.4)"); action.Enable(); - runtime.advanceTimeEachDynamicUpdate = 0; - using (var trace = new InputActionTrace()) { trace.SubscribeTo(action); - runtime.currentTime = 0.1f; - Set(gamepad.leftTrigger, 0.123f); - runtime.currentTime = 0.2f; - Set(gamepad.leftTrigger, 0.234f); + Set(gamepad.leftTrigger, 0.123f, time: 0.1f); + Set(gamepad.leftTrigger, 0.234f, time: 0.2f); - var actions = trace.ToArray(); - Assert.That(actions, Has.Length.EqualTo(1)); - Assert.That(actions[0].phase, Is.EqualTo(InputActionPhase.Started)); - Assert.That(actions[0].time, Is.EqualTo(0.1).Within(0.00001)); - Assert.That(actions[0].ReadValue, Is.EqualTo(0.123).Within(0.00001)); + Assert.That(trace, + Started(action, time: 0.1, value: 0.123f)); trace.Clear(); - runtime.currentTime = 0.6f; - Set(gamepad.leftTrigger, 0.345f); - runtime.currentTime = 0.7f; - Set(gamepad.leftTrigger, 0.456f); + Set(gamepad.leftTrigger, 0.345f, time: 0.6f); + Set(gamepad.leftTrigger, 0.456f, time: 0.7f); - actions = trace.ToArray(); - Assert.That(actions, Has.Length.EqualTo(1)); - Assert.That(actions[0].phase, Is.EqualTo(InputActionPhase.Performed)); - Assert.That(actions[0].time, Is.EqualTo(0.6).Within(0.00001)); - Assert.That(actions[0].ReadValue, Is.EqualTo(0.345).Within(0.00001)); + Assert.That(trace, + Performed(action, time: 0.6, value: 0.345)); Assert.That(action.phase, Is.EqualTo(InputActionPhase.Performed)); } } diff --git a/Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs b/Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs index b069609b4d..f17d9c4b19 100644 --- a/Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs +++ b/Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs @@ -198,8 +198,10 @@ public void Action_WithMultipleInteractions_DoesNotThrowWhenUsingMultipleMaps() [Test] [Category("Actions")] - public void Actions_WhenTransitionFromOneInteractionToNext_GetCallbacks() + public void Actions_WhenTransitioningFromOneInteractionToNext_GetCallbacks() { + ResetTime(); + var gamepad = InputSystem.AddDevice(); var action = new InputAction("test", InputActionType.Button, binding: "/buttonSouth", @@ -217,7 +219,7 @@ public void Actions_WhenTransitionFromOneInteractionToNext_GetCallbacks() // Expire the tap. The system should transitioning from the tap to a slowtap. // Note the starting time of the slowTap will be 0 not 2. - runtime.currentTime = 2; + currentTime = 2; InputSystem.Update(); Assert.That(trace, @@ -230,6 +232,8 @@ public void Actions_WhenTransitionFromOneInteractionToNext_GetCallbacks() [Category("Actions")] public void Actions_CanPerformPressInteraction() { + ResetTime(); + var gamepad = InputSystem.AddDevice(); // We add a second input device (and bind to it), to test that the binding @@ -252,7 +256,7 @@ public void Actions_CanPerformPressInteraction() using (var releaseOnly = new InputActionTrace(releaseOnlyAction)) using (var pressAndRelease = new InputActionTrace(pressAndReleaseAction)) { - runtime.currentTime = 1; + currentTime = 1; Press(gamepad.buttonSouth); Assert.That(pressOnly, @@ -267,7 +271,7 @@ public void Actions_CanPerformPressInteraction() releaseOnly.Clear(); pressAndRelease.Clear(); - runtime.currentTime = 2; + currentTime = 2; Release(gamepad.buttonSouth); Assert.That(pressOnly, Canceled(pressOnlyAction, gamepad.buttonSouth, value: 0.0, time: 2, duration: 1)); @@ -282,7 +286,7 @@ public void Actions_CanPerformPressInteraction() releaseOnly.Clear(); pressAndRelease.Clear(); - runtime.currentTime = 5; + currentTime = 5; Press(gamepad.buttonSouth); Assert.That(pressOnly, @@ -565,6 +569,8 @@ public void Actions_ReleasedHoldInteractionIsCancelled_WithMultipleBindings() [Category("Actions")] public void Actions_CanPerformTapInteraction() { + ResetTime(); + var gamepad = InputSystem.AddDevice(); var performedReceivedCalls = 0; @@ -633,7 +639,7 @@ public void Actions_CanPerformDoubleTapInteraction() trace.SubscribeTo(action); // Press button. - runtime.currentTime = 1; + currentTime = 1; InputSystem.QueueStateEvent(gamepad, new GamepadState().WithButton(GamepadButton.South), 1); InputSystem.Update(); @@ -647,7 +653,7 @@ public void Actions_CanPerformDoubleTapInteraction() trace.Clear(); // Release before tap time and make sure the double tap cancels. - runtime.currentTime = 12; + currentTime = 12; InputSystem.QueueStateEvent(gamepad, new GamepadState(), 1.75); InputSystem.Update(); @@ -662,7 +668,7 @@ public void Actions_CanPerformDoubleTapInteraction() // Press again and then release before tap time. Should see only the start from // the initial press. - runtime.currentTime = 2.5; + currentTime = 2.5; InputSystem.QueueStateEvent(gamepad, new GamepadState().WithButton(GamepadButton.South), 2); InputSystem.QueueStateEvent(gamepad, new GamepadState(), 2.25); InputSystem.Update(); @@ -678,7 +684,7 @@ public void Actions_CanPerformDoubleTapInteraction() trace.Clear(); // Wait for longer than tapDelay and make sure we're seeing a cancellation. - runtime.currentTime = 4; + currentTime = 4; InputSystem.Update(); actions = trace.ToArray(); @@ -693,7 +699,7 @@ public void Actions_CanPerformDoubleTapInteraction() // Now press and release within tap time. Then press again within delay time but release // only after tap time. Should we started and canceled. - runtime.currentTime = 6; + currentTime = 6; InputSystem.QueueStateEvent(gamepad, new GamepadState().WithButton(GamepadButton.South), 4.7); InputSystem.QueueStateEvent(gamepad, new GamepadState(), 4.9); InputSystem.QueueStateEvent(gamepad, new GamepadState().WithButton(GamepadButton.South), 5); @@ -716,7 +722,7 @@ public void Actions_CanPerformDoubleTapInteraction() trace.Clear(); // Finally perform a full, proper double tap cycle. - runtime.currentTime = 8; + currentTime = 8; InputSystem.QueueStateEvent(gamepad, new GamepadState().WithButton(GamepadButton.South), 7); InputSystem.QueueStateEvent(gamepad, new GamepadState(), 7.25); InputSystem.QueueStateEvent(gamepad, new GamepadState().WithButton(GamepadButton.South), 7.5); diff --git a/Assets/Tests/InputSystem/CoreTests_Controls.cs b/Assets/Tests/InputSystem/CoreTests_Controls.cs index 904a57f804..22d2667ced 100644 --- a/Assets/Tests/InputSystem/CoreTests_Controls.cs +++ b/Assets/Tests/InputSystem/CoreTests_Controls.cs @@ -641,7 +641,7 @@ public void Controls_CanQueueValueChange_InFuture() InputSystem.Update(); Assert.That(gamepad.leftTrigger.ReadValue(), Is.EqualTo(0).Within(0.00001)); - runtime.currentTimeForFixedUpdate = 1; + runtime.currentTimeForFixedUpdate = runtime.currentTime + 1; InputSystem.Update(); Assert.That(gamepad.leftTrigger.ReadValue(), Is.EqualTo(0.123).Within(0.00001)); } diff --git a/Assets/Tests/InputSystem/CoreTests_Devices.cs b/Assets/Tests/InputSystem/CoreTests_Devices.cs index f0ca36a03b..c3a4dca796 100644 --- a/Assets/Tests/InputSystem/CoreTests_Devices.cs +++ b/Assets/Tests/InputSystem/CoreTests_Devices.cs @@ -3082,21 +3082,21 @@ public void Devices_CanGetStartTimeOfTouches() BeginTouch(4, new Vector2(0.123f, 0.234f), time: 0.1); BeginTouch(5, new Vector2(0.234f, 0.345f), time: 0.2); - Assert.That(touchscreen.touches[0].startTime.ReadValue(), Is.EqualTo(0.1)); - Assert.That(touchscreen.touches[1].startTime.ReadValue(), Is.EqualTo(0.2)); + Assert.That(touchscreen.touches[0].startTime.ReadValue(), Is.EqualTo(0.1).Within(0.0001)); + Assert.That(touchscreen.touches[1].startTime.ReadValue(), Is.EqualTo(0.2).Within(0.0001)); MoveTouch(4, new Vector2(0.345f, 0.456f), time: 0.3); MoveTouch(4, new Vector2(0.456f, 0.567f), time: 0.3); MoveTouch(5, new Vector2(0.567f, 0.678f), time: 0.4); - Assert.That(touchscreen.touches[0].startTime.ReadValue(), Is.EqualTo(0.1)); - Assert.That(touchscreen.touches[1].startTime.ReadValue(), Is.EqualTo(0.2)); + Assert.That(touchscreen.touches[0].startTime.ReadValue(), Is.EqualTo(0.1).Within(0.0001)); + Assert.That(touchscreen.touches[1].startTime.ReadValue(), Is.EqualTo(0.2).Within(0.0001)); EndTouch(4, new Vector2(0.123f, 0.234f), time: 0.5); EndTouch(5, new Vector2(0.234f, 0.345f), time: 0.5); - Assert.That(touchscreen.touches[0].startTime.ReadValue(), Is.EqualTo(0.1)); - Assert.That(touchscreen.touches[1].startTime.ReadValue(), Is.EqualTo(0.2)); + Assert.That(touchscreen.touches[0].startTime.ReadValue(), Is.EqualTo(0.1).Within(0.0001)); + Assert.That(touchscreen.touches[1].startTime.ReadValue(), Is.EqualTo(0.2).Within(0.0001)); } [Test] @@ -3132,14 +3132,14 @@ public void Devices_CanDetectTouchTaps() Assert.That(allTouchTaps[1].control, Is.SameAs(touchscreen.touches[0].tap)); Assert.That(allTouchTaps[0].ReadValue(), Is.EqualTo(1)); Assert.That(allTouchTaps[1].ReadValue(), Is.EqualTo(0)); - Assert.That(allTouchTaps[0].time, Is.EqualTo(0.3)); - Assert.That(allTouchTaps[1].time, Is.EqualTo(0.3)); + Assert.That(allTouchTaps[0].time, Is.EqualTo(0.3).Within(0.0001)); + Assert.That(allTouchTaps[1].time, Is.EqualTo(0.3).Within(0.0001)); Assert.That(allTouchTaps[2].control, Is.SameAs(touchscreen.touches[1].tap)); Assert.That(allTouchTaps[3].control, Is.SameAs(touchscreen.touches[1].tap)); Assert.That(allTouchTaps[2].ReadValue(), Is.EqualTo(1)); Assert.That(allTouchTaps[3].ReadValue(), Is.EqualTo(0)); - Assert.That(allTouchTaps[2].time, Is.EqualTo(0.3)); - Assert.That(allTouchTaps[3].time, Is.EqualTo(0.3)); + Assert.That(allTouchTaps[2].time, Is.EqualTo(0.3).Within(0.0001)); + Assert.That(allTouchTaps[3].time, Is.EqualTo(0.3).Within(0.0001)); // The primary touch switched from touch #0 to touch #1 when we released // touch #0 while touch #1 was still ongoing. Even though touch #1 then @@ -3166,16 +3166,16 @@ public void Devices_CanDetectTouchTaps() Assert.That(allTouchTaps[1].control, Is.SameAs(touchscreen.touches[0].tap)); Assert.That(allTouchTaps[0].ReadValue(), Is.EqualTo(1)); Assert.That(allTouchTaps[1].ReadValue(), Is.EqualTo(0)); - Assert.That(allTouchTaps[0].time, Is.EqualTo(0.8)); - Assert.That(allTouchTaps[1].time, Is.EqualTo(0.8)); + Assert.That(allTouchTaps[0].time, Is.EqualTo(0.8).Within(0.0001)); + Assert.That(allTouchTaps[1].time, Is.EqualTo(0.8).Within(0.0001)); Assert.That(primaryTouchTap, Has.Count.EqualTo(2)); Assert.That(primaryTouchTap[0].control, Is.SameAs(touchscreen.primaryTouch.tap)); Assert.That(primaryTouchTap[1].control, Is.SameAs(touchscreen.primaryTouch.tap)); Assert.That(primaryTouchTap[0].ReadValue(), Is.EqualTo(1)); Assert.That(primaryTouchTap[1].ReadValue(), Is.EqualTo(0)); - Assert.That(primaryTouchTap[0].time, Is.EqualTo(0.8)); - Assert.That(primaryTouchTap[1].time, Is.EqualTo(0.8)); + Assert.That(primaryTouchTap[0].time, Is.EqualTo(0.8).Within(0.0001)); + Assert.That(primaryTouchTap[1].time, Is.EqualTo(0.8).Within(0.0001)); } } @@ -3183,6 +3183,8 @@ public void Devices_CanDetectTouchTaps() [Category("Devices")] public void Devices_CanDetectTouchTaps_AndKeepTrackOfTapCounts() { + ResetTime(); + // Give us known tap settings. InputSystem.settings.defaultTapTime = 0.5f; InputSystem.settings.tapRadius = 5; @@ -3202,7 +3204,7 @@ public void Devices_CanDetectTouchTaps_AndKeepTrackOfTapCounts() Assert.That(touchscreen.touches[0].tapCount.ReadValue(), Is.EqualTo(2)); Assert.That(touchscreen.primaryTouch.tapCount.ReadValue(), Is.EqualTo(2)); - runtime.currentTime = 10; + currentTime = 10; InputSystem.Update(); Assert.That(touchscreen.touches[0].tapCount.ReadValue(), Is.Zero); diff --git a/Assets/Tests/InputSystem/CoreTests_Events.cs b/Assets/Tests/InputSystem/CoreTests_Events.cs index f8aad6c0ce..6de1f06996 100644 --- a/Assets/Tests/InputSystem/CoreTests_Events.cs +++ b/Assets/Tests/InputSystem/CoreTests_Events.cs @@ -416,6 +416,8 @@ public void Events_CanSwitchToFullyManualUpdates() [Category("Events")] public void Events_CanSwitchToProcessingInFixedUpdates() { + ResetTime(); + var mouse = InputSystem.AddDevice(); var receivedOnChange = true; @@ -468,6 +470,7 @@ public unsafe void Events_InFixedUpdate_AreTimesliced() InputSystem.settings.updateMode = InputSettings.UpdateMode.ProcessEventsInFixedUpdate; runtime.currentTimeForFixedUpdate = 1; + runtime.currentTimeOffsetToRealtimeSinceStartup = 0; var gamepad = InputSystem.AddDevice(); @@ -555,7 +558,7 @@ public void Events_CanGetAverageEventLag() var keyboard = InputSystem.AddDevice(); runtime.advanceTimeEachDynamicUpdate = 0; - runtime.currentTime = 10; + currentTime = 10; InputSystem.QueueStateEvent(keyboard, new KeyboardState(Key.A), 6); InputSystem.QueueStateEvent(gamepad, new GamepadState {leftStick = new Vector2(0.123f, 0.234f)}, 1); @@ -590,7 +593,7 @@ public unsafe void Events_CanCreateStateEventFromDevice() var stateEventPtr = StateEvent.From(eventPtr); Assert.That(stateEventPtr->baseEvent.deviceId, Is.EqualTo(mouse.deviceId)); - Assert.That(stateEventPtr->baseEvent.time, Is.EqualTo(runtime.currentTime)); + Assert.That(stateEventPtr->baseEvent.time, Is.EqualTo(InputState.currentTime)); Assert.That(stateEventPtr->baseEvent.sizeInBytes.AlignToMultipleOf(4), Is.EqualTo(buffer.Length)); Assert.That(stateEventPtr->baseEvent.sizeInBytes, Is.EqualTo(InputEvent.kBaseEventSize + sizeof(FourCC) + mouse.stateBlock.alignedSizeInBytes)); diff --git a/Assets/Tests/InputSystem/CoreTests_Remoting.cs b/Assets/Tests/InputSystem/CoreTests_Remoting.cs index a8db1188a7..21b010ad1a 100644 --- a/Assets/Tests/InputSystem/CoreTests_Remoting.cs +++ b/Assets/Tests/InputSystem/CoreTests_Remoting.cs @@ -120,6 +120,8 @@ public void Remote_OnlyGeneratedLayoutsAreSentToRemotes() [Category("Remote")] public void Remote_EventsAreSentToRemotes() { + ResetTime(); + var gamepad = InputSystem.AddDevice(); using (var remote = new FakeRemote()) diff --git a/Assets/Tests/InputSystem/CoreTests_State.cs b/Assets/Tests/InputSystem/CoreTests_State.cs index e7240f9651..7fee57d947 100644 --- a/Assets/Tests/InputSystem/CoreTests_State.cs +++ b/Assets/Tests/InputSystem/CoreTests_State.cs @@ -819,7 +819,7 @@ public void State_StateChangeMonitorsStayIntactWhenOtherDevicesAreRemoved() [Category("State")] public void State_CurrentTimeTakesOffsetToRealtimeSinceStartupIntoAccount() { - runtime.currentTime += 2; + runtime.currentTime = 2; runtime.currentTimeOffsetToRealtimeSinceStartup = 1; Assert.That(InputState.currentTime, Is.EqualTo(1)); @@ -860,15 +860,15 @@ public void State_CanWaitForStateChangeWithinGivenAmountOfTime() }); // Add and immediately expire timeout. - InputState.AddChangeMonitorTimeout(gamepad.leftStick, monitor, runtime.currentTime + 1, + InputState.AddChangeMonitorTimeout(gamepad.leftStick, monitor, currentTime + 1, timerIndex: 1234); - runtime.currentTime += 2; + currentTime += 2; InputSystem.Update(); Assert.That(timeoutFired); Assert.That(!monitorFired); Assert.That(receivedTimerIndex.Value, Is.EqualTo(1234)); - Assert.That(receivedTime.Value, Is.EqualTo(runtime.currentTime).Within(0.00001)); + Assert.That(receivedTime.Value, Is.EqualTo(currentTime).Within(0.00001)); Assert.That(receivedControl, Is.SameAs(gamepad.leftStick)); timeoutFired = false; @@ -877,7 +877,7 @@ public void State_CanWaitForStateChangeWithinGivenAmountOfTime() // Add timeout and perform a state change. Then advance past timeout time // and make sure we *DO* get a notification. - InputState.AddChangeMonitorTimeout(gamepad.leftStick, monitor, runtime.currentTime + 1, + InputState.AddChangeMonitorTimeout(gamepad.leftStick, monitor, currentTime + 1, timerIndex: 4321); InputSystem.QueueStateEvent(gamepad, new GamepadState {leftStick = Vector2.one}); InputSystem.Update(); @@ -887,7 +887,7 @@ public void State_CanWaitForStateChangeWithinGivenAmountOfTime() monitorFired = false; - runtime.currentTime += 2; + currentTime += 2; InputSystem.Update(); Assert.That(!monitorFired); @@ -897,7 +897,7 @@ public void State_CanWaitForStateChangeWithinGivenAmountOfTime() // Add and remove timeout. Then advance past timeout time and make sure we *don't* // get a notification. - InputState.AddChangeMonitorTimeout(gamepad.leftStick, monitor, runtime.currentTime + 1, + InputState.AddChangeMonitorTimeout(gamepad.leftStick, monitor, currentTime + 1, timerIndex: 1423); InputState.RemoveChangeMonitorTimeout(monitor, timerIndex: 1423); InputSystem.QueueStateEvent(gamepad, new GamepadState {leftStick = Vector2.one}); @@ -924,7 +924,7 @@ public void State_StateChangeMonitorTimeout_CanBeAddedFromMonitorCallback() Assert.That(!monitorFired); monitorFired = true; InputState.AddChangeMonitorTimeout(gamepad.leftStick, monitor, - runtime.currentTime + 1); + InputState.currentTime + 1); }, timerExpiredCallback: (control, time, monitorIndex, timerIndex) => { @@ -939,7 +939,7 @@ public void State_StateChangeMonitorTimeout_CanBeAddedFromMonitorCallback() Assert.That(monitorFired); // Expire timer. - runtime.currentTime += 2; + currentTime += 2; InputSystem.Update(); Assert.That(timeoutFired); @@ -965,13 +965,13 @@ public void State_StateChangeMonitorTimeout_CanBeAddedFromTimeoutCallback() InputState.AddChangeMonitorTimeout(gamepad.buttonSouth, monitor, 1.5); // Trigger first timeout. - runtime.currentTime += 2; + currentTime += 2; InputSystem.Update(); Assert.That(timeoutCount, Is.EqualTo(1)); // Trigger second timeout. - runtime.currentTime += 2; + currentTime += 2; InputSystem.Update(); Assert.That(timeoutCount, Is.EqualTo(2)); @@ -1032,6 +1032,8 @@ public void State_StateChangeMonitor_CanBeRemovedFromMonitorCallback() [Category("State")] public void State_RemovingMonitorRemovesTimeouts() { + ResetTime(); + var gamepad = InputSystem.AddDevice(); var monitor = InputState.AddChangeMonitor(gamepad.buttonWest, @@ -1043,7 +1045,7 @@ public void State_RemovingMonitorRemovesTimeouts() InputState.AddChangeMonitorTimeout(gamepad.buttonWest, monitor, 2); InputState.RemoveChangeMonitor(gamepad.buttonWest, monitor); - runtime.currentTime = 4; + currentTime = 4; InputSystem.Update(); } @@ -1117,12 +1119,14 @@ public void State_UpdatingStateDirectly_StillTriggersChangeMonitors() [Category("State")] public void State_UpdatingStateDirectly_DoesNotModifyTimestampOfDeviceAndDoesNotMakeItCurrent() { + ResetTime(); + var gamepad1 = InputSystem.AddDevice(); var gamepad2 = InputSystem.AddDevice(); Assert.That(Gamepad.current, Is.SameAs(gamepad2)); - runtime.currentTime = 123; + currentTime = 123; InputState.Change(gamepad1, new GamepadState {leftTrigger = 0.123f}); Assert.That(gamepad1.lastUpdateTime, Is.Zero.Within(0.0001)); @@ -1246,10 +1250,10 @@ public void State_CanRecordHistory() Assert.That(history[1].ReadValue(), Is.EqualTo(0.234).Within(0.00001)); Assert.That(history[2].ReadValue(), Is.EqualTo(0.345).Within(0.00001)); Assert.That(history[3].ReadValue(), Is.EqualTo(0.456).Within(0.00001)); - Assert.That(history[0].time, Is.EqualTo(0.111)); - Assert.That(history[1].time, Is.EqualTo(0.222)); - Assert.That(history[2].time, Is.EqualTo(0.333)); - Assert.That(history[3].time, Is.EqualTo(0.444)); + Assert.That(history[0].time, Is.EqualTo(0.111).Within(0.0001)); + Assert.That(history[1].time, Is.EqualTo(0.222).Within(0.0001)); + Assert.That(history[2].time, Is.EqualTo(0.333).Within(0.0001)); + Assert.That(history[3].time, Is.EqualTo(0.444).Within(0.0001)); Assert.That(history[0].control, Is.SameAs(gamepad1.leftTrigger)); Assert.That(history[1].control, Is.SameAs(gamepad1.leftTrigger)); Assert.That(history[2].control, Is.SameAs(gamepad2.rightTrigger)); diff --git a/Assets/Tests/InputSystem/Plugins/EnhancedTouchTests.cs b/Assets/Tests/InputSystem/Plugins/EnhancedTouchTests.cs index c673699393..29a11eb22e 100644 --- a/Assets/Tests/InputSystem/Plugins/EnhancedTouchTests.cs +++ b/Assets/Tests/InputSystem/Plugins/EnhancedTouchTests.cs @@ -121,6 +121,8 @@ public void EnhancedTouch_CanBeDisabledAndEnabled_WithoutTouchscreenPresent() [TestCase(InputSettings.UpdateMode.ProcessEventsInFixedUpdate, InputUpdateType.Fixed)] public void EnhancedTouch_SupportsInputUpdateIn(InputSettings.UpdateMode updateMode, InputUpdateType updateType) { + ResetTime(); + InputSystem.settings.updateMode = updateMode; runtime.currentTimeForFixedUpdate += Time.fixedDeltaTime; BeginTouch(1, new Vector2(0.123f, 0.234f), queueEventOnly: true); @@ -139,6 +141,8 @@ public void EnhancedTouch_SupportsInputUpdateIn(InputSettings.UpdateMode updateM [TestCase(InputSettings.UpdateMode.ProcessEventsInFixedUpdate)] public void EnhancedTouch_SupportsEditorUpdates(InputSettings.UpdateMode updateMode) { + ResetTime(); + InputSystem.settings.editorInputBehaviorInPlayMode = default; // To better observe that play mode and edit mode state is indeed independent and handled @@ -502,13 +506,13 @@ public void EnhancedTouch_CanCheckForTaps() [Category("EnhancedTouch")] public void EnhancedTouch_CanGetStartPositionAndTimeOfTouch() { - runtime.currentTime = 0.111; + currentTime = 0.111; BeginTouch(1, new Vector2(0.123f, 0.234f), queueEventOnly: true); MoveTouch(1, new Vector2(0.234f, 0.345f), queueEventOnly: true); - runtime.currentTime = 0.222; + currentTime = 0.222; MoveTouch(1, new Vector2(0.345f, 0.456f), queueEventOnly: true); BeginTouch(2, new Vector2(0.456f, 0.567f), queueEventOnly: true); - runtime.currentTime = 0.333; + currentTime = 0.333; EndTouch(2, new Vector2(0.567f, 0.678f), queueEventOnly: true); InputSystem.Update(); @@ -516,8 +520,8 @@ public void EnhancedTouch_CanGetStartPositionAndTimeOfTouch() Is.EqualTo(new Vector2(0.123f, 0.234f)).Using(Vector2EqualityComparer.Instance)); Assert.That(Touch.activeTouches[1].startScreenPosition, Is.EqualTo(new Vector2(0.456f, 0.567f)).Using(Vector2EqualityComparer.Instance)); - Assert.That(Touch.activeTouches[0].startTime, Is.EqualTo(0.111)); - Assert.That(Touch.activeTouches[1].startTime, Is.EqualTo(0.222)); + Assert.That(Touch.activeTouches[0].startTime, Is.EqualTo(0.111).Within(0.0001)); + Assert.That(Touch.activeTouches[1].startTime, Is.EqualTo(0.222).Within(0.0001)); } [Test] @@ -526,6 +530,8 @@ public void EnhancedTouch_CanGetStartPositionAndTimeOfTouch() [TestCase(true)] public void EnhancedTouch_CanAccessHistoryOfTouch_WithEventMergingSetTo(bool mergeRedundantEvents) { + ResetTime(); + InputSystem.settings.disableRedundantEventsMerging = !mergeRedundantEvents; // Noise. This one shouldn't show up in the history. @@ -534,9 +540,9 @@ public void EnhancedTouch_CanAccessHistoryOfTouch_WithEventMergingSetTo(bool mer InputSystem.Update(); InputSystem.Update(); // The end touch lingers for one frame. - runtime.currentTime = 0.876; + currentTime = 0.876; BeginTouch(1, new Vector2(0.123f, 0.234f), queueEventOnly: true); - runtime.currentTime = 0.987; + currentTime = 0.987; MoveTouch(1, new Vector2(0.234f, 0.345f), queueEventOnly: true); MoveTouch(1, new Vector2(0.345f, 0.456f), queueEventOnly: true); MoveTouch(1, new Vector2(0.456f, 0.567f), queueEventOnly: true); @@ -553,15 +559,15 @@ public void EnhancedTouch_CanAccessHistoryOfTouch_WithEventMergingSetTo(bool mer Assert.That(Touch.activeTouches[0].history, Has.All.Property("finger").SameAs(Touch.activeTouches[0].finger)); var beganIndex = mergeRedundantEvents ? 1 : 2; Assert.That(Touch.activeTouches[0].history[beganIndex].phase, Is.EqualTo(TouchPhase.Began)); - Assert.That(Touch.activeTouches[0].history[beganIndex].time, Is.EqualTo(0.876)); - Assert.That(Touch.activeTouches[0].history[beganIndex].startTime, Is.EqualTo(0.876)); + Assert.That(Touch.activeTouches[0].history[beganIndex].time, Is.EqualTo(0.876).Within(0.0001)); + Assert.That(Touch.activeTouches[0].history[beganIndex].startTime, Is.EqualTo(0.876).Within(0.0001)); Assert.That(Touch.activeTouches[0].history[beganIndex].startScreenPosition, Is.EqualTo(new Vector2(0.123f, 0.234f)).Using(Vector2EqualityComparer.Instance)); for (int index = 0; index < (mergeRedundantEvents ? 1 : 2); ++index) { Assert.That(Touch.activeTouches[0].history[index].phase, Is.EqualTo(TouchPhase.Moved)); - Assert.That(Touch.activeTouches[0].history[index].time, Is.EqualTo(0.987)); - Assert.That(Touch.activeTouches[0].history[index].startTime, Is.EqualTo(0.876)); + Assert.That(Touch.activeTouches[0].history[index].time, Is.EqualTo(0.987).Within(0.0001)); + Assert.That(Touch.activeTouches[0].history[index].startTime, Is.EqualTo(0.876).Within(0.0001)); Assert.That(Touch.activeTouches[0].history[index].startScreenPosition, Is.EqualTo(new Vector2(0.123f, 0.234f)).Using(Vector2EqualityComparer.Instance)); } diff --git a/Assets/Tests/InputSystem/Plugins/UITests.cs b/Assets/Tests/InputSystem/Plugins/UITests.cs index 7f8903c42f..2f14a49133 100644 --- a/Assets/Tests/InputSystem/Plugins/UITests.cs +++ b/Assets/Tests/InputSystem/Plugins/UITests.cs @@ -250,6 +250,8 @@ public void UI_InputModuleHasDefaultActions() [TestCase("GenericDeviceWithPointingAbility", UIPointerType.MouseOrPen, PointerEventData.InputButton.Left, ExpectedResult = 1)] public IEnumerator UI_CanDriveUIFromPointer(string deviceLayout, UIPointerType pointerType, PointerEventData.InputButton clickButton) { + ResetTime(); + InputSystem.RegisterLayout(kTrackedDeviceWithButton); InputSystem.RegisterLayout(kGenericDeviceWithPointingAbility); diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index b54b58a0b7..4c58979687 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -8,6 +8,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. Due to package verification, the latest version below is the unpublished version and the date is meaningless. however, it has to be formatted properly to pass verification tests. +## [Unreleased] + +### Fixed + +#### Actions + +* Fixed `InputAction.GetTimeoutCompletionPercentage` jumping to 100% completion early ([case 1377009](https://issuetracker.unity3d.com/issues/gettimeoutcompletionpercentage-returns-1-after-0-dot-1s-when-hold-action-was-started-even-though-it-is-not-performed-yet)). + ## [1.3.0] - 2021-12-10 ### Changed diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputAction.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputAction.cs index 2f3cff989f..611f5e7eea 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputAction.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputAction.cs @@ -1372,7 +1372,7 @@ public unsafe float GetTimeoutCompletionPercentage() var duration = interactionState.timerDuration; var startTime = interactionState.timerStartTime; var endTime = startTime + duration; - var remainingTime = endTime - InputRuntime.s_Instance.currentTime; + var remainingTime = endTime - InputState.currentTime; if (remainingTime <= 0) timerCompletion = 1; else diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionRebindingExtensions.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionRebindingExtensions.cs index 3f96edd8bf..c37385976e 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionRebindingExtensions.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionRebindingExtensions.cs @@ -2095,7 +2095,7 @@ public RebindingOperation Start() throw new InvalidOperationException( "Must either have an action (call WithAction()) to apply binding to or have a custom callback to apply the binding (call OnApplyBinding())"); - m_StartTime = InputRuntime.s_Instance.currentTime; + m_StartTime = InputState.currentTime; if (m_WaitSecondsAfterMatch > 0 || m_Timeout > 0) { @@ -2390,7 +2390,7 @@ private unsafe void OnEvent(InputEventPtr eventPtr, InputDevice device) m_Scores[candidateIndex] = score; if (m_WaitSecondsAfterMatch > 0) - m_LastMatchTime = InputRuntime.s_Instance.currentTime; + m_LastMatchTime = InputState.currentTime; } } else @@ -2404,7 +2404,7 @@ private unsafe void OnEvent(InputEventPtr eventPtr, InputDevice device) haveChangedCandidates = true; if (m_WaitSecondsAfterMatch > 0) - m_LastMatchTime = InputRuntime.s_Instance.currentTime; + m_LastMatchTime = InputState.currentTime; } } @@ -2490,7 +2490,7 @@ private void OnAfterUpdate() // If we don't have a match yet but we have a timeout and have expired it, // cancel the operation. if (m_LastMatchTime < 0 && m_Timeout > 0 && - InputRuntime.s_Instance.currentTime - m_StartTime > m_Timeout) + InputState.currentTime - m_StartTime > m_Timeout) { Cancel(); return; @@ -2505,7 +2505,7 @@ private void OnAfterUpdate() return; // Complete if timeout has expired. - if (InputRuntime.s_Instance.currentTime >= m_LastMatchTime + m_WaitSecondsAfterMatch) + if (InputState.currentTime >= m_LastMatchTime + m_WaitSecondsAfterMatch) Complete(); } diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs index b151596d5d..c28fda6df1 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs @@ -489,7 +489,7 @@ public void ResetActionState(int actionIndex, InputActionPhase toPhase = InputAc if (actionState->phase != InputActionPhase.Waiting && actionState->phase != InputActionPhase.Disabled) { // Cancellation calls should receive current time. - actionState->time = InputRuntime.s_Instance.currentTime; + actionState->time = InputState.currentTime; // If the action got triggered from an interaction, go and reset all interactions on the binding // that got triggered. @@ -900,7 +900,7 @@ private void OnBeforeInitialUpdate() Profiler.BeginSample("InitialActionStateCheck"); // Use current time as time of control state change. - var time = InputRuntime.s_Instance.currentTime; + var time = InputState.currentTime; ////REVIEW: should we store this data in a separate place rather than go through all bindingStates? diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Remote/InputRemoting.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Remote/InputRemoting.cs index 74663c21eb..1dd24e8263 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Devices/Remote/InputRemoting.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Devices/Remote/InputRemoting.cs @@ -623,9 +623,7 @@ public static unsafe Message Create(InputEvent* events, int eventCount) var totalSize = 0u; var eventPtr = new InputEventPtr(events); for (var i = 0; i < eventCount; ++i, eventPtr = eventPtr.Next()) - { - totalSize += eventPtr.sizeInBytes; - } + totalSize = totalSize.AlignToMultipleOf(4) + eventPtr.sizeInBytes; // Copy event data to buffer. Would be nice if we didn't have to do that // but unfortunately we need a byte[] and can't just pass the 'events' IntPtr diff --git a/Packages/com.unity.inputsystem/Tests/TestFixture/InputTestFixture.cs b/Packages/com.unity.inputsystem/Tests/TestFixture/InputTestFixture.cs index a1c28798fe..7de2b8e980 100644 --- a/Packages/com.unity.inputsystem/Tests/TestFixture/InputTestFixture.cs +++ b/Packages/com.unity.inputsystem/Tests/TestFixture/InputTestFixture.cs @@ -529,10 +529,7 @@ public void Set(InputControl control, TValue state, double time void SetUpAndQueueEvent(InputEventPtr eventPtr) { - ////REVIEW: should we by default take the time from the device here? - if (time >= 0) - eventPtr.time = time; - eventPtr.time += timeOffset; + eventPtr.time = (time >= 0 ? time : InputState.currentTime) + timeOffset; control.WriteValueIntoEvent(state, eventPtr); InputSystem.QueueEvent(eventPtr); } @@ -650,7 +647,7 @@ public void Move(InputControl positionControl, Vector2 position, Vector position = position, delta = delta, pressure = pressure, - }, (time >= 0 ? time : InputRuntime.s_Instance.currentTime) + timeOffset); + }, (time >= 0 ? time : InputState.currentTime) + timeOffset); if (!queueEventOnly) InputSystem.Update(); } @@ -726,10 +723,10 @@ public void Trigger(InputAction action) /// Current time used by the input system. public double currentTime { - get => runtime.currentTime; + get => runtime.currentTime - runtime.currentTimeOffsetToRealtimeSinceStartup; set { - runtime.currentTime = value; + runtime.currentTime = value + runtime.currentTimeOffsetToRealtimeSinceStartup; runtime.dontAdvanceTimeNextDynamicUpdate = true; } } From a83dcab3a8ca2025d179a4966f72d934a52ea4a2 Mon Sep 17 00:00:00 2001 From: Andrew O'Connor Date: Tue, 14 Dec 2021 17:06:49 +0100 Subject: [PATCH 02/53] Bump version to 1.4.0 --- Assets/Samples/InGameHints/InGameHintsActions.cs | 6 ++---- Assets/Samples/SimpleDemo/SimpleControls.cs | 6 ++---- Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs | 2 +- .../InputSystem/Devices/Precompiled/FastKeyboard.cs | 2 +- .../InputSystem/Devices/Precompiled/FastMouse.cs | 2 +- .../InputSystem/Devices/Precompiled/FastTouchscreen.cs | 2 +- .../Plugins/DualShock/FastDualShock4GamepadHID.cs | 2 +- .../com.unity.inputsystem/Tests/TestFixture/AssemblyInfo.cs | 2 +- Packages/com.unity.inputsystem/package.json | 2 +- 9 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Assets/Samples/InGameHints/InGameHintsActions.cs b/Assets/Samples/InGameHints/InGameHintsActions.cs index 0719048ad1..4ba802254b 100644 --- a/Assets/Samples/InGameHints/InGameHintsActions.cs +++ b/Assets/Samples/InGameHints/InGameHintsActions.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator -// version 1.3.0 +// version 1.4.0 // from Assets/Samples/InGameHints/InGameHintsActions.inputactions // // Changes to this file may cause incorrect behavior and will be lost if @@ -17,7 +17,7 @@ namespace UnityEngine.InputSystem.Samples.InGameHints { - public partial class @InGameHintsActions: IInputActionCollection2, IDisposable + public partial class @InGameHintsActions : IInputActionCollection2, IDisposable { public InputActionAsset asset { get; } public @InGameHintsActions() @@ -315,14 +315,12 @@ public void Disable() { asset.Disable(); } - public IEnumerable bindings => asset.bindings; public InputAction FindAction(string actionNameOrId, bool throwIfNotFound = false) { return asset.FindAction(actionNameOrId, throwIfNotFound); } - public int FindBinding(InputBinding bindingMask, out InputAction action) { return asset.FindBinding(bindingMask, out action); diff --git a/Assets/Samples/SimpleDemo/SimpleControls.cs b/Assets/Samples/SimpleDemo/SimpleControls.cs index 876693392d..4722849e4e 100644 --- a/Assets/Samples/SimpleDemo/SimpleControls.cs +++ b/Assets/Samples/SimpleDemo/SimpleControls.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator -// version 1.3.0 +// version 1.4.0 // from Assets/Samples/SimpleDemo/SimpleControls.inputactions // // Changes to this file may cause incorrect behavior and will be lost if @@ -15,7 +15,7 @@ using UnityEngine.InputSystem; using UnityEngine.InputSystem.Utilities; -public partial class @SimpleControls: IInputActionCollection2, IDisposable +public partial class @SimpleControls : IInputActionCollection2, IDisposable { public InputActionAsset asset { get; } public @SimpleControls() @@ -210,14 +210,12 @@ public void Disable() { asset.Disable(); } - public IEnumerable bindings => asset.bindings; public InputAction FindAction(string actionNameOrId, bool throwIfNotFound = false) { return asset.FindAction(actionNameOrId, throwIfNotFound); } - public int FindBinding(InputBinding bindingMask, out InputAction action) { return asset.FindBinding(bindingMask, out action); diff --git a/Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs b/Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs index ee5f5e75db..ed1bf3a381 100644 --- a/Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs +++ b/Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs @@ -15,7 +15,7 @@ public static partial class InputSystem // Keep this in sync with "Packages/com.unity.inputsystem/package.json". // NOTE: Unfortunately, System.Version doesn't use semantic versioning so we can't include // "-preview" suffixes here. - internal const string kAssemblyVersion = "1.3.0"; + internal const string kAssemblyVersion = "1.4.0"; internal const string kDocUrl = "https://docs.unity3d.com/Packages/com.unity.inputsystem@1.3"; } } diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastKeyboard.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastKeyboard.cs index ce1572125b..0c2f6981ff 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastKeyboard.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastKeyboard.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator -// version 1.3.0 +// version 1.4.0 // from "Keyboard" layout // // Changes to this file may cause incorrect behavior and will be lost if diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastMouse.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastMouse.cs index 2f8d7f49e7..adbb88da18 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastMouse.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastMouse.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator -// version 1.3.0 +// version 1.4.0 // from "Mouse" layout // // Changes to this file may cause incorrect behavior and will be lost if diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastTouchscreen.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastTouchscreen.cs index 238a1e0731..0906592e86 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastTouchscreen.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastTouchscreen.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator -// version 1.3.0 +// version 1.4.0 // from "Touchscreen" layout // // Changes to this file may cause incorrect behavior and will be lost if diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/FastDualShock4GamepadHID.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/FastDualShock4GamepadHID.cs index ce3c3ba933..0c0ff7acc8 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/FastDualShock4GamepadHID.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/FastDualShock4GamepadHID.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator -// version 1.3.0 +// version 1.4.0 // from "DualShock4GamepadHID" layout // // Changes to this file may cause incorrect behavior and will be lost if diff --git a/Packages/com.unity.inputsystem/Tests/TestFixture/AssemblyInfo.cs b/Packages/com.unity.inputsystem/Tests/TestFixture/AssemblyInfo.cs index 2d12df4ae0..1e2d265e03 100644 --- a/Packages/com.unity.inputsystem/Tests/TestFixture/AssemblyInfo.cs +++ b/Packages/com.unity.inputsystem/Tests/TestFixture/AssemblyInfo.cs @@ -4,7 +4,7 @@ // Keep this in sync with "Packages/com.unity.inputsystem/package.json". // NOTE: Unfortunately, System.Version doesn't use semantic versioning so we can't include // "-preview" suffixes here. -[assembly: AssemblyVersion("1.3.0")] +[assembly: AssemblyVersion("1.4.0")] [assembly: InternalsVisibleTo("Unity.InputSystem.Tests.Editor")] [assembly: InternalsVisibleTo("Unity.InputSystem.Tests")] [assembly: InternalsVisibleTo("Unity.InputSystem.IntegrationTests")] diff --git a/Packages/com.unity.inputsystem/package.json b/Packages/com.unity.inputsystem/package.json index a1fe2618a0..c1f3937e8f 100755 --- a/Packages/com.unity.inputsystem/package.json +++ b/Packages/com.unity.inputsystem/package.json @@ -1,7 +1,7 @@ { "name": "com.unity.inputsystem", "displayName": "Input System", - "version": "1.3.0", + "version": "1.4.0", "unity": "2019.4", "description": "A new input system which can be used as a more extensible and customizable alternative to Unity's classic input system in UnityEngine.Input.", "keywords": [ From 6e934ade2a5969dd2da79c4beeb6aae27f417f52 Mon Sep 17 00:00:00 2001 From: Andrew O'Connor Date: Tue, 14 Dec 2021 17:14:09 +0100 Subject: [PATCH 03/53] Formatting fixes --- Assets/Samples/InGameHints/InGameHintsActions.cs | 4 +++- Assets/Samples/SimpleDemo/SimpleControls.cs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Assets/Samples/InGameHints/InGameHintsActions.cs b/Assets/Samples/InGameHints/InGameHintsActions.cs index 4ba802254b..3cd6aac591 100644 --- a/Assets/Samples/InGameHints/InGameHintsActions.cs +++ b/Assets/Samples/InGameHints/InGameHintsActions.cs @@ -17,7 +17,7 @@ namespace UnityEngine.InputSystem.Samples.InGameHints { - public partial class @InGameHintsActions : IInputActionCollection2, IDisposable + public partial class @InGameHintsActions: IInputActionCollection2, IDisposable { public InputActionAsset asset { get; } public @InGameHintsActions() @@ -315,12 +315,14 @@ public void Disable() { asset.Disable(); } + public IEnumerable bindings => asset.bindings; public InputAction FindAction(string actionNameOrId, bool throwIfNotFound = false) { return asset.FindAction(actionNameOrId, throwIfNotFound); } + public int FindBinding(InputBinding bindingMask, out InputAction action) { return asset.FindBinding(bindingMask, out action); diff --git a/Assets/Samples/SimpleDemo/SimpleControls.cs b/Assets/Samples/SimpleDemo/SimpleControls.cs index 4722849e4e..d99e794409 100644 --- a/Assets/Samples/SimpleDemo/SimpleControls.cs +++ b/Assets/Samples/SimpleDemo/SimpleControls.cs @@ -15,7 +15,7 @@ using UnityEngine.InputSystem; using UnityEngine.InputSystem.Utilities; -public partial class @SimpleControls : IInputActionCollection2, IDisposable +public partial class @SimpleControls: IInputActionCollection2, IDisposable { public InputActionAsset asset { get; } public @SimpleControls() @@ -210,12 +210,14 @@ public void Disable() { asset.Disable(); } + public IEnumerable bindings => asset.bindings; public InputAction FindAction(string actionNameOrId, bool throwIfNotFound = false) { return asset.FindAction(actionNameOrId, throwIfNotFound); } + public int FindBinding(InputBinding bindingMask, out InputAction action) { return asset.FindBinding(bindingMask, out action); From d23561ca2d08f80e79b30de5ae963de7c36a7321 Mon Sep 17 00:00:00 2001 From: Andrew O'Connor Date: Wed, 15 Dec 2021 10:16:33 +0100 Subject: [PATCH 04/53] More version number updates --- Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs b/Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs index ed1bf3a381..0faa7a0867 100644 --- a/Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs +++ b/Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs @@ -16,6 +16,6 @@ public static partial class InputSystem // NOTE: Unfortunately, System.Version doesn't use semantic versioning so we can't include // "-preview" suffixes here. internal const string kAssemblyVersion = "1.4.0"; - internal const string kDocUrl = "https://docs.unity3d.com/Packages/com.unity.inputsystem@1.3"; + internal const string kDocUrl = "https://docs.unity3d.com/Packages/com.unity.inputsystem@1.4"; } } From 3f62dfd9f6e293efecf2455a81dd7cfaf06bc8ae Mon Sep 17 00:00:00 2001 From: Andrew O'Connor Date: Wed, 15 Dec 2021 10:24:52 +0100 Subject: [PATCH 05/53] Update validation exception package version --- Packages/com.unity.inputsystem/ValidationExceptions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Packages/com.unity.inputsystem/ValidationExceptions.json b/Packages/com.unity.inputsystem/ValidationExceptions.json index 8b91d1e139..a198d011b7 100644 --- a/Packages/com.unity.inputsystem/ValidationExceptions.json +++ b/Packages/com.unity.inputsystem/ValidationExceptions.json @@ -3,22 +3,22 @@ { "ValidationTest": "API Validation", "ExceptionMessage": "Breaking changes require a new major version.", - "PackageVersion": "1.3.0" + "PackageVersion": "1.4.0" }, { "ValidationTest": "API Updater Configuration Validation", "ExceptionMessage": "stdout:\nAPIUpdater Configuration Validation\n-----------------------------------\n\nBase type validation (Failed: 0, Total: 0, Ignored 0):\n------------------------------------------------------\nstderr:\n\nAPIUpdater Configuration Validator failed with an exception:\nMono.Cecil.AssemblyResolutionException: Failed to resolve assembly: 'UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null'\n at Mono.Cecil.BaseAssemblyResolver.Resolve(AssemblyNameReference name, ReaderParameters parameters)\n at APIUpdater.Framework.Core.AssemblyResolver.Resolve(AssemblyNameReference name, ReaderParameters parameters) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Core/AssemblyResolver.cs:line 29\n at Mono.Cecil.BaseAssemblyResolver.Resolve(AssemblyNameReference name)\n at Mono.Cecil.DefaultAssemblyResolver.Resolve(AssemblyNameReference name)\n at Mono.Cecil.MetadataResolver.Resolve(TypeReference type)\n at Mono.Cecil.ModuleDefinition.Resolve(TypeReference type)\n at Mono.Cecil.TypeReference.Resolve()\n at APIUpdater.Framework.Util.CecilExtensions.AllMembers(TypeDefinition type) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Util/CecilExtensions.cs:line 306\n at APIUpdater.Framework.Util.CecilExtensions.AllMembers(TypeDefinition type) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Util/CecilExtensions.cs:line 306\n at APIUpdater.Framework.Util.CecilExtensions.AllMembers(TypeDefinition type) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Util/CecilExtensions.cs:line 306\n at APIUpdater.Framework.Configuration.Validator.MemberUpdatesValidator.ResolveSourceMember[T](MemberReferenceReplacementConfig mrr) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Configuration/Validator/MemberUpdatesValidator.cs:line 384\n at APIUpdater.Framework.Configuration.Validator.MemberUpdatesValidator.CheckIfMemberIsVirtualOrAbstract(MemberReferenceReplacementConfig config) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Configuration/Validator/MemberUpdatesValidator.cs:line 72\n at APIUpdater.Framework.Configuration.Validator.MemberUpdatesValidator.CheckMemberUpdates(ConfigurationProvider config) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Configuration/Validator/MemberUpdatesValidator.cs:line 49\n at APIUpdater.Framework.Configuration.Validator.MemberUpdatesValidator.Validate(ConfigurationProvider config) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Configuration/Validator/MemberUpdatesValidator.cs:line 26\n at APIUpdater.Framework.Configuration.Validator.ConfigurationValidator.IsValid() in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Configuration/Validator/ConfigurationValidator.cs:line 56\n at APIUpdater.ConfigurationValidator.Program.Validate(Dictionary`2 whiteList, IList`1 assemblyPaths, ConfigurationProvider provider, IEnumerable`1 extraAssemblySearchPaths, Action`1 debugLogger) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/Program.cs:line 167\n at APIUpdater.ConfigurationValidator.Program.<>c__DisplayClass3_0.b__0() in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/Program.cs:line 111\n at APIUpdater.ConfigurationValidator.Program.RunTest(Func`1 test) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/Program.cs:line 124\n\nAPIUpdater Configuration Validator failed with an exception:\nMono.Cecil.AssemblyResolutionException: Failed to resolve assembly: 'UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null'\n at Mono.Cecil.BaseAssemblyResolver.Resolve(AssemblyNameReference name, ReaderParameters parameters)\n at APIUpdater.Framework.Core.AssemblyResolver.Resolve(AssemblyNameReference name, ReaderParameters parameters) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Core/AssemblyResolver.cs:line 29\n at Mono.Cecil.BaseAssemblyResolver.Resolve(AssemblyNameReference name)\n at Mono.Cecil.DefaultAssemblyResolver.Resolve(AssemblyNameReference name)\n at Mono.Cecil.MetadataResolver.Resolve(TypeReference type)\n at Mono.Cecil.ModuleDefinition.Resolve(TypeReference type)\n at Mono.Cecil.TypeReference.Resolve()\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.GetDeclaringTypeForMemberReferenceExpressionTarget(IMemberDefinition original, IMemberDefinition replacementMember, Boolean targetIsExtension) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/BaseConfiguredUpdateTestRunner.cs:line 493\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.GetOriginalAndExpectedUpdateSourceForInstanceMember(MemberReferenceReplacementConfig mrr, IMemberDefinition originalMember, String& original, String& expected) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/BaseConfiguredUpdateTestRunner.cs:line 308\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.GetSourceForMemberTests(IMemberDefinition sourceMember, MemberReferenceReplacementConfig mrr, String& original, String& expected) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/BaseConfiguredUpdateTestRunner.cs:line 267\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.APIUpdater.Framework.Configuration.IUpdateStepConfigVisitor.Visit(MemberReferenceReplacementConfig mrr) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/BaseConfiguredUpdateTestRunner.cs:line 121\n at APIUpdater.Framework.Configuration.MemberReferenceReplacementConfig.Accept[T](IUpdateStepConfigVisitor`1 visitor) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Configuration/MemberReferenceReplacementConfig.cs:line 33\n at APIUpdater.ConfigurationValidator.Program.CsUpdateTests(Dictionary`2 whiteList, ConfigurationProvider provider, IList`1 potentiallyReferencedAssemblies, Action`1 debugLogger) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/Program.cs:line 199\n at APIUpdater.ConfigurationValidator.Program.<>c__DisplayClass3_0.b__1() in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/Program.cs:line 113\n at APIUpdater.ConfigurationValidator.Program.RunTest(Func`1 test) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/Program.cs:line 124\n", - "PackageVersion": "1.3.0" + "PackageVersion": "1.4.0" }, { "ValidationTest": "API Updater Configuration Validation", "ExceptionMessage": "stdout:\r\nAPIUpdater Configuration Validation\r\n-----------------------------------\r\n\r\nConfiguration Validation Tests (Failed: 0, Total: 3, Ignored 0):\r\n----------------------------------------------------------------\r\n\r\n\r\nBase type validation (Failed: 0, Total: 0, Ignored 0):\r\n------------------------------------------------------\r\nstderr:\r\n\r\nAPIUpdater Configuration Validator failed with an exception:\r\nMono.Cecil.AssemblyResolutionException: Failed to resolve assembly: 'UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null'\r\n at Mono.Cecil.BaseAssemblyResolver.Resolve(AssemblyNameReference name, ReaderParameters parameters)\r\n at APIUpdater.Framework.Core.AssemblyResolver.Resolve(AssemblyNameReference name, ReaderParameters parameters)\r\n at Mono.Cecil.BaseAssemblyResolver.Resolve(AssemblyNameReference name)\r\n at Mono.Cecil.DefaultAssemblyResolver.Resolve(AssemblyNameReference name)\r\n at Mono.Cecil.MetadataResolver.Resolve(TypeReference type)\r\n at Mono.Cecil.ModuleDefinition.Resolve(TypeReference type)\r\n at Mono.Cecil.TypeReference.Resolve()\r\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.GetDeclaringTypeForMemberReferenceExpressionTarget(IMemberDefinition original, IMemberDefinition replacementMember, Boolean targetIsExtension)\r\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.GetOriginalAndExpectedUpdateSourceForInstanceMember(MemberReferenceReplacementConfig mrr, IMemberDefinition originalMember, String& original, String& expected)\r\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.GetSourceForMemberTests(IMemberDefinition sourceMember, MemberReferenceReplacementConfig mrr, String& original, String& expected)\r\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.APIUpdater.Framework.Configuration.IUpdateStepConfigVisitor.Visit(MemberReferenceReplacementConfig mrr)\r\n at APIUpdater.Framework.Configuration.MemberReferenceReplacementConfig.Accept[T](IUpdateStepConfigVisitor`1 visitor)\r\n at APIUpdater.ConfigurationValidator.Program.CsUpdateTests(Dictionary`2 whiteList, ConfigurationProvider provider, IList`1 potentiallyReferencedAssemblies, Action`1 debugLogger)\r\n at APIUpdater.ConfigurationValidator.Program.<>c__DisplayClass3_0.b__1()\r\n at APIUpdater.ConfigurationValidator.Program.RunTest(Func`1 test)\r\n", - "PackageVersion": "1.3.0" + "PackageVersion": "1.4.0" }, { "ValidationTest": "API Updater Configuration Validation", "ExceptionMessage": "stdout:\nAPIUpdater Configuration Validation\n-----------------------------------\n\nConfiguration Validation Tests (Failed: 0, Total: 3, Ignored 0):\n----------------------------------------------------------------\n\n\nBase type validation (Failed: 0, Total: 0, Ignored 0):\n------------------------------------------------------\nstderr:\n\nAPIUpdater Configuration Validator failed with an exception:\nMono.Cecil.AssemblyResolutionException: Failed to resolve assembly: 'UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null'\n at Mono.Cecil.BaseAssemblyResolver.Resolve(AssemblyNameReference name, ReaderParameters parameters)\n at APIUpdater.Framework.Core.AssemblyResolver.Resolve(AssemblyNameReference name, ReaderParameters parameters) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Core/AssemblyResolver.cs:line 29\n at Mono.Cecil.BaseAssemblyResolver.Resolve(AssemblyNameReference name)\n at Mono.Cecil.DefaultAssemblyResolver.Resolve(AssemblyNameReference name)\n at Mono.Cecil.MetadataResolver.Resolve(TypeReference type)\n at Mono.Cecil.ModuleDefinition.Resolve(TypeReference type)\n at Mono.Cecil.TypeReference.Resolve()\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.GetDeclaringTypeForMemberReferenceExpressionTarget(IMemberDefinition original, IMemberDefinition replacementMember, Boolean targetIsExtension) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/BaseConfiguredUpdateTestRunner.cs:line 493\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.GetOriginalAndExpectedUpdateSourceForInstanceMember(MemberReferenceReplacementConfig mrr, IMemberDefinition originalMember, String& original, String& expected) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/BaseConfiguredUpdateTestRunner.cs:line 308\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.GetSourceForMemberTests(IMemberDefinition sourceMember, MemberReferenceReplacementConfig mrr, String& original, String& expected) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/BaseConfiguredUpdateTestRunner.cs:line 267\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.APIUpdater.Framework.Configuration.IUpdateStepConfigVisitor.Visit(MemberReferenceReplacementConfig mrr) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/BaseConfiguredUpdateTestRunner.cs:line 121\n at APIUpdater.Framework.Configuration.MemberReferenceReplacementConfig.Accept[T](IUpdateStepConfigVisitor`1 visitor) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Configuration/MemberReferenceReplacementConfig.cs:line 33\n at APIUpdater.ConfigurationValidator.Program.CsUpdateTests(Dictionary`2 whiteList, ConfigurationProvider provider, IList`1 potentiallyReferencedAssemblies, Action`1 debugLogger) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/Program.cs:line 199\n at APIUpdater.ConfigurationValidator.Program.<>c__DisplayClass3_0.b__1() in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/Program.cs:line 113\n at APIUpdater.ConfigurationValidator.Program.RunTest(Func`1 test) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/Program.cs:line 124\n", - "PackageVersion": "1.3.0" + "PackageVersion": "1.4.0" } ], "WarningExceptions": [] From 014376be7f5cf71e908b122be17a920ebb05e08e Mon Sep 17 00:00:00 2001 From: Dmytro Ivanov Date: Wed, 12 Jan 2022 11:15:56 +0100 Subject: [PATCH 06/53] Partially fixing CI --- .../Tests/InputSystem/Unity.InputSystem.Tests.asmdef | 5 +++++ .../com.unity.inputsystem/ValidationExceptions.json | 11 ----------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef b/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef index 4f7dd8dfdb..fe79bd3713 100644 --- a/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef +++ b/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef @@ -39,6 +39,11 @@ "name": "Unity", "expression": "[2021.2,2021.3)", "define": "TEMP_DISABLE_UITOOLKIT_TEST" + }, + { + "name": "Unity", + "expression": "[2022.1,2022.2)", + "define": "TEMP_DISABLE_UITOOLKIT_TEST" } ], "noEngineReferences": false diff --git a/Packages/com.unity.inputsystem/ValidationExceptions.json b/Packages/com.unity.inputsystem/ValidationExceptions.json index a198d011b7..a524e21a37 100644 --- a/Packages/com.unity.inputsystem/ValidationExceptions.json +++ b/Packages/com.unity.inputsystem/ValidationExceptions.json @@ -7,18 +7,7 @@ }, { "ValidationTest": "API Updater Configuration Validation", - "ExceptionMessage": "stdout:\nAPIUpdater Configuration Validation\n-----------------------------------\n\nBase type validation (Failed: 0, Total: 0, Ignored 0):\n------------------------------------------------------\nstderr:\n\nAPIUpdater Configuration Validator failed with an exception:\nMono.Cecil.AssemblyResolutionException: Failed to resolve assembly: 'UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null'\n at Mono.Cecil.BaseAssemblyResolver.Resolve(AssemblyNameReference name, ReaderParameters parameters)\n at APIUpdater.Framework.Core.AssemblyResolver.Resolve(AssemblyNameReference name, ReaderParameters parameters) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Core/AssemblyResolver.cs:line 29\n at Mono.Cecil.BaseAssemblyResolver.Resolve(AssemblyNameReference name)\n at Mono.Cecil.DefaultAssemblyResolver.Resolve(AssemblyNameReference name)\n at Mono.Cecil.MetadataResolver.Resolve(TypeReference type)\n at Mono.Cecil.ModuleDefinition.Resolve(TypeReference type)\n at Mono.Cecil.TypeReference.Resolve()\n at APIUpdater.Framework.Util.CecilExtensions.AllMembers(TypeDefinition type) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Util/CecilExtensions.cs:line 306\n at APIUpdater.Framework.Util.CecilExtensions.AllMembers(TypeDefinition type) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Util/CecilExtensions.cs:line 306\n at APIUpdater.Framework.Util.CecilExtensions.AllMembers(TypeDefinition type) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Util/CecilExtensions.cs:line 306\n at APIUpdater.Framework.Configuration.Validator.MemberUpdatesValidator.ResolveSourceMember[T](MemberReferenceReplacementConfig mrr) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Configuration/Validator/MemberUpdatesValidator.cs:line 384\n at APIUpdater.Framework.Configuration.Validator.MemberUpdatesValidator.CheckIfMemberIsVirtualOrAbstract(MemberReferenceReplacementConfig config) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Configuration/Validator/MemberUpdatesValidator.cs:line 72\n at APIUpdater.Framework.Configuration.Validator.MemberUpdatesValidator.CheckMemberUpdates(ConfigurationProvider config) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Configuration/Validator/MemberUpdatesValidator.cs:line 49\n at APIUpdater.Framework.Configuration.Validator.MemberUpdatesValidator.Validate(ConfigurationProvider config) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Configuration/Validator/MemberUpdatesValidator.cs:line 26\n at APIUpdater.Framework.Configuration.Validator.ConfigurationValidator.IsValid() in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Configuration/Validator/ConfigurationValidator.cs:line 56\n at APIUpdater.ConfigurationValidator.Program.Validate(Dictionary`2 whiteList, IList`1 assemblyPaths, ConfigurationProvider provider, IEnumerable`1 extraAssemblySearchPaths, Action`1 debugLogger) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/Program.cs:line 167\n at APIUpdater.ConfigurationValidator.Program.<>c__DisplayClass3_0.b__0() in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/Program.cs:line 111\n at APIUpdater.ConfigurationValidator.Program.RunTest(Func`1 test) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/Program.cs:line 124\n\nAPIUpdater Configuration Validator failed with an exception:\nMono.Cecil.AssemblyResolutionException: Failed to resolve assembly: 'UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null'\n at Mono.Cecil.BaseAssemblyResolver.Resolve(AssemblyNameReference name, ReaderParameters parameters)\n at APIUpdater.Framework.Core.AssemblyResolver.Resolve(AssemblyNameReference name, ReaderParameters parameters) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Core/AssemblyResolver.cs:line 29\n at Mono.Cecil.BaseAssemblyResolver.Resolve(AssemblyNameReference name)\n at Mono.Cecil.DefaultAssemblyResolver.Resolve(AssemblyNameReference name)\n at Mono.Cecil.MetadataResolver.Resolve(TypeReference type)\n at Mono.Cecil.ModuleDefinition.Resolve(TypeReference type)\n at Mono.Cecil.TypeReference.Resolve()\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.GetDeclaringTypeForMemberReferenceExpressionTarget(IMemberDefinition original, IMemberDefinition replacementMember, Boolean targetIsExtension) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/BaseConfiguredUpdateTestRunner.cs:line 493\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.GetOriginalAndExpectedUpdateSourceForInstanceMember(MemberReferenceReplacementConfig mrr, IMemberDefinition originalMember, String& original, String& expected) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/BaseConfiguredUpdateTestRunner.cs:line 308\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.GetSourceForMemberTests(IMemberDefinition sourceMember, MemberReferenceReplacementConfig mrr, String& original, String& expected) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/BaseConfiguredUpdateTestRunner.cs:line 267\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.APIUpdater.Framework.Configuration.IUpdateStepConfigVisitor.Visit(MemberReferenceReplacementConfig mrr) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/BaseConfiguredUpdateTestRunner.cs:line 121\n at APIUpdater.Framework.Configuration.MemberReferenceReplacementConfig.Accept[T](IUpdateStepConfigVisitor`1 visitor) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Configuration/MemberReferenceReplacementConfig.cs:line 33\n at APIUpdater.ConfigurationValidator.Program.CsUpdateTests(Dictionary`2 whiteList, ConfigurationProvider provider, IList`1 potentiallyReferencedAssemblies, Action`1 debugLogger) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/Program.cs:line 199\n at APIUpdater.ConfigurationValidator.Program.<>c__DisplayClass3_0.b__1() in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/Program.cs:line 113\n at APIUpdater.ConfigurationValidator.Program.RunTest(Func`1 test) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/Program.cs:line 124\n", "PackageVersion": "1.4.0" - }, - { - "ValidationTest": "API Updater Configuration Validation", - "ExceptionMessage": "stdout:\r\nAPIUpdater Configuration Validation\r\n-----------------------------------\r\n\r\nConfiguration Validation Tests (Failed: 0, Total: 3, Ignored 0):\r\n----------------------------------------------------------------\r\n\r\n\r\nBase type validation (Failed: 0, Total: 0, Ignored 0):\r\n------------------------------------------------------\r\nstderr:\r\n\r\nAPIUpdater Configuration Validator failed with an exception:\r\nMono.Cecil.AssemblyResolutionException: Failed to resolve assembly: 'UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null'\r\n at Mono.Cecil.BaseAssemblyResolver.Resolve(AssemblyNameReference name, ReaderParameters parameters)\r\n at APIUpdater.Framework.Core.AssemblyResolver.Resolve(AssemblyNameReference name, ReaderParameters parameters)\r\n at Mono.Cecil.BaseAssemblyResolver.Resolve(AssemblyNameReference name)\r\n at Mono.Cecil.DefaultAssemblyResolver.Resolve(AssemblyNameReference name)\r\n at Mono.Cecil.MetadataResolver.Resolve(TypeReference type)\r\n at Mono.Cecil.ModuleDefinition.Resolve(TypeReference type)\r\n at Mono.Cecil.TypeReference.Resolve()\r\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.GetDeclaringTypeForMemberReferenceExpressionTarget(IMemberDefinition original, IMemberDefinition replacementMember, Boolean targetIsExtension)\r\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.GetOriginalAndExpectedUpdateSourceForInstanceMember(MemberReferenceReplacementConfig mrr, IMemberDefinition originalMember, String& original, String& expected)\r\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.GetSourceForMemberTests(IMemberDefinition sourceMember, MemberReferenceReplacementConfig mrr, String& original, String& expected)\r\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.APIUpdater.Framework.Configuration.IUpdateStepConfigVisitor.Visit(MemberReferenceReplacementConfig mrr)\r\n at APIUpdater.Framework.Configuration.MemberReferenceReplacementConfig.Accept[T](IUpdateStepConfigVisitor`1 visitor)\r\n at APIUpdater.ConfigurationValidator.Program.CsUpdateTests(Dictionary`2 whiteList, ConfigurationProvider provider, IList`1 potentiallyReferencedAssemblies, Action`1 debugLogger)\r\n at APIUpdater.ConfigurationValidator.Program.<>c__DisplayClass3_0.b__1()\r\n at APIUpdater.ConfigurationValidator.Program.RunTest(Func`1 test)\r\n", - "PackageVersion": "1.4.0" - }, - { - "ValidationTest": "API Updater Configuration Validation", - "ExceptionMessage": "stdout:\nAPIUpdater Configuration Validation\n-----------------------------------\n\nConfiguration Validation Tests (Failed: 0, Total: 3, Ignored 0):\n----------------------------------------------------------------\n\n\nBase type validation (Failed: 0, Total: 0, Ignored 0):\n------------------------------------------------------\nstderr:\n\nAPIUpdater Configuration Validator failed with an exception:\nMono.Cecil.AssemblyResolutionException: Failed to resolve assembly: 'UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null'\n at Mono.Cecil.BaseAssemblyResolver.Resolve(AssemblyNameReference name, ReaderParameters parameters)\n at APIUpdater.Framework.Core.AssemblyResolver.Resolve(AssemblyNameReference name, ReaderParameters parameters) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Core/AssemblyResolver.cs:line 29\n at Mono.Cecil.BaseAssemblyResolver.Resolve(AssemblyNameReference name)\n at Mono.Cecil.DefaultAssemblyResolver.Resolve(AssemblyNameReference name)\n at Mono.Cecil.MetadataResolver.Resolve(TypeReference type)\n at Mono.Cecil.ModuleDefinition.Resolve(TypeReference type)\n at Mono.Cecil.TypeReference.Resolve()\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.GetDeclaringTypeForMemberReferenceExpressionTarget(IMemberDefinition original, IMemberDefinition replacementMember, Boolean targetIsExtension) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/BaseConfiguredUpdateTestRunner.cs:line 493\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.GetOriginalAndExpectedUpdateSourceForInstanceMember(MemberReferenceReplacementConfig mrr, IMemberDefinition originalMember, String& original, String& expected) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/BaseConfiguredUpdateTestRunner.cs:line 308\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.GetSourceForMemberTests(IMemberDefinition sourceMember, MemberReferenceReplacementConfig mrr, String& original, String& expected) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/BaseConfiguredUpdateTestRunner.cs:line 267\n at APIUpdater.ConfigurationValidator.BaseConfiguredUpdateTestRunner.APIUpdater.Framework.Configuration.IUpdateStepConfigVisitor.Visit(MemberReferenceReplacementConfig mrr) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/BaseConfiguredUpdateTestRunner.cs:line 121\n at APIUpdater.Framework.Configuration.MemberReferenceReplacementConfig.Accept[T](IUpdateStepConfigVisitor`1 visitor) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.Framework/Configuration/MemberReferenceReplacementConfig.cs:line 33\n at APIUpdater.ConfigurationValidator.Program.CsUpdateTests(Dictionary`2 whiteList, ConfigurationProvider provider, IList`1 potentiallyReferencedAssemblies, Action`1 debugLogger) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/Program.cs:line 199\n at APIUpdater.ConfigurationValidator.Program.<>c__DisplayClass3_0.b__1() in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/Program.cs:line 113\n at APIUpdater.ConfigurationValidator.Program.RunTest(Func`1 test) in /Users/bokken/buildslave/unity/build/Editor/Tools/ScriptUpdater/APIUpdater.ConfigurationValidator/Program.cs:line 124\n", - "PackageVersion": "1.4.0" } ], "WarningExceptions": [] From 7a48d098a67734285e638c00a37553b77f7ca695 Mon Sep 17 00:00:00 2001 From: Dmytro Ivanov Date: Wed, 12 Jan 2022 15:20:59 +0100 Subject: [PATCH 07/53] FIX: Better support for Switch Pro controller (#1471) --- .../Tests/InputSystem/APIVerificationTests.cs | 4 + Assets/Tests/InputSystem/SwitchTests.cs | 54 +- Packages/com.unity.inputsystem/CHANGELOG.md | 2 + .../Documentation~/SupportedDevices.md | 2 +- .../Plugins/Switch/SwitchProControllerHID.cs | 529 +++++++++++++++--- .../InputSystem/Utilities/NumberHelpers.cs | 10 + 6 files changed, 514 insertions(+), 87 deletions(-) diff --git a/Assets/Tests/InputSystem/APIVerificationTests.cs b/Assets/Tests/InputSystem/APIVerificationTests.cs index 3d856a6d3d..cd18ffa2d0 100644 --- a/Assets/Tests/InputSystem/APIVerificationTests.cs +++ b/Assets/Tests/InputSystem/APIVerificationTests.cs @@ -778,6 +778,10 @@ public class Touchscreen : UnityEngine.InputSystem.Pointer, UnityEngine.InputSys [Property("Exclusions", @"1.0.0 public bool filterNoiseOnCurrent { get; set; } ")] + // SwitchProControllerHID inherited from IInputStateCallbackReceiver and IEventPreProcessor, both are internal interfaces + [Property("Exclusions", @"1.0.0 + public class SwitchProControllerHID : UnityEngine.InputSystem.Gamepad + ")] public void API_MinorVersionsHaveNoBreakingChanges() { var currentVersion = CoreTests.PackageJson.ReadVersion(); diff --git a/Assets/Tests/InputSystem/SwitchTests.cs b/Assets/Tests/InputSystem/SwitchTests.cs index e09761b32d..09e5047d93 100644 --- a/Assets/Tests/InputSystem/SwitchTests.cs +++ b/Assets/Tests/InputSystem/SwitchTests.cs @@ -8,6 +8,7 @@ using UnityEngine.InputSystem.HID; using UnityEngine.InputSystem.Switch.LowLevel; using UnityEngine.InputSystem.Processors; +using UnityEngine.TestTools.Utils; internal class SwitchTests : CoreTestsFixture { @@ -35,31 +36,48 @@ public void Devices_SupportsHIDNpad() InputSystem.QueueStateEvent(controller, new SwitchProControllerHIDInputState { - leftStickX = 0x1000, - leftStickY = 0x1000, - rightStickX = 0x7fff, - rightStickY = 0xefff, + leftStickX = 0x10, + leftStickY = 0x10, + rightStickX = 0x80, + rightStickY = 0xf2, }); InputSystem.Update(); var leftStickDeadzone = controller.leftStick.TryGetProcessor(); var rightStickDeadzone = controller.rightStick.TryGetProcessor(); - Assert.That(Vector2.Distance(controller.leftStick.ReadValue(), leftStickDeadzone.Process(new Vector2(-1.0f, 1.0f))), Is.LessThan(0.0001f)); - Assert.That(Vector2.Distance(controller.rightStick.ReadValue(), rightStickDeadzone.Process(new Vector2(0.0f, -1.0f))), Is.LessThan(0.0001f)); + var currentLeft = controller.leftStick.ReadValue(); + var expectedLeft = leftStickDeadzone.Process(new Vector2(-1.0f, 1.0f)); - AssertButtonPress(controller, new SwitchProControllerHIDInputState().WithButton(SwitchProControllerHIDInputState.Button.A), controller.buttonEast); - AssertButtonPress(controller, new SwitchProControllerHIDInputState().WithButton(SwitchProControllerHIDInputState.Button.B), controller.buttonSouth); - AssertButtonPress(controller, new SwitchProControllerHIDInputState().WithButton(SwitchProControllerHIDInputState.Button.X), controller.buttonNorth); - AssertButtonPress(controller, new SwitchProControllerHIDInputState().WithButton(SwitchProControllerHIDInputState.Button.Y), controller.buttonWest); - AssertButtonPress(controller, new SwitchProControllerHIDInputState().WithButton(SwitchProControllerHIDInputState.Button.StickL), controller.leftStickButton); - AssertButtonPress(controller, new SwitchProControllerHIDInputState().WithButton(SwitchProControllerHIDInputState.Button.StickR), controller.rightStickButton); - AssertButtonPress(controller, new SwitchProControllerHIDInputState().WithButton(SwitchProControllerHIDInputState.Button.L), controller.leftShoulder); - AssertButtonPress(controller, new SwitchProControllerHIDInputState().WithButton(SwitchProControllerHIDInputState.Button.R), controller.rightShoulder); - AssertButtonPress(controller, new SwitchProControllerHIDInputState().WithButton(SwitchProControllerHIDInputState.Button.ZL), controller.leftTrigger); - AssertButtonPress(controller, new SwitchProControllerHIDInputState().WithButton(SwitchProControllerHIDInputState.Button.ZR), controller.rightTrigger); - AssertButtonPress(controller, new SwitchProControllerHIDInputState().WithButton(SwitchProControllerHIDInputState.Button.Plus), controller.startButton); - AssertButtonPress(controller, new SwitchProControllerHIDInputState().WithButton(SwitchProControllerHIDInputState.Button.Minus), controller.selectButton); + var currentRight = controller.rightStick.ReadValue(); + var expectedRight = rightStickDeadzone.Process(new Vector2(0.0f, -1.0f)); + + Assert.That(currentLeft, Is.EqualTo(expectedLeft).Using(Vector2EqualityComparer.Instance)); + Assert.That(currentRight, Is.EqualTo(expectedRight).Using(new Vector2EqualityComparer(0.01f))); + + AssertButtonPress(controller, StateWithButton(SwitchProControllerHIDInputState.Button.A), controller.buttonEast); + AssertButtonPress(controller, StateWithButton(SwitchProControllerHIDInputState.Button.B), controller.buttonSouth); + AssertButtonPress(controller, StateWithButton(SwitchProControllerHIDInputState.Button.X), controller.buttonNorth); + AssertButtonPress(controller, StateWithButton(SwitchProControllerHIDInputState.Button.Y), controller.buttonWest); + AssertButtonPress(controller, StateWithButton(SwitchProControllerHIDInputState.Button.StickL), controller.leftStickButton); + AssertButtonPress(controller, StateWithButton(SwitchProControllerHIDInputState.Button.StickR), controller.rightStickButton); + AssertButtonPress(controller, StateWithButton(SwitchProControllerHIDInputState.Button.L), controller.leftShoulder); + AssertButtonPress(controller, StateWithButton(SwitchProControllerHIDInputState.Button.R), controller.rightShoulder); + AssertButtonPress(controller, StateWithButton(SwitchProControllerHIDInputState.Button.ZL), controller.leftTrigger); + AssertButtonPress(controller, StateWithButton(SwitchProControllerHIDInputState.Button.ZR), controller.rightTrigger); + AssertButtonPress(controller, StateWithButton(SwitchProControllerHIDInputState.Button.Plus), controller.startButton); + AssertButtonPress(controller, StateWithButton(SwitchProControllerHIDInputState.Button.Minus), controller.selectButton); + } + + private static SwitchProControllerHIDInputState StateWithButton(SwitchProControllerHIDInputState.Button button) + { + return new SwitchProControllerHIDInputState + { + leftStickX = 0x7f, + leftStickY = 0x7f, + rightStickX = 0x7f, + rightStickY = 0x7f, + }.WithButton(button); } #endif diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 4c58979687..d9d0478dbe 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -12,6 +12,8 @@ however, it has to be formatted properly to pass verification tests. ### Fixed +- Fixed Switch Pro controller not working correctly in different scenarios ([case 1369091](https://issuetracker.unity3d.com/issues/nintendo-switch-pro-controller-output-garbage), [case 1190216](https://issuetracker.unity3d.com/issues/inputsystem-windows-switch-pro-controller-only-works-when-connected-via-bluetooth-but-not-via-usb), case 1314869). + #### Actions * Fixed `InputAction.GetTimeoutCompletionPercentage` jumping to 100% completion early ([case 1377009](https://issuetracker.unity3d.com/issues/gettimeoutcompletionpercentage-returns-1-after-0-dot-1s-when-hold-action-was-started-even-though-it-is-not-performed-yet)). diff --git a/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md b/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md index eb5936d0a8..4e0d1856ab 100644 --- a/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md +++ b/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md @@ -43,7 +43,7 @@ On UWP only USB connection is supported, motor rumble and lightbar are not worki >6. Unity supports Made for iOS (Mfi) certified controllers on iOS. Xbox One and PS4 controllers are only supported on iOS 13 or higher. >7. Consoles are supported using separate packages. You need to install these packages in your Project to enable console support. >8. Unity officially supports PS4 controllers only on [Android 10 or higher](https://playstation.com/en-us/support/hardware/ps4-pair-dualshock-4-wireless-with-sony-xperia-and-android). ->9. Switch Joy-Cons are not currently supported on Windows and Mac. Also, Switch Pro controllers are supported only when connected via Bluetooth but not when connected via wired USB. +>9. Switch Joy-Cons are not currently supported on Windows and Mac. >10. PS5 DualSense is supported on Windows and macOS via USB HID, though setting motor rumble and lightbar color when connected over Bluetooth is currently not supported. On UWP only USB connection is supported, motor rumble and lightbar are not working correctly. On Android it's expected to be working from Android 12. diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/Switch/SwitchProControllerHID.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/Switch/SwitchProControllerHID.cs index 3bd4730896..28dd3d7fab 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/Switch/SwitchProControllerHID.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/Switch/SwitchProControllerHID.cs @@ -1,5 +1,6 @@ #if UNITY_EDITOR || UNITY_STANDALONE_WIN || UNITY_STANDALONE_OSX || UNITY_WSA || PACKAGE_DOCS_GENERATION using System; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using UnityEngine.InputSystem.Controls; using UnityEngine.InputSystem.Layouts; @@ -15,71 +16,79 @@ namespace UnityEngine.InputSystem.Switch.LowLevel /// /// Structure of HID input reports for Switch Pro controllers. /// - [StructLayout(LayoutKind.Explicit, Size = 20)] + [StructLayout(LayoutKind.Explicit, Size = 7)] internal struct SwitchProControllerHIDInputState : IInputStateTypeInfo { - public FourCC format => new FourCC('H', 'I', 'D'); - - [InputControl(name = "dpad", format = "BIT", layout = "Dpad", bit = 24, sizeInBits = 4, defaultState = 8)] - [InputControl(name = "dpad/up", format = "BIT", layout = "DiscreteButton", parameters = "minValue=7,maxValue=1,nullValue=8,wrapAtValue=7", bit = 24, sizeInBits = 4)] - [InputControl(name = "dpad/right", format = "BIT", layout = "DiscreteButton", parameters = "minValue=1,maxValue=3", bit = 24, sizeInBits = 4)] - [InputControl(name = "dpad/down", format = "BIT", layout = "DiscreteButton", parameters = "minValue=3,maxValue=5", bit = 24, sizeInBits = 4)] - [InputControl(name = "dpad/left", format = "BIT", layout = "DiscreteButton", parameters = "minValue=5, maxValue=7", bit = 24, sizeInBits = 4)] - [InputControl(name = "buttonNorth", displayName = "X", shortDisplayName = "X", bit = (uint)Button.North)] - [InputControl(name = "buttonSouth", displayName = "B", shortDisplayName = "B", bit = (uint)Button.South, usage = "Back")] - [InputControl(name = "buttonWest", displayName = "Y", shortDisplayName = "Y", bit = (uint)Button.West, usage = "SecondaryAction")] - [InputControl(name = "buttonEast", displayName = "A", shortDisplayName = "A", bit = (uint)Button.East, usage = "PrimaryAction")] - [InputControl(name = "leftStickPress", displayName = "Left Stick", bit = (uint)Button.StickL)] - [InputControl(name = "rightStickPress", displayName = "Right Stick", bit = (uint)Button.StickR)] + public static FourCC Format = new FourCC('S', 'P', 'V', 'S'); // Switch Pro Virtual State + + public FourCC format => Format; + + [InputControl(name = "leftStick", layout = "Stick", format = "VC2B")] + [InputControl(name = "leftStick/x", offset = 0, format = "BYTE", parameters = "normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5")] + [InputControl(name = "leftStick/left", offset = 0, format = "BYTE", parameters = "normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5,clamp=1,clampMin=0.15,clampMax=0.5,invert")] + [InputControl(name = "leftStick/right", offset = 0, format = "BYTE", parameters = "normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5,clamp=1,clampMin=0.5,clampMax=0.85")] + [InputControl(name = "leftStick/y", offset = 1, format = "BYTE", parameters = "invert,normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5")] + [InputControl(name = "leftStick/up", offset = 1, format = "BYTE", parameters = "normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5,clamp=1,clampMin=0.15,clampMax=0.5,invert")] + [InputControl(name = "leftStick/down", offset = 1, format = "BYTE", parameters = "normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5,clamp=1,clampMin=0.5,clampMax=0.85,invert=false")] + [FieldOffset(0)] public byte leftStickX; + [FieldOffset(1)] public byte leftStickY; + + [InputControl(name = "rightStick", layout = "Stick", format = "VC2B")] + [InputControl(name = "rightStick/x", offset = 0, format = "BYTE", parameters = "normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5")] + [InputControl(name = "rightStick/left", offset = 0, format = "BYTE", parameters = "normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5,clamp=1,clampMin=0,clampMax=0.5,invert")] + [InputControl(name = "rightStick/right", offset = 0, format = "BYTE", parameters = "normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5,clamp=1,clampMin=0.5,clampMax=1")] + [InputControl(name = "rightStick/y", offset = 1, format = "BYTE", parameters = "invert,normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5")] + [InputControl(name = "rightStick/up", offset = 1, format = "BYTE", parameters = "normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5,clamp=1,clampMin=0.15,clampMax=0.5,invert")] + [InputControl(name = "rightStick/down", offset = 1, format = "BYTE", parameters = "normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5,clamp=1,clampMin=0.5,clampMax=0.85,invert=false")] + [FieldOffset(2)] public byte rightStickX; + [FieldOffset(3)] public byte rightStickY; + + [InputControl(name = "dpad", format = "BIT", bit = 0, sizeInBits = 4)] + [InputControl(name = "dpad/up", bit = (int)Button.Up)] + [InputControl(name = "dpad/right", bit = (int)Button.Right)] + [InputControl(name = "dpad/down", bit = (int)Button.Down)] + [InputControl(name = "dpad/left", bit = (int)Button.Left)] + [InputControl(name = "buttonWest", displayName = "Y", shortDisplayName = "Y", bit = (int)Button.Y, usage = "SecondaryAction")] + [InputControl(name = "buttonNorth", displayName = "X", shortDisplayName = "X", bit = (int)Button.X)] + [InputControl(name = "buttonSouth", displayName = "B", shortDisplayName = "B", bit = (int)Button.B, usage = "Back")] + [InputControl(name = "buttonEast", displayName = "A", shortDisplayName = "A", bit = (int)Button.A, usage = "PrimaryAction")] [InputControl(name = "leftShoulder", displayName = "L", shortDisplayName = "L", bit = (uint)Button.L)] [InputControl(name = "rightShoulder", displayName = "R", shortDisplayName = "R", bit = (uint)Button.R)] + [InputControl(name = "leftStickPress", displayName = "Left Stick", bit = (uint)Button.StickL)] + [InputControl(name = "rightStickPress", displayName = "Right Stick", bit = (uint)Button.StickR)] [InputControl(name = "leftTrigger", displayName = "ZL", shortDisplayName = "ZL", format = "BIT", bit = (uint)Button.ZL)] [InputControl(name = "rightTrigger", displayName = "ZR", shortDisplayName = "ZR", format = "BIT", bit = (uint)Button.ZR)] [InputControl(name = "start", displayName = "Plus", bit = (uint)Button.Plus, usage = "Menu")] [InputControl(name = "select", displayName = "Minus", bit = (uint)Button.Minus)] - [FieldOffset(0)] - public uint buttons; - - [InputControl(name = "leftStick", format = "VC2S", layout = "Stick")] - [InputControl(name = "leftStick/x", offset = 0, format = "USHT", parameters = "normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5")] - [InputControl(name = "leftStick/left", offset = 0, format = "USHT", parameters = "normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5,clamp=1,clampMin=0.15,clampMax=0.5,invert")] - [InputControl(name = "leftStick/right", offset = 0, format = "USHT", parameters = "normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5,clamp=1,clampMin=0.5,clampMax=0.85")] - [InputControl(name = "leftStick/y", offset = 2, format = "USHT", parameters = "invert,normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5")] - [InputControl(name = "leftStick/up", offset = 2, format = "USHT", parameters = "normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5,clamp=1,clampMin=0.15,clampMax=0.5,invert")] - [InputControl(name = "leftStick/down", offset = 2, format = "USHT", parameters = "normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5,clamp=1,clampMin=0.5,clampMax=0.85,invert=false")] - [FieldOffset(4)] public ushort leftStickX; - [FieldOffset(6)] public ushort leftStickY; - - [InputControl(name = "rightStick", format = "VC2S", layout = "Stick")] - [InputControl(name = "rightStick/x", offset = 0, format = "USHT", parameters = "normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5")] - [InputControl(name = "rightStick/left", offset = 0, format = "USHT", parameters = "normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5,clamp=1,clampMin=0,clampMax=0.5,invert")] - [InputControl(name = "rightStick/right", offset = 0, format = "USHT", parameters = "normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5,clamp=1,clampMin=0.5,clampMax=1")] - [InputControl(name = "rightStick/y", offset = 2, format = "USHT", parameters = "invert,normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5")] - [InputControl(name = "rightStick/up", offset = 2, format = "USHT", parameters = "normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5,clamp=1,clampMin=0.15,clampMax=0.5,invert")] - [InputControl(name = "rightStick/down", offset = 2, format = "USHT", parameters = "normalize,normalizeMin=0.15,normalizeMax=0.85,normalizeZero=0.5,clamp=1,clampMin=0.5,clampMax=0.85,invert=false")] - [FieldOffset(8)] public ushort rightStickX; - [FieldOffset(10)] public ushort rightStickY; - - public float leftTrigger => ((buttons & (1U << (int)Button.ZL)) != 0) ? 1f : 0f; - - public float rightTrigger => ((buttons & (1U << (int)Button.ZR)) != 0) ? 1f : 0f; + [FieldOffset(4)] public ushort buttons1; + + [InputControl(name = "capture", layout = "Button", displayName = "Capture", bit = (uint)Button.Capture - 16)] + [InputControl(name = "home", layout = "Button", displayName = "Home", bit = (uint)Button.Home - 16)] + [FieldOffset(6)] public byte buttons2; public enum Button { - North = 11, - South = 8, - West = 10, - East = 9, + Up = 0, + Right = 1, + Down = 2, + Left = 3, + + West = 4, + North = 5, + South = 6, + East = 7, - StickL = 18, - StickR = 19, - L = 12, - R = 13, + L = 8, + R = 9, + StickL = 10, + StickR = 11, - ZL = 14, - ZR = 15, - Plus = 17, - Minus = 16, + ZL = 12, + ZR = 13, + Plus = 14, + Minus = 15, + Capture = 16, + Home = 17, X = North, B = South, @@ -87,22 +96,46 @@ public enum Button A = East, } + [MethodImpl(MethodImplOptions.AggressiveInlining)] public SwitchProControllerHIDInputState WithButton(Button button, bool value = true) { - Debug.Assert((int)button < 32, $"Expected button < 32, so we fit into the 32 bit wide bitmask"); - var bit = 1U << (int)button; - if (value) - buttons |= bit; - else - buttons &= ~bit; - // dpad default state - buttons |= 8 << 24; - leftStickX = 0x8000; - leftStickY = 0x8000; - rightStickX = 0x8000; - rightStickY = 0x8000; + Set(button, value); return this; } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public void Set(Button button, bool state) + { + Debug.Assert((int)button < 18, $"Expected button < 18"); + if ((int)button < 16) + { + var bit = (ushort)(1U << (int)button); + if (state) + buttons1 = (ushort)(buttons1 | bit); + else + buttons1 &= (ushort)~bit; + } + else if ((int)button < 18) + { + var bit = (byte)(1U << ((int)button - 16)); + if (state) + buttons2 = (byte)(buttons2 | bit); + else + buttons2 &= (byte)~bit; + } + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public void Press(Button button) + { + Set(button, true); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public void Release(Button button) + { + Set(button, false); + } } #endif } @@ -113,12 +146,372 @@ namespace UnityEngine.InputSystem.Switch /// /// A Nintendo Switch Pro controller connected to a desktop mac/windows PC using the HID interface. /// - /// - /// This controller currently only works when connected via Bluetooth but not when connected over USB. - /// [InputControlLayout(stateType = typeof(SwitchProControllerHIDInputState), displayName = "Switch Pro Controller")] - public class SwitchProControllerHID : Gamepad + public class SwitchProControllerHID : Gamepad, IInputStateCallbackReceiver, IEventPreProcessor { + [InputControl(name = "capture", displayName = "Capture")] + public ButtonControl captureButton { get; protected set; } + + [InputControl(name = "home", displayName = "Home")] + public ButtonControl homeButton { get; protected set; } + + protected override void OnAdded() + { + base.OnAdded(); + + captureButton = GetChildControl("capture"); + homeButton = GetChildControl("home"); + + HandshakeRestart(); + } + + private static readonly SwitchMagicOutputReport.CommandIdType[] s_HandshakeSequence = new[] + { + SwitchMagicOutputReport.CommandIdType.Status, + SwitchMagicOutputReport.CommandIdType.Handshake, + SwitchMagicOutputReport.CommandIdType.Highspeed, + SwitchMagicOutputReport.CommandIdType.Handshake, + SwitchMagicOutputReport.CommandIdType.ForceUSB + ////TODO: Should we add a step to revert back to simple interface? + //// Because currently full reports don't work in old input system. + }; + + private int m_HandshakeStepIndex; + private double m_HandshakeTimer; + + private void HandshakeRestart() + { + // Delay first command issue until some time into the future + m_HandshakeStepIndex = -1; + m_HandshakeTimer = InputRuntime.s_Instance.currentTime; + } + + private void HandshakeTick() + { + const double handshakeRestartTimeout = 2.0; + const double handshakeNextStepTimeout = 0.1; + + var currentTime = InputRuntime.s_Instance.currentTime; + + // There were no events for last few seconds, restart handshake + if (currentTime >= m_LastUpdateTimeInternal + handshakeRestartTimeout && + currentTime >= m_HandshakeTimer + handshakeRestartTimeout) + m_HandshakeStepIndex = 0; + // If handshake is complete, ignore the tick. + else if (m_HandshakeStepIndex + 1 >= s_HandshakeSequence.Length) + return; + // If we timeout, proceed to next step after some time is elapsed. + else if (currentTime > m_HandshakeTimer + handshakeNextStepTimeout) + m_HandshakeStepIndex++; + // If we haven't timed out on handshake step, skip the tick. + else + return; + + m_HandshakeTimer = currentTime; + + var command = s_HandshakeSequence[m_HandshakeStepIndex]; + + // Native backend rejects one of the commands based on size of descriptor. + // So just report both at a same time. + ////TODO: fix this. + var commandBt = SwitchMagicOutputHIDBluetooth.Create(command); + if (ExecuteCommand(ref commandBt) > 0) + return; + + var commandUsb = SwitchMagicOutputHIDUSB.Create(command); + ExecuteCommand(ref commandUsb); + } + + public void OnNextUpdate() + { + HandshakeTick(); + } + + public void OnStateEvent(InputEventPtr eventPtr) + { + InputState.Change(this, eventPtr); + } + + public bool GetStateOffsetForEvent(InputControl control, InputEventPtr eventPtr, ref uint offset) + { + return false; + } + + public unsafe bool PreProcessEvent(InputEventPtr eventPtr) + { + if (eventPtr.type == DeltaStateEvent.Type) + // if someone queued delta state SPVS directly, just use as-is + // otherwise skip all delta state events + return DeltaStateEvent.FromUnchecked(eventPtr)->stateFormat == SwitchProControllerHIDInputState.Format; + + // use all other non-state/non-delta-state events + if (eventPtr.type != StateEvent.Type) + return true; + + var stateEvent = StateEvent.FromUnchecked(eventPtr); + var size = stateEvent->stateSizeInBytes; + + if (stateEvent->stateFormat == SwitchProControllerHIDInputState.Format) + return true; // if someone queued SPVS directly, just use as-is + + if (stateEvent->stateFormat != SwitchHIDGenericInputReport.Format || size < sizeof(SwitchHIDGenericInputReport)) + return false; // skip unrecognized state events otherwise they will corrupt control states + + var genericReport = (SwitchHIDGenericInputReport*)stateEvent->state; + if (genericReport->reportId == SwitchSimpleInputReport.ExpectedReportId && size >= SwitchSimpleInputReport.kSize) + { + var data = ((SwitchSimpleInputReport*)stateEvent->state)->ToHIDInputReport(); + *((SwitchProControllerHIDInputState*)stateEvent->state) = data; + stateEvent->stateFormat = SwitchProControllerHIDInputState.Format; + return true; + } + else if (genericReport->reportId == SwitchFullInputReport.ExpectedReportId && size >= SwitchFullInputReport.kSize) + { + var data = ((SwitchFullInputReport*)stateEvent->state)->ToHIDInputReport(); + *((SwitchProControllerHIDInputState*)stateEvent->state) = data; + stateEvent->stateFormat = SwitchProControllerHIDInputState.Format; + return true; + } + else + return false; // skip unrecognized reportId + } + + [StructLayout(LayoutKind.Explicit, Size = kSize)] + private struct SwitchSimpleInputReport + { + public const int kSize = 12; + public const byte ExpectedReportId = 0x3f; + + [FieldOffset(0)] public byte reportId; + [FieldOffset(1)] public byte buttons0; + [FieldOffset(2)] public byte buttons1; + [FieldOffset(3)] public byte hat; + [FieldOffset(4)] public ushort leftX; + [FieldOffset(6)] public ushort leftY; + [FieldOffset(8)] public ushort rightX; + [FieldOffset(10)] public ushort rightY; + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public SwitchProControllerHIDInputState ToHIDInputReport() + { + var leftXByte = (byte)NumberHelpers.RemapUIntBitsToNormalizeFloatToUIntBits(leftX, 16, 8); + var leftYByte = (byte)NumberHelpers.RemapUIntBitsToNormalizeFloatToUIntBits(leftY, 16, 8); + var rightXByte = (byte)NumberHelpers.RemapUIntBitsToNormalizeFloatToUIntBits(rightX, 16, 8); + var rightYByte = (byte)NumberHelpers.RemapUIntBitsToNormalizeFloatToUIntBits(rightY, 16, 8); + + var state = new SwitchProControllerHIDInputState + { + leftStickX = leftXByte, + leftStickY = leftYByte, + rightStickX = rightXByte, + rightStickY = rightYByte + }; + + state.Set(SwitchProControllerHIDInputState.Button.B, (buttons0 & 0x01) != 0); + state.Set(SwitchProControllerHIDInputState.Button.A, (buttons0 & 0x02) != 0); + state.Set(SwitchProControllerHIDInputState.Button.Y, (buttons0 & 0x04) != 0); + state.Set(SwitchProControllerHIDInputState.Button.X, (buttons0 & 0x08) != 0); + state.Set(SwitchProControllerHIDInputState.Button.L, (buttons0 & 0x10) != 0); + state.Set(SwitchProControllerHIDInputState.Button.R, (buttons0 & 0x20) != 0); + state.Set(SwitchProControllerHIDInputState.Button.ZL, (buttons0 & 0x40) != 0); + state.Set(SwitchProControllerHIDInputState.Button.ZR, (buttons0 & 0x80) != 0); + state.Set(SwitchProControllerHIDInputState.Button.Minus, (buttons1 & 0x01) != 0); + state.Set(SwitchProControllerHIDInputState.Button.Plus, (buttons1 & 0x02) != 0); + state.Set(SwitchProControllerHIDInputState.Button.StickL, (buttons1 & 0x04) != 0); + state.Set(SwitchProControllerHIDInputState.Button.StickR, (buttons1 & 0x08) != 0); + state.Set(SwitchProControllerHIDInputState.Button.Home, (buttons1 & 0x10) != 0); + state.Set(SwitchProControllerHIDInputState.Button.Capture, (buttons1 & 0x20) != 0); + + var left = false; + var up = false; + var right = false; + var down = false; + + switch (hat) + { + case 0: + up = true; + break; + case 1: + up = true; + right = true; + break; + case 2: + right = true; + break; + case 3: + down = true; + right = true; + break; + case 4: + down = true; + break; + case 5: + down = true; + left = true; + break; + case 6: + left = true; + break; + case 7: + up = true; + left = true; + break; + } + + state.Set(SwitchProControllerHIDInputState.Button.Left, left); + state.Set(SwitchProControllerHIDInputState.Button.Up, up); + state.Set(SwitchProControllerHIDInputState.Button.Right, right); + state.Set(SwitchProControllerHIDInputState.Button.Down, down); + + return state; + } + } + + [StructLayout(LayoutKind.Explicit, Size = kSize)] + private struct SwitchFullInputReport + { + public const int kSize = 25; + public const byte ExpectedReportId = 0x30; + + [FieldOffset(0)] public byte reportId; + [FieldOffset(3)] public byte buttons0; + [FieldOffset(4)] public byte buttons1; + [FieldOffset(5)] public byte buttons2; + [FieldOffset(6)] public byte left0; + [FieldOffset(7)] public byte left1; + [FieldOffset(8)] public byte left2; + [FieldOffset(9)] public byte right0; + [FieldOffset(10)] public byte right1; + [FieldOffset(11)] public byte right2; + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public SwitchProControllerHIDInputState ToHIDInputReport() + { + ////TODO: calibration curve + + var leftXRaw = (uint)(left0 | ((left1 & 0x0F) << 8)); + var leftYRaw = (uint)(((left1 & 0xF0) >> 4) | (left2 << 4)); + var rightXRaw = (uint)(right0 | ((right1 & 0x0F) << 8)); + var rightYRaw = (uint)(((right1 & 0xF0) >> 4) | (right2 << 4)); + + var leftXByte = (byte)NumberHelpers.RemapUIntBitsToNormalizeFloatToUIntBits(leftXRaw, 12, 8); + var leftYByte = (byte)(0xff - (byte)NumberHelpers.RemapUIntBitsToNormalizeFloatToUIntBits(leftYRaw, 12, 8)); + var rightXByte = (byte)NumberHelpers.RemapUIntBitsToNormalizeFloatToUIntBits(rightXRaw, 12, 8); + var rightYByte = (byte)(0xff - (byte)NumberHelpers.RemapUIntBitsToNormalizeFloatToUIntBits(rightYRaw, 12, 8)); + + var state = new SwitchProControllerHIDInputState + { + leftStickX = leftXByte, + leftStickY = leftYByte, + rightStickX = rightXByte, + rightStickY = rightYByte + }; + + state.Set(SwitchProControllerHIDInputState.Button.Y, (buttons0 & 0x01) != 0); + state.Set(SwitchProControllerHIDInputState.Button.X, (buttons0 & 0x02) != 0); + state.Set(SwitchProControllerHIDInputState.Button.B, (buttons0 & 0x04) != 0); + state.Set(SwitchProControllerHIDInputState.Button.A, (buttons0 & 0x08) != 0); + state.Set(SwitchProControllerHIDInputState.Button.R, (buttons0 & 0x40) != 0); + state.Set(SwitchProControllerHIDInputState.Button.ZR, (buttons0 & 0x80) != 0); + state.Set(SwitchProControllerHIDInputState.Button.Minus, (buttons1 & 0x01) != 0); + state.Set(SwitchProControllerHIDInputState.Button.Plus, (buttons1 & 0x02) != 0); + state.Set(SwitchProControllerHIDInputState.Button.StickR, (buttons1 & 0x04) != 0); + state.Set(SwitchProControllerHIDInputState.Button.StickL, (buttons1 & 0x08) != 0); + state.Set(SwitchProControllerHIDInputState.Button.Home, (buttons1 & 0x10) != 0); + state.Set(SwitchProControllerHIDInputState.Button.Capture, (buttons1 & 0x20) != 0); + state.Set(SwitchProControllerHIDInputState.Button.Down, (buttons2 & 0x01) != 0); + state.Set(SwitchProControllerHIDInputState.Button.Up, (buttons2 & 0x02) != 0); + state.Set(SwitchProControllerHIDInputState.Button.Right, (buttons2 & 0x04) != 0); + state.Set(SwitchProControllerHIDInputState.Button.Left, (buttons2 & 0x08) != 0); + state.Set(SwitchProControllerHIDInputState.Button.L, (buttons2 & 0x40) != 0); + state.Set(SwitchProControllerHIDInputState.Button.ZL, (buttons2 & 0x80) != 0); + + return state; + } + } + + [StructLayout(LayoutKind.Explicit)] + private struct SwitchHIDGenericInputReport + { + public static FourCC Format => new FourCC('H', 'I', 'D'); + + [FieldOffset(0)] public byte reportId; + } + + [StructLayout(LayoutKind.Explicit, Size = kSize)] + internal struct SwitchMagicOutputReport + { + public const int kSize = 49; + + public const byte ExpectedReplyInputReportId = 0x81; + + [FieldOffset(0)] public byte reportType; + [FieldOffset(1)] public byte commandId; + + internal enum ReportType + { + Magic = 0x80 + } + + public enum CommandIdType + { + Status = 0x01, + Handshake = 0x02, + Highspeed = 0x03, + ForceUSB = 0x04, + } + } + + [StructLayout(LayoutKind.Explicit, Size = kSize)] + internal struct SwitchMagicOutputHIDBluetooth : IInputDeviceCommandInfo + { + public static FourCC Type => new FourCC('H', 'I', 'D', 'O'); + public FourCC typeStatic => Type; + + public const int kSize = InputDeviceCommand.kBaseCommandSize + 49; + + [FieldOffset(0)] public InputDeviceCommand baseCommand; + [FieldOffset(InputDeviceCommand.kBaseCommandSize + 0)] public SwitchMagicOutputReport report; + + public static SwitchMagicOutputHIDBluetooth Create(SwitchMagicOutputReport.CommandIdType type) + { + return new SwitchMagicOutputHIDBluetooth + { + baseCommand = new InputDeviceCommand(Type, kSize), + report = new SwitchMagicOutputReport + { + reportType = (byte)SwitchMagicOutputReport.ReportType.Magic, + commandId = (byte)type + } + }; + } + } + + [StructLayout(LayoutKind.Explicit, Size = kSize)] + internal struct SwitchMagicOutputHIDUSB : IInputDeviceCommandInfo + { + public static FourCC Type => new FourCC('H', 'I', 'D', 'O'); + public FourCC typeStatic => Type; + + public const int kSize = InputDeviceCommand.kBaseCommandSize + 64; + + [FieldOffset(0)] public InputDeviceCommand baseCommand; + [FieldOffset(InputDeviceCommand.kBaseCommandSize + 0)] public SwitchMagicOutputReport report; + + public static SwitchMagicOutputHIDUSB Create(SwitchMagicOutputReport.CommandIdType type) + { + return new SwitchMagicOutputHIDUSB + { + baseCommand = new InputDeviceCommand(Type, kSize), + report = new SwitchMagicOutputReport + { + reportType = (byte)SwitchMagicOutputReport.ReportType.Magic, + commandId = (byte)type + } + }; + } + } } #endif } diff --git a/Packages/com.unity.inputsystem/InputSystem/Utilities/NumberHelpers.cs b/Packages/com.unity.inputsystem/InputSystem/Utilities/NumberHelpers.cs index 50ef99e3b1..68c164ef0a 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Utilities/NumberHelpers.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Utilities/NumberHelpers.cs @@ -83,5 +83,15 @@ public static uint NormalizedFloatToUInt(float value, uint uintMinValue, uint ui return uintMaxValue; return (uint)(value * ((double)uintMaxValue - uintMinValue) + uintMinValue); } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static uint RemapUIntBitsToNormalizeFloatToUIntBits(uint value, uint inBitSize, uint outBitSize) + { + var inMaxValue = (uint)((1UL << (int)inBitSize) - 1); + var outMaxValue = (uint)((1UL << (int)outBitSize) - 1); + + var normFloat = UIntToNormalizedFloat(value, 0, inMaxValue); + return NormalizedFloatToUInt(normFloat, 0, outMaxValue); + } } } From 7fa6b995b4cef85dc0b9ee809fa66a4fc2bcf21e Mon Sep 17 00:00:00 2001 From: Dmytro Ivanov Date: Thu, 13 Jan 2022 14:48:02 +0100 Subject: [PATCH 08/53] FIX: Fixing CloseWindow being called when clicking on separator items in dropdown window (#1487) --- Packages/com.unity.inputsystem/CHANGELOG.md | 3 ++- .../Internal/AdvancedDropdown/AdvancedDropdownWindow.cs | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index d9d0478dbe..20c1550576 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -13,10 +13,11 @@ however, it has to be formatted properly to pass verification tests. ### Fixed - Fixed Switch Pro controller not working correctly in different scenarios ([case 1369091](https://issuetracker.unity3d.com/issues/nintendo-switch-pro-controller-output-garbage), [case 1190216](https://issuetracker.unity3d.com/issues/inputsystem-windows-switch-pro-controller-only-works-when-connected-via-bluetooth-but-not-via-usb), case 1314869). +- Fixed `InvalidCastException: Specified cast is not valid.` being thrown when clicking on menu separators in the control picker ([case 1388049](https://issuetracker.unity3d.com/issues/invalidcastexception-is-thrown-when-selecting-the-header-of-an-advanceddropdown)). #### Actions -* Fixed `InputAction.GetTimeoutCompletionPercentage` jumping to 100% completion early ([case 1377009](https://issuetracker.unity3d.com/issues/gettimeoutcompletionpercentage-returns-1-after-0-dot-1s-when-hold-action-was-started-even-though-it-is-not-performed-yet)). +- Fixed `InputAction.GetTimeoutCompletionPercentage` jumping to 100% completion early ([case 1377009](https://issuetracker.unity3d.com/issues/gettimeoutcompletionpercentage-returns-1-after-0-dot-1s-when-hold-action-was-started-even-though-it-is-not-performed-yet)). ## [1.3.0] - 2021-12-10 diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/AdvancedDropdown/AdvancedDropdownWindow.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/AdvancedDropdown/AdvancedDropdownWindow.cs index cde075d1eb..e0838765c4 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/AdvancedDropdown/AdvancedDropdownWindow.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/AdvancedDropdown/AdvancedDropdownWindow.cs @@ -463,12 +463,9 @@ private void DrawList(AdvancedDropdownItem item) { GoToChild(); } - else + else if (!selectedChild.IsSeparator()) { - if (!selectedChild.IsSeparator() && selectionChanged != null) - { - selectionChanged(selectedChild); - } + selectionChanged?.Invoke(selectedChild); if (closeOnSelection) { CloseWindow(); From 753bc6b2a76a65512a49d724763df9b1cac6a9d0 Mon Sep 17 00:00:00 2001 From: Rene Damm Date: Sat, 15 Jan 2022 00:45:48 +0100 Subject: [PATCH 09/53] CHANGE: Behavior between button release threshold and zero (case 1393330, #1490). --- Assets/Tests/InputSystem/CoreTests_Actions.cs | 74 ++++++++++++++++++- .../CoreTests_Actions_Interactions.cs | 2 +- Packages/com.unity.inputsystem/CHANGELOG.md | 19 +++++ .../InputSystem/Actions/InputActionState.cs | 14 +++- .../Actions/Interactions/PressInteraction.cs | 9 ++- .../Tests/TestFixture/InputTestFixture.cs | 18 ++--- 6 files changed, 119 insertions(+), 17 deletions(-) diff --git a/Assets/Tests/InputSystem/CoreTests_Actions.cs b/Assets/Tests/InputSystem/CoreTests_Actions.cs index 4fb7e4b1ae..7db95bb7d8 100644 --- a/Assets/Tests/InputSystem/CoreTests_Actions.cs +++ b/Assets/Tests/InputSystem/CoreTests_Actions.cs @@ -461,7 +461,7 @@ public void Actions_ButtonActions_RespectButtonPressPoints() // No change on left trigger action, right trigger action cancels. Assert.That(leftTriggerButtonTrace, Is.Empty); - Assert.That(rightTriggerButtonTrace, Canceled(rightTriggerButton, gamepad.rightTrigger, value: 0f)); + Assert.That(rightTriggerButtonTrace, Started(rightTriggerButton, gamepad.rightTrigger, value: 0.6f)); Assert.That(leftTriggerValueTrace, Performed(leftTriggerValue, gamepad.leftTrigger, value: 0.6f)); Assert.That(rightTriggerValueTrace, Performed(rightTriggerValue, gamepad.rightTrigger, value: 0.6f)); @@ -475,8 +475,8 @@ public void Actions_ButtonActions_RespectButtonPressPoints() Set(gamepad.rightTrigger, 0.4f); // Left trigger cancels, right trigger *starts* again (but doesn't perform). - Assert.That(leftTriggerButtonTrace, Canceled(leftTriggerButton, gamepad.leftTrigger, value: 0f)); - Assert.That(rightTriggerButtonTrace, Started(rightTriggerButton, gamepad.rightTrigger, 0.4f)); + Assert.That(leftTriggerButtonTrace, Started(leftTriggerButton, gamepad.leftTrigger, value: 0.4f)); + Assert.That(rightTriggerButtonTrace, Is.Empty); Assert.That(leftTriggerValueTrace, Performed(leftTriggerValue, gamepad.leftTrigger, value: 0.4f)); Assert.That(rightTriggerValueTrace, Performed(rightTriggerValue, gamepad.rightTrigger, value: 0.4f)); @@ -490,7 +490,7 @@ public void Actions_ButtonActions_RespectButtonPressPoints() Set(gamepad.rightTrigger, 0f); // No change on left and right trigger actions. - Assert.That(leftTriggerButtonTrace, Is.Empty); + Assert.That(leftTriggerButtonTrace, Canceled(leftTriggerButton, gamepad.leftTrigger, 0f)); Assert.That(rightTriggerButtonTrace, Canceled(rightTriggerButton, gamepad.rightTrigger, 0f)); Assert.That(leftTriggerValueTrace, Canceled(leftTriggerValue, gamepad.leftTrigger, value: 0f)); @@ -517,6 +517,72 @@ public void Actions_ButtonActions_RespectButtonPressPoints() } } + // https://fogbugz.unity3d.com/f/cases/1393330/ + [Test] + [Category("Actions")] + public void Actions_ButtonActions_GoBackToStartedWhenHeldBelowReleasePoint() + { + InputSystem.settings.defaultButtonPressPoint = 0.5f; + InputSystem.settings.buttonReleaseThreshold = 0.8f; + var gamepad = InputSystem.AddDevice(); + + // Make sure both PressInteraction and the default interaction handles this exactly the same way. + var buttonAction = new InputAction(type: InputActionType.Button, binding: "/rightTrigger"); + var pressAction = new InputAction(type: InputActionType.Value, binding: "/rightTrigger", interactions: "press"); + + buttonAction.Enable(); + pressAction.Enable(); + + using (var buttonTrace = new InputActionTrace(buttonAction)) + using (var pressTrace = new InputActionTrace(pressAction)) + { + // Started. + Set(gamepad.rightTrigger, 0.3f); + + Assert.That(buttonTrace, Started(buttonAction, value: 0.3f)); + Assert.That(pressTrace, Started(pressAction, value: 0.3f)); + + buttonTrace.Clear(); + pressTrace.Clear(); + + // Started. + Set(gamepad.rightTrigger, 0.1f); + + Assert.That(buttonTrace, Is.Empty); + Assert.That(pressTrace, Is.Empty); + + // Performed. + Set(gamepad.rightTrigger, 0.6f); + + Assert.That(buttonTrace, Performed(buttonAction, value: 0.6f)); + Assert.That(pressTrace, Performed(pressAction, value: 0.6f)); + + buttonTrace.Clear(); + pressTrace.Clear(); + + // Performed. + Set(gamepad.rightTrigger, 0.7f); + + Assert.That(buttonTrace, Is.Empty); + Assert.That(pressTrace, Is.Empty); + + // Started. + Set(gamepad.rightTrigger, 0.3f); + + Assert.That(buttonTrace, Started(buttonAction, value: 0.3f)); + Assert.That(pressTrace, Started(pressAction, value: 0.3f)); + + buttonTrace.Clear(); + pressTrace.Clear(); + + // Canceled. + Set(gamepad.rightTrigger, 0); + + Assert.That(buttonTrace, Canceled(buttonAction, value: 0)); + Assert.That(pressTrace, Canceled(pressAction, value: 0)); + } + } + [Test] [Category("Actions")] public void Actions_ButtonActions_DoNotReactToCurrentStateOfControlWhenEnabled() diff --git a/Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs b/Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs index f17d9c4b19..c96e6f4bd5 100644 --- a/Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs +++ b/Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs @@ -335,7 +335,7 @@ public void Actions_CanPerformPressInteraction_UsingReleasePointWhenBoundToAxisC Set(gamepad.leftTrigger, 0.3f); - Assert.That(trace, Canceled(action, control: gamepad.leftTrigger, value: 0f)); + Assert.That(trace, Started(action, control: gamepad.leftTrigger, value: 0.3f)); } } diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 20c1550576..8854ef0d30 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -10,6 +10,25 @@ however, it has to be formatted properly to pass verification tests. ## [Unreleased] +## Changed + +* `Button` type `InputAction`s now go to `started` when a button goes from a press to below the release threshold but not yet to 0 ([case ] + ```CSharp + // Before: + Set(Gamepad.current.rightTrigger, 0.7f); // Performed (pressed) + Set(Gamepad.current.rightTrigger, 0.2f); // Canceled (released) + Set(Gamepad.current.rightTrigger, 0.1f); // Started!! + Set(Gamepad.current.rightTrigger, 0f); // Canceled + + // Now: + Set(Gamepad.current.rightTrigger, 0.7f); // Performed (pressed) + Set(Gamepad.current.rightTrigger, 0.2f); // Started (released but not fully) + Set(Gamepad.current.rightTrigger, 0.1f); // + Set(Gamepad.current.rightTrigger, 0f); // Canceled + ``` + - This also applies to `PressInteraction` when set to `Press` behavior. + - In effect, it means that a button will be in `started` or `performed` phase for as long as its value is not 0 and will only go to `canceled` once dropping to 0. + ### Fixed - Fixed Switch Pro controller not working correctly in different scenarios ([case 1369091](https://issuetracker.unity3d.com/issues/nintendo-switch-pro-controller-output-garbage), [case 1190216](https://issuetracker.unity3d.com/issues/inputsystem-windows-switch-pro-controller-only-works-when-connected-via-bluetooth-but-not-via-usb), case 1314869). diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs index c28fda6df1..4880ad496c 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs @@ -1567,9 +1567,19 @@ private void ProcessDefaultInteraction(ref TriggerState trigger, int actionIndex { var actuation = ComputeMagnitude(ref trigger); var pressPoint = controls[trigger.controlIndex] is ButtonControl button ? button.pressPointOrDefault : ButtonControl.s_GlobalDefaultButtonPressPoint; - var threshold = pressPoint * ButtonControl.s_GlobalDefaultButtonReleaseThreshold; - if (actuation <= threshold) + if (Mathf.Approximately(0f, actuation)) + { ChangePhaseOfAction(InputActionPhase.Canceled, ref trigger); + } + else + { + var threshold = pressPoint * ButtonControl.s_GlobalDefaultButtonReleaseThreshold; + if (actuation <= threshold) + { + // Button released to below threshold but not fully released. + ChangePhaseOfAction(InputActionPhase.Started, ref trigger); + } + } } else if (actionState->isPassThrough) { diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/PressInteraction.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/PressInteraction.cs index cdc928fdae..e7ba07125f 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/PressInteraction.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/PressInteraction.cs @@ -72,7 +72,10 @@ public void Process(ref InputInteractionContext context) if (actuation <= releasePointOrDefault) { m_WaitingForRelease = false; - context.Canceled(); + if (Mathf.Approximately(0f, actuation)) + context.Canceled(); + else + context.Started(); } } else if (actuation >= pressPointOrDefault) @@ -85,6 +88,10 @@ public void Process(ref InputInteractionContext context) { context.Started(); } + else if (Mathf.Approximately(0f, actuation) && context.isStarted) + { + context.Canceled(); + } break; case PressBehavior.ReleaseOnly: diff --git a/Packages/com.unity.inputsystem/Tests/TestFixture/InputTestFixture.cs b/Packages/com.unity.inputsystem/Tests/TestFixture/InputTestFixture.cs index 7de2b8e980..21b2259798 100644 --- a/Packages/com.unity.inputsystem/Tests/TestFixture/InputTestFixture.cs +++ b/Packages/com.unity.inputsystem/Tests/TestFixture/InputTestFixture.cs @@ -838,27 +838,27 @@ private bool Verify(InputActionTrace.ActionEventPtr eventPtr) if (value != null) { var val = eventPtr.ReadValueAsObject(); - if (value is float f) + if (val is float f) { - if (!Mathf.Approximately(f, Convert.ToSingle(val))) + if (!Mathf.Approximately(f, Convert.ToSingle(value))) return false; } - else if (value is double d) + else if (val is double d) { - if (!Mathf.Approximately((float)d, (float)Convert.ToDouble(val))) + if (!Mathf.Approximately((float)d, (float)Convert.ToDouble(value))) return false; } - else if (value is Vector2 v2) + else if (val is Vector2 v2) { - if (!Vector2EqualityComparer.Instance.Equals(v2, val.As())) + if (!Vector2EqualityComparer.Instance.Equals(v2, value.As())) return false; } - else if (value is Vector3 v3) + else if (val is Vector3 v3) { - if (!Vector3EqualityComparer.Instance.Equals(v3, val.As())) + if (!Vector3EqualityComparer.Instance.Equals(v3, value.As())) return false; } - else if (!value.Equals(val)) + else if (!val.Equals(value)) return false; } From 645c6f15286fdfb95660848158054940f8e30c45 Mon Sep 17 00:00:00 2001 From: andrew-oc <78356434+andrew-oc@users.noreply.github.com> Date: Thu, 20 Jan 2022 10:33:30 +0100 Subject: [PATCH 10/53] FIX: Input from other devices not working when DualShock 4 controller is connected (#1493) --- Assets/Tests/InputSystem/CoreTests_Editor.cs | 24 ++++++++++++++++--- Assets/Tests/InputSystem/CoreTests_Layouts.cs | 23 ++++++++++++++++++ Packages/com.unity.inputsystem/CHANGELOG.md | 1 + .../InputSystem/Controls/InputControl.cs | 5 +++- .../Controls/InputControlLayout.cs | 19 +++++++++++++++ .../Controls/InputControlLayoutAttribute.cs | 13 ++++++++++ .../InputSystem/Devices/InputDeviceBuilder.cs | 6 +++++ .../Editor/InputLayoutCodeGenerator.cs | 6 +++-- .../Plugins/DualShock/DualShockGamepadHID.cs | 2 +- .../DualShock/FastDualShock4GamepadHID.cs | 1 + 10 files changed, 93 insertions(+), 7 deletions(-) diff --git a/Assets/Tests/InputSystem/CoreTests_Editor.cs b/Assets/Tests/InputSystem/CoreTests_Editor.cs index 012582d338..5646539eb4 100644 --- a/Assets/Tests/InputSystem/CoreTests_Editor.cs +++ b/Assets/Tests/InputSystem/CoreTests_Editor.cs @@ -7,6 +7,7 @@ using System.CodeDom.Compiler; using System.Text.RegularExpressions; using System.Reflection; +using System.Text; using NUnit.Framework; using UnityEditor; using UnityEngine.Scripting; @@ -3058,13 +3059,30 @@ public void Editor_CanGenerateCodeForInputDeviceLayout(string layoutName, Type d internal static Type Compile(string code, string typeName, string options = null) { var codeProvider = CodeDomProvider.CreateProvider("CSharp"); - var cp = new CompilerParameters(); - cp.CompilerOptions = options; + var cp = new CompilerParameters { CompilerOptions = options }; cp.ReferencedAssemblies.Add($"{EditorApplication.applicationContentsPath}/Managed/UnityEngine/UnityEngine.CoreModule.dll"); cp.ReferencedAssemblies.Add("Library/ScriptAssemblies/Unity.InputSystem.dll"); var cr = codeProvider.CompileAssemblyFromSource(cp, code); - Assert.That(cr.Errors, Is.Empty); + var assembly = cr.CompiledAssembly; + + // on some machines/environments, mono/mcs (which the codedom compiler uses) outputs a byte order mark after a successful compile, which + // codedom interprets as an error. Check for that here and just load the assembly manually in that case + if (cr.Errors.HasErrors) + { + if (!Encoding.UTF8.GetBytes(cr.Errors[0].ErrorText).SequenceEqual(Encoding.UTF8.GetPreamble())) + Assert.Fail($"Compilation failed: {cr.Errors}"); + + foreach (var tempFile in cr.TempFiles) + { + if (tempFile is string tempFileStr && tempFileStr.EndsWith("dll")) + { + assembly = Assembly.Load(new AssemblyName { CodeBase = tempFileStr }); + break; + } + } + } + Assert.That(assembly, Is.Not.Null); var type = assembly.GetType(typeName); Assert.That(type, Is.Not.Null); diff --git a/Assets/Tests/InputSystem/CoreTests_Layouts.cs b/Assets/Tests/InputSystem/CoreTests_Layouts.cs index c645ebcbef..bb22af0ab9 100644 --- a/Assets/Tests/InputSystem/CoreTests_Layouts.cs +++ b/Assets/Tests/InputSystem/CoreTests_Layouts.cs @@ -2667,4 +2667,27 @@ public void Layouts_CanConfigureDeviceUsages() InputSystem.RemoveDeviceUsage(gamepad, CommonUsages.Vertical); Assert.That(gamepad.usages, Is.Empty); } + + private struct TestNoisyDeviceWithNoExplicityNoisyControlsState : IInputStateTypeInfo + { + [InputControl(layout = "Button")] + public bool control; + + public FourCC format => new FourCC('T', 'E', 'S', 'T'); + } + + [InputControlLayout(stateType = typeof(TestNoisyDeviceWithNoExplicityNoisyControlsState), isNoisy = true)] + private class TestNoisyDeviceWithNoExplicityNoisyControls : InputDevice + { + } + + [Test] + [Category("Layouts")] + public void Layouts_CanMarkDeviceNoisy_WhenDeviceHasNoExplicitlyNoisyControls() + { + InputSystem.RegisterLayout("Test"); + var device = InputDevice.Build("Test"); + + Assert.That(device.noisy, Is.True); + } } diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 8854ef0d30..e8d12a0c33 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -33,6 +33,7 @@ however, it has to be formatted properly to pass verification tests. - Fixed Switch Pro controller not working correctly in different scenarios ([case 1369091](https://issuetracker.unity3d.com/issues/nintendo-switch-pro-controller-output-garbage), [case 1190216](https://issuetracker.unity3d.com/issues/inputsystem-windows-switch-pro-controller-only-works-when-connected-via-bluetooth-but-not-via-usb), case 1314869). - Fixed `InvalidCastException: Specified cast is not valid.` being thrown when clicking on menu separators in the control picker ([case 1388049](https://issuetracker.unity3d.com/issues/invalidcastexception-is-thrown-when-selecting-the-header-of-an-advanceddropdown)). +- Fixed DualShock 4 controller not allowing input from other devices due to noisy input from its unmapped sensors ([case 1365891](https://issuetracker.unity3d.com/issues/input-from-the-keyboard-is-not-working-when-the-dualshock-4-controller-is-connected)). #### Actions diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControl.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControl.cs index 755b945255..63b8d38b4e 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControl.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControl.cs @@ -349,7 +349,10 @@ internal set // Making a control noisy makes all its children noisy. var list = children; for (var i = 0; i < list.Count; ++i) - list[i].noisy = true; + { + if (null != list[i]) + list[i].noisy = true; + } } else m_ControlFlags &= ~ControlFlags.IsNoisy; diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlLayout.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlLayout.cs index 692afa5c4c..d263f1082a 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlLayout.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlLayout.cs @@ -475,6 +475,23 @@ internal set } } + /// + /// Mark the input device created from this layout as noisy, irrespective of whether or not any + /// of its controls have been marked as noisy. + /// + /// + public bool isNoisy + { + get => (m_Flags & Flags.IsNoisy) != 0; + internal set + { + if (value) + m_Flags |= Flags.IsNoisy; + else + m_Flags &= ~Flags.IsNoisy; + } + } + /// /// Override value for . If this is set by the /// layout, it will prevent from being issued. However, other @@ -976,6 +993,7 @@ public static InputControlLayout FromType(string name, Type type) m_Description = layoutAttribute?.description, m_DisplayName = layoutAttribute?.displayName, canRunInBackground = layoutAttribute?.canRunInBackgroundInternal, + isNoisy = layoutAttribute?.isNoisy ?? false }; if (layoutAttribute?.commonUsages != null) @@ -1023,6 +1041,7 @@ private enum Flags IsOverride = 1 << 2, CanRunInBackground = 1 << 3, CanRunInBackgroundIsSet = 1 << 4, + IsNoisy = 1 << 5 } private InputControlLayout(string name, Type type) diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlLayoutAttribute.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlLayoutAttribute.cs index ca6e72d319..70928594ab 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlLayoutAttribute.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlLayoutAttribute.cs @@ -55,6 +55,19 @@ public sealed class InputControlLayoutAttribute : Attribute public string variants { get; set; } + /// + /// Allows marking a device as noisy regardless of control layout. + /// + /// + /// Controls can be individually marked as noisy using the + /// attribute, but this property can be used to mark a device as noisy even when no control has been + /// marked as such. This can be useful when a device state layout has only been partially implemented + /// i.e. some data in the state memory has not been mapped to a control, and the unimplemented controls + /// are noisy. Without doing this, the device will constantly be made current as the system has no way + /// to know that the event data contains only noise. + /// + public bool isNoisy { get; set; } + internal bool? canRunInBackgroundInternal; public bool canRunInBackground diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/InputDeviceBuilder.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/InputDeviceBuilder.cs index 8d8a3ace52..d296732a2e 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Devices/InputDeviceBuilder.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Devices/InputDeviceBuilder.cs @@ -193,6 +193,12 @@ private InputControl InstantiateLayout(InternedString layout, InternedString var control.m_Parent = parent; control.m_Device = m_Device; + // this has to be done down here instead of in the device block above because the state for the + // device needs to be set up before setting noisy or it will throw because the device's m_Device + // hasn't been set yet. Yes, a device's m_Device is itself. + if (control is InputDevice) + control.noisy = layout.isNoisy; + // Create children and configure their settings from our // layout values. var haveChildrenUsingStateFromOtherControl = false; diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/InputLayoutCodeGenerator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/InputLayoutCodeGenerator.cs index 7ad9c8a400..f412b174b7 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/InputLayoutCodeGenerator.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/InputLayoutCodeGenerator.cs @@ -146,10 +146,11 @@ public static string GenerateCodeForDeviceLayout(string layoutName, string defin writer.WriteLine($" .WithDisplayName(\"{device.displayName}\")"); writer.WriteLine($" .WithChildren({device.m_ChildStartIndex}, {device.m_ChildCount})"); writer.WriteLine($" .WithLayout(new InternedString(\"{device.layout}\"))"); - if (device.noisy) - writer.WriteLine(" .IsNoisy(true)"); writer.WriteLine($" .WithStateBlock(new InputStateBlock {{ format = new FourCC({(int)device.stateBlock.format}), sizeInBits = {device.stateBlock.sizeInBits} }});"); + if (device.noisy) + writer.WriteLine("builder.IsNoisy(true);"); + // Add controls to device. writer.WriteLine(); foreach (var layout in usedControlLayouts) @@ -231,6 +232,7 @@ public static string GenerateCodeForDeviceLayout(string layoutName, string defin } writer.WriteLine(); + writer.WriteLine("builder.Finish();"); writer.EndBlock(); diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockGamepadHID.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockGamepadHID.cs index e8517d0dfc..b362a01adc 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockGamepadHID.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockGamepadHID.cs @@ -669,7 +669,7 @@ public DualSenseHIDInputReport ToHIDInputReport() /// /// PS4 DualShock controller that is interfaced to a HID backend. /// - [InputControlLayout(stateType = typeof(DualShock4HIDInputReport), hideInUI = true)] + [InputControlLayout(stateType = typeof(DualShock4HIDInputReport), hideInUI = true, isNoisy = true)] public class DualShock4GamepadHID : DualShockGamepad { public ButtonControl leftTriggerButton { get; protected set; } diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/FastDualShock4GamepadHID.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/FastDualShock4GamepadHID.cs index 0c0ff7acc8..925ac4069d 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/FastDualShock4GamepadHID.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/FastDualShock4GamepadHID.cs @@ -32,6 +32,7 @@ public FastDualShock4GamepadHID() .WithChildren(0, 19) .WithLayout(new InternedString("DualShock4GamepadHID")) .WithStateBlock(new InputStateBlock { format = new FourCC(1212761120), sizeInBits = 80 }); + builder.IsNoisy(true); var kStickLayout = new InternedString("Stick"); var kDpadLayout = new InternedString("Dpad"); From c3f3360b2e210a901ca54ebbc2bcca1422f3f336 Mon Sep 17 00:00:00 2001 From: andrew-oc <78356434+andrew-oc@users.noreply.github.com> Date: Fri, 21 Jan 2022 13:55:00 +0100 Subject: [PATCH 11/53] FIX: InputSystem.onAnyButtonPress now filters out non-state or delta state events (#1475) --- Assets/Tests/InputSystem/CoreTests_Events.cs | 31 +++++++++++++++ Packages/com.unity.inputsystem/CHANGELOG.md | 1 + .../Controls/InputControlExtensions.cs | 38 ++++++++++++------- .../InputSystem/InputSystem.cs | 3 +- 4 files changed, 59 insertions(+), 14 deletions(-) diff --git a/Assets/Tests/InputSystem/CoreTests_Events.cs b/Assets/Tests/InputSystem/CoreTests_Events.cs index 6de1f06996..502d624ca4 100644 --- a/Assets/Tests/InputSystem/CoreTests_Events.cs +++ b/Assets/Tests/InputSystem/CoreTests_Events.cs @@ -179,6 +179,37 @@ public void Events_CanListenForButtonPresses() InputSystem.Update(); } + [Test] + [Category("Events")] + public void Events_OnAnyButtonPressed_FiltersOutNonStateEvents() + { + var keyboard = InputSystem.AddDevice(); + + var callCount = 0; + + InputSystem.onAnyButtonPress + .CallOnce(_ => { ++callCount; }); + + InputSystem.QueueTextEvent(keyboard, ' '); + InputSystem.Update(); + + Assert.That(callCount, Is.EqualTo(0)); + } + + [Test] + [Category("Events")] + public unsafe void Events_GetAllButtonPressesInEvent_ReturnsEmptyEnumerableForNonStateOrDeltaStateEvents() + { + var inputEvent = TextEvent.Create(InputSystem.AddDevice().deviceId, ' '); + + IEnumerable controls = null; + Assert.That(() => + { + controls = InputControlExtensions.GetAllButtonPresses((InputEvent*)UnsafeUtility.AddressOf(ref inputEvent)); + }, Throws.Nothing); + Assert.That(controls, Is.Empty); + } + [Test] [Category("Events")] public void Events_CanGetAllButtonPressesInEvent() diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index e8d12a0c33..0b6deb62c1 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -34,6 +34,7 @@ however, it has to be formatted properly to pass verification tests. - Fixed Switch Pro controller not working correctly in different scenarios ([case 1369091](https://issuetracker.unity3d.com/issues/nintendo-switch-pro-controller-output-garbage), [case 1190216](https://issuetracker.unity3d.com/issues/inputsystem-windows-switch-pro-controller-only-works-when-connected-via-bluetooth-but-not-via-usb), case 1314869). - Fixed `InvalidCastException: Specified cast is not valid.` being thrown when clicking on menu separators in the control picker ([case 1388049](https://issuetracker.unity3d.com/issues/invalidcastexception-is-thrown-when-selecting-the-header-of-an-advanceddropdown)). - Fixed DualShock 4 controller not allowing input from other devices due to noisy input from its unmapped sensors ([case 1365891](https://issuetracker.unity3d.com/issues/input-from-the-keyboard-is-not-working-when-the-dualshock-4-controller-is-connected)). +- Fixed `InputSystem.onAnyButtonPress` so that it doesn't throw exceptions when trying to process non state or delta events ([case 1376034](https://issuetracker.unity3d.com/product/unity/issues/guid/1376034/)). #### Actions diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlExtensions.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlExtensions.cs index d227530c3c..ff87adcf13 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlExtensions.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlExtensions.cs @@ -1068,9 +1068,9 @@ public static InputEventControlCollection EnumerateChangedControls(this InputEve /// /// Return true if the given has any /// - /// - /// - /// + /// An event. Must be a or . + /// The threshold value that a button must be actuated by to be considered pressed. + /// Whether the method should only consider button controls. See . /// /// is a null pointer. /// is not a or -or- @@ -1085,20 +1085,29 @@ public static bool HasButtonPress(this InputEventPtr eventPtr, float magnitude = /// /// Get the first pressed button from the given event or null if the event doesn't contain a new button press. /// - /// - /// - /// + /// An event. Must be a or . + /// The threshold value that a control must be actuated by (see + /// ) to be considered pressed. If not given, defaults to . + /// Whether the method should only consider s. Otherwise, + /// any that has an actuation (see ) equal to + /// or greater than the given will be considered a pressed button. This is 'true' by + /// default. /// The control that was pressed. /// is a null pointer. - /// is not a or -or- - /// the referenced by the in the event cannot be found. + /// The referenced by the in the event cannot + /// be found. /// /// /// Buttons will be evaluated in the order that they appear in the devices layout i.e. the bit position of each control /// in the devices state memory. For example, in the gamepad state, button north (bit position 4) will be evaluated before button - /// east (bit position 5), so if both buttons were pressed in the given event, button north would be returned. + /// east (bit position 5), so if both buttons were pressed in the given event, button north would be returned. + /// Note that the function returns null if the is not a StateEvent or DeltaStateEvent. public static InputControl GetFirstButtonPressOrNull(this InputEventPtr eventPtr, float magnitude = -1, bool buttonControlsOnly = true) { + if (eventPtr.type != StateEvent.Type && eventPtr.type != DeltaStateEvent.Type) + return null; + if (magnitude < 0) magnitude = InputSystem.settings.defaultButtonPressPoint; @@ -1115,16 +1124,19 @@ public static InputControl GetFirstButtonPressOrNull(this InputEventPtr eventPtr /// Enumerate all pressed buttons in the given event. /// /// An event. Must be a or . - /// - /// + /// The threshold value that a button must be actuated by to be considered pressed. + /// Whether the method should only consider button controls. See . /// An enumerable collection containing all buttons that were pressed in the given event. /// is a null pointer. - /// is not a or -or- - /// the referenced by the in the event cannot be found. + /// The referenced by the in the event cannot be found. + /// Returns an empty enumerable if the is not a StateEvent or DeltaStateEvent. /// /// public static IEnumerable GetAllButtonPresses(this InputEventPtr eventPtr, float magnitude = -1, bool buttonControlsOnly = true) { + if (eventPtr.type != StateEvent.Type && eventPtr.type != DeltaStateEvent.Type) + yield break; + if (magnitude < 0) magnitude = InputSystem.settings.defaultButtonPressPoint; diff --git a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs index 5bc9b248c8..6ed567ecac 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs @@ -2401,7 +2401,8 @@ public static InputEventListener onEvent /// /// public static IObservable onAnyButtonPress => - onEvent.Select(e => e.GetFirstButtonPressOrNull()).Where(c => c != null); + onEvent + .Select(e => e.GetFirstButtonPressOrNull()).Where(c => c != null); /// /// Add an event to the internal event queue. From ef992809e066ac35b914f08b53b13e88203c3fc9 Mon Sep 17 00:00:00 2001 From: andrew-oc <78356434+andrew-oc@users.noreply.github.com> Date: Mon, 24 Jan 2022 08:51:00 +0100 Subject: [PATCH 12/53] FIX: Remove xmldoc references to internal member (#1499) --- .../InputSystem/Controls/InputControlExtensions.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlExtensions.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlExtensions.cs index ff87adcf13..bf09dd8906 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlExtensions.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlExtensions.cs @@ -1070,7 +1070,7 @@ public static InputEventControlCollection EnumerateChangedControls(this InputEve /// /// An event. Must be a or . /// The threshold value that a button must be actuated by to be considered pressed. - /// Whether the method should only consider button controls. See . + /// Whether the method should only consider button controls. /// /// is a null pointer. /// is not a or -or- @@ -1125,11 +1125,11 @@ public static InputControl GetFirstButtonPressOrNull(this InputEventPtr eventPtr /// /// An event. Must be a or . /// The threshold value that a button must be actuated by to be considered pressed. - /// Whether the method should only consider button controls. See . + /// Whether the method should only consider button controls. /// An enumerable collection containing all buttons that were pressed in the given event. /// is a null pointer. /// The referenced by the in the event cannot be found. - /// Returns an empty enumerable if the is not a StateEvent or DeltaStateEvent. + /// Returns an empty enumerable if the is not a or . /// /// public static IEnumerable GetAllButtonPresses(this InputEventPtr eventPtr, float magnitude = -1, bool buttonControlsOnly = true) From 5f2b4b88e937c161ffa85ab02c7ca93ba3282806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kan=20Sidenvall?= Date: Thu, 27 Jan 2022 15:21:57 +0100 Subject: [PATCH 13/53] =?UTF-8?q?Fixed=20a=20bug=20causing=20layout=20over?= =?UTF-8?q?rides=20to=20crash=20the=20editor=20with=20stackov=E2=80=A6=20(?= =?UTF-8?q?#1486)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fixed a bug causing layout overrides to crash the editor with stack-overflow and fixed invalid behavior when replacing overrides by reusing identifiers. --- Assets/Tests/InputSystem/CoreTests_Layouts.cs | 65 +++++++++++++++++++ Packages/com.unity.inputsystem/CHANGELOG.md | 2 + .../InputSystem/InputManager.cs | 33 ++++++---- 3 files changed, 89 insertions(+), 11 deletions(-) mode change 100644 => 100755 Packages/com.unity.inputsystem/InputSystem/InputManager.cs diff --git a/Assets/Tests/InputSystem/CoreTests_Layouts.cs b/Assets/Tests/InputSystem/CoreTests_Layouts.cs index bb22af0ab9..a3b76d5f88 100644 --- a/Assets/Tests/InputSystem/CoreTests_Layouts.cs +++ b/Assets/Tests/InputSystem/CoreTests_Layouts.cs @@ -896,6 +896,71 @@ public void Layouts_CanApplyOverridesToExistingLayouts() Assert.That(device["extraControl"], Is.TypeOf()); } + [Test] + [Category("Layouts")] + public void Layouts_CanReplaceExistingOverrideToExistingLayouts() + { + // Add a control to existing Mouse layout. + InputSystem.RegisterLayoutOverride(@" + { + ""name"" : ""Overrides"", + ""extend"" : ""Mouse"", + ""controls"" : [ + { ""name"" : ""extraControl"", ""layout"" : ""Button"" } + ] + } + "); + + // Replace previous override in Mouse layout + InputSystem.RegisterLayoutOverride(@" + { + ""name"" : ""Overrides"", + ""extend"" : ""Mouse"", + ""controls"" : [ + { ""name"" : ""anotherControl"", ""layout"" : ""Button"" } + ] + } + "); + + var device = InputSystem.AddDevice(); + Assert.That(device["anotherControl"], Is.TypeOf()); + } + + private static class FaultyOverrideJson + { + // Name and extend set to same name + public const string CircularDependencyJson = @" + { + ""name"" : ""Mouse"", + ""extend"" : ""Mouse"", + ""controls"" : [ + { ""name"" : ""extraControl"", ""layout"" : ""Button"" } + ] + } + "; + + // Should be combined with given explicit name "Mouse" + public const string SameExplicitNameJson = @" + { + ""name"" : ""IrrelevantGivenAsArgumentInsteadOfJson"", + ""extend"" : ""Mouse"", + ""controls"" : [ + { ""name"" : ""extraControl"", ""layout"" : ""Button"" } + ] + } + "; + } + + [Test] // Case 1377685 - according to use-case + [Category("Layouts")] + [TestCase(FaultyOverrideJson.CircularDependencyJson, null)] + [TestCase(FaultyOverrideJson.SameExplicitNameJson, "Mouse")] + public void Layouts_OverrideShouldFailWithException_IfAttemptingToReplaceExistingLayoutWithTheSameName(string overrideJson, string name) + { + Assert.That(() => InputSystem.RegisterLayoutOverride(overrideJson, name), + Throws.Exception.With.Message.Contain("Layout overrides must have unique names")); + } + [Test] [Category("Layouts")] public void Layouts_CanApplyOverridesToMultipleLayouts() diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 0b6deb62c1..19f46403c9 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -30,6 +30,8 @@ however, it has to be formatted properly to pass verification tests. - In effect, it means that a button will be in `started` or `performed` phase for as long as its value is not 0 and will only go to `canceled` once dropping to 0. ### Fixed +* Fixed an issue where a layout-override registered via `InputSystem.RegisterLayoutOverride(...)` would cause the editor to malfunction or crash if the layout override had a name already used by an existing layout. (case 1377685). +* Fixed an issue where attempting to replace an existing layout-override by using an existing layout-override name didn't work as expected and would instead aggregate overrides instead of replacing them when an override with the given name already exists. - Fixed Switch Pro controller not working correctly in different scenarios ([case 1369091](https://issuetracker.unity3d.com/issues/nintendo-switch-pro-controller-output-garbage), [case 1190216](https://issuetracker.unity3d.com/issues/inputsystem-windows-switch-pro-controller-only-works-when-connected-via-bluetooth-but-not-via-usb), case 1314869). - Fixed `InvalidCastException: Specified cast is not valid.` being thrown when clicking on menu separators in the control picker ([case 1388049](https://issuetracker.unity3d.com/issues/invalidcastexception-is-thrown-when-selecting-the-header-of-an-advanceddropdown)). diff --git a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs old mode 100644 new mode 100755 index 7e893f8f3f..98114c8018 --- a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs @@ -291,7 +291,7 @@ public void RegisterControlLayout(string name, Type type) nameof(type)); var internedName = new InternedString(name); - var isReplacement = DoesLayoutExist(internedName); + var isReplacement = m_Layouts.HasLayout(internedName); // All we do is enter the type into a map. We don't construct an InputControlLayout // from it until we actually need it in an InputDeviceBuilder to create a device. @@ -354,7 +354,22 @@ public void RegisterControlLayout(string json, string name = null, bool isOverri } // Add it to our records. - var isReplacement = DoesLayoutExist(internedLayoutName); + var isReplacement = m_Layouts.HasLayout(internedLayoutName); + if (isReplacement && isOverride) + { // Do not allow a layout override to replace a "base layout" by name, but allow layout overrides + // to replace an existing layout override. + // This is required to guarantee that its a hierarchy (directed graph) rather + // than a cyclic graph. + + var isReplacingOverride = m_Layouts.layoutOverrideNames.Contains(internedLayoutName); + if (!isReplacingOverride) + { + throw new ArgumentException($"Failed to register layout override '{internedLayoutName}'" + + $"since a layout named '{internedLayoutName}' already exist. Layout overrides must " + + $"have unique names with respect to existing layouts."); + } + } + m_Layouts.layoutStrings[internedLayoutName] = json; if (isOverride) { @@ -363,7 +378,10 @@ public void RegisterControlLayout(string json, string name = null, bool isOverri { var baseLayoutName = baseLayouts[i]; m_Layouts.layoutOverrides.TryGetValue(baseLayoutName, out var overrideList); - ArrayHelpers.Append(ref overrideList, internedLayoutName); + if (!isReplacement) + ArrayHelpers.Append(ref overrideList, internedLayoutName); + + m_Layouts.layoutOverrides[baseLayoutName] = overrideList; } } @@ -386,7 +404,7 @@ public void RegisterControlLayout(string json, string name = null, bool isOverri var internedLayoutName = new InternedString(name); var internedBaseLayoutName = new InternedString(baseLayout); - var isReplacement = DoesLayoutExist(internedLayoutName); + var isReplacement = m_Layouts.HasLayout(internedLayoutName); m_Layouts.layoutBuilders[internedLayoutName] = method; @@ -889,13 +907,6 @@ private bool IsDeviceLayoutMarkedAsSupportedInSettings(InternedString layoutName return false; } - private bool DoesLayoutExist(InternedString name) - { - return m_Layouts.layoutTypes.ContainsKey(name) || - m_Layouts.layoutStrings.ContainsKey(name) || - m_Layouts.layoutBuilders.ContainsKey(name); - } - public IEnumerable ListControlLayouts(string basedOn = null) { ////FIXME: this may add a name twice From 9624ba22a934ce41104a606d155c86b4ee0b3198 Mon Sep 17 00:00:00 2001 From: Dmytro Ivanov Date: Wed, 2 Feb 2022 13:33:42 +0100 Subject: [PATCH 14/53] NEW: Added support for some 3rdparty Nintendo gamepads (#1504) --- Assets/Tests/InputSystem/SwitchTests.cs | 23 +++++ Packages/com.unity.inputsystem/CHANGELOG.md | 4 + .../Documentation~/SupportedDevices.md | 6 +- .../Plugins/DualShock/DualShockSupport.cs | 4 +- .../Plugins/Switch/SwitchProControllerHID.cs | 94 +++++++++++++++++++ .../Plugins/Switch/SwitchSupportHID.cs | 17 +++- 6 files changed, 142 insertions(+), 6 deletions(-) diff --git a/Assets/Tests/InputSystem/SwitchTests.cs b/Assets/Tests/InputSystem/SwitchTests.cs index 09e5047d93..e7da5e1826 100644 --- a/Assets/Tests/InputSystem/SwitchTests.cs +++ b/Assets/Tests/InputSystem/SwitchTests.cs @@ -80,6 +80,29 @@ private static SwitchProControllerHIDInputState StateWithButton(SwitchProControl }.WithButton(button); } + [Test] + [Category("Devices")] + [TestCase(0x0f0d, 0x00c1)] + [TestCase(0x20d6, 0xa712)] + [TestCase(0x0e6f, 0x0185)] + public void Devices_SupportsSwitchLikeControllers(int vendorId, int productId) + { + var hidDescriptor = new HID.HIDDeviceDescriptor + { + vendorId = vendorId, + productId = productId, + }; + + var device = InputSystem.AddDevice( + new InputDeviceDescription + { + interfaceName = HID.kHIDInterface, + capabilities = hidDescriptor.ToJson() + }); + + Assert.That(device, Is.TypeOf()); + } + #endif } #endif diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 19f46403c9..2b43d76e79 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -42,6 +42,10 @@ however, it has to be formatted properly to pass verification tests. - Fixed `InputAction.GetTimeoutCompletionPercentage` jumping to 100% completion early ([case 1377009](https://issuetracker.unity3d.com/issues/gettimeoutcompletionpercentage-returns-1-after-0-dot-1s-when-hold-action-was-started-even-though-it-is-not-performed-yet)). +### Added + +- Added support for "Hori Co HORIPAD for Nintendo Switch", "PowerA NSW Fusion Wired FightPad", "PDP Wired Fight Pad Pro: Mario". + ## [1.3.0] - 2021-12-10 ### Changed diff --git a/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md b/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md index 4e0d1856ab..67b2cdc625 100644 --- a/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md +++ b/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md @@ -28,9 +28,9 @@ Support for the following Devices doesn't require specialized support of particu |------|-------|---|-----|---|-------|---|----|----|---|------|-----| |Xbox 360 (4)|Yes|Yes (3)|Yes|Yes|No|No|No|Yes|No|No|Sometimes (2)| |Xbox One|Yes (1)|Yes (3)|Yes (1)|Yes|Yes (1)|Yes (6)|Yes (6)|Yes|No|No|Sometimes (2)| -|PS3/PS4|Yes (5)|Yes (5)|Yes (5)|Yes (5)|Yes (5)|Yes (5, 6)|Yes (5, 6)|No|Yes|No|Sometimes (2)| +|PS3/PS4|Yes (5)|Yes (5)|Yes (5)|Yes (5)|Yes (5, 8)|Yes (5, 6)|Yes (5, 6)|No|Yes|No|Sometimes (2)| |PS5|Yes (10)|Yes (10)|No (10)|Yes (10)|Yes (10)|No (10)|No (10)|No|Yes|No|Sometimes (2)| -|Switch|Yes (8)|Yes (8)|Yes|Yes|No|No|No|No|No|Yes|Sometimes (2)| +|Switch|Yes (9)|Yes (9)|Yes|Yes|No|No|No|No|No|Yes|Sometimes (2)| |MFi (such as SteelSeries)|No|No|No|No|No|Yes|Yes|No|No|No|No| >__Notes__: @@ -43,7 +43,7 @@ On UWP only USB connection is supported, motor rumble and lightbar are not worki >6. Unity supports Made for iOS (Mfi) certified controllers on iOS. Xbox One and PS4 controllers are only supported on iOS 13 or higher. >7. Consoles are supported using separate packages. You need to install these packages in your Project to enable console support. >8. Unity officially supports PS4 controllers only on [Android 10 or higher](https://playstation.com/en-us/support/hardware/ps4-pair-dualshock-4-wireless-with-sony-xperia-and-android). ->9. Switch Joy-Cons are not currently supported on Windows and Mac. +>9. Switch Joy-Cons are not currently supported on Windows and Mac. Some of official accessories are supported on Windows and Mac: "Hori Co HORIPAD for Nintendo Switch", "PowerA NSW Fusion Wired FightPad", "PDP Wired Fight Pad Pro: Mario". >10. PS5 DualSense is supported on Windows and macOS via USB HID, though setting motor rumble and lightbar color when connected over Bluetooth is currently not supported. On UWP only USB connection is supported, motor rumble and lightbar are not working correctly. On Android it's expected to be working from Android 12. diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockSupport.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockSupport.cs index 5ed33a7686..1600a4dcbf 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockSupport.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockSupport.cs @@ -37,8 +37,8 @@ public static void Initialize() .WithInterface("HID") .WithCapability("vendorId", 0x54C) // Sony Entertainment. .WithCapability("productId", 0x9CC)); // Wireless controller. - InputSystem.RegisterLayout( - matches: new InputDeviceMatcher() + InputSystem.RegisterLayoutMatcher( + new InputDeviceMatcher() .WithInterface("HID") .WithCapability("vendorId", 0x54C) // Sony Entertainment. .WithCapability("productId", 0x5C4)); // Wireless controller. diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/Switch/SwitchProControllerHID.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/Switch/SwitchProControllerHID.cs index 28dd3d7fab..7050bffd38 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/Switch/SwitchProControllerHID.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/Switch/SwitchProControllerHID.cs @@ -272,10 +272,104 @@ public unsafe bool PreProcessEvent(InputEventPtr eventPtr) stateEvent->stateFormat = SwitchProControllerHIDInputState.Format; return true; } + else if (size == 8 || size == 9) // official accessories send 8 byte reports + { + // On Windows HID stack we somehow get 1 byte extra prepended, so if we get 9 bytes, subtract one, see ISX-993 + // This is written in such way that if we fix it in backend, we wont break the package (Unity will report 8 bytes instead of 9 bytes). + var bugOffset = size == 9 ? 1 : 0; + var data = ((SwitchInputOnlyReport*)((byte*)stateEvent->state + bugOffset))->ToHIDInputReport(); + *((SwitchProControllerHIDInputState*)stateEvent->state) = data; + stateEvent->stateFormat = SwitchProControllerHIDInputState.Format; + return true; + } else return false; // skip unrecognized reportId } + [StructLayout(LayoutKind.Explicit, Size = kSize)] + private struct SwitchInputOnlyReport + { + public const int kSize = 7; + + [FieldOffset(0)] public byte buttons0; + [FieldOffset(1)] public byte buttons1; + [FieldOffset(2)] public byte hat; + [FieldOffset(3)] public byte leftX; + [FieldOffset(4)] public byte leftY; + [FieldOffset(5)] public byte rightX; + [FieldOffset(6)] public byte rightY; + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public SwitchProControllerHIDInputState ToHIDInputReport() + { + var state = new SwitchProControllerHIDInputState + { + leftStickX = leftX, + leftStickY = leftY, + rightStickX = rightX, + rightStickY = rightY + }; + + state.Set(SwitchProControllerHIDInputState.Button.Y, (buttons0 & 0x01) != 0); + state.Set(SwitchProControllerHIDInputState.Button.B, (buttons0 & 0x02) != 0); + state.Set(SwitchProControllerHIDInputState.Button.A, (buttons0 & 0x04) != 0); + state.Set(SwitchProControllerHIDInputState.Button.X, (buttons0 & 0x08) != 0); + state.Set(SwitchProControllerHIDInputState.Button.L, (buttons0 & 0x10) != 0); + state.Set(SwitchProControllerHIDInputState.Button.R, (buttons0 & 0x20) != 0); + state.Set(SwitchProControllerHIDInputState.Button.ZL, (buttons0 & 0x40) != 0); + state.Set(SwitchProControllerHIDInputState.Button.ZR, (buttons0 & 0x80) != 0); + state.Set(SwitchProControllerHIDInputState.Button.Minus, (buttons1 & 0x01) != 0); + state.Set(SwitchProControllerHIDInputState.Button.Plus, (buttons1 & 0x02) != 0); + state.Set(SwitchProControllerHIDInputState.Button.StickL, (buttons1 & 0x04) != 0); + state.Set(SwitchProControllerHIDInputState.Button.StickR, (buttons1 & 0x08) != 0); + state.Set(SwitchProControllerHIDInputState.Button.Home, (buttons1 & 0x10) != 0); + state.Set(SwitchProControllerHIDInputState.Button.Capture, (buttons1 & 0x20) != 0); + + var left = false; + var up = false; + var right = false; + var down = false; + + switch (hat) + { + case 0: + up = true; + break; + case 1: + up = true; + right = true; + break; + case 2: + right = true; + break; + case 3: + down = true; + right = true; + break; + case 4: + down = true; + break; + case 5: + down = true; + left = true; + break; + case 6: + left = true; + break; + case 7: + up = true; + left = true; + break; + } + + state.Set(SwitchProControllerHIDInputState.Button.Left, left); + state.Set(SwitchProControllerHIDInputState.Button.Up, up); + state.Set(SwitchProControllerHIDInputState.Button.Right, right); + state.Set(SwitchProControllerHIDInputState.Button.Down, down); + return state; + } + } + [StructLayout(LayoutKind.Explicit, Size = kSize)] private struct SwitchSimpleInputReport { diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/Switch/SwitchSupportHID.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/Switch/SwitchSupportHID.cs index 4aa074269d..77542ae8f3 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/Switch/SwitchSupportHID.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/Switch/SwitchSupportHID.cs @@ -19,8 +19,23 @@ public static void Initialize() InputSystem.RegisterLayout( matches: new InputDeviceMatcher() .WithInterface("HID") - .WithCapability("vendorId", 0x57e) // Nintendo + .WithCapability("vendorId", 0x057e) // Nintendo .WithCapability("productId", 0x2009)); // Pro Controller. + InputSystem.RegisterLayoutMatcher( + new InputDeviceMatcher() + .WithInterface("HID") + .WithCapability("vendorId", 0x0f0d) // Hori Co., Ltd + .WithCapability("productId", 0x00c1)); // HORIPAD for Nintendo Switch + InputSystem.RegisterLayoutMatcher( + new InputDeviceMatcher() + .WithInterface("HID") + .WithCapability("vendorId", 0x20d6) // PowerA NSW Fusion Wired FightPad + .WithCapability("productId", 0xa712)); + InputSystem.RegisterLayoutMatcher( + new InputDeviceMatcher() + .WithInterface("HID") + .WithCapability("vendorId", 0x0e6f) // PDP Wired Fight Pad Pro: Mario + .WithCapability("productId", 0x0185)); #endif } } From 81a9496454ffa65225a8b434a6a500ee5616eda6 Mon Sep 17 00:00:00 2001 From: Rene Damm Date: Wed, 2 Feb 2022 13:51:38 +0100 Subject: [PATCH 15/53] FIX: D-pad inputs sometimes getting skipped over (case 1389858, #1495). --- Assets/Tests/InputSystem/CoreTests_Actions.cs | 30 ++++++++++++ Packages/com.unity.inputsystem/CHANGELOG.md | 1 + .../Documentation~/ActionBindings.md | 37 +++++++++++--- .../Documentation~/Actions.md | 4 +- .../Documentation~/Controls.md | 2 +- .../Documentation~/Interactions.md | 2 +- .../InputSystem/Actions/InputActionState.cs | 49 +++++++++---------- .../InputSystem/Controls/DpadControl.cs | 10 +++- .../InputSystem/State/InputStateBlock.cs | 2 +- 9 files changed, 100 insertions(+), 37 deletions(-) diff --git a/Assets/Tests/InputSystem/CoreTests_Actions.cs b/Assets/Tests/InputSystem/CoreTests_Actions.cs index 7db95bb7d8..ed92262c2f 100644 --- a/Assets/Tests/InputSystem/CoreTests_Actions.cs +++ b/Assets/Tests/InputSystem/CoreTests_Actions.cs @@ -197,6 +197,7 @@ public void Actions_WhenSeveralBindingsResolveToSameControl_SameControlFeedsInto action3.AddBinding("/buttonSouth"); action4.AddBinding("/buttonSouth"); // Should not be removed; different action. + ////REVIEW: This setup here doesn't seem to make any sense; there's probably no need to support something like this. action5.AddBinding("/buttonSouth", interactions: "press(behavior=0)"); action5.AddBinding("/buttonSouth", interactions: "press(behavior=1)"); action5.AddBinding("/buttonSouth", processors: "invert"); @@ -2321,6 +2322,34 @@ public void Actions_WithMultipleBoundControls_CanHandleButtonPressesAndReleases( Assert.That(action.activeControl, Is.Null); } + // https://fogbugz.unity3d.com/f/cases/1389858/ + [Test] + [Category("Actions")] + public void Actions_WithMultipleBoundControls_ValueChangesOfEqualMagnitudeAreNotIgnored() + { + var gamepad = InputSystem.AddDevice(); + + var action = new InputAction(); + action.AddBinding("/leftStick"); + action.AddBinding("/dpad"); + + action.Enable(); + + using (var trace = new InputActionTrace(action)) + { + Set(gamepad.dpad, Vector2.left); + + Assert.That(trace, Started(action, value: Vector2.left, control: gamepad.dpad) + .AndThen(Performed(action, value: Vector2.left, control: gamepad.dpad))); + + trace.Clear(); + + Set(gamepad.dpad, Vector2.right); + + Assert.That(trace, Performed(action, value: Vector2.right, control: gamepad.dpad)); + } + } + // There can be situations where two different controls are driven from the same state. Most prominently, this is // the case with the Pointer.button control that subclasses usually rewrite to whatever their primary button is. [Test] @@ -8806,6 +8835,7 @@ public void Actions_CanDrivePointerInputFromTouchPenAndMouse() .AndThen(Started(pressAction, touchscreen.press, 1, time: 0.3)) .AndThen(Performed(pressAction, touchscreen.press, 1, time: 0.3)) .AndThen(Performed(positionAction, touchscreen.position, new Vector2(10, 20), time: 0.4)) + .AndThen(Performed(pressAction, touchscreen.press, 1, time: 0.4)) // Because `press` is tied to `phase` which changes state twice (but not value). .AndThen(Started(deltaAction, touchscreen.delta, new Vector2(9, 18), time: 0.4)) .AndThen(Performed(deltaAction, touchscreen.delta, new Vector2(9, 18), time: 0.4)) .AndThen(Canceled(pressAction, touchscreen.press, 0, time: 0.5)) diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 2b43d76e79..f1e1703d68 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -41,6 +41,7 @@ however, it has to be formatted properly to pass verification tests. #### Actions - Fixed `InputAction.GetTimeoutCompletionPercentage` jumping to 100% completion early ([case 1377009](https://issuetracker.unity3d.com/issues/gettimeoutcompletionpercentage-returns-1-after-0-dot-1s-when-hold-action-was-started-even-though-it-is-not-performed-yet)). +- Fixed d-pad inputs sometimes being ignored on actions that were binding to multiple controls ([case 1389858](https://unity.slack.com/archives/G01RVV1SPU4/p1642501574002300)). ### Added diff --git a/Packages/com.unity.inputsystem/Documentation~/ActionBindings.md b/Packages/com.unity.inputsystem/Documentation~/ActionBindings.md index 5b5d433220..3fd0182aa3 100644 --- a/Packages/com.unity.inputsystem/Documentation~/ActionBindings.md +++ b/Packages/com.unity.inputsystem/Documentation~/ActionBindings.md @@ -21,7 +21,7 @@ * [Details](#details) * [Binding resolution](#binding-resolution) * [Choosing which Devices to use](#choosing-which-devices-to-use) - * [Disambiguation](#disambiguation) + * [Conflict resolution](#conflict-resolution) * [Initial state check](#initial-state-check) An [`InputBinding`](../api/UnityEngine.InputSystem.InputBinding.html) represents a connection between an [Action](Actions.md) and one or more [Controls](Controls.md) identified by a [Control path](Controls.md#control-paths). An Action can have an arbitrary number of Bindings pointed at it. Multiple Bindings can reference the same Control. @@ -680,15 +680,40 @@ You can override this behavior by restricting [`InputActionAssets`](../api/Unity actionMap.devices = new[] { Gamepad.all[0] }; ``` -### Disambiguation +### Conflict Resolution -If multiple Controls are bound to an Action, the Input System monitors input from each bound Control to feed the Action. The Input System must also define which of the bound controls to use for the value of the action. For example, if you have a Binding to `/leftStick`, and you have multiple connected gamepads, the Input System must determine which gamepad's stick provides the input value for the Action. +If multiple Controls are bound to an Action, conflicting inputs may arise. For example, if an Action is bound to both the left and the right trigger on a gamepad, then if the player presses *both* triggers at the same time, then which of the triggers needs to be released for the Action to be considered stopped? -This Control is the "driving" Control; the Control which is driving the Action. Unity decides which Control is currently driving the Action in a process called disambiguation. +To resolve this, the Input System uses a "rule of maximum actuation". Simply put, at any point, the Control with the highest level of [actuation](Controls.md#control-actuation) is chosen to "drive" the action and thus determine its value. -During the disambiguation process, the Input System looks at the value of each Control bound to an Action. If the [magnitude](Controls.md#control-actuation) of the input from any Control is higher then the magnitude of the Control currently driving the Action, then the Control with the higher magnitude becomes the new Control driving the Action. In the above example of `/leftStick` binding to multiple gamepads, the Control driving the Action is the left stick which is actuated the furthest of all the gamepads. You can query which Control is currently driving the Action by checking the [`InputAction.CallbackContext.control`](../api/UnityEngine.InputSystem.InputAction.CallbackContext.html#UnityEngine_InputSystem_InputAction_CallbackContext_control) property in an [Action callback](Actions.md#action-callbacks). +In the scenario with the two triggers, releasing one of the triggers would not cause the Action to stop as the other trigger is still held. Only once both triggers are fully released will the Action be stopped. -If you don't want your Action to perform disambiguation, you can set your Action type to [Pass-Through](Actions.md#pass-through). Pass-Through Actions skip disambiguation, and changes to any bound Control trigger them. The value of a Pass-Through Action is the value of whichever bound Control changed most recently. +This rule can lead to outcomes that may not appear intuitive at first. Consider the following sequence of events: + +1. Left trigger is fully pressed (value=1). +2. Right trigger is partially pressed (value=0.6). +3. Left trigger is released. +4. Right trigger is released. + +Applying the "rule of maximum actuation", this leads to the following sequence of changes on the Action: + +1. Action is `started` and then `performed`. Value is 1, Control is left trigger. +2. Nothing happens. The right trigger is not actuated enough for it to override the input on the left trigger. +3. Action is `performed`. Value is 0.6, Control is right trigger. This is because now the left trigger has fallen below the level of the right trigger and thus the latter is chosen to now "drive" the action. +4. Action is `canceled` as no more active inputs are feeding into the Action. + +Note that when a Control is part of a Composite, the "rule of maximum actuation" is applied to the Composite as a whole, not to the individual Controls bound as part of it. So, a WASD keyboard binding, for example, has a single value of actuation corresponding to the magnitude of the resulting vector. + +#### Disabling Conflict Resolution + +Conflict resolution is always applied to [Button](Actions.md#button) and [Value](Actions.md#value) type Actions. However, it can be undesirable in situations when an Action is simply used to gather any and all inputs from bound Controls. For example, the following Action would monitor the A button of all available gamepads: + +```CSharp +var action = new InputAction(type: InputActionType.PassThrough, binding: "/buttonSouth"); +action.Enable(); +``` + +By using the [Pass-Through](Actions.md#pass-through) Action type, conflict resolution is bypassed and thus, pressing the A button on one gamepad will not result in a press on a different gamepad being ignored. ### Initial state check diff --git a/Packages/com.unity.inputsystem/Documentation~/Actions.md b/Packages/com.unity.inputsystem/Documentation~/Actions.md index 31635c6f4a..ffb6434535 100644 --- a/Packages/com.unity.inputsystem/Documentation~/Actions.md +++ b/Packages/com.unity.inputsystem/Documentation~/Actions.md @@ -445,7 +445,7 @@ Each Action can be one of three different [Action types](../api/UnityEngine.Inpu This is the default Action type. Use this for any inputs which should track continuous changes to the state of a Control. - [`Value`](../api/UnityEngine.InputSystem.InputActionType.html#UnityEngine_InputSystem_InputActionType_Value) type actions continuously monitor all the Controls which are bound to the Action, and then choose the one which is the most actuated to be the Control driving the Action, and report the values from that Control in callbacks, triggered whenever the value changes. If a different bound Control actuated more, then that Control becomes the Control driving the Action, and the Action starts reporting values from that Control. This process is called [disambiguation](ActionBindings.md#disambiguation). This is useful if you want to allow different Controls to control an Action in the game, but only take input from one Control at the same time. + [`Value`](../api/UnityEngine.InputSystem.InputActionType.html#UnityEngine_InputSystem_InputActionType_Value) type actions continuously monitor all the Controls which are bound to the Action, and then choose the one which is the most actuated to be the Control driving the Action, and report the values from that Control in callbacks, triggered whenever the value changes. If a different bound Control actuated more, then that Control becomes the Control driving the Action, and the Action starts reporting values from that Control. This process is called [conflict resolution](ActionBindings.md#conflict-resolution). This is useful if you want to allow different Controls to control an Action in the game, but only take input from one Control at the same time. When the Action initially enables, it performs an [initial state check](ActionBindings.md#initial-state-check) of all bound Controls. If any of them is actuated, the Action then triggers a callback with the current value. @@ -455,7 +455,7 @@ This is very similar to [`Value`](../api/UnityEngine.InputSystem.InputActionType #### Pass-Through - [`Pass-Through`](../api/UnityEngine.InputSystem.InputActionType.html#UnityEngine_InputSystem_InputActionType_PassThrough) Actions bypass the [disambiguation](ActionBindings.md#disambiguation) process described above for `Value` Actions and don't use the concept of a specific Control driving the Action. Instead, any change to any bound Control triggers a callback with that Control's value. This is useful if you want to process all input from a set of Controls. + [`Pass-Through`](../api/UnityEngine.InputSystem.InputActionType.html#UnityEngine_InputSystem_InputActionType_PassThrough) Actions bypass the [conflict resolution](ActionBindings.md#conflict-resolution) process described above for `Value` Actions and don't use the concept of a specific Control driving the Action. Instead, any change to any bound Control triggers a callback with that Control's value. This is useful if you want to process all input from a set of Controls. ### Debugging Actions diff --git a/Packages/com.unity.inputsystem/Documentation~/Controls.md b/Packages/com.unity.inputsystem/Documentation~/Controls.md index 8ad27819c2..b73fe21e04 100644 --- a/Packages/com.unity.inputsystem/Documentation~/Controls.md +++ b/Packages/com.unity.inputsystem/Documentation~/Controls.md @@ -204,7 +204,7 @@ if (Gamepad.current.leftStick.EvaluateMagnitude() > 0.25f) There are two mechanisms that most notably make use of Control actuation: - [Interactive rebinding](ActionBindings.md#interactive-rebinding) (`InputActionRebindingExceptions.RebindOperation`) uses it to select between multiple suitable Controls to find the one that is actuated the most. -- [Disambiguation](ActionBindings.md#disambiguation) between multiple Controls that are bound to the same action uses it to decide which Control gets to drive the action. +- [Conflict resolution](ActionBindings.md#conflict-resolution) between multiple Controls that are bound to the same action uses it to decide which Control gets to drive the action. ## Noisy Controls diff --git a/Packages/com.unity.inputsystem/Documentation~/Interactions.md b/Packages/com.unity.inputsystem/Documentation~/Interactions.md index bbc7c744f7..d179972316 100644 --- a/Packages/com.unity.inputsystem/Documentation~/Interactions.md +++ b/Packages/com.unity.inputsystem/Documentation~/Interactions.md @@ -67,7 +67,7 @@ fireAction.canceled += ### Multiple Controls on an Action -If you have multiple Controls bound to a Binding or an Action which has an Interaction, then the Input System first applies the [Control disambiguation](ActionBindings.md#disambiguation) logic to get a single value for the Action, which it then feeds to the Interaction logic. Any of the bound Controls can perform the Interaction. +If you have multiple Controls bound to a Binding or an Action which has an Interaction, then the Input System first applies the [conflict resolution](ActionBindings.md#conflict-resolution) logic to get a single value for the Action, which it then feeds to the Interaction logic. Any of the bound Controls can perform the Interaction. ### Multiple Interactions on a Binding diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs index 4880ad496c..5d7d3249a1 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs @@ -1242,15 +1242,29 @@ private bool IsConflictingInput(ref TriggerState trigger, int actionIndex) memory.controlMagnitudes[triggerControlIndex] = trigger.magnitude; } + // Determine which control to consider the one currently associated with the action. + // We do the same thing as for the triggered control and in the case of a composite, + // switch to the first control of the composite. + var actionStateControlIndex = actionState->controlIndex; + if (bindingStates[actionState->bindingIndex].isPartOfComposite) + { + var compositeBindingIndex = bindingStates[actionState->bindingIndex].compositeOrCompositeBindingIndex; + actionStateControlIndex = bindingStates[compositeBindingIndex].controlStartIndex; + } + // Never ignore state changes for actions that aren't currently driven by // anything. - if (actionState->controlIndex == kInvalidIndex) + if (actionStateControlIndex == kInvalidIndex) { actionState->magnitude = trigger.magnitude; Profiler.EndSample(); return false; } + // Find out if we get triggered from the control that is actively driving the action. + var isControlCurrentlyDrivingTheAction = triggerControlIndex == actionStateControlIndex || + controls[triggerControlIndex] == controls[actionStateControlIndex]; // Same control, different binding. + // If the control is actuated *more* than the current level of actuation we recorded for the // action, we process the state change normally. If this isn't the control that is already // driving the action, it will become the one now. @@ -1267,7 +1281,7 @@ private bool IsConflictingInput(ref TriggerState trigger, int actionIndex) // account or not. // NOTE: For composites, we have forced triggerControlIndex to the first control // in the composite. See above. - if (trigger.magnitude > 0 && triggerControlIndex != actionState->controlIndex && actionState->magnitude > 0) + if (trigger.magnitude > 0 && !isControlCurrentlyDrivingTheAction && actionState->magnitude > 0) actionState->hasMultipleConcurrentActuations = true; // Keep recorded magnitude in action state up to date. @@ -1276,13 +1290,6 @@ private bool IsConflictingInput(ref TriggerState trigger, int actionIndex) return false; } - var actionStateControlIndex = actionState->controlIndex; - if (bindingStates[actionState->bindingIndex].isPartOfComposite) - { - var compositeBindingIndex = bindingStates[actionState->bindingIndex].compositeOrCompositeBindingIndex; - actionStateControlIndex = bindingStates[compositeBindingIndex].controlStartIndex; - } - // If the control is actuated *less* then the current level of actuation we // recorded for the action *and* the control that changed is the one that is currently // driving the action, we have to check whether there is another actuation @@ -1291,14 +1298,15 @@ private bool IsConflictingInput(ref TriggerState trigger, int actionIndex) { // If we're not currently driving the action, it's simple. Doesn't matter that we lowered // actuation as we didn't have the highest actuation anyway. - if (triggerControlIndex != actionStateControlIndex) + if (!isControlCurrentlyDrivingTheAction) { Profiler.EndSample(); ////REVIEW: should we *count* actuations instead? (problem is that then we have to reliably determine when a control //// first actuates; the current solution will occasionally run conflict resolution when it doesn't have to //// but won't require the extra bookkeeping) // Do NOT let this control state change affect the action. - actionState->hasMultipleConcurrentActuations = true; + if (trigger.magnitude > 0) + actionState->hasMultipleConcurrentActuations = true; return true; } @@ -1435,20 +1443,13 @@ private bool IsConflictingInput(ref TriggerState trigger, int actionIndex) // If we're not really effecting any change on the action, ignore the control state change. // NOTE: We may be looking at a control here that points in a completely direction, for example, even - // though it has the same magnitude. However, we require a control to *higher* absolute actuation + // though it has the same magnitude. However, we require a control to *increase* absolute actuation // before we let it drive the action. - if (Mathf.Approximately(trigger.magnitude, actionState->magnitude)) + if (!isControlCurrentlyDrivingTheAction && Mathf.Approximately(trigger.magnitude, actionState->magnitude)) { - // However, if we have changed the control to a different control on the same composite, we *should* let - // it drive the action - this is like a direction change on the same control. - if (bindingStates[trigger.bindingIndex].isPartOfComposite && triggerControlIndex == actionStateControlIndex) - return false; // If we do have an actuation on a control that isn't currently driving the action, flag the action has // having multiple concurrent inputs ATM. - // NOTE: We explicitly check for whether it is in fact not the same control even if the control indices are different. - // The reason is that we allow the same control, on the same action to be bound more than once on the same - // action. - if (trigger.magnitude > 0 && triggerControlIndex != actionState->controlIndex && controls[triggerControlIndex] != controls[actionState->controlIndex]) + if (trigger.magnitude > 0) actionState->hasMultipleConcurrentActuations = true; return true; } @@ -1587,10 +1588,6 @@ private void ProcessDefaultInteraction(ref TriggerState trigger, int actionIndex ChangePhaseOfAction(InputActionPhase.Performed, ref trigger, phaseAfterPerformedOrCanceled: InputActionPhase.Performed); } - else - { - Debug.Assert(false, "Value type actions should not be left in performed state"); - } break; } @@ -2284,6 +2281,8 @@ private float ComputeMagnitude(int bindingIndex, int controlIndex) Debug.Assert(bindingIndex >= 0 && bindingIndex < totalBindingCount, "Binding index is out of range"); Debug.Assert(controlIndex >= 0 && controlIndex < totalControlCount, "Control index is out of range"); + // If the control is part of a composite, it's the InputBindingComposite + // object that computes a magnitude for the whole composite. if (bindingStates[bindingIndex].isPartOfComposite) { var compositeBindingIndex = bindingStates[bindingIndex].compositeOrCompositeBindingIndex; diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/DpadControl.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/DpadControl.cs index 44d06a9280..4a34d56a37 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Controls/DpadControl.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/DpadControl.cs @@ -99,7 +99,15 @@ public override unsafe Vector2 ReadUnprocessedValueFromState(void* statePtr) public override unsafe void WriteValueIntoState(Vector2 value, void* statePtr) { - throw new NotImplementedException(); + var upIsPressed = up.IsValueConsideredPressed(value.y); + var downIsPressed = down.IsValueConsideredPressed(value.y * -1f); + var leftIsPressed = left.IsValueConsideredPressed(value.x * -1f); + var rightIsPressed = right.IsValueConsideredPressed(value.x); + + up.WriteValueIntoState(upIsPressed && !downIsPressed ? value.y : 0f, statePtr); + down.WriteValueIntoState(downIsPressed && !upIsPressed ? value.y * -1f : 0f, statePtr); + left.WriteValueIntoState(leftIsPressed && !rightIsPressed ? value.x * -1f : 0f, statePtr); + right.WriteValueIntoState(rightIsPressed && !leftIsPressed ? value.x : 0f, statePtr); } /// diff --git a/Packages/com.unity.inputsystem/InputSystem/State/InputStateBlock.cs b/Packages/com.unity.inputsystem/InputSystem/State/InputStateBlock.cs index 389be7e92b..3e5e943e04 100644 --- a/Packages/com.unity.inputsystem/InputSystem/State/InputStateBlock.cs +++ b/Packages/com.unity.inputsystem/InputSystem/State/InputStateBlock.cs @@ -414,7 +414,7 @@ public void WriteFloat(void* statePtr, float value) { case kFormatBit: if (sizeInBits == 1) - MemoryHelpers.WriteSingleBit(valuePtr, bitOffset, value >= 0.5f); + MemoryHelpers.WriteSingleBit(valuePtr, bitOffset, value >= 0.5f);////REVIEW: Shouldn't this be the global button press point? else MemoryHelpers.WriteNormalizedUIntAsMultipleBits(valuePtr, bitOffset, sizeInBits, value); break; From d2dd4f705f7db3c0e24fb0d029118c75b45327a8 Mon Sep 17 00:00:00 2001 From: Rene Damm Date: Wed, 2 Feb 2022 13:53:22 +0100 Subject: [PATCH 16/53] FIX: InputControlPath.Matches() incorrectly matching prefixes (#1492). --- Assets/Tests/InputSystem/CoreTests_Controls.cs | 12 ++++++++++++ Packages/com.unity.inputsystem/CHANGELOG.md | 13 ++++++++----- .../InputSystem/Controls/InputControlPath.cs | 17 ++++++++--------- 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/Assets/Tests/InputSystem/CoreTests_Controls.cs b/Assets/Tests/InputSystem/CoreTests_Controls.cs index 22d2667ced..f99b5c8b7f 100644 --- a/Assets/Tests/InputSystem/CoreTests_Controls.cs +++ b/Assets/Tests/InputSystem/CoreTests_Controls.cs @@ -1244,6 +1244,18 @@ public void Controls_CanCheckIfControlMatchesGivenPathPrefix() Assert.That(InputControlPath.MatchesPrefix("/rightStick", gamepad.leftStick), Is.False); } + [Test] + [Category("Controls")] + public void Controls_MatchingPath_DoesNotMatchPrefixOnly() + { + var keyboard = InputSystem.AddDevice(); + + Assert.That(InputControlPath.Matches("/e", keyboard.eKey), Is.True); + Assert.That(InputControlPath.Matches("/escape", keyboard.eKey), Is.False); + Assert.That(InputControlPath.Matches("/e", keyboard.escapeKey), Is.False); + Assert.That(InputControlPath.Matches("/escape", keyboard.escapeKey), Is.True); + } + [Test] [Category("Controls")] public void Controls_CanKeepListsOfControls_WithoutAllocatingGCMemory() diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index f1e1703d68..d13a5a3376 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -12,7 +12,7 @@ however, it has to be formatted properly to pass verification tests. ## Changed -* `Button` type `InputAction`s now go to `started` when a button goes from a press to below the release threshold but not yet to 0 ([case ] +- `Button` type `InputAction`s now go to `started` when a button goes from a press to below the release threshold but not yet to 0 ([case ] ```CSharp // Before: Set(Gamepad.current.rightTrigger, 0.7f); // Performed (pressed) @@ -26,17 +26,20 @@ however, it has to be formatted properly to pass verification tests. Set(Gamepad.current.rightTrigger, 0.1f); // Set(Gamepad.current.rightTrigger, 0f); // Canceled ``` - - This also applies to `PressInteraction` when set to `Press` behavior. - - In effect, it means that a button will be in `started` or `performed` phase for as long as its value is not 0 and will only go to `canceled` once dropping to 0. + * This also applies to `PressInteraction` when set to `Press` behavior. + * In effect, it means that a button will be in `started` or `performed` phase for as long as its value is not 0 and will only go to `canceled` once dropping to 0. ### Fixed -* Fixed an issue where a layout-override registered via `InputSystem.RegisterLayoutOverride(...)` would cause the editor to malfunction or crash if the layout override had a name already used by an existing layout. (case 1377685). -* Fixed an issue where attempting to replace an existing layout-override by using an existing layout-override name didn't work as expected and would instead aggregate overrides instead of replacing them when an override with the given name already exists. +- Fixed an issue where a layout-override registered via `InputSystem.RegisterLayoutOverride(...)` would cause the editor to malfunction or crash if the layout override had a name already used by an existing layout. (case 1377685). +- Fixed an issue where attempting to replace an existing layout-override by using an existing layout-override name didn't work as expected and would instead aggregate overrides instead of replacing them when an override with the given name already exists. - Fixed Switch Pro controller not working correctly in different scenarios ([case 1369091](https://issuetracker.unity3d.com/issues/nintendo-switch-pro-controller-output-garbage), [case 1190216](https://issuetracker.unity3d.com/issues/inputsystem-windows-switch-pro-controller-only-works-when-connected-via-bluetooth-but-not-via-usb), case 1314869). - Fixed `InvalidCastException: Specified cast is not valid.` being thrown when clicking on menu separators in the control picker ([case 1388049](https://issuetracker.unity3d.com/issues/invalidcastexception-is-thrown-when-selecting-the-header-of-an-advanceddropdown)). - Fixed DualShock 4 controller not allowing input from other devices due to noisy input from its unmapped sensors ([case 1365891](https://issuetracker.unity3d.com/issues/input-from-the-keyboard-is-not-working-when-the-dualshock-4-controller-is-connected)). - Fixed `InputSystem.onAnyButtonPress` so that it doesn't throw exceptions when trying to process non state or delta events ([case 1376034](https://issuetracker.unity3d.com/product/unity/issues/guid/1376034/)). +- Fixed `InputControlPath.Matches` incorrectly reporting matches when only a prefix was matching. + * This would, for example, cause `Keyboard.eKey` to be matched by `/escape`. + * Fix contributed by [Fredrik Ludvigsen](https://github.com/steinbitglis) in [#1485](https://github.com/Unity-Technologies/InputSystem/pull/1485). #### Actions diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlPath.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlPath.cs index 16126758da..027439a25b 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlPath.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlPath.cs @@ -1404,22 +1404,21 @@ private static bool ComparePathElementToString(Substring pathElement, string ele var pathElementLength = pathElement.length; var elementLength = element.Length; - // `element` is expected to not include escape sequence. `pathElement` may. - // So if `element` is longer than `pathElement`, the two can't be a match. - if (elementLength > pathElementLength) - return false; - - for (var i = 0; i < pathElementLength && i < elementLength; ++i) + for (int i = 0, j = 0;; i++, j++) { + var pathElementDone = i == pathElementLength; + var elementDone = j == elementLength; + + if (pathElementDone || elementDone) + return pathElementDone == elementDone; + var ch = pathElement[i]; if (ch == '\\' && i + 1 < pathElementLength) ch = pathElement[++i]; - if (char.ToLowerInvariant(ch) != char.ToLowerInvariant(element[i])) + if (char.ToLowerInvariant(ch) != char.ToLowerInvariant(element[j])) return false; } - - return true; } } From 060a7d5be400022f2a949e3959dd5ca41d5b2620 Mon Sep 17 00:00:00 2001 From: Rene Damm Date: Wed, 2 Feb 2022 13:56:32 +0100 Subject: [PATCH 17/53] FIX: Index exception with multiple interactions (case 1392559, #1491). --- Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs | 5 ++++- Packages/com.unity.inputsystem/CHANGELOG.md | 4 +++- .../com.unity.inputsystem/Documentation~/Interactions.md | 4 +++- .../InputSystem/Actions/InputActionState.cs | 1 + 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs b/Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs index c96e6f4bd5..cfa3b112a4 100644 --- a/Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs +++ b/Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs @@ -181,7 +181,10 @@ public void Action_WithMultipleInteractions_DoesNotThrowWhenUsingMultipleMaps() var map1 = new InputActionMap("map1"); var map2 = new InputActionMap("map2"); map1.AddAction(name: "action1", type: InputActionType.Button, binding: "/buttonSouth"); - map2.AddAction(name: "action2", type: InputActionType.Button, binding: "/buttonNorth", interactions: "press,hold(duration=0.4)"); + // https://fogbugz.unity3d.com/f/cases/1392559 + // Having `press` after `hold` ensures that we have an interaction waiting in performed state and + // thus also exercise that path in InputActionState. + map2.AddAction(name: "action2", type: InputActionType.Button, binding: "/buttonNorth", interactions: "hold(duration=0.4),press"); var asset = ScriptableObject.CreateInstance(); asset.AddActionMap(map1); diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index d13a5a3376..9cdaeee256 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -10,7 +10,7 @@ however, it has to be formatted properly to pass verification tests. ## [Unreleased] -## Changed +### Changed - `Button` type `InputAction`s now go to `started` when a button goes from a press to below the release threshold but not yet to 0 ([case ] ```CSharp @@ -45,6 +45,8 @@ however, it has to be formatted properly to pass verification tests. - Fixed `InputAction.GetTimeoutCompletionPercentage` jumping to 100% completion early ([case 1377009](https://issuetracker.unity3d.com/issues/gettimeoutcompletionpercentage-returns-1-after-0-dot-1s-when-hold-action-was-started-even-though-it-is-not-performed-yet)). - Fixed d-pad inputs sometimes being ignored on actions that were binding to multiple controls ([case 1389858](https://unity.slack.com/archives/G01RVV1SPU4/p1642501574002300)). +- Fixed `IndexOutOfRangeException` when having multiple interactions on an action and/or binding in an action map other than the first of an asset ([case 1392559](https://issuetracker.unity3d.com/issues/map-index-on-trigger-and-indexoutofrangeexception-are-thrown-when-using-interaction-on-both-binding-and-its-parent-action)). + * Fix contributed by [Russell Quinn](https://github.com/russellquinn) in [#1483](https://github.com/Unity-Technologies/InputSystem/pull/1483). ### Added diff --git a/Packages/com.unity.inputsystem/Documentation~/Interactions.md b/Packages/com.unity.inputsystem/Documentation~/Interactions.md index d179972316..9cd40d9e4c 100644 --- a/Packages/com.unity.inputsystem/Documentation~/Interactions.md +++ b/Packages/com.unity.inputsystem/Documentation~/Interactions.md @@ -116,7 +116,9 @@ action.AddBinding("/leftStick") ### Interactions applied to Actions -Interactions on Actions work very similar to Interactions on Bindings, but they affect all Controls bound to an Action, not just the ones coming from a specific Binding. If there are Interactions on both the Binding and the Action, the Input System processes the ones from the binding first. +Applying Interactions directly to an Action is equivalent to applying them to all Bindings for the Action. It is thus more or less a shortcut that avoids manually adding the same Interaction(s) to each of the Bindings. + +If Interactions are applied __both__ to an Action and to its Bindings, then the effect is the same as if the Action's Interactions are *appended* to the list of Interactions on each of the Bindings. This means that the Binding's Interactions are applied *first*, and then the Action's Interactions are applied *after*. You can add and edit Interactions on Actions in the [Input Action Assets](ActionAssets.md) editor window the [same way](#interactions-applied-to-bindings) as you would do for Bindings: select an Action to Edit, then add the Interactions in the right window pane. diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs index 5d7d3249a1..49867d8035 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs @@ -1821,6 +1821,7 @@ private void StopTimeout(int interactionIndex) controlIndex = interactionStates[index].triggerControlIndex, bindingIndex = trigger.bindingIndex, interactionIndex = index, + mapIndex = trigger.mapIndex, time = interactionStates[index].performedTime, // Time when the interaction performed. startTime = startTime, }; From e6bbc353d44146e57624bd896b69ed6b1d93d3f1 Mon Sep 17 00:00:00 2001 From: Rene Damm Date: Wed, 2 Feb 2022 19:19:10 +0100 Subject: [PATCH 18/53] FIX: AxisComposite ignoring processors (case 1398942, #1503). --- Assets/Tests/InputSystem/CoreTests_Actions.cs | 44 ++++++++++------- Packages/com.unity.inputsystem/CHANGELOG.md | 6 ++- .../Actions/Composites/AxisComposite.cs | 47 +++++++++---------- 3 files changed, 53 insertions(+), 44 deletions(-) diff --git a/Assets/Tests/InputSystem/CoreTests_Actions.cs b/Assets/Tests/InputSystem/CoreTests_Actions.cs index ed92262c2f..8b0d88b5b8 100644 --- a/Assets/Tests/InputSystem/CoreTests_Actions.cs +++ b/Assets/Tests/InputSystem/CoreTests_Actions.cs @@ -6602,14 +6602,8 @@ public void Actions_CanCreateAxisComposite() InputSystem.QueueStateEvent(gamepad, new GamepadState {leftTrigger = 0.345f}); InputSystem.Update(); - var actions = trace.ToArray(); - Assert.That(actions, Has.Length.EqualTo(2)); - Assert.That(actions[0].phase, Is.EqualTo(InputActionPhase.Started)); - Assert.That(actions[0].control, Is.EqualTo(gamepad.leftTrigger)); - Assert.That(actions[0].ReadValue(), Is.EqualTo(-0.345).Within(0.00001)); - Assert.That(actions[1].phase, Is.EqualTo(InputActionPhase.Performed)); - Assert.That(actions[1].control, Is.EqualTo(gamepad.leftTrigger)); - Assert.That(actions[1].ReadValue(), Is.EqualTo(-0.345).Within(0.00001)); + Assert.That(trace, Started(action, control: gamepad.leftTrigger, value: -0.345f) + .AndThen(Performed(action, control: gamepad.leftTrigger, value: -0.345f))); trace.Clear(); @@ -6617,14 +6611,10 @@ public void Actions_CanCreateAxisComposite() InputSystem.QueueStateEvent(gamepad, new GamepadState {rightTrigger = 0.456f}); InputSystem.Update(); - actions = trace.ToArray(); - Assert.That(actions, Has.Length.EqualTo(1)); - Assert.That(actions[0].phase, Is.EqualTo(InputActionPhase.Performed)); // Bit of an odd case. leftTrigger and rightTrigger have both changed state here so // in a way, it's up to the system which one to pick. Might be useful if it was deliberately // picking the control with the highest magnitude but not sure it's worth the effort. - Assert.That(actions[0].control, Is.EqualTo(gamepad.leftTrigger)); - Assert.That(actions[0].ReadValue(), Is.EqualTo(0.456).Within(0.00001)); + Assert.That(trace, Performed(action, control: gamepad.leftTrigger, value: 0.456f)); trace.Clear(); @@ -6632,11 +6622,7 @@ public void Actions_CanCreateAxisComposite() InputSystem.QueueStateEvent(gamepad, new GamepadState()); InputSystem.Update(); - actions = trace.ToArray(); - Assert.That(actions, Has.Length.EqualTo(1)); - Assert.That(actions[0].phase, Is.EqualTo(InputActionPhase.Canceled)); - Assert.That(actions[0].control, Is.EqualTo(gamepad.rightTrigger)); - Assert.That(actions[0].ReadValue(), Is.Zero.Within(0.00001)); + Assert.That(trace, Canceled(action, control: gamepad.rightTrigger, value: 0f)); } } @@ -6766,6 +6752,28 @@ public void Actions_CanCreateAxisComposite_WithCustomMinMax() Assert.That(action.ReadValue(), Is.EqualTo(2).Within(0.00001)); } + // https://fogbugz.unity3d.com/f/cases/1398942/ + [Test] + [Category("Actions")] + public void Actions_CanCreateAxisComposite_AndApplyProcessorsToPartBindings() + { + var mouse = InputSystem.AddDevice(); + + var action = new InputAction(); + action.AddCompositeBinding("1DAxis(minValue=0,maxValue=10)") + .With("Positive", "/scroll/y", processors: "clamp(min=0,max=1)") + .With("Negative", "/scroll/y", processors: "invert,clamp(min=0,max=1)"); + action.Enable(); + + Set(mouse.scroll.y, 2f); + + Assert.That(action.ReadValue(), Is.EqualTo(10)); + + Set(mouse.scroll.y, -2f); + + Assert.That(action.ReadValue(), Is.EqualTo(0)); + } + [Test] [Category("Actions")] public void Actions_CanCreateVector2Composite() diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 9cdaeee256..edbaf46c41 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -31,7 +31,7 @@ however, it has to be formatted properly to pass verification tests. ### Fixed -- Fixed an issue where a layout-override registered via `InputSystem.RegisterLayoutOverride(...)` would cause the editor to malfunction or crash if the layout override had a name already used by an existing layout. (case 1377685). +- Fixed an issue where a layout-override registered via `InputSystem.RegisterLayoutOverride(...)` would cause the editor to malfunction or crash if the layout override had a name already used by an existing layout (case 1377685). - Fixed an issue where attempting to replace an existing layout-override by using an existing layout-override name didn't work as expected and would instead aggregate overrides instead of replacing them when an override with the given name already exists. - Fixed Switch Pro controller not working correctly in different scenarios ([case 1369091](https://issuetracker.unity3d.com/issues/nintendo-switch-pro-controller-output-garbage), [case 1190216](https://issuetracker.unity3d.com/issues/inputsystem-windows-switch-pro-controller-only-works-when-connected-via-bluetooth-but-not-via-usb), case 1314869). - Fixed `InvalidCastException: Specified cast is not valid.` being thrown when clicking on menu separators in the control picker ([case 1388049](https://issuetracker.unity3d.com/issues/invalidcastexception-is-thrown-when-selecting-the-header-of-an-advanceddropdown)). @@ -47,6 +47,8 @@ however, it has to be formatted properly to pass verification tests. - Fixed d-pad inputs sometimes being ignored on actions that were binding to multiple controls ([case 1389858](https://unity.slack.com/archives/G01RVV1SPU4/p1642501574002300)). - Fixed `IndexOutOfRangeException` when having multiple interactions on an action and/or binding in an action map other than the first of an asset ([case 1392559](https://issuetracker.unity3d.com/issues/map-index-on-trigger-and-indexoutofrangeexception-are-thrown-when-using-interaction-on-both-binding-and-its-parent-action)). * Fix contributed by [Russell Quinn](https://github.com/russellquinn) in [#1483](https://github.com/Unity-Technologies/InputSystem/pull/1483). +- Fixed `AxisComposite` not respecting processors applied to `positive` and `negative` bindings (case 1398942). + * This was a regression introduced in [1.0.0-pre.6](#axiscomposite-min-max-value-fix). ### Added @@ -209,7 +211,7 @@ however, it has to be formatted properly to pass verification tests. - Fixed `MultiTapInteraction` not respecting `InputSettings.multiTapDelayTime` ([case 1292754](https://issuetracker.unity3d.com/issues/multitapdelaytime-does-not-influence-maxtapspacing-in-input-action-assets)). - Fixed changing values in `Input System Package` project settings not affecting default values displayed in `.inputactions` editor window ([case 1292754](https://issuetracker.unity3d.com/issues/multitapdelaytime-does-not-influence-maxtapspacing-in-input-action-assets)). - Fixed rebinding a part of a composite with `RebindingOperation.WithTargetBinding` not also changing the type of control being looked for ([case 1272563](https://issuetracker.unity3d.com/issues/input-system-performinteractiverebinding-method-doesnt-detect-button-input-when-rebinding-part-of-a-2d-vector-composite)). -- Fixed `AxisComposite` not respecting `minValue` and `maxValue` properties ([case 1335838](https://issuetracker.unity3d.com/issues/inputsystem-1d-axis-composite-binding-will-return-a-incorrect-value-if-minvalue-and-maxvalue-is-not-1-and-1)). +- Fixed `AxisComposite` not respecting `minValue` and `maxValue` properties ([case 1335838](https://issuetracker.unity3d.com/issues/inputsystem-1d-axis-composite-binding-will-return-a-incorrect-value-if-minvalue-and-maxvalue-is-not-1-and-1)). - Fixed `ArgumentOutOfRangeException` caused by `IsPointerOverGameObject` ([case 1337354](https://issuetracker.unity3d.com/issues/mobile-argumentoutofrangeexception-is-thrown-when-calling-ispointerovergameobject)). - `PlayerInput` no longer logs an error message when it is set to `Invoke UnityEvents` and can't find an action in the given `.inputactions` asset ([case 1259577](https://issuetracker.unity3d.com/issues/an-error-is-thrown-when-deleting-an-input-action-and-entering-play-mode)). - Fixed `HoldInteraction` getting stuck when hold and release happens in same event ([case 1346786](https://issuetracker.unity3d.com/issues/input-system-the-canceled-event-is-not-fired-when-clicking-a-button-for-a-precise-amount-of-time)). diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/AxisComposite.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/AxisComposite.cs index ca13d8a239..8375e4c6f2 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/AxisComposite.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/AxisComposite.cs @@ -2,18 +2,14 @@ using UnityEngine.InputSystem.Layouts; using UnityEngine.InputSystem.Processors; using UnityEngine.InputSystem.Utilities; -using UnityEngine.Scripting; namespace UnityEngine.InputSystem.Composites { /// - /// A single axis value computed from a "negative" and a "positive" button. + /// A single axis value computed from one axis that pulls in the direction () and one + /// axis that pulls in the direction (). /// /// - /// This composite allows to arrange any arbitrary two buttons from a device in an - /// axis configuration such that one button pushes in one direction and the other - /// pushes in the opposite direction. - /// /// The limits of the axis are determined by and . /// By default, they are set to [-1..1]. The values can be set as parameters. /// @@ -26,7 +22,7 @@ namespace UnityEngine.InputSystem.Composites /// /// /// - /// If both buttons are pressed at the same time, the behavior depends on . + /// If both axes are actuated at the same time, the behavior depends on . /// By default, neither side will win () and the result /// will be 0 (or, more precisely, the midpoint between and ). /// This can be customized to make the positive side win () @@ -37,33 +33,36 @@ namespace UnityEngine.InputSystem.Composites /// acceleration control(s), and setting to , /// if the break button is pressed, it will always cause the acceleration button to be ignored. /// - /// The values returned are the actual actuation values of the buttons, unaltered for - /// and inverted for . This means that if the buttons are actual axes (e.g. - /// the triggers on gamepads), then the values correspond to how much the axis is actuated. + /// The actual absolute values of and are used + /// to scale and respectively. So if, for example, + /// is bound to and the trigger is at a value of 0.5, then the resulting + /// value is maxValue * 0.5 (the actual formula is midPoint + (maxValue - midPoint) * positive). /// [DisplayStringFormat("{negative}/{positive}")] [DisplayName("Positive/Negative Binding")] public class AxisComposite : InputBindingComposite { /// - /// Binding for the button that controls the positive direction of the axis. + /// Binding for the axis input that controls the negative [..0] direction of the + /// combined axis. /// /// /// This property is automatically assigned by the input system. /// // ReSharper disable once MemberCanBePrivate.Global // ReSharper disable once FieldCanBeMadeReadOnly.Global - [InputControl(layout = "Button")] public int negative = 0; + [InputControl(layout = "Axis")] public int negative = 0; /// - /// Binding for the button that controls the negative direction of the axis. + /// Binding for the axis input that controls the positive [0..] direction of the + /// combined axis. /// /// /// This property is automatically assigned by the input system. /// // ReSharper disable once MemberCanBePrivate.Global // ReSharper disable once FieldCanBeMadeReadOnly.Global - [InputControl(layout = "Button")] public int positive = 0; + [InputControl(layout = "Axis")] public int positive = 0; /// /// The lower bound that the axis is limited to. -1 by default. @@ -131,22 +130,22 @@ public class AxisComposite : InputBindingComposite /// public override float ReadValue(ref InputBindingCompositeContext context) { - var negativeMagnitude = context.EvaluateMagnitude(negative); - var positiveMagnitude = context.EvaluateMagnitude(positive); + var negativeValue = Mathf.Abs(context.ReadValue(negative)); + var positiveValue = Mathf.Abs(context.ReadValue(positive)); - var negativeIsPressed = negativeMagnitude > 0; - var positiveIsPressed = positiveMagnitude > 0; + var negativeIsActuated = negativeValue > Mathf.Epsilon; + var positiveIsActuated = positiveValue > Mathf.Epsilon; - if (negativeIsPressed == positiveIsPressed) + if (negativeIsActuated == positiveIsActuated) { switch (whichSideWins) { case WhichSideWins.Negative: - positiveIsPressed = false; + positiveIsActuated = false; break; case WhichSideWins.Positive: - negativeIsPressed = false; + negativeIsActuated = false; break; case WhichSideWins.Neither: @@ -156,10 +155,10 @@ public override float ReadValue(ref InputBindingCompositeContext context) var mid = midPoint; - if (negativeIsPressed) - return mid - (mid - minValue) * negativeMagnitude; + if (negativeIsActuated) + return mid - (mid - minValue) * negativeValue; - return mid + (maxValue - mid) * positiveMagnitude; + return mid + (maxValue - mid) * positiveValue; } /// From 2aafb7530f1e16d8a39288e78a2df8940013f55d Mon Sep 17 00:00:00 2001 From: Rene Damm Date: Wed, 2 Feb 2022 19:23:50 +0100 Subject: [PATCH 19/53] FIX: Exceptions when accessing actions during startup (case 1378614, #1496). --- Packages/com.unity.inputsystem/CHANGELOG.md | 1 + .../InputSystem/Actions/InputBindingResolver.cs | 2 ++ Packages/com.unity.inputsystem/InputSystem/InputSystem.cs | 7 +++++++ .../InputSystem/Utilities/TypeTable.cs | 3 +++ 4 files changed, 13 insertions(+) diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index edbaf46c41..a4bba9e3ea 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -40,6 +40,7 @@ however, it has to be formatted properly to pass verification tests. - Fixed `InputControlPath.Matches` incorrectly reporting matches when only a prefix was matching. * This would, for example, cause `Keyboard.eKey` to be matched by `/escape`. * Fix contributed by [Fredrik Ludvigsen](https://github.com/steinbitglis) in [#1485](https://github.com/Unity-Technologies/InputSystem/pull/1485). +- Fixed accessing `InputAction`s directly during `RuntimeInitializeOnLoad` not initializing the input system as a whole and leading to exceptions ([case 1378614](https://issuetracker.unity3d.com/issues/input-system-nullreferenceexception-error-is-thrown-when-using-input-actions-in-builds)). #### Actions diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingResolver.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingResolver.cs index 821f4a45f2..95a32f50c0 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingResolver.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingResolver.cs @@ -117,6 +117,8 @@ public unsafe void AddActionMap(InputActionMap map) { Debug.Assert(map != null, "Received null map"); + InputSystem.EnsureInitialized(); + var actionsInThisMap = map.m_Actions; var bindingsInThisMap = map.m_Bindings; var bindingCountInThisMap = bindingsInThisMap?.Length ?? 0; diff --git a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs index 6ed567ecac..86b9b86879 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs @@ -3176,6 +3176,13 @@ private static void RunInitializeInPlayer() #endif } + // Initialization is triggered by accessing InputSystem. Some parts (like InputActions) + // do not rely on InputSystem and thus can be accessed without tapping InputSystem. + // This method will explicitly make sure we trigger initialization. + internal static void EnsureInitialized() + { + } + #if UNITY_EDITOR internal static InputSystemObject s_SystemObject; diff --git a/Packages/com.unity.inputsystem/InputSystem/Utilities/TypeTable.cs b/Packages/com.unity.inputsystem/InputSystem/Utilities/TypeTable.cs index 83ecbe1243..4ae8b83e52 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Utilities/TypeTable.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Utilities/TypeTable.cs @@ -65,6 +65,9 @@ public Type LookupTypeRegistration(string name) if (string.IsNullOrEmpty(name)) throw new ArgumentException("Name cannot be null or empty", nameof(name)); + if (table == null) + throw new InvalidOperationException("Input System not yet initialized"); + var internedName = new InternedString(name); if (table.TryGetValue(internedName, out var type)) return type; From aeff87c3f22d77a12f7a2966fdc7a237d55aaee0 Mon Sep 17 00:00:00 2001 From: Tomas Dirvanauskas Date: Wed, 2 Feb 2022 20:26:14 +0200 Subject: [PATCH 20/53] CHANGE: Make a few Android-specific state structs public (#1498). --- Packages/com.unity.inputsystem/CHANGELOG.md | 4 + .../Plugins/Android/AndroidAxis.cs | 175 +++- .../Plugins/Android/AndroidGameController.cs | 90 +- .../Plugins/Android/AndroidKeyCode.cs | 889 +++++++++++++++++- 4 files changed, 1111 insertions(+), 47 deletions(-) diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index a4bba9e3ea..7b2993ec9f 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -28,6 +28,10 @@ however, it has to be formatted properly to pass verification tests. ``` * This also applies to `PressInteraction` when set to `Press` behavior. * In effect, it means that a button will be in `started` or `performed` phase for as long as its value is not 0 and will only go to `canceled` once dropping to 0. +- Made the following internal types public. These types can be useful when deconstructing raw events captured via `InputEventTrace`. + * `UnityEngine.InputSystem.Android.LowLevel.AndroidAxis` + * `UnityEngine.InputSystem.Android.LowLevel.AndroidGameControllerState` + * `UnityEngine.InputSystem.Android.LowLevel.AndroidKeyCode` ### Fixed diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/Android/AndroidAxis.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/Android/AndroidAxis.cs index 8c0dcb7033..a9995fc2f3 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/Android/AndroidAxis.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/Android/AndroidAxis.cs @@ -1,4 +1,4 @@ -#if UNITY_EDITOR || UNITY_ANDROID +#if UNITY_EDITOR || UNITY_ANDROID || PACKAGE_DOCS_GENERATION using System; using System.Linq; using System.Runtime.InteropServices; @@ -7,50 +7,221 @@ namespace UnityEngine.InputSystem.Android.LowLevel { + /// + /// Enum used to identity the axis type in the Android motion input event. See . + /// See https://developer.android.com/reference/android/view/MotionEvent#constants_1 for more details. + /// [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1027:MarkEnumsWithFlags", Justification = "False positive")] - internal enum AndroidAxis + public enum AndroidAxis { + /// + /// X axis of a motion event. + /// X = 0, + + /// + /// Y axis of a motion event. + /// Y = 1, + + /// + /// Pressure axis of a motion event. + /// Pressure = 2, + + /// + /// Size axis of a motion event. + /// Size = 3, + + /// + /// TouchMajor axis of a motion event. + /// TouchMajor = 4, + + /// + /// TouchMinor axis of a motion event. + /// TouchMinor = 5, + + /// + /// ToolMajor axis of a motion event. + /// ToolMajor = 6, + + /// + /// ToolMinor axis of a motion event. + /// ToolMinor = 7, + + /// + /// Orientation axis of a motion event. + /// Orientation = 8, + + /// + /// Vertical Scroll of a motion event. + /// Vscroll = 9, + + /// + /// Horizontal Scroll axis of a motion event. + /// Hscroll = 10, + + /// + /// Z axis of a motion event. + /// Z = 11, + + /// + /// X Rotation axis of a motion event. + /// Rx = 12, + + /// + /// Y Rotation axis of a motion event. + /// Ry = 13, + + /// + /// Z Rotation axis of a motion event. + /// Rz = 14, + + /// + /// Hat X axis of a motion event. + /// HatX = 15, + + /// + /// Hat Y axis of a motion event. + /// HatY = 16, + + /// + /// Left Trigger axis of a motion event. + /// Ltrigger = 17, + + /// + /// Right Trigger axis of a motion event. + /// Rtrigger = 18, + + /// + /// Throttle axis of a motion event. + /// Throttle = 19, + + /// + /// Rudder axis of a motion event. + /// Rudder = 20, + + /// + /// Wheel axis of a motion event. + /// Wheel = 21, + + /// + /// Gas axis of a motion event. + /// Gas = 22, + + /// + /// Break axis of a motion event. + /// Brake = 23, + + /// + /// Distance axis of a motion event. + /// Distance = 24, + + /// + /// Tilt axis of a motion event. + /// Tilt = 25, + + /// + /// Generic 1 axis of a motion event. + /// Generic1 = 32, + + /// + /// Generic 2 axis of a motion event. + /// Generic2 = 33, + + /// + /// Generic 3 axis of a motion event. + /// Generic3 = 34, + + /// + /// Generic 4 axis of a motion event. + /// Generic4 = 35, + + /// + /// Generic 5 axis of a motion event. + /// Generic5 = 36, + + /// + /// Generic 6 axis of a motion event. + /// Generic6 = 37, + + /// + /// Generic 7 axis of a motion event. + /// Generic7 = 38, + + /// + /// Generic 8 axis of a motion event. + /// Generic8 = 39, + + /// + /// Generic 9 axis of a motion event. + /// Generic9 = 40, + + /// + /// Generic 10 axis of a motion event. + /// Generic10 = 41, + + /// + /// Generic 11 axis of a motion event. + /// Generic11 = 42, + + /// + /// Generic 12 axis of a motion event. + /// Generic12 = 43, + + /// + /// Generic 13 axis of a motion event. + /// Generic13 = 44, + + /// + /// Generic 14 axis of a motion event. + /// Generic14 = 45, + + /// + /// Generic 15 axis of a motion event. + /// Generic15 = 46, + + /// + /// Generic 16 axis of a motion event. + /// Generic16 = 47, } } diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/Android/AndroidGameController.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/Android/AndroidGameController.cs index fdbb837dc1..eb3bbff536 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/Android/AndroidGameController.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/Android/AndroidGameController.cs @@ -10,55 +10,61 @@ namespace UnityEngine.InputSystem.Android.LowLevel { + /// + /// Default state layout for Android game controller. + /// [StructLayout(LayoutKind.Sequential)] - internal unsafe struct AndroidGameControllerState : IInputStateTypeInfo + public unsafe struct AndroidGameControllerState : IInputStateTypeInfo { public const int MaxAxes = 48; public const int MaxButtons = 220; - internal const string kVariantGamepad = "Gamepad"; - internal const string kVariantJoystick = "Joystick"; - internal const string kVariantDPadAxes = "DpadAxes"; - internal const string kVariantDPadButtons = "DpadButtons"; + public class Variants + { + public const string Gamepad = "Gamepad"; + public const string Joystick = "Joystick"; + public const string DPadAxes = "DpadAxes"; + public const string DPadButtons = "DpadButtons"; + } internal const uint kAxisOffset = sizeof(uint) * (uint)((MaxButtons + 31) / 32); public static FourCC kFormat = new FourCC('A', 'G', 'C', ' '); - [InputControl(name = "dpad", layout = "Dpad", bit = (uint)AndroidKeyCode.DpadUp, sizeInBits = 4, variants = kVariantDPadButtons)] - [InputControl(name = "dpad/up", bit = (uint)AndroidKeyCode.DpadUp, variants = kVariantDPadButtons)] - [InputControl(name = "dpad/down", bit = (uint)AndroidKeyCode.DpadDown, variants = kVariantDPadButtons)] - [InputControl(name = "dpad/left", bit = (uint)AndroidKeyCode.DpadLeft, variants = kVariantDPadButtons)] - [InputControl(name = "dpad/right", bit = (uint)AndroidKeyCode.DpadRight, variants = kVariantDPadButtons)] - [InputControl(name = "buttonSouth", bit = (uint)AndroidKeyCode.ButtonA, variants = kVariantGamepad)] - [InputControl(name = "buttonWest", bit = (uint)AndroidKeyCode.ButtonX, variants = kVariantGamepad)] - [InputControl(name = "buttonNorth", bit = (uint)AndroidKeyCode.ButtonY, variants = kVariantGamepad)] - [InputControl(name = "buttonEast", bit = (uint)AndroidKeyCode.ButtonB, variants = kVariantGamepad)] - [InputControl(name = "leftStickPress", bit = (uint)AndroidKeyCode.ButtonThumbl, variants = kVariantGamepad)] - [InputControl(name = "rightStickPress", bit = (uint)AndroidKeyCode.ButtonThumbr, variants = kVariantGamepad)] - [InputControl(name = "leftShoulder", bit = (uint)AndroidKeyCode.ButtonL1, variants = kVariantGamepad)] - [InputControl(name = "rightShoulder", bit = (uint)AndroidKeyCode.ButtonR1, variants = kVariantGamepad)] - [InputControl(name = "start", bit = (uint)AndroidKeyCode.ButtonStart, variants = kVariantGamepad)] - [InputControl(name = "select", bit = (uint)AndroidKeyCode.ButtonSelect, variants = kVariantGamepad)] + [InputControl(name = "dpad", layout = "Dpad", bit = (uint)AndroidKeyCode.DpadUp, sizeInBits = 4, variants = Variants.DPadButtons)] + [InputControl(name = "dpad/up", bit = (uint)AndroidKeyCode.DpadUp, variants = Variants.DPadButtons)] + [InputControl(name = "dpad/down", bit = (uint)AndroidKeyCode.DpadDown, variants = Variants.DPadButtons)] + [InputControl(name = "dpad/left", bit = (uint)AndroidKeyCode.DpadLeft, variants = Variants.DPadButtons)] + [InputControl(name = "dpad/right", bit = (uint)AndroidKeyCode.DpadRight, variants = Variants.DPadButtons)] + [InputControl(name = "buttonSouth", bit = (uint)AndroidKeyCode.ButtonA, variants = Variants.Gamepad)] + [InputControl(name = "buttonWest", bit = (uint)AndroidKeyCode.ButtonX, variants = Variants.Gamepad)] + [InputControl(name = "buttonNorth", bit = (uint)AndroidKeyCode.ButtonY, variants = Variants.Gamepad)] + [InputControl(name = "buttonEast", bit = (uint)AndroidKeyCode.ButtonB, variants = Variants.Gamepad)] + [InputControl(name = "leftStickPress", bit = (uint)AndroidKeyCode.ButtonThumbl, variants = Variants.Gamepad)] + [InputControl(name = "rightStickPress", bit = (uint)AndroidKeyCode.ButtonThumbr, variants = Variants.Gamepad)] + [InputControl(name = "leftShoulder", bit = (uint)AndroidKeyCode.ButtonL1, variants = Variants.Gamepad)] + [InputControl(name = "rightShoulder", bit = (uint)AndroidKeyCode.ButtonR1, variants = Variants.Gamepad)] + [InputControl(name = "start", bit = (uint)AndroidKeyCode.ButtonStart, variants = Variants.Gamepad)] + [InputControl(name = "select", bit = (uint)AndroidKeyCode.ButtonSelect, variants = Variants.Gamepad)] public fixed uint buttons[(MaxButtons + 31) / 32]; - [InputControl(name = "dpad", layout = "Dpad", offset = (uint)AndroidAxis.HatX * sizeof(float) + kAxisOffset, format = "VEC2", sizeInBits = 64, variants = kVariantDPadAxes)] - [InputControl(name = "dpad/right", offset = 0, bit = 0, sizeInBits = 32, format = "FLT", parameters = "clamp=3,clampConstant=0,clampMin=0,clampMax=1", variants = kVariantDPadAxes)] - [InputControl(name = "dpad/left", offset = 0, bit = 0, sizeInBits = 32, format = "FLT", parameters = "clamp=3,clampConstant=0,clampMin=-1,clampMax=0,invert", variants = kVariantDPadAxes)] - [InputControl(name = "dpad/down", offset = ((uint)AndroidAxis.HatY - (uint)AndroidAxis.HatX) * sizeof(float), bit = 0, sizeInBits = 32, format = "FLT", parameters = "clamp=3,clampConstant=0,clampMin=0,clampMax=1", variants = kVariantDPadAxes)] - [InputControl(name = "dpad/up", offset = ((uint)AndroidAxis.HatY - (uint)AndroidAxis.HatX) * sizeof(float), bit = 0, sizeInBits = 32, format = "FLT", parameters = "clamp=3,clampConstant=0,clampMin=-1,clampMax=0,invert", variants = kVariantDPadAxes)] - [InputControl(name = "leftTrigger", offset = (uint)AndroidAxis.Brake * sizeof(float) + kAxisOffset, parameters = "clamp=1,clampMin=0,clampMax=1.0", variants = kVariantGamepad)] - [InputControl(name = "rightTrigger", offset = (uint)AndroidAxis.Gas * sizeof(float) + kAxisOffset, parameters = "clamp=1,clampMin=0,clampMax=1.0", variants = kVariantGamepad)] - [InputControl(name = "leftStick", variants = kVariantGamepad)] - [InputControl(name = "leftStick/y", variants = kVariantGamepad, parameters = "invert")] - [InputControl(name = "leftStick/up", variants = kVariantGamepad, parameters = "invert,clamp=1,clampMin=-1.0,clampMax=0.0")] - [InputControl(name = "leftStick/down", variants = kVariantGamepad, parameters = "invert=false,clamp=1,clampMin=0,clampMax=1.0")] + [InputControl(name = "dpad", layout = "Dpad", offset = (uint)AndroidAxis.HatX * sizeof(float) + kAxisOffset, format = "VEC2", sizeInBits = 64, variants = Variants.DPadAxes)] + [InputControl(name = "dpad/right", offset = 0, bit = 0, sizeInBits = 32, format = "FLT", parameters = "clamp=3,clampConstant=0,clampMin=0,clampMax=1", variants = Variants.DPadAxes)] + [InputControl(name = "dpad/left", offset = 0, bit = 0, sizeInBits = 32, format = "FLT", parameters = "clamp=3,clampConstant=0,clampMin=-1,clampMax=0,invert", variants = Variants.DPadAxes)] + [InputControl(name = "dpad/down", offset = ((uint)AndroidAxis.HatY - (uint)AndroidAxis.HatX) * sizeof(float), bit = 0, sizeInBits = 32, format = "FLT", parameters = "clamp=3,clampConstant=0,clampMin=0,clampMax=1", variants = Variants.DPadAxes)] + [InputControl(name = "dpad/up", offset = ((uint)AndroidAxis.HatY - (uint)AndroidAxis.HatX) * sizeof(float), bit = 0, sizeInBits = 32, format = "FLT", parameters = "clamp=3,clampConstant=0,clampMin=-1,clampMax=0,invert", variants = Variants.DPadAxes)] + [InputControl(name = "leftTrigger", offset = (uint)AndroidAxis.Brake * sizeof(float) + kAxisOffset, parameters = "clamp=1,clampMin=0,clampMax=1.0", variants = Variants.Gamepad)] + [InputControl(name = "rightTrigger", offset = (uint)AndroidAxis.Gas * sizeof(float) + kAxisOffset, parameters = "clamp=1,clampMin=0,clampMax=1.0", variants = Variants.Gamepad)] + [InputControl(name = "leftStick", variants = Variants.Gamepad)] + [InputControl(name = "leftStick/y", variants = Variants.Gamepad, parameters = "invert")] + [InputControl(name = "leftStick/up", variants = Variants.Gamepad, parameters = "invert,clamp=1,clampMin=-1.0,clampMax=0.0")] + [InputControl(name = "leftStick/down", variants = Variants.Gamepad, parameters = "invert=false,clamp=1,clampMin=0,clampMax=1.0")] ////FIXME: state for this control is not contiguous - [InputControl(name = "rightStick", offset = (uint)AndroidAxis.Z * sizeof(float) + kAxisOffset, sizeInBits = ((uint)AndroidAxis.Rz - (uint)AndroidAxis.Z + 1) * sizeof(float) * 8, variants = kVariantGamepad)] - [InputControl(name = "rightStick/x", variants = kVariantGamepad)] - [InputControl(name = "rightStick/y", offset = ((uint)AndroidAxis.Rz - (uint)AndroidAxis.Z) * sizeof(float), variants = kVariantGamepad, parameters = "invert")] - [InputControl(name = "rightStick/up", offset = ((uint)AndroidAxis.Rz - (uint)AndroidAxis.Z) * sizeof(float), variants = kVariantGamepad, parameters = "invert,clamp=1,clampMin=-1.0,clampMax=0.0")] - [InputControl(name = "rightStick/down", offset = ((uint)AndroidAxis.Rz - (uint)AndroidAxis.Z) * sizeof(float), variants = kVariantGamepad, parameters = "invert=false,clamp=1,clampMin=0,clampMax=1.0")] + [InputControl(name = "rightStick", offset = (uint)AndroidAxis.Z * sizeof(float) + kAxisOffset, sizeInBits = ((uint)AndroidAxis.Rz - (uint)AndroidAxis.Z + 1) * sizeof(float) * 8, variants = Variants.Gamepad)] + [InputControl(name = "rightStick/x", variants = Variants.Gamepad)] + [InputControl(name = "rightStick/y", offset = ((uint)AndroidAxis.Rz - (uint)AndroidAxis.Z) * sizeof(float), variants = Variants.Gamepad, parameters = "invert")] + [InputControl(name = "rightStick/up", offset = ((uint)AndroidAxis.Rz - (uint)AndroidAxis.Z) * sizeof(float), variants = Variants.Gamepad, parameters = "invert,clamp=1,clampMin=-1.0,clampMax=0.0")] + [InputControl(name = "rightStick/down", offset = ((uint)AndroidAxis.Rz - (uint)AndroidAxis.Z) * sizeof(float), variants = Variants.Gamepad, parameters = "invert=false,clamp=1,clampMin=0,clampMax=1.0")] public fixed float axis[MaxAxes]; public FourCC format @@ -176,7 +182,7 @@ namespace UnityEngine.InputSystem.Android /// It's obvious that this depends on the driver and not Android OS, thus we can only assume Samsung in this case doesn't properly support Dualshock in their drivers /// While we can do custom mapping for Samsung, we can never now when will they try to update the driver for Dualshock or some other gamepad /// - [InputControlLayout(stateType = typeof(AndroidGameControllerState), variants = AndroidGameControllerState.kVariantGamepad)] + [InputControlLayout(stateType = typeof(AndroidGameControllerState), variants = AndroidGameControllerState.Variants.Gamepad)] public class AndroidGamepad : Gamepad { } @@ -185,7 +191,7 @@ public class AndroidGamepad : Gamepad /// Generic controller with Dpad axes /// [InputControlLayout(stateType = typeof(AndroidGameControllerState), hideInUI = true, - variants = AndroidGameControllerState.kVariantGamepad + InputControlLayout.VariantSeparator + AndroidGameControllerState.kVariantDPadAxes)] + variants = AndroidGameControllerState.Variants.Gamepad + InputControlLayout.VariantSeparator + AndroidGameControllerState.Variants.DPadAxes)] public class AndroidGamepadWithDpadAxes : AndroidGamepad { } @@ -194,7 +200,7 @@ public class AndroidGamepadWithDpadAxes : AndroidGamepad /// Generic controller with Dpad buttons /// [InputControlLayout(stateType = typeof(AndroidGameControllerState), hideInUI = true, - variants = AndroidGameControllerState.kVariantGamepad + InputControlLayout.VariantSeparator + AndroidGameControllerState.kVariantDPadButtons)] + variants = AndroidGameControllerState.Variants.Gamepad + InputControlLayout.VariantSeparator + AndroidGameControllerState.Variants.DPadButtons)] public class AndroidGamepadWithDpadButtons : AndroidGamepad { } @@ -202,7 +208,7 @@ public class AndroidGamepadWithDpadButtons : AndroidGamepad /// /// Joystick on Android. /// - [InputControlLayout(stateType = typeof(AndroidGameControllerState), variants = AndroidGameControllerState.kVariantJoystick)] + [InputControlLayout(stateType = typeof(AndroidGameControllerState), variants = AndroidGameControllerState.Variants.Joystick)] public class AndroidJoystick : Joystick { } @@ -211,7 +217,7 @@ public class AndroidJoystick : Joystick /// A PlayStation DualShock 4 controller connected to an Android device. /// [InputControlLayout(stateType = typeof(AndroidGameControllerState), displayName = "Android DualShock 4 Gamepad", - variants = AndroidGameControllerState.kVariantGamepad + InputControlLayout.VariantSeparator + AndroidGameControllerState.kVariantDPadAxes)] + variants = AndroidGameControllerState.Variants.Gamepad + InputControlLayout.VariantSeparator + AndroidGameControllerState.Variants.DPadAxes)] public class DualShock4GamepadAndroid : DualShockGamepad { } @@ -220,7 +226,7 @@ public class DualShock4GamepadAndroid : DualShockGamepad /// A PlayStation DualShock 4 controller connected to an Android device. /// [InputControlLayout(stateType = typeof(AndroidGameControllerState), displayName = "Android Xbox One Controller", - variants = AndroidGameControllerState.kVariantGamepad + InputControlLayout.VariantSeparator + AndroidGameControllerState.kVariantDPadAxes)] + variants = AndroidGameControllerState.Variants.Gamepad + InputControlLayout.VariantSeparator + AndroidGameControllerState.Variants.DPadAxes)] public class XboxOneGamepadAndroid : XInput.XInputController { } diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/Android/AndroidKeyCode.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/Android/AndroidKeyCode.cs index 79fe87afdf..7fff382693 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/Android/AndroidKeyCode.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/Android/AndroidKeyCode.cs @@ -1,4 +1,4 @@ -#if UNITY_EDITOR || UNITY_ANDROID +#if UNITY_EDITOR || UNITY_ANDROID || PACKAGE_DOCS_GENERATION using System; using System.Linq; using System.Runtime.InteropServices; @@ -7,227 +7,1110 @@ namespace UnityEngine.InputSystem.Android.LowLevel { - internal enum AndroidKeyCode + /// + /// Enum used to identity the key in the Android key event. See . + /// See https://developer.android.com/reference/android/view/KeyEvent#constants_1 for more details. + /// + public enum AndroidKeyCode { + /// + /// Unknown key code. + /// Unknown = 0, + + /// + /// Soft Left key. Usually situated below the display on phones and used as a multi-function feature key for selecting a software defined function shown on the bottom left of the display. + /// SoftLeft = 1, + + /// + /// Soft Right key. Usually situated below the display on phones and used as a multi-function feature key for selecting a software defined function shown on the bottom right of the display. + /// SoftRight = 2, + + /// + /// Home key. This key is handled by the framework and is never delivered to applications. + /// Home = 3, + + /// + /// Back key. + /// Back = 4, + + /// + /// Call key. + /// Call = 5, + + /// + /// End Call key. + /// Endcall = 6, + + /// + /// '0' key. + /// Alpha0 = 7, + + /// + /// '1' key. + /// Alpha1 = 8, + + /// + /// '2' key. + /// Alpha2 = 9, + + /// + /// '3' key. + /// Alpha3 = 10, + + /// + /// '4' key. + /// Alpha4 = 11, + + /// + /// '5' key. + /// Alpha5 = 12, + + /// + /// '6' key. + /// Alpha6 = 13, + + /// + /// '7' key. + /// Alpha7 = 14, + + /// + /// '8' key. + /// Alpha8 = 15, + + /// + /// '9' key. + /// Alpha9 = 16, + + /// + /// '*' key. + /// Star = 17, + + /// + /// '#' key. + /// Pound = 18, + + /// + /// Directional Pad Up key. May also be synthesized from trackball motions. + /// DpadUp = 19, + + /// + /// Directional Pad Down key. May also be synthesized from trackball motions. + /// DpadDown = 20, + + /// + /// Directional Pad Left key. May also be synthesized from trackball motions. + /// DpadLeft = 21, + + /// + /// Directional Pad Right key. May also be synthesized from trackball motions. + /// DpadRight = 22, + + /// + /// Directional Pad Center key. May also be synthesized from trackball motions. + /// DpadCenter = 23, + + /// + /// Volume Up key. Adjusts the speaker volume up. + /// VolumeUp = 24, + + /// + /// Volume Down key. Adjusts the speaker volume down. + /// VolumeDown = 25, + + /// + /// Power key. + /// Power = 26, + + /// + /// Camera key. Used to launch a camera application or take pictures. + /// Camera = 27, + + /// + /// Clear key. + /// Clear = 28, + + /// + /// 'A' key. + /// A = 29, + + /// + /// 'B' key. + /// B = 30, + + /// + /// 'C' key. + /// C = 31, + + /// + /// 'D' key. + /// D = 32, + + /// + /// 'E' key. + /// E = 33, + + /// + /// 'F' key. + /// F = 34, + + /// + /// 'G' key. + /// G = 35, + + /// + /// 'H' key. + /// H = 36, + + /// + /// 'I' key. + /// I = 37, + + /// + /// 'J' key. + /// J = 38, + + /// + /// 'K' key. + /// K = 39, + + /// + /// 'L' key. + /// L = 40, + + /// + /// 'M' key. + /// M = 41, + + /// + /// 'N' key. + /// N = 42, + + /// + /// 'O' key. + /// O = 43, + + /// + /// 'P' key. + /// P = 44, + + /// + /// 'Q' key. + /// Q = 45, + + /// + /// 'R' key. + /// R = 46, + + /// + /// 'S' key. + /// S = 47, + + /// + /// 'T' key. + /// T = 48, + + /// + /// 'U' key. + /// U = 49, + + /// + /// 'V' key. + /// V = 50, + + /// + /// 'W' key. + /// W = 51, + + /// + /// 'X' key. + /// X = 52, + + /// + /// 'Y' key. + /// Y = 53, + + /// + /// 'Z' key. + /// Z = 54, + + /// + /// ',' key. + /// Comma = 55, + + /// + /// '.' key. + /// Period = 56, + + /// + /// Left Alt modifier key. + /// AltLeft = 57, + + /// + /// Right Alt modifier key. + /// AltRight = 58, + + /// + /// Left Shift modifier key. + /// ShiftLeft = 59, + + /// + /// Right Shift modifier key. + /// ShiftRight = 60, + + /// + /// Tab key. + /// Tab = 61, + + /// + /// Space key. + /// Space = 62, + + /// + /// Symbol modifier key. Used to enter alternate symbols. + /// Sym = 63, + + /// + /// Explorer special function key. Used to launch a browser application. + /// Explorer = 64, + + /// + /// Envelope special function key. Used to launch a mail application. + /// Envelope = 65, + + /// + /// Enter key. + /// Enter = 66, + + /// + /// Backspace key. Deletes characters before the insertion point, unlike . + /// Del = 67, + + /// + /// '`' (backtick) key. + /// Grave = 68, + + /// + /// '-' key. + /// Minus = 69, + + /// + /// '=' key. + /// Equals = 70, + + /// + /// '[' key. + /// LeftBracket = 71, + + /// + /// ']' key. + /// RightBracket = 72, + + /// + /// '\' key. + /// Backslash = 73, + + /// + /// ';' key. + /// Semicolon = 74, + + /// + /// ''' (apostrophe) key. + /// Apostrophe = 75, + + /// + /// '/' key. + /// Slash = 76, + + /// + /// '@' key. + /// At = 77, + + /// + /// Number modifier key. Used to enter numeric symbols. This key is not Num Lock; it is more like . + /// Num = 78, + + /// + /// Headset Hook key. Used to hang up calls and stop media. + /// Headsethook = 79, - Focus = 80, // *Camera* focus + + /// + /// Camera Focus key. Used to focus the camera. + /// + Focus = 80, + + /// + /// '+' key. + /// // *Camera* focus Plus = 81, + + /// + /// Menu key. + /// Menu = 82, + + /// + /// Notification key. + /// Notification = 83, + + /// + /// Search key. + /// Search = 84, + + /// + /// Play/Pause media key. + /// MediaPlayPause = 85, + + /// + /// Stop media key. + /// MediaStop = 86, + + /// + /// Play Next media key. + /// MediaNext = 87, + + /// + /// Play Previous media key. + /// MediaPrevious = 88, + + /// + /// Rewind media key. + /// MediaRewind = 89, + + /// + /// Fast Forward media key. + /// MediaFastForward = 90, + + /// + /// Mute key. Mutes the microphone, unlike . + /// Mute = 91, + + /// + /// Page Up key. + /// PageUp = 92, + + /// + /// Page Down key. + /// PageDown = 93, + + /// + /// Picture Symbols modifier key. Used to switch symbol sets (Emoji, Kao-moji). + /// Pictsymbols = 94, + + /// + /// Switch Charset modifier key. Used to switch character sets (Kanji, Katakana). + /// SwitchCharset = 95, + + /// + /// A Button key. On a game controller, the A button should be either the button labeled A or the first button on the bottom row of controller buttons. + /// ButtonA = 96, + + /// + /// B Button key. On a game controller, the B button should be either the button labeled B or the second button on the bottom row of controller buttons. + /// ButtonB = 97, + + /// + /// C Button key. On a game controller, the C button should be either the button labeled C or the third button on the bottom row of controller buttons. + /// ButtonC = 98, + + /// + /// X Button key. On a game controller, the X button should be either the button labeled X or the first button on the upper row of controller buttons. + /// ButtonX = 99, + + /// + /// Y Button key. On a game controller, the Y button should be either the button labeled Y or the second button on the upper row of controller buttons. + /// ButtonY = 100, + + /// + /// Z Button key. On a game controller, the Z button should be either the button labeled Z or the third button on the upper row of controller buttons. + /// ButtonZ = 101, + + /// + /// L1 Button key. On a game controller, the L1 button should be either the button labeled L1 (or L) or the top left trigger button. + /// ButtonL1 = 102, + + /// + /// R1 Button key. On a game controller, the R1 button should be either the button labeled R1 (or R) or the top right trigger button. + /// ButtonR1 = 103, + + /// + /// L2 Button key. On a game controller, the L2 button should be either the button labeled L2 or the bottom left trigger button. + /// ButtonL2 = 104, + + /// + /// R2 Button key. On a game controller, the R2 button should be either the button labeled R2 or the bottom right trigger button. + /// ButtonR2 = 105, + + /// + /// Left Thumb Button key. On a game controller, the left thumb button indicates that the left (or only) joystick is pressed. + /// ButtonThumbl = 106, + + /// + /// Right Thumb Button key. On a game controller, the right thumb button indicates that the right joystick is pressed. + /// ButtonThumbr = 107, + + /// + /// Start Button key. On a game controller, the button labeled Start. + /// ButtonStart = 108, + + /// + /// Select Button key. On a game controller, the button labeled Select. + /// ButtonSelect = 109, + + /// + /// Mode Button key. On a game controller, the button labeled Mode. + /// ButtonMode = 110, + + /// + /// Escape key. + /// Escape = 111, + + /// + /// Forward Delete key. Deletes characters ahead of the insertion point, unlike . + /// ForwardDel = 112, + + /// + /// Left Control modifier key. + /// CtrlLeft = 113, + + /// + /// Right Control modifier key. + /// CtrlRight = 114, + + /// + /// Caps Lock key. + /// CapsLock = 115, + + /// + /// Scroll Lock key. + /// ScrollLock = 116, + + /// + /// Left Meta modifier key. + /// MetaLeft = 117, + + /// + /// Right Meta modifier key. + /// MetaRight = 118, + + /// + /// Function modifier key. + /// Function = 119, + + /// + /// System Request / Print Screen key. + /// Sysrq = 120, + + /// + /// Break / Pause key. + /// Break = 121, + + /// + /// Home Movement key. Used for scrolling or moving the cursor around to the start of a line or to the top of a list. + /// MoveHome = 122, + + /// + /// End Movement key. Used for scrolling or moving the cursor around to the end of a line or to the bottom of a list. + /// MoveEnd = 123, + + /// + /// Insert key. Toggles insert / overwrite edit mode. + /// Insert = 124, + + /// + /// Forward key. Navigates forward in the history stack. Complement of . + /// Forward = 125, + + /// + /// Play media key. + /// MediaPlay = 126, + + /// + /// Play/Pause media key. + /// MediaPause = 127, + + /// + /// Close media key. May be used to close a CD tray, for example. + /// MediaClose = 128, + + /// + /// Eject media key. May be used to eject a CD tray, for example. + /// MediaEject = 129, + + /// + /// Record media key. + /// MediaRecord = 130, + + /// + /// F1 key. + /// F1 = 131, + + /// + /// F2 key. + /// F2 = 132, + + /// + /// F3 key. + /// F3 = 133, + + /// + /// F4 key. + /// F4 = 134, + + /// + /// F5 key. + /// F5 = 135, + + /// + /// F6 key. + /// F6 = 136, + + /// + /// F7 key. + /// F7 = 137, + + /// + /// F8 key. + /// F8 = 138, + + /// + /// F9 key. + /// F9 = 139, + + /// + /// F10 key. + /// F10 = 140, + + /// + /// F11 key. + /// F11 = 141, + + /// + /// F12 key. + /// F12 = 142, + + /// + /// Num Lock key. This is the Num Lock key; it is different from . This key alters the behavior of other keys on the numeric keypad. + /// NumLock = 143, + + /// + /// Numeric keypad '0' key. + /// Numpad0 = 144, + + /// + /// Numeric keypad '1' key. + /// Numpad1 = 145, + + /// + /// Numeric keypad '2' key. + /// Numpad2 = 146, + + /// + /// Numeric keypad '3' key. + /// Numpad3 = 147, + + /// + /// Numeric keypad '4' key. + /// Numpad4 = 148, + + /// + /// Numeric keypad '5' key. + /// Numpad5 = 149, + + /// + /// 'Numeric keypad '6' key. + /// Numpad6 = 150, + + /// + /// 'Numeric keypad '7' key. + /// Numpad7 = 151, + + /// + /// Numeric keypad '8' key. + /// Numpad8 = 152, + + /// + /// Numeric keypad '9' key. + /// Numpad9 = 153, + + /// + /// Numeric keypad '/' key (for division). + /// NumpadDivide = 154, + + /// + /// Numeric keypad '*' key (for multiplication). + /// NumpadMultiply = 155, + + /// + /// Numeric keypad '-' key (for subtraction). + /// NumpadSubtract = 156, + + /// + /// Numeric keypad '+' key (for addition). + /// NumpadAdd = 157, + + /// + /// Numeric keypad '.' key (for decimals or digit grouping). + /// NumpadDot = 158, + + /// + /// Numeric keypad ',' key (for decimals or digit grouping). + /// NumpadComma = 159, + + /// + /// Numeric keypad Enter key. + /// NumpadEnter = 160, + + /// + /// Numeric keypad '=' key. + /// NumpadEquals = 161, + + /// + /// Numeric keypad '(' key. + /// NumpadLeftParen = 162, + + /// + /// Numeric keypad ')' key. + /// NumpadRightParen = 163, + + /// + /// Volume Mute key. Mutes the speaker, unlike . This key should normally be implemented as a toggle such that the first press mutes the speaker and the second press restores the original volum + /// VolumeMute = 164, + + /// + /// Info key. Common on TV remotes to show additional information related to what is currently being viewed. + /// Info = 165, + + /// + /// Channel up key. On TV remotes, increments the television channel. + /// ChannelUp = 166, + + /// + /// Channel down key. On TV remotes, increments the television channel. + /// ChannelDown = 167, + + /// + /// Zoom in key. + /// ZoomIn = 168, + + /// + /// Zoom out key. + /// ZoomOut = 169, + + /// + /// TV key. On TV remotes, switches to viewing live TV. + /// Tv = 170, + + /// + /// Window key. On TV remotes, toggles picture-in-picture mode or other windowing functions. On Android Wear devices, triggers a display offset. + /// Window = 171, + + /// + /// Guide key. On TV remotes, shows a programming guide. + /// Guide = 172, + + /// + /// DVR key. On some TV remotes, switches to a DVR mode for recorded shows. + /// Dvr = 173, + + /// + /// Bookmark key. On some TV remotes, bookmarks content or web pages. + /// Bookmark = 174, + + /// + /// Toggle captions key. Switches the mode for closed-captioning text, for example during television shows. + /// Captions = 175, + + /// + /// Settings key. Starts the system settings activity. + /// Settings = 176, + + /// + /// TV power key. On HDMI TV panel devices and Android TV devices that don't support HDMI, toggles the power state of the device. On HDMI source devices, toggles the power state of the HDMI-connected TV via HDMI-CEC and makes the source device follow this power state. + /// TvPower = 177, + + /// + /// TV input key. On TV remotes, switches the input on a television screen. + /// TvInput = 178, + + /// + /// Set-top-box power key. On TV remotes, toggles the power on an external Set-top-box. + /// StbPower = 179, + + /// + /// Set-top-box input key. On TV remotes, switches the input mode on an external Set-top-box. + /// StbInput = 180, + + /// + /// A/V Receiver power key. On TV remotes, toggles the power on an external A/V Receiver. + /// AvrPower = 181, + + /// + /// A/V Receiver input key. On TV remotes, switches the input mode on an external A/V Receive + /// AvrInput = 182, + + /// + /// Red "programmable" key. On TV remotes, acts as a contextual/programmable key. + /// ProgRed = 183, + + /// + /// Green "programmable" key. On TV remotes, actsas a contextual/programmable key. + /// ProgGreen = 184, + + /// + /// Yellow "programmable" key. On TV remotes, actsas a contextual/programmable key. + /// ProgYellow = 185, + + /// + /// Blue "programmable" key. On TV remotes, actsas a contextual/programmable key. + /// ProgBlue = 186, + + /// + /// App switch key. Should bring up the application switcher dialog. + /// AppSwitch = 187, + + /// + /// Generic Game Pad Button #1. + /// Button1 = 188, + + /// + /// Generic Game Pad Button #2. + /// Button2 = 189, + + /// + /// Generic Game Pad Button #3. + /// Button3 = 190, + + /// + /// Generic Game Pad Button #4. + /// Button4 = 191, + + /// + /// Generic Game Pad Button #5. + /// Button5 = 192, + + /// + /// Generic Game Pad Button #6. + /// Button6 = 193, + + /// + /// Generic Game Pad Button #7. + /// Button7 = 194, + + /// + /// Generic Game Pad Button #8. + /// Button8 = 195, + + /// + /// Generic Game Pad Button #9. + /// Button9 = 196, + + /// + /// Generic Game Pad Button #10. + /// Button10 = 197, + + /// + /// Generic Game Pad Button #11. + /// Button11 = 198, + + /// + /// Generic Game Pad Button #12. + /// Button12 = 199, + + /// + /// Generic Game Pad Button #13. + /// Button13 = 200, + + /// + /// Generic Game Pad Button #14. + /// Button14 = 201, + + /// + /// Generic Game Pad Button #15. + /// Button15 = 202, + + /// + /// Generic Game Pad Button #16. + /// Button16 = 203, + + /// + /// Language Switch key. Toggles the current input language such as switching between English and Japanese on a QWERTY keyboard. On some devices, the same function may be performed by pressing Shift+Spacebar. + /// LanguageSwitch = 204, + + /// + /// 'Manner Mode key. Toggles silent or vibrate mode on and off to make the device behave more politely in certain settings such as on a crowded train. On some devices, the key may only operate when long-pressed. + /// MannerMode = 205, + + /// + /// 3D Mode key. Toggles the display between 2D and 3D mode. + /// Mode3D = 206, + + /// + /// Contacts special function key. Used to launch an address book application. + /// Contacts = 207, + + /// + /// Calendar special function key. Used to launch a calendar application. + /// Calendar = 208, + + /// + /// Music special function key. Used to launch a music player application. + /// Music = 209, + + /// + /// Calculator special function key. Used to launch a calculator application. + /// Calculator = 210, + + /// + /// Japanese full-width / half-width key. + /// ZenkakuHankaku = 211, + + /// + /// Japanese alphanumeric key. + /// Eisu = 212, + + /// + /// Japanese non-conversion key. + /// Muhenkan = 213, + + /// + /// Japanese conversion key. + /// Henkan = 214, + + /// + /// Japanese katakana / hiragana key. + /// KatakanaHiragana = 215, + + /// + /// Japanese Yen key. + /// Yen = 216, + + /// + /// Japanese Ro key. + /// Ro = 217, + + /// + /// Japanese kana key. + /// Kana = 218, + + /// + /// Assist key. Launches the global assist activity. Not delivered to applications. + /// Assist = 219, } } From dd365335dbea7a0a39cd43e6cf82a08779d46b30 Mon Sep 17 00:00:00 2001 From: Rene Damm Date: Wed, 2 Feb 2022 19:31:41 +0100 Subject: [PATCH 21/53] CHANGE: Adding or removing device no longer temp-disables actions (case 1379932, #1500). --- Assets/Tests/InputSystem/CoreTests_Actions.cs | 660 +++++++++++++++--- .../CoreTests_Actions_Interactions.cs | 2 +- Packages/com.unity.inputsystem/CHANGELOG.md | 4 + .../Documentation~/ActionBindings.md | 13 + .../Actions/IInputActionCollection.cs | 10 + .../InputSystem/Actions/InputAction.cs | 56 +- .../InputSystem/Actions/InputActionAsset.cs | 24 +- .../InputSystem/Actions/InputActionMap.cs | 279 +++++--- .../Actions/InputActionRebindingExtensions.cs | 24 +- .../Actions/InputActionSetupExtensions.cs | 94 ++- .../InputSystem/Actions/InputActionState.cs | 424 +++++++++-- .../Actions/InputBindingResolver.cs | 131 ++-- .../InputSystem/Controls/InputControlList.cs | 42 +- .../Devices/Remote/InputRemoting.cs | 1 + .../PlayerInput/DefaultInputActions.cs | 4 +- .../DefaultInputActions.inputactions | 4 +- .../InputSystem/Utilities/OneOrMore.cs | 2 +- 17 files changed, 1357 insertions(+), 417 deletions(-) diff --git a/Assets/Tests/InputSystem/CoreTests_Actions.cs b/Assets/Tests/InputSystem/CoreTests_Actions.cs index 8b0d88b5b8..7a70e66281 100644 --- a/Assets/Tests/InputSystem/CoreTests_Actions.cs +++ b/Assets/Tests/InputSystem/CoreTests_Actions.cs @@ -1,4 +1,5 @@ using System; +using System.Collections; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; @@ -651,12 +652,9 @@ public void Actions_ValueActionsReactToCurrentStateOfControlWhenEnabled() actionThatShouldNotTrigger.started += ctx => Assert.Fail("Action should not start"); actionThatShouldNotTrigger.performed += ctx => Assert.Fail("Action should not be performed"); - using (var trace1 = new InputActionTrace()) - using (var trace2 = new InputActionTrace()) + using (var trace1 = new InputActionTrace(actionWithoutInteraction)) + using (var trace2 = new InputActionTrace(actionWithHold)) { - trace1.SubscribeTo(actionWithoutInteraction); - trace2.SubscribeTo(actionWithHold); - actionWithoutInteraction.Enable(); actionWithHold.Enable(); actionThatShouldNotTrigger.Enable(); @@ -667,39 +665,10 @@ public void Actions_ValueActionsReactToCurrentStateOfControlWhenEnabled() InputSystem.QueueDeltaStateEvent(gamepad.leftStick, new Vector2(0.345f, 0.456f)); InputSystem.Update(); - var actions1 = trace1.ToArray(); - var actions2 = trace2.ToArray(); - - Assert.That(actions1, Has.Length.EqualTo(3)); - Assert.That(actions2, Has.Length.EqualTo(1)); - - Assert.That(actions1[0].phase, Is.EqualTo(InputActionPhase.Started)); - Assert.That(actions1[0].action, Is.SameAs(actionWithoutInteraction)); - Assert.That(actions1[0].interaction, Is.Null); - Assert.That(actions1[0].control, Is.SameAs(gamepad.leftStick)); - Assert.That(actions1[0].ReadValue(), - Is.EqualTo(new StickDeadzoneProcessor().Process(new Vector2(0.123f, 0.234f))) - .Using(Vector2EqualityComparer.Instance)); - Assert.That(actions1[1].phase, Is.EqualTo(InputActionPhase.Performed)); - Assert.That(actions1[1].action, Is.SameAs(actionWithoutInteraction)); - Assert.That(actions1[1].interaction, Is.Null); - Assert.That(actions1[1].control, Is.SameAs(gamepad.leftStick)); - Assert.That(actions1[1].ReadValue(), - Is.EqualTo(new StickDeadzoneProcessor().Process(new Vector2(0.123f, 0.234f))) - .Using(Vector2EqualityComparer.Instance)); - Assert.That(actions1[2].phase, Is.EqualTo(InputActionPhase.Performed)); - Assert.That(actions1[2].action, Is.SameAs(actionWithoutInteraction)); - Assert.That(actions1[2].interaction, Is.Null); - Assert.That(actions1[2].control, Is.SameAs(gamepad.leftStick)); - Assert.That(actions1[2].ReadValue(), - Is.EqualTo(new StickDeadzoneProcessor().Process(new Vector2(0.345f, 0.456f))) - .Using(Vector2EqualityComparer.Instance)); - - Assert.That(actions2[0].phase, Is.EqualTo(InputActionPhase.Started)); - Assert.That(actions2[0].action, Is.SameAs(actionWithHold)); - Assert.That(actions2[0].interaction, Is.TypeOf()); - Assert.That(actions2[0].control, Is.SameAs(gamepad.buttonSouth)); - Assert.That(actions2[0].ReadValue(), Is.EqualTo(1).Within(0.00001)); + Assert.That(trace1, Started(actionWithoutInteraction, control: gamepad.leftStick, value: new StickDeadzoneProcessor().Process(new Vector2(0.123f, 0.234f))) + .AndThen(Performed(actionWithoutInteraction, control: gamepad.leftStick, value: new StickDeadzoneProcessor().Process(new Vector2(0.123f, 0.234f)))) + .AndThen(Performed(actionWithoutInteraction, control: gamepad.leftStick, value: new StickDeadzoneProcessor().Process(new Vector2(0.345f, 0.456f))))); + Assert.That(trace2, Started(actionWithHold, control: gamepad.buttonSouth, value: 1f)); } } @@ -3273,14 +3242,339 @@ public void Actions_CanAddBindingsToActions_ToExistingComposite() .Property("path").EqualTo("/rightArrow")); } - // Case 1218544 + [Serializable] + public enum Modification + { + AddBinding, + RemoveBinding, + ModifyBinding, + ApplyBindingOverride, + AddAction, + RemoveAction, + AddMap, + RemoveMap, + ChangeBindingMask, + AddDevice, + RemoveDevice, + AddDeviceGlobally, + RemoveDeviceGlobally, + } + + public class ModificationCases : IEnumerable + { + [Preserve] + public ModificationCases() {} + + public IEnumerator GetEnumerator() + { + bool ModificationAppliesToSingletonAction(Modification modification) + { + switch (modification) + { + case Modification.AddBinding: + case Modification.RemoveBinding: + case Modification.ModifyBinding: + case Modification.ApplyBindingOverride: + case Modification.AddDeviceGlobally: + case Modification.RemoveDeviceGlobally: + return true; + } + return false; + } + + bool ModificationAppliesToSingleActionMap(Modification modification) + { + switch (modification) + { + case Modification.AddMap: + case Modification.RemoveMap: + return false; + } + return true; + } + + // NOTE: This executes *outside* of our test fixture during test discovery. + + // Creates a matrix of all permutations of Modifications combined with assets, maps, and singleton actions. + foreach (var func in new Func[] { () => new DefaultInputActions().asset, CreateMap, CreateSingletonAction }) + { + foreach (var value in Enum.GetValues(typeof(Modification))) + { + var actions = func(); + if (actions is InputActionMap map) + { + if (map.m_SingletonAction != null) + { + if (!ModificationAppliesToSingletonAction((Modification)value)) + continue; + } + else if (!ModificationAppliesToSingleActionMap((Modification)value)) + { + continue; + } + } + + yield return new TestCaseData(value, actions); + } + } + } + + private InputActionMap CreateMap() + { + var map = new InputActionMap("SingleActionMap"); + var action1 = map.AddAction("action1"); + var action2 = map.AddAction("action2"); + var action3 = map.AddAction("action3"); + action1.AddBinding("/space", groups: "Keyboard"); + action1.AddBinding("/buttonNorth", groups: "Gamepad"); + action2.AddBinding("/buttonSouth", groups: "Gamepad"); + action3.AddBinding("/leftButton", groups: "Mouse"); + action3.AddBinding("/rightTrigger", groups: "Gamepad"); + return map; + } + + private InputActionMap CreateSingletonAction() + { + var action = new InputAction("SingletonAction"); + action.AddBinding("/buttonSouth", groups: "Gamepad"); + action.AddBinding("/space", groups: "Keyboard"); + return action.GetOrCreateActionMap(); + } + } + [Test] [Category("Actions")] - public void Actions_CanAddBindingsToActions_AfterActionHasBeenEnabled() + [TestCaseSource(typeof(ModificationCases))] + public void Actions_CanHandleModification(Modification modification, IInputActionCollection2 actions) + { + var gamepad = InputSystem.AddDevice(); + + if (modification == Modification.AddDevice || modification == Modification.RemoveDevice) + actions.devices = new[] { gamepad }; + else if (modification == Modification.ChangeBindingMask) + actions.bindingMask = InputBinding.MaskByGroup("Gamepad"); + + List listOfControlsBeforeModification = null; + InputAction enabledAction = null; + + bool NeedsFullResolve() + { + switch (modification) + { + case Modification.AddDevice: + case Modification.RemoveDevice: + case Modification.AddDeviceGlobally: + case Modification.RemoveDeviceGlobally: + return false; + } + return true; + } + + bool NeedsActionsToBeDisabled() + { + switch (modification) + { + case Modification.AddAction: + case Modification.RemoveAction: + case Modification.AddMap: + case Modification.RemoveMap: + return true; + } + return false; + } + + void ApplyAndVerifyModification() + { + switch (modification) + { + case Modification.AddBinding: + { + var action = actions.Last(a => a.controls.Contains(gamepad.buttonSouth)); + action.AddBinding("/buttonNorth"); + Assert.That(action.controls, Has.Exactly(1).SameAs(gamepad.buttonSouth)); + Assert.That(action.controls, Has.Exactly(1).SameAs(gamepad.buttonNorth)); + Assert.That(actions.SelectMany(a => a.controls).Distinct(), + Is.EquivalentTo(listOfControlsBeforeModification.Append(gamepad.buttonNorth).Distinct())); + break; + } + + case Modification.RemoveBinding: + { + var action = actions.First(a => a.controls.Contains(gamepad.buttonSouth)); + action.ChangeBinding(0).Erase(); + Assert.That(action.controls, Has.Exactly(0).SameAs(gamepad.buttonSouth)); + break; + } + + case Modification.ModifyBinding: + { + var action = actions.First(a => a.controls.Contains(gamepad.buttonSouth)); + action.ChangeBinding(0).WithPath("/buttonNorth"); + Assert.That(action.controls, Does.Contain(gamepad.buttonNorth)); + break; + } + + case Modification.ApplyBindingOverride: + { + var action = actions.Last(a => a.controls.Contains(gamepad.buttonSouth)); + action.ApplyBindingOverride("/buttonNorth"); + Assert.That(action.controls, Does.Contain(gamepad.buttonNorth)); + break; + } + + case Modification.AddAction: + { + foreach (var map in actions.Select(a => a.actionMap).Distinct()) + map.AddAction("NewAction", binding: "/leftTrigger"); + Assert.That(actions.FindAction("NewAction"), Is.Not.Null); + Assert.That(actions.FindAction("NewAction").enabled, Is.False); + Assert.That(actions.FindAction("NewAction").controls, Is.EqualTo(new[] { gamepad.leftTrigger })); + break; + } + + case Modification.RemoveAction: + { + var action = actions.First(a => a.controls.Contains(gamepad.buttonSouth)); + action.RemoveAction(); + Assert.That(actions.FindAction(action.name), Is.Not.SameAs(action)); + break; + } + + case Modification.AddMap: + { + var map = new InputActionMap("NewMap"); + var action = map.AddAction("NewAction", binding: "/buttonEast"); + ((InputActionAsset)actions).AddActionMap(map); + Assert.That(action.controls, Is.EqualTo(new[] { gamepad.buttonEast })); + Assert.That(actions.SelectMany(a => a.controls).Distinct(), + Is.EquivalentTo(listOfControlsBeforeModification.Append(gamepad.buttonEast).Distinct())); + break; + } + + case Modification.RemoveMap: + { + var asset = (InputActionAsset)actions; + var map = asset.actionMaps[0]; + asset.RemoveActionMap(map); + Assert.That(actions.SelectMany(a => a.controls), Is.Not.Empty); + break; + } + + case Modification.ChangeBindingMask: + { + actions.bindingMask = InputBinding.MaskByGroup("Nothing"); + Assert.That(actions.SelectMany(a => a.controls), Is.Empty); + break; + } + + case Modification.AddDevice: + { + var addedDevice = InputSystem.AddDevice(); + actions.devices = new[] { gamepad, addedDevice }; + Assert.That(actions.SelectMany(a => a.controls), Is.SupersetOf(listOfControlsBeforeModification)); + Assert.That(actions.SelectMany(a => a.controls).Select(c => c.device), Does.Contain(addedDevice)); + break; + } + + case Modification.RemoveDevice: + { + InputSystem.RemoveDevice(gamepad); + Assert.That(actions.devices, Is.Not.Null); + Assert.That(actions.devices, Is.Empty); + Assert.That(actions.SelectMany(a => a.controls), Is.Empty); + Assert.That(actions.Where(a => a.enabled), Is.EquivalentTo(new[] { enabledAction })); + break; + } + + case Modification.AddDeviceGlobally: + { + var addedDevice = InputSystem.AddDevice(); + Assert.That(actions.Where(a => a.controls.Any(c => c.device == addedDevice)), Is.Not.Empty, + "Expected at least one action to bind to a control on the newly added device"); + break; + } + + case Modification.RemoveDeviceGlobally: + { + InputSystem.RemoveDevice(gamepad); + Assert.That(actions.Where(a => a.controls.Any(c => c.device == gamepad)), Is.Empty, + "Expected that none of the actions binds to a control on the removed device anymore"); + Assert.That(actions.Where(a => a.enabled), Is.EquivalentTo(new[] { enabledAction })); + break; + } + } + } + + var changes = new List(); + InputSystem.onActionChange += (_, change) => changes.Add(change); + + // Initial resolve. + Assert.That(actions.Where(x => x.controls.Contains(gamepad.buttonSouth)), Is.Not.Empty, + "Expecting at least one action bound to the A button"); + Assert.That(changes, Is.EqualTo(new[] { InputActionChange.BoundControlsChanged })); + listOfControlsBeforeModification = actions.SelectMany(a => a.controls).Distinct().ToList(); + + // Put one action into enabled and in-progress state. + var aButtonAction = actions.First(x => x.controls.Contains(gamepad.buttonSouth)); + aButtonAction.Enable(); + Press(gamepad.buttonSouth); + Assert.That(aButtonAction.IsInProgress(), Is.True); + Assert.That(aButtonAction.activeControl, Is.SameAs(gamepad.buttonSouth)); + + // If actions need to be disabled for the modification to be valid, + // make sure we throw if we attempt the modification now. + if (NeedsActionsToBeDisabled()) + { + Assert.That(() => ApplyAndVerifyModification(), Throws.InvalidOperationException); + aButtonAction.Disable(); + } + else + { + enabledAction = aButtonAction; + } + + changes.Clear(); + + // Apply. + ApplyAndVerifyModification(); + + // If we have removed the gamepad, the action will have been cancelled (but NOT disabled!) by virtue of + // losing its active control. + if (modification == Modification.RemoveDevice || modification == Modification.RemoveDeviceGlobally) + { + Assert.That(changes, Is.EqualTo(new[] { InputActionChange.ActionCanceled, InputActionChange.BoundControlsAboutToChange, InputActionChange.BoundControlsChanged })); + Assert.That(aButtonAction.phase.IsInProgress(), Is.False); + Assert.That(aButtonAction.activeControl, Is.Null); + Assert.That(aButtonAction.ReadValue(), Is.EqualTo(0f)); + } + // If the modification doesn't need a full resolve, the action + // should have kept going uninterrupted. + else if (!NeedsFullResolve()) + { + Assert.That(changes, Is.EqualTo(new[] { InputActionChange.BoundControlsAboutToChange, InputActionChange.BoundControlsChanged })); + Assert.That(aButtonAction.phase.IsInProgress(), Is.True); + Assert.That(aButtonAction.activeControl, Is.SameAs(gamepad.buttonSouth)); + Assert.That(aButtonAction.ReadValue(), Is.EqualTo(1f)); + } + else if (!NeedsActionsToBeDisabled()) + { + // Action should have been automatically disabled and re-enabled. + Assert.That(changes, + Is.EqualTo(new[] + { + InputActionChange.ActionCanceled, InputActionChange.ActionDisabled, InputActionChange.BoundControlsAboutToChange, + InputActionChange.BoundControlsChanged, InputActionChange.ActionEnabled + })); + } + } + + // https://fogbugz.unity3d.com/f/cases/1218544 + [Test] + [Category("Actions")] + public void Actions_CanAddBindingsToActions_AfterActionHasAlreadyResolvedControls() { var gamepad = InputSystem.AddDevice(); var action = new InputAction(name: "test", binding: "/leftStick"); - action.Enable(); Assert.That(action.controls, Is.EquivalentTo(new[] { gamepad.leftStick })); Assert.That(action.bindings, Has.Count.EqualTo(1)); @@ -3749,37 +4043,57 @@ public void Actions_ControlsUpdateWhenNewDeviceIsAdded() [Test] [Category("Actions")] - public void Actions_WhenDeviceIsRemoved_BoundControlsAreUpdated() + public void Actions_WhenDeviceIsAdded_OngoingActionsAreUnaffected() { - var gamepad = InputSystem.AddDevice(); + var gamepad1 = InputSystem.AddDevice(); - var action = new InputAction(binding: "/leftTrigger"); - action.Enable(); + var buttonAction = new InputAction(type: InputActionType.Button, binding: "/buttonSouth"); + var valueAction = new InputAction(type: InputActionType.Value, binding: "/leftTrigger"); - Assert.That(action.controls, Has.Count.EqualTo(1)); - Assert.That(action.controls, Has.Exactly(1).SameAs(gamepad.leftTrigger)); + buttonAction.Enable(); + valueAction.Enable(); - InputSystem.RemoveDevice(gamepad); + Press(gamepad1.buttonSouth); + Set(gamepad1.leftTrigger, 0.5f); - Assert.That(action.controls, Has.Count.Zero); + Assert.That(buttonAction.IsPressed, Is.True); + Assert.That(valueAction.ReadValue(), Is.EqualTo(0.5f)); + + using (var trace = new InputActionTrace()) + { + trace.SubscribeToAll(); + + var gamepad2 = InputSystem.AddDevice(); + + Assert.That(trace, Is.Empty); + + // Make sure we execute initial state checks. + InputSystem.Update(); + + Assert.That(trace, Is.Empty); + + Set(gamepad2.leftTrigger, 1f); + + Assert.That(valueAction.ReadValue(), Is.EqualTo(1f)); + Assert.That(valueAction.activeControl, Is.SameAs(gamepad2.leftTrigger)); + } } [Test] [Category("Actions")] - public void Actions_WhenDeviceIsRemoved_OngoingActionsAreCancelled() + public void Actions_WhenDeviceIsRemoved_BoundControlsAreUpdated() { var gamepad = InputSystem.AddDevice(); var action = new InputAction(binding: "/leftTrigger"); action.Enable(); - Set(gamepad.leftTrigger, 0.75f); - - Assert.That(action.inProgress, Is.True); + Assert.That(action.controls, Has.Count.EqualTo(1)); + Assert.That(action.controls, Has.Exactly(1).SameAs(gamepad.leftTrigger)); InputSystem.RemoveDevice(gamepad); - Assert.That(action.inProgress, Is.False); + Assert.That(action.controls, Has.Count.Zero); } [Test] @@ -3901,7 +4215,7 @@ public void Actions_ControlsUpdateWhenDeviceIsRemoved_WhileActionIsDisabled() [Test] [Category("Actions")] - public void Actions_ControlsUpdateWhenDeviceUsagesChange() + public void Actions_ControlsUpdate_WhenDeviceUsagesChange() { var device1 = InputSystem.AddDevice(); var device2 = InputSystem.AddDevice(); @@ -3925,7 +4239,7 @@ public void Actions_ControlsUpdateWhenDeviceUsagesChange() // layout which in turn affects bindings to keys by "display name" (i.e. text character). [Test] [Category("Actions")] - public void Actions_ControlsUpdateWhenDeviceConfigurationChanges() + public void Actions_ControlsUpdate_WhenDeviceConfigurationChanges() { var keyboard = InputSystem.AddDevice(); @@ -3943,7 +4257,7 @@ public void Actions_ControlsUpdateWhenDeviceConfigurationChanges() [Test] [Category("Actions")] - public void Actions_ControlsUpdateWhenDeviceConfigurationChanges_AndControlIsNotFound() + public void Actions_ControlsUpdate_WhenDeviceConfigurationChanges_AndControlIsNotFound() { var keyboard = InputSystem.AddDevice(); @@ -3990,14 +4304,10 @@ public void Actions_WhenControlsUpdate_NotificationIsTriggered_ButOnlyAfterBindi InputSystem.AddDevice(); Assert.That(received, - Is.EquivalentTo(new object[] + Is.EqualTo(new object[] { - // When the action map re-resolves it will temporarily disable the action - // which we see surface through the notifications. - enabledAction, InputActionChange.ActionDisabled, enabledAction, InputActionChange.BoundControlsAboutToChange, - enabledAction, InputActionChange.BoundControlsChanged, - enabledAction, InputActionChange.ActionEnabled, + enabledAction, InputActionChange.BoundControlsChanged })); received.Clear(); @@ -4007,7 +4317,7 @@ public void Actions_WhenControlsUpdate_NotificationIsTriggered_ButOnlyAfterBindi _ = controlsQueriedAction.controls; Assert.That(received, - Is.EquivalentTo(new object[] + Is.EqualTo(new object[] { controlsQueriedAction, InputActionChange.BoundControlsChanged })); @@ -4017,7 +4327,7 @@ public void Actions_WhenControlsUpdate_NotificationIsTriggered_ButOnlyAfterBindi InputSystem.AddDevice(); Assert.That(received, - Is.EquivalentTo(new object[] + Is.EqualTo(new object[] { controlsQueriedAction, InputActionChange.BoundControlsAboutToChange, controlsQueriedAction, InputActionChange.BoundControlsChanged @@ -4043,14 +4353,10 @@ public void Actions_WhenControlsUpdateInActionMap_NotificationIsTriggered() InputSystem.AddDevice(); Assert.That(received, - Is.EquivalentTo(new object[] + Is.EqualTo(new object[] { - // When the action map re-resolves it will temporarily disable the action - // which we see surface through the notifications. - actionMap, InputActionChange.ActionMapDisabled, actionMap, InputActionChange.BoundControlsAboutToChange, actionMap, InputActionChange.BoundControlsChanged, - actionMap, InputActionChange.ActionMapEnabled, })); } @@ -4075,17 +4381,167 @@ public void Actions_WhenControlsUpdateInActionAsset_NotificationIsTriggered() InputSystem.AddDevice(); - // For some reason, actionMap and asset are considered equivalent so we do the element - // checks individually here. - Assert.That(received, Has.Count.EqualTo(8)); - Assert.That(received[0], Is.SameAs(actionMap)); - Assert.That(received[1], Is.EqualTo(InputActionChange.ActionMapDisabled)); - Assert.That(received[2], Is.SameAs(asset)); - Assert.That(received[3], Is.EqualTo(InputActionChange.BoundControlsAboutToChange)); - Assert.That(received[4], Is.SameAs(asset)); - Assert.That(received[5], Is.EqualTo(InputActionChange.BoundControlsChanged)); - Assert.That(received[6], Is.SameAs(actionMap)); - Assert.That(received[7], Is.EqualTo(InputActionChange.ActionMapEnabled)); + Assert.That(received, Is.EqualTo(new object[] + { + asset, InputActionChange.BoundControlsAboutToChange, + asset, InputActionChange.BoundControlsChanged, + })); + } + + [Test] + [Category("Actions")] + public void Actions_WhenControlsUpdate_TimeoutsAreCarriedOver() + { + currentTime = 0; + var gamepad1 = InputSystem.AddDevice(); + + var action = new InputAction(binding: "/buttonSouth", interactions: "hold(duration=3)"); + action.Enable(); + + currentTime = 1; + Press(gamepad1.buttonSouth); + + Assert.That(action.WasPerformedThisFrame(), Is.False); + Assert.That(action.IsInProgress(), Is.True); + Assert.That(action.activeControl, Is.SameAs(gamepad1.buttonSouth)); + Assert.That(action.GetTimeoutCompletionPercentage(), Is.EqualTo(0).Within(0.0001)); + + currentTime = 2; + InputSystem.Update(); + + Assert.That(action.GetTimeoutCompletionPercentage(), Is.EqualTo(1 / 3f).Within(0.0001)); + + var gamepad2 = InputSystem.AddDevice(); + + Assert.That(action.WasPerformedThisFrame(), Is.False); + Assert.That(action.IsInProgress(), Is.True); + Assert.That(action.activeControl, Is.SameAs(gamepad1.buttonSouth)); + Assert.That(action.GetTimeoutCompletionPercentage(), Is.EqualTo(1 / 3f).Within(0.0001)); + + currentTime = 5; + InputSystem.Update(); + + Assert.That(action.WasPerformedThisFrame(), Is.True); + Assert.That(action.IsInProgress(), Is.True); + Assert.That(action.activeControl, Is.SameAs(gamepad1.buttonSouth)); + Assert.That(action.GetTimeoutCompletionPercentage(), Is.EqualTo(1f).Within(0.0001)); + } + + [Test] + [Category("Actions")] + public void Actions_WhenControlsUpdate_InProgressActionsKeepGoing() + { + currentTime = 0; + var gamepad = InputSystem.AddDevice(); + + var action1 = new InputAction(binding: "/leftStick"); + var action2 = new InputAction(binding: "/buttonSouth", interactions: "hold(duration=3)"); + var action3 = new InputAction(binding: "/buttonNorth"); + + action1.Enable(); + action2.Enable(); + action3.Enable(); + + Set(gamepad.leftStick, new Vector2(0.6f, 0.6f)); + currentTime = 1; + Press(gamepad.buttonSouth); + + Assert.That(action1.IsInProgress(), Is.True); + Assert.That(action2.IsInProgress(), Is.True); + Assert.That(action3.IsInProgress(), Is.False); + Assert.That(action1.activeControl, Is.SameAs(gamepad.leftStick)); + Assert.That(action2.activeControl, Is.SameAs(gamepad.buttonSouth)); + Assert.That(action3.activeControl, Is.Null); + Assert.That(action2.GetTimeoutCompletionPercentage(), Is.EqualTo(0f)); + + currentTime = 2; + var gamepad2 = InputSystem.AddDevice(); + InputSystem.Update(); + + Assert.That(action1.IsInProgress(), Is.True); + Assert.That(action2.IsInProgress(), Is.True); + Assert.That(action3.IsInProgress(), Is.False); + Assert.That(action1.activeControl, Is.SameAs(gamepad.leftStick)); + Assert.That(action2.activeControl, Is.SameAs(gamepad.buttonSouth)); + Assert.That(action3.activeControl, Is.Null); + Assert.That(action2.GetTimeoutCompletionPercentage(), Is.EqualTo(1 / 3f).Within(0.001)); + + InputSystem.RemoveDevice(gamepad2); + currentTime = 3; + Set(gamepad.leftStick, new Vector2(0.7f, 0.7f)); + + Assert.That(action1.IsInProgress(), Is.True); + Assert.That(action2.IsInProgress(), Is.True); + Assert.That(action3.IsInProgress(), Is.False); + Assert.That(action1.activeControl, Is.SameAs(gamepad.leftStick)); + Assert.That(action2.activeControl, Is.SameAs(gamepad.buttonSouth)); + Assert.That(action3.activeControl, Is.Null); + Assert.That(action2.GetTimeoutCompletionPercentage(), Is.EqualTo(2 * (1 / 3f)).Within(0.001)); + + currentTime = 5; + InputSystem.Update(); + + Assert.That(action1.IsInProgress(), Is.True); + Assert.That(action2.IsInProgress(), Is.True); + Assert.That(action3.IsInProgress(), Is.False); + Assert.That(action1.activeControl, Is.SameAs(gamepad.leftStick)); + Assert.That(action2.activeControl, Is.SameAs(gamepad.buttonSouth)); + Assert.That(action3.activeControl, Is.Null); + Assert.That(action2.GetTimeoutCompletionPercentage(), Is.EqualTo(1f)); + Assert.That(action2.WasPerformedThisFrame(), Is.True); + } + + [Test] + [Category("Actions")] + public void Actions_WhenInProgress_AddingAndRemovingUnusedDevice_DoesNotAffectActionInProgress() + { + InputSystem.settings.defaultDeadzoneMax = 1f; + InputSystem.settings.defaultDeadzoneMin = 0f; + + var usedGamepad = InputSystem.AddDevice(); + + var action = new InputAction(binding: "/leftStick"); + action.Enable(); + + Set(usedGamepad.leftStick, new Vector2(0.6f, 0.6f)); + + Assert.That(action.phase, Is.EqualTo(InputActionPhase.Started)); + Assert.That(action.ReadValue(), Is.EqualTo(new Vector2(0.6f, 0.6f)).Using(Vector2EqualityComparer.Instance)); + Assert.That(action.activeControl, Is.SameAs(usedGamepad.leftStick)); + + using (var trace = new InputActionTrace(action)) + { + // Adding an unused gamepad should re-resolve but should not + // alter the progression state of the action. + var unusedGamepad = InputSystem.AddDevice(); + InputSystem.Update(); + + Assert.That(action.controls, Is.EquivalentTo(new[] { usedGamepad.leftStick, unusedGamepad.leftStick })); + Assert.That(trace, Is.Empty); + Assert.That(action.phase, Is.EqualTo(InputActionPhase.Started)); + Assert.That(action.ReadValue(), Is.EqualTo(new Vector2(0.6f, 0.6f)).Using(Vector2EqualityComparer.Instance)); + Assert.That(action.activeControl, Is.SameAs(usedGamepad.leftStick)); + + InputSystem.RemoveDevice(unusedGamepad); + InputSystem.Update(); + + Assert.That(action.controls, Is.EquivalentTo(new[] { usedGamepad.leftStick })); + Assert.That(trace, Is.Empty); + Assert.That(action.phase, Is.EqualTo(InputActionPhase.Started)); + Assert.That(action.ReadValue(), Is.EqualTo(new Vector2(0.6f, 0.6f)).Using(Vector2EqualityComparer.Instance)); + Assert.That(action.activeControl, Is.SameAs(usedGamepad.leftStick)); + + // Finally, add an unused device but then remove the actively used one. + InputSystem.AddDevice(unusedGamepad); + InputSystem.RemoveDevice(usedGamepad); + InputSystem.Update(); + + Assert.That(action.controls, Is.EquivalentTo(new[] { unusedGamepad.leftStick })); + Assert.That(trace, Canceled(action, control: usedGamepad.leftStick, value: Vector2.zero)); + Assert.That(action.phase, Is.EqualTo(InputActionPhase.Waiting)); + Assert.That(action.ReadValue(), Is.EqualTo(Vector2.zero)); + Assert.That(action.activeControl, Is.Null); + } } [Test] @@ -6655,22 +7111,15 @@ public void Actions_CanCreateAxisComposite_AndDetermineWhichSideWins() InputSystem.QueueStateEvent(gamepad, new GamepadState {leftTrigger = 0.345f}); InputSystem.Update(); - var actions = trace.ToArray(); - Assert.That(actions, Has.Length.EqualTo(2)); - Assert.That(actions[0].phase, Is.EqualTo(InputActionPhase.Started)); - Assert.That(actions[0].ReadValue(), Is.EqualTo(-0.345).Within(0.00001)); - Assert.That(actions[1].phase, Is.EqualTo(InputActionPhase.Performed)); - Assert.That(actions[1].ReadValue(), Is.EqualTo(-0.345).Within(0.00001)); + Assert.That(trace, Started(action, value: -0.345f) + .AndThen(Performed(action, value: -0.345f))); trace.Clear(); InputSystem.QueueStateEvent(gamepad, new GamepadState {leftTrigger = 0.345f, rightTrigger = 0.543f}); InputSystem.Update(); - actions = trace.ToArray(); - Assert.That(actions, Has.Length.EqualTo(1)); - Assert.That(actions[0].phase, Is.EqualTo(InputActionPhase.Canceled)); - Assert.That(actions[0].ReadValue(), Is.Zero.Within(0.00001)); + Assert.That(trace, Canceled(action, value: 0f)); trace.Clear(); @@ -6681,15 +7130,9 @@ public void Actions_CanCreateAxisComposite_AndDetermineWhichSideWins() InputSystem.Update(); // We get a started and performed when switching to the right trigger and then another performed - // when we right trigger changes value. - actions = trace.ToArray(); - Assert.That(actions, Has.Length.EqualTo(3)); - Assert.That(actions[0].phase, Is.EqualTo(InputActionPhase.Started)); - Assert.That(actions[0].ReadValue(), Is.EqualTo(0.543f).Within(0.00001)); - Assert.That(actions[1].phase, Is.EqualTo(InputActionPhase.Performed)); - Assert.That(actions[1].ReadValue(), Is.EqualTo(0.543f).Within(0.00001)); - Assert.That(actions[2].phase, Is.EqualTo(InputActionPhase.Performed)); - Assert.That(actions[2].ReadValue(), Is.EqualTo(0.234f).Within(0.00001)); + // when the right trigger changes value. + Assert.That(trace, + Started(action, value: 0.543f).AndThen(Performed(action, value: 0.543f)).AndThen(Performed(action, value: 0.234f))); trace.Clear(); @@ -6699,16 +7142,9 @@ public void Actions_CanCreateAxisComposite_AndDetermineWhichSideWins() InputSystem.QueueStateEvent(gamepad, new GamepadState {leftTrigger = 0.567f, rightTrigger = 0.765f}); InputSystem.Update(); - actions = trace.ToArray(); - Assert.That(actions, Has.Length.EqualTo(4)); - Assert.That(actions[0].phase, Is.EqualTo(InputActionPhase.Canceled)); - Assert.That(actions[0].ReadValue(), Is.EqualTo(0).Within(0.00001)); - Assert.That(actions[1].phase, Is.EqualTo(InputActionPhase.Started)); - Assert.That(actions[1].ReadValue(), Is.EqualTo(-0.123f).Within(0.00001)); - Assert.That(actions[2].phase, Is.EqualTo(InputActionPhase.Performed)); - Assert.That(actions[2].ReadValue(), Is.EqualTo(-0.123).Within(0.00001)); - Assert.That(actions[3].phase, Is.EqualTo(InputActionPhase.Performed)); - Assert.That(actions[3].ReadValue(), Is.EqualTo(-0.567).Within(0.00001)); + Assert.That(trace, + Canceled(action, value: 0f).AndThen(Started(action, value: -0.123f)).AndThen(Performed(action, value: -0.123f)) + .AndThen(Performed(action, value: -0.567f))); } } @@ -9112,9 +9548,7 @@ public void Actions_AddingActionToAssetWithEnabledActions_ThrowsException() // adding an action now should fail with a descriptive exception Assert.That(() => map1.AddAction("action4"), - Throws.InvalidOperationException.With.Message.Contains("action4") - .And.With.Message.Contains("map1") - .And.With.Message.Contains("map2")); + Throws.InvalidOperationException); Assert.That(map1.actions, Has.Count.EqualTo(2)); } diff --git a/Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs b/Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs index cfa3b112a4..c76221328a 100644 --- a/Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs +++ b/Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs @@ -174,7 +174,7 @@ public void Actions_StartedAndCanceledAreEnforcedImplicitly() [Test] [Category("Actions")] - public void Action_WithMultipleInteractions_DoesNotThrowWhenUsingMultipleMaps() + public void Actions_WithMultipleInteractions_DoNotThrowWhenUsingMultipleMaps() { var gamepad = InputSystem.AddDevice(); diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 7b2993ec9f..e9c858d276 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -32,6 +32,10 @@ however, it has to be formatted properly to pass verification tests. * `UnityEngine.InputSystem.Android.LowLevel.AndroidAxis` * `UnityEngine.InputSystem.Android.LowLevel.AndroidGameControllerState` * `UnityEngine.InputSystem.Android.LowLevel.AndroidKeyCode` +- Adding or removing a device no longer leads to affected actions being temporarily disabled ([case 1379932](https://issuetracker.unity3d.com/issues/inputactionreferences-reading-resets-when-inputactionmap-has-an-action-for-the-other-hand-and-that-hand-starts-slash-stops-tracking)). + * If, for example, an action was bound to `/buttonSouth` and was enabled, adding a second `Gamepad` would lead to the action being temporarily disabled, then updated, and finally re-enabled. + * This was especially noticeable if the action was currently in progress as it would get cancelled and then subsequently resumed. + * Now, an in-progress action will get cancelled if the device of its active control is removed. If its active control is not affected, however, the action will keep going regardless of whether controls are added or removed from its `InputAction.controls` list. ### Fixed diff --git a/Packages/com.unity.inputsystem/Documentation~/ActionBindings.md b/Packages/com.unity.inputsystem/Documentation~/ActionBindings.md index 3fd0182aa3..b0455fb928 100644 --- a/Packages/com.unity.inputsystem/Documentation~/ActionBindings.md +++ b/Packages/com.unity.inputsystem/Documentation~/ActionBindings.md @@ -20,6 +20,7 @@ * [Control schemes](#control-schemes) * [Details](#details) * [Binding resolution](#binding-resolution) + * [Binding resolution while Actions are enabled](#binding-resolution-while-actions-are-enabled) * [Choosing which Devices to use](#choosing-which-devices-to-use) * [Conflict resolution](#conflict-resolution) * [Initial state check](#initial-state-check) @@ -665,6 +666,18 @@ If there are multiple Bindings on the same Action that all reference the same Co To query the Controls that an Action resolves to, you can use [`InputAction.controls`](../api/UnityEngine.InputSystem.InputAction.html#UnityEngine_InputSystem_InputAction_controls). You can also run this query if the Action is disabled. +To be notified when binding resolution happens, you can listen to [`InputSystem.onActionChange`](../api/UnityEngine.InputSystem.InputSystem.html#UnityEngine_InputSystem_InputSystem_onActionChange) which triggers [`InputActionChange.BoundControlsAboutToChange`](../api/UnityEngine.InputSystem.InputActionChange.html#UnityEngine_InputSystem_InputActionChange_BoundControlsAboutToChange) before modifying Control lists and triggers [`InputActionChange.BoundControlsChanged`](../api/UnityEngine.InputSystem.InputActionChange.html#UnityEngine_InputSystem_InputActionChange_BoundControlsChanged) after having updated them. + +#### Binding resolution while Actions are enabled + +In certain situations, the [Controls](../api/UnityEngine.InputSystem.InputAction.html#UnityEngine_InputSystem_InputAction_controls) bound to an Action have to be updated more than once. For example, if a new [Device](Devices.md) becomes usable with an Action, the Action may now pick up input from additional controls. Also, if Bindings are added, removed, or modified, Control lists will need to be updated. + +This updating of Controls usually happens transparently in the background. However, when an Action is [enabled](../api/UnityEngine.InputSystem.InputAction.html#UnityEngine_InputSystem_InputAction_enabled) and especially when it is [in progress](../api/UnityEngine.InputSystem.InputAction.html#UnityEngine_InputSystem_InputAction_IsInProgress_), there may be a noticeable effect on the Action. + +Adding or removing a device – either [globally](../api/UnityEngine.InputSystem.InputSystem.html#UnityEngine_InputSystem_InputSystem_devices) or to/from the [device list](../api/UnityEngine.InputSystem.InputActionAsset.html#UnityEngine_InputSystem_InputActionAsset_devices) of an Action – will remain transparent __except__ if an Action is in progress and it is the device of its [active Control](../api/UnityEngine.InputSystem.InputAction.html#UnityEngine_InputSystem_InputAction_activeControl) that is being removed. In this case, the Action will automatically be [cancelled](../api/UnityEngine.InputSystem.InputAction.html#UnityEngine_InputSystem_InputAction_canceled). + +Modifying the [binding mask](../api/UnityEngine.InputSystem.InputActionAsset.html#UnityEngine_InputSystem_InputActionAsset_bindingMask) or modifying any of the Bindings (such as through [rebinding](#interactive-rebinding) or by adding or removing bindings) will, however, lead to all enabled Actions being temporarily disabled and then re-enabled and resumed. + #### Choosing which Devices to use >__Note__: [`InputUser`](UserManagement.md) and [`PlayerInput`](Components.md) make use of this facility automatically. They set [`InputActionMap.devices`](../api/UnityEngine.InputSystem.InputActionMap.html#UnityEngine_InputSystem_InputActionMap_devices) automatically based on the Devices that are paired to the user. diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/IInputActionCollection.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/IInputActionCollection.cs index c0e07194ed..5efa25759b 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/IInputActionCollection.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/IInputActionCollection.cs @@ -18,6 +18,9 @@ public interface IInputActionCollection : IEnumerable /// /// /// If this is not null, only bindings that match the mask will be used. + /// + /// Modifying this property while any of the actions in the collection are enabled will + /// lead to the actions getting disabled temporarily and then re-enabled. /// InputBinding? bindingMask { get; set; } @@ -31,6 +34,13 @@ public interface IInputActionCollection : IEnumerable /// only one gamepad is listed here, then a "<Gamepad>/leftStick" binding will /// only bind to the gamepad in the list and not to the one that is only available /// globally. + /// + /// Modifying this property after bindings in the collection have already been resolved, + /// will lead to getting refreshed. If any of the actions + /// in the collection are currently in progress (see ), + /// the actions will remain unaffected and in progress except if the controls currently + /// driving them (see ) are no longer part of any + /// of the selected devices. In that case, the action is . /// ReadOnlyArray? devices { get; set; } diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputAction.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputAction.cs index 611f5e7eea..04a5059bde 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputAction.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputAction.cs @@ -389,7 +389,7 @@ public string expectedControlType var map = GetOrCreateActionMap(); if (map.m_State != null) - map.LazyResolveBindings(); + map.LazyResolveBindings(fullResolve: true); } } @@ -1095,6 +1095,22 @@ public unsafe bool IsPressed() return false; } + /// + /// Whether the action has been or . + /// + /// True if the action is currently triggering. + /// + public unsafe bool IsInProgress() + { + var state = GetOrCreateActionMap().m_State; + if (state != null) + { + var actionStatePtr = &state.actionStates[m_ActionIndexInState]; + return actionStatePtr->phase.IsInProgress(); + } + return false; + } + /// /// Returns true if the action's value crossed the press threshold (see ) /// at any point in the frame. @@ -1479,8 +1495,8 @@ private InputActionState.TriggerState currentState { if (m_ActionIndexInState == InputActionState.kInvalidIndex) return new InputActionState.TriggerState(); - Debug.Assert(m_ActionMap != null); - Debug.Assert(m_ActionMap.m_State != null); + Debug.Assert(m_ActionMap != null, "Action must have associated action map"); + Debug.Assert(m_ActionMap.m_State != null, "Action map must have state at this point"); return m_ActionMap.m_State.FetchActionState(this); } } @@ -1514,6 +1530,40 @@ private void CreateInternalActionMapForSingletonAction() }; } + internal void RequestInitialStateCheckOnEnabledAction() + { + Debug.Assert(enabled, "This should only be called on actions that are enabled"); + + var map = GetOrCreateActionMap(); + var state = map.m_State; + state.SetInitialStateCheckPending(m_ActionIndexInState); + } + + // NOTE: This does *NOT* check whether the control is valid according to the binding it + // resolved from and/or the current binding mask. If, for example, the binding is + // "/#(ä)" and the keyboard switches from a DE layout to a US layout, the + // key would still be considered valid even if the path in the binding would actually + // no longer resolve to it. + internal bool ActiveControlIsValid(InputControl control) + { + if (control == null) + return false; + + // Device must still be added. + var device = control.device; + if (!device.added) + return false; + + // If we have a device list in the map or asset, device + // must be in list. + var map = GetOrCreateActionMap(); + var deviceList = map.devices; + if (deviceList != null && !deviceList.Value.ContainsReference(device)) + return false; + + return true; + } + internal InputBinding? FindEffectiveBindingMask() { if (m_BindingMask.HasValue) diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionAsset.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionAsset.cs index cc2a128073..a446152687 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionAsset.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionAsset.cs @@ -187,7 +187,7 @@ public IEnumerable bindings m_BindingMask = value; - ReResolveIfNecessary(); + ReResolveIfNecessary(fullResolve: true); } } @@ -240,7 +240,7 @@ public IEnumerable bindings set { if (m_Devices.Set(value)) - ReResolveIfNecessary(); + ReResolveIfNecessary(fullResolve: false); } } @@ -866,7 +866,23 @@ internal void MarkAsDirty() #endif } - private void ReResolveIfNecessary() + internal void OnWantToChangeSetup() + { + if (m_ActionMaps.LengthSafe() > 0) + m_ActionMaps[0].OnWantToChangeSetup(); + } + + internal void OnSetupChanged() + { + MarkAsDirty(); + + if (m_ActionMaps.LengthSafe() > 0) + m_ActionMaps[0].OnSetupChanged(); + else + m_SharedStateForAllMaps = null; + } + + private void ReResolveIfNecessary(bool fullResolve) { if (m_SharedStateForAllMaps == null) return; @@ -874,7 +890,7 @@ private void ReResolveIfNecessary() Debug.Assert(m_ActionMaps != null && m_ActionMaps.Length > 0); // State is share between all action maps in the asset. Resolving bindings for the // first map will resolve them for all maps. - m_ActionMaps[0].LazyResolveBindings(); + m_ActionMaps[0].LazyResolveBindings(fullResolve); } private void OnDestroy() diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionMap.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionMap.cs index cd818f993e..da8683c5c3 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionMap.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionMap.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; +using Unity.Collections; using UnityEngine.InputSystem.Utilities; ////REVIEW: given we have the global ActionPerformed callback, do we really need the per-map callback? @@ -215,7 +216,7 @@ public ReadOnlyArray controlSchemes return; m_BindingMask = value; - LazyResolveBindings(); + LazyResolveBindings(fullResolve: true); } } @@ -266,7 +267,7 @@ public ReadOnlyArray controlSchemes set { if (m_Devices.Set(value)) - LazyResolveBindings(); + LazyResolveBindings(fullResolve: false); } } @@ -703,9 +704,6 @@ IEnumerator IEnumerable.GetEnumerator() [NonSerialized] private InputControl[] m_ControlsForEachAction; - [NonSerialized] private bool m_ControlsForEachActionInitialized; - [NonSerialized] private bool m_BindingsForEachActionInitialized; - /// /// Number of actions currently enabled in the map. /// @@ -728,8 +726,8 @@ IEnumerator IEnumerable.GetEnumerator() /// Initialized when map (or any action in it) is first enabled. /// [NonSerialized] internal InputActionState m_State; - [NonSerialized] private bool m_NeedToResolveBindings; [NonSerialized] internal InputBinding? m_BindingMask; + [NonSerialized] private Flags m_Flags; [NonSerialized] internal DeviceArray m_Devices; @@ -737,6 +735,63 @@ IEnumerator IEnumerable.GetEnumerator() [NonSerialized] internal Dictionary m_ActionIndexByNameOrId; + private bool needToResolveBindings + { + get => (m_Flags & Flags.NeedToResolveBindings) != 0; + set + { + if (value) + m_Flags |= Flags.NeedToResolveBindings; + else + m_Flags &= ~Flags.NeedToResolveBindings; + } + } + + private bool bindingResolutionNeedsFullReResolve + { + get => (m_Flags & Flags.BindingResolutionNeedsFullReResolve) != 0; + set + { + if (value) + m_Flags |= Flags.BindingResolutionNeedsFullReResolve; + else + m_Flags &= ~Flags.BindingResolutionNeedsFullReResolve; + } + } + + private bool controlsForEachActionInitialized + { + get => (m_Flags & Flags.ControlsForEachActionInitialized) != 0; + set + { + if (value) + m_Flags |= Flags.ControlsForEachActionInitialized; + else + m_Flags &= ~Flags.ControlsForEachActionInitialized; + } + } + + private bool bindingsForEachActionInitialized + { + get => (m_Flags & Flags.BindingsForEachActionInitialized) != 0; + set + { + if (value) + m_Flags |= Flags.BindingsForEachActionInitialized; + else + m_Flags &= ~Flags.BindingsForEachActionInitialized; + } + } + + [Flags] + private enum Flags + { + NeedToResolveBindings = 1 << 0, + BindingResolutionNeedsFullReResolve = 1 << 1, + ControlsForEachActionInitialized = 1 << 2, + BindingsForEachActionInitialized = 1 << 3, + } + internal static int s_DeferBindingResolution; internal struct DeviceArray @@ -820,7 +875,7 @@ internal ReadOnlyArray GetBindingsForSingleAction(InputAction acti Debug.Assert(!action.isSingletonAction || m_SingletonAction == action, "Action is not a singleton action"); // See if we need to refresh. - if (!m_BindingsForEachActionInitialized) + if (!bindingsForEachActionInitialized) SetUpPerActionControlAndBindingArrays(); return new ReadOnlyArray(m_BindingsForEachAction, action.m_BindingsStartIndex, @@ -836,7 +891,7 @@ internal ReadOnlyArray GetControlsForSingleAction(InputAction acti Debug.Assert(action.m_ActionMap == this); Debug.Assert(!action.isSingletonAction || m_SingletonAction == action); - if (!m_ControlsForEachActionInitialized) + if (!controlsForEachActionInitialized) SetUpPerActionControlAndBindingArrays(); return new ReadOnlyArray(m_ControlsForEachAction, action.m_ControlStartIndex, @@ -862,8 +917,8 @@ private unsafe void SetUpPerActionControlAndBindingArrays() { m_ControlsForEachAction = null; m_BindingsForEachAction = null; - m_ControlsForEachActionInitialized = true; - m_BindingsForEachActionInitialized = true; + controlsForEachActionInitialized = true; + bindingsForEachActionInitialized = true; return; } @@ -1050,18 +1105,60 @@ private unsafe void SetUpPerActionControlAndBindingArrays() } } - m_ControlsForEachActionInitialized = true; - m_BindingsForEachActionInitialized = true; + controlsForEachActionInitialized = true; + bindingsForEachActionInitialized = true; + } + + internal void OnWantToChangeSetup() + { + if (asset != null) + { + foreach (var assetMap in asset.actionMaps) + if (assetMap.enabled) + throw new InvalidOperationException( + $"Cannot add, remove, or change elements of InputActionAsset {asset} while one or more of its actions are enabled"); + } + else if (enabled) + { + throw new InvalidOperationException( + $"Cannot add, remove, or change elements of InputActionMap {this} while one or more of its actions are enabled"); + } + } + + internal void OnSetupChanged() + { + if (m_Asset != null) + { + m_Asset.MarkAsDirty(); + foreach (var map in m_Asset.actionMaps) + map.m_State = default; + } + else + { + m_State = default; + } + ClearCachedActionData(); + LazyResolveBindings(fullResolve: true); + } + + internal void OnBindingModified() + { + ClearCachedActionData(); + LazyResolveBindings(fullResolve: true); } ////TODO: re-use allocations such that only grow the arrays and hit zero GC allocs when we already have enough memory - internal void ClearCachedActionData() + internal void ClearCachedActionData(bool onlyControls = false) { - m_BindingsForEachActionInitialized = default; - m_ControlsForEachActionInitialized = default; - m_BindingsForEachAction = default; + if (!onlyControls) + { + bindingsForEachActionInitialized = false; + m_BindingsForEachAction = default; + m_ActionIndexByNameOrId = default; + } + + controlsForEachActionInitialized = false; m_ControlsForEachAction = default; - m_ActionIndexByNameOrId = default; } internal void GenerateId() @@ -1073,11 +1170,11 @@ internal void GenerateId() /// Resolve bindings right away if we have to. Otherwise defer it to when we next need /// the bindings. /// - internal bool LazyResolveBindings() + internal bool LazyResolveBindings(bool fullResolve) { // Clear cached controls for actions. Don't need to necessarily clear m_BindingsForEachAction. m_ControlsForEachAction = null; - m_ControlsForEachActionInitialized = false; + controlsForEachActionInitialized = false; // If we haven't had to resolve bindings yet, we can wait until when we // actually have to. @@ -1089,11 +1186,11 @@ internal bool LazyResolveBindings() // rebinding UIs), so now we just always re-resolve anything that ever had an InputActionState // created. Unfortunately, this can lead to some unnecessary re-resolving. + needToResolveBindings = true; + bindingResolutionNeedsFullReResolve = fullResolve; + if (s_DeferBindingResolution > 0) - { - m_NeedToResolveBindings = true; return false; - } // Have to do it straight away. ResolveBindings(); @@ -1107,11 +1204,11 @@ internal void ResolveBindingsIfNecessary() // We only resolve if a map is used that needs resolution to happen. Note that // this will still resolve bindings for *all* maps in the asset. - if (m_State == null || m_NeedToResolveBindings) + if (m_State == null || needToResolveBindings) { if (m_State != null && m_State.isProcessingControlStateChange) { - Debug.Assert(s_DeferBindingResolution > 0); + Debug.Assert(s_DeferBindingResolution > 0, "While processing control state changes, binding resolution should be suppressed"); return; } @@ -1119,6 +1216,44 @@ internal void ResolveBindingsIfNecessary() } } + // We have three different starting scenarios for binding resolution: + // + // (1) From scratch. + // There is no InputActionState and we resolve everything from a completely fresh start. This happens when + // we either have not resolved bindings at all yet or when something touches the action setup (e.g. adds + // or removes an action or binding) and we thus throw away the existing InputActionState. + // NOTE: + // * Actions can be in enabled state. + // * No action can be in an in-progress state (since binding resolution is needed for actions to + // be processed, no action processing can have happened yet) + // + // (2) From an existing InputActionState when a device has been added or removed. + // There is an InputActionState and the action setup (maps, actions, bindings, binding masks) has not changed. However, + // the set of devices usable with the action has changed (either the per-asset/map device list or the global + // list, if we're using it). + // NOTE: + // * Actions can be in enabled state. + // * Actions *can* be in an in-progress state. + // IF the control currently driving the action is on a device that is no longer usable with the action, the + // action is CANCELLED. OTHERWISE, the action will be left as is and keep being in progress from its active control. + // * A device CONFIGURATION change will NOT go down this path (e.g. changing the Keyboard layout). This is because + // any binding path involving display names may now resolve to different controls -- which may impact currently + // active controls of in-progress actions. + // * A change in the USAGES of a device will NOT go down this path either. This is for the same reason -- i.e. an + // active control may no longer match the binding path it matched before. If, for example, we switch the left-hand + // and right-hand roles of two controllers, will will go down path (3) and not (2). + // + // (3) From an existing InputActionState on any other change not covered before. + // There is an InputActionState and the action setup (maps, actions, bindings, binding masks) may have changed. Also, + // any change may have happened in the set of usable devices and targeted controls. This includes binding overrides + // having been applied. + // NOTE: + // * Action can be in enabled state. + // * Actions *can* be in an in-progress state. + // Any such action will be CANCELLED as part of the re-resolution process. + // + // Both (1) and (3) are considered a "full resolve". (2) is not. + /// /// Resolve all bindings to their controls and also add any action interactions /// from the bindings. @@ -1133,13 +1268,12 @@ internal void ResolveBindingsIfNecessary() /// /// Bindings can be re-resolved while actions are enabled. This happens changing device or binding /// masks on action maps or assets (, , , - /// , ). When this happens, - /// we temporarily disable and then reenable actions. Note that this is visible to observers. + /// , ). Doing so will + /// not affect the enable state of actions and, as much as possible, will try to take current + /// action states across. /// internal void ResolveBindings() { - m_ControlsForEachActionInitialized = false; - // Make sure that if we trigger callbacks as part of disabling and re-enabling actions, // we don't trigger a re-resolve while we're already resolving bindings. using (InputActionRebindingExtensions.DeferBindingResolution()) @@ -1147,7 +1281,7 @@ internal void ResolveBindings() // In case we have actions that are currently enabled, we temporarily retain the // UnmanagedMemory of our InputActionState so that we can sync action states after // we have re-resolved bindings. - var tempMemory = new InputActionState.UnmanagedMemory(); + var oldMemory = new InputActionState.UnmanagedMemory(); try { OneOrMore> actionMaps; @@ -1157,6 +1291,7 @@ internal void ResolveBindings() // If we're part of an asset, we share state and thus binding resolution with // all maps in the asset. + var needFullResolve = m_State == null; if (m_Asset != null) { actionMaps = m_Asset.actionMaps; @@ -1165,8 +1300,13 @@ internal void ResolveBindings() // If there's a binding mask set on the asset, apply it. resolver.bindingMask = m_Asset.m_BindingMask; - for (var i = 0; i < actionMaps.Count; ++i) - actionMaps[i].m_NeedToResolveBindings = false; + foreach (var map in actionMaps) + { + needFullResolve |= map.bindingResolutionNeedsFullReResolve; + map.needToResolveBindings = false; + map.bindingResolutionNeedsFullReResolve = false; + map.controlsForEachActionInitialized = false; + } } else { @@ -1174,7 +1314,10 @@ internal void ResolveBindings() // Gets its own private state. actionMaps = this; - m_NeedToResolveBindings = false; + needFullResolve |= bindingResolutionNeedsFullReResolve; + needToResolveBindings = false; + bindingResolutionNeedsFullReResolve = false; + controlsForEachActionInitialized = false; } // If we already have a state, re-use the arrays we have already allocated. @@ -1182,95 +1325,49 @@ internal void ResolveBindings() // case where we didn't have to grow the arrays, we should end up with zero GC allocations // here. var hasEnabledActions = false; + InputControlList activeControls = default; if (m_State != null) { // Grab a clone of the current memory. We clone because disabling all the actions // in the map will alter the memory state and we want the state before we start // touching it. - // - // Technically, ATM we only need the phase values in the action states but duplicating - // the unmanaged memory is cheap and avoids having to add yet more complication to the - // code paths here. - tempMemory = m_State.memory.Clone(); - - // If the state has enabled actions, temporarily disable them. - hasEnabledActions = m_State.HasEnabledActions(); - for (var i = 0; i < actionMaps.Count; ++i) - { - var map = actionMaps[i]; + oldMemory = m_State.memory.Clone(); - if (hasEnabledActions) - m_State.DisableAllActions(map); - - // Let listeners know we are about to modify bindings. Do this *after* we disabled the - // actions so that cancellations happen first. - if (map.m_SingletonAction != null) - InputActionState.NotifyListenersOfActionChange(InputActionChange.BoundControlsAboutToChange, map.m_SingletonAction); - else if (m_Asset == null) - InputActionState.NotifyListenersOfActionChange(InputActionChange.BoundControlsAboutToChange, map); - } - if (m_Asset != null) - InputActionState.NotifyListenersOfActionChange(InputActionChange.BoundControlsAboutToChange, m_Asset); + m_State.PrepareForBindingReResolution(needFullResolve, ref activeControls, ref hasEnabledActions); // Reuse the arrays we have so that we can avoid managed memory allocations, if possible. - resolver.StartWithArraysFrom(m_State); + resolver.StartWithPreviousResolve(m_State, isFullResolve: needFullResolve); // Throw away old memory. m_State.memory.Dispose(); } // Resolve all maps in the asset. - for (var i = 0; i < actionMaps.Count; ++i) - resolver.AddActionMap(actionMaps[i]); + foreach (var map in actionMaps) + resolver.AddActionMap(map); // Install state. if (m_State == null) { - if (m_Asset != null) - { - var state = new InputActionState(); - for (var i = 0; i < actionMaps.Count; ++i) - actionMaps[i].m_State = state; - m_Asset.m_SharedStateForAllMaps = state; - } - else - { - m_State = new InputActionState(); - } + m_State = new InputActionState(); m_State.Initialize(resolver); } else { m_State.ClaimDataFrom(resolver); } - - // Wipe caches. - for (var i = 0; i < actionMaps.Count; ++i) + if (m_Asset != null) { - var map = actionMaps[i]; - - ////TODO: determine whether we really need to wipe this; keep them if nothing has changed - map.m_ControlsForEachAction = null; - map.m_ControlsForEachActionInitialized = false; - - if (map.m_SingletonAction != null) - InputActionState.NotifyListenersOfActionChange(InputActionChange.BoundControlsChanged, map.m_SingletonAction); - else if (m_Asset == null) - InputActionState.NotifyListenersOfActionChange(InputActionChange.BoundControlsChanged, map); + foreach (var map in actionMaps) + map.m_State = m_State; + m_Asset.m_SharedStateForAllMaps = m_State; } - if (m_Asset != null) - InputActionState.NotifyListenersOfActionChange(InputActionChange.BoundControlsChanged, m_Asset); - - // Fire InputBindingComposite.FinishSetup() calls. - m_State.FinishBindingCompositeSetups(); - // Re-enable actions. - if (hasEnabledActions) - m_State.RestoreActionStates(tempMemory); + m_State.FinishBindingResolution(hasEnabledActions, oldMemory, activeControls, isFullResolve: needFullResolve); } finally { - tempMemory.Dispose(); + oldMemory.Dispose(); } } } diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionRebindingExtensions.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionRebindingExtensions.cs index c37385976e..4ac5e1668e 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionRebindingExtensions.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionRebindingExtensions.cs @@ -591,9 +591,19 @@ public static void ApplyBindingOverride(this InputAction action, InputBinding bi if (action == null) throw new ArgumentNullException(nameof(action)); + var enabled = action.enabled; + if (enabled) + action.Disable(); + bindingOverride.action = action.name; var actionMap = action.GetOrCreateActionMap(); ApplyBindingOverride(actionMap, bindingOverride); + + if (enabled) + { + action.Enable(); + action.RequestInitialStateCheckOnEnabledAction(); + } } /// @@ -705,10 +715,7 @@ public static int ApplyBindingOverride(this InputActionMap actionMap, InputBindi } if (matchCount > 0) - { - actionMap.ClearCachedActionData(); - actionMap.LazyResolveBindings(); - } + actionMap.OnBindingModified(); return matchCount; } @@ -740,8 +747,7 @@ public static void ApplyBindingOverride(this InputActionMap actionMap, int bindi actionMap.m_Bindings[bindingIndex].overrideInteractions = bindingOverride.overrideInteractions; actionMap.m_Bindings[bindingIndex].overrideProcessors = bindingOverride.overrideProcessors; - actionMap.ClearCachedActionData(); - actionMap.LazyResolveBindings(); + actionMap.OnBindingModified(); } /// @@ -835,8 +841,7 @@ public static void RemoveAllBindingOverrides(this IInputActionCollection2 action binding.RemoveOverrides(); } - actionMap.ClearCachedActionData(); - actionMap.LazyResolveBindings(); + actionMap.OnBindingModified(); } } } @@ -874,8 +879,7 @@ public static void RemoveAllBindingOverrides(this InputAction action) bindings[i].overrideProcessors = null; } - actionMap.ClearCachedActionData(); - actionMap.LazyResolveBindings(); + actionMap.OnBindingModified(); } ////REVIEW: are the IEnumerable variations worth having? diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionSetupExtensions.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionSetupExtensions.cs index 7871ac1420..c0df6a41dd 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionSetupExtensions.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionSetupExtensions.cs @@ -51,7 +51,8 @@ public static InputActionMap AddActionMap(this InputActionAsset asset, string na /// A named action map. /// or is null. /// has no name or asset already contains a - /// map with the same name. + /// map with the same name -or- is currently enabled -or- is part of + /// an that has s that are enabled. /// public static void AddActionMap(this InputActionAsset asset, InputActionMap map) { @@ -69,9 +70,12 @@ public static void AddActionMap(this InputActionAsset asset, InputActionMap map) throw new InvalidOperationException( $"An action map called '{map.name}' already exists in the asset"); + map.OnWantToChangeSetup(); + asset.OnWantToChangeSetup(); + ArrayHelpers.Append(ref asset.m_ActionMaps, map); - asset.MarkAsDirty(); map.m_Asset = asset; + asset.OnSetupChanged(); } /// @@ -82,7 +86,8 @@ public static void AddActionMap(this InputActionAsset asset, InputActionMap map) /// does nothing. /// or is null. /// is currently enabled (see ). + /// cref="InputActionMap.enabled"/>) or is part of an that has s + /// that are currently enabled. /// /// public static void RemoveActionMap(this InputActionAsset asset, InputActionMap map) @@ -91,16 +96,17 @@ public static void RemoveActionMap(this InputActionAsset asset, InputActionMap m throw new ArgumentNullException(nameof(asset)); if (map == null) throw new ArgumentNullException(nameof(map)); - if (map.enabled) - throw new InvalidOperationException("Cannot remove an action map from the asset while it is enabled"); + + map.OnWantToChangeSetup(); + asset.OnWantToChangeSetup(); // Ignore if not part of this asset. if (map.m_Asset != asset) return; ArrayHelpers.Erase(ref asset.m_ActionMaps, map); - asset.MarkAsDirty(); map.m_Asset = null; + asset.OnSetupChanged(); } /// @@ -151,8 +157,8 @@ public static void RemoveActionMap(this InputActionAsset asset, string nameOrId) /// is null. /// is null or empty. /// is enabled (see ) + /// or is part of an that has s that are /// -or- already contains an action called (case-insensitive). - /// parent InputActionAsset has one or more maps enabled (see ). public static InputAction AddAction(this InputActionMap map, string name, InputActionType type = default, string binding = null, string interactions = null, string processors = null, string groups = null, string expectedControlLayout = null) { @@ -160,14 +166,7 @@ public static void RemoveActionMap(this InputActionAsset asset, string nameOrId) throw new ArgumentNullException(nameof(map)); if (string.IsNullOrEmpty(name)) throw new ArgumentException("Action must have name", nameof(name)); - if (map.enabled) - throw new InvalidOperationException( - $"Cannot add action '{name}' to map '{map}' while it the map is enabled"); - if (map.asset != null) - foreach (var assetMap in map.asset.actionMaps) - if (assetMap.enabled) - throw new InvalidOperationException( - $"Cannot add action '{name}' to map '{map}' while any of the maps in the parent input asset are enabled, found '{assetMap}' currently enabled."); + map.OnWantToChangeSetup(); if (map.FindAction(name) != null) throw new InvalidOperationException( $"Cannot add action with duplicate name '{name}' to set '{map.name}'"); @@ -184,6 +183,7 @@ public static void RemoveActionMap(this InputActionAsset asset, string nameOrId) // Add binding, if supplied. if (!string.IsNullOrEmpty(binding)) { + // Will trigger OnSetupChanged. action.AddBinding(binding, interactions: interactions, processors: processors, groups: groups); } else @@ -196,13 +196,9 @@ public static void RemoveActionMap(this InputActionAsset asset, string nameOrId) // If no binding has been supplied but there are interactions and processors, they go on the action itself. action.m_Interactions = interactions; action.m_Processors = processors; - } - - if (map.asset != null) - map.asset.MarkAsDirty(); - map.ClearCachedActionData(); - map.LazyResolveBindings(); + map.OnSetupChanged(); + } return action; } @@ -212,9 +208,10 @@ public static void RemoveActionMap(this InputActionAsset asset, string nameOrId) /// /// An input action that is part of an . /// is null. - /// is part of an - /// that has at least one enabled action -or- is a standalone action + /// is a standalone action /// that is not part of an and thus cannot be removed from anything. + /// is part of an + /// or that has at least one enabled action. /// /// After removal, the action's will be set to null /// and the action will effectively become a standalone action that is not associated with @@ -231,27 +228,23 @@ public static void RemoveAction(this InputAction action) if (actionMap == null) throw new ArgumentException( $"Action '{action}' does not belong to an action map; nowhere to remove from", nameof(action)); - if (actionMap.enabled) - throw new ArgumentException($"Cannot remove action '{action}' while its action map is enabled"); + actionMap.OnWantToChangeSetup(); var bindingsForAction = action.bindings.ToArray(); - var index = ArrayHelpers.IndexOfReference(actionMap.m_Actions, action); + var index = actionMap.m_Actions.IndexOfReference(action); Debug.Assert(index != -1, "Could not find action in map"); ArrayHelpers.EraseAt(ref actionMap.m_Actions, index); action.m_ActionMap = null; action.m_SingletonActionBindings = bindingsForAction; - if (actionMap.asset != null) - actionMap.asset.MarkAsDirty(); - - actionMap.ClearCachedActionData(); - // Remove bindings to action from map. var newActionMapBindingCount = actionMap.m_Bindings.Length - bindingsForAction.Length; if (newActionMapBindingCount == 0) + { actionMap.m_Bindings = null; + } else { var newActionMapBindings = new InputBinding[newActionMapBindingCount]; @@ -265,6 +258,8 @@ public static void RemoveAction(this InputAction action) } actionMap.m_Bindings = newActionMapBindings; } + + actionMap.OnSetupChanged(); } /// @@ -514,18 +509,16 @@ private static int AddBindingInternal(InputActionMap map, InputBinding binding, if (map.asset != null) map.asset.MarkAsDirty(); - // Invalidate per-action binding sets so that this gets refreshed if - // anyone queries it. - map.ClearCachedActionData(); - - // Make sure bindings get re-resolved. - map.LazyResolveBindings(); - // If we're looking at a singleton action, make sure m_Bindings is up to date just // in case the action gets serialized. if (map.m_SingletonAction != null) map.m_SingletonAction.m_SingletonActionBindings = map.m_Bindings; + // NOTE: We treat this as a mere binding modification, even though we have added something. + // InputAction.RestoreActionStatesAfterReResolvingBindings() can deal with bindings + // having been removed or added. + map.OnBindingModified(); + return bindingIndex; } @@ -1067,8 +1060,7 @@ public BindingSyntax WithName(string name) if (!valid) throw new InvalidOperationException("Accessor is not valid"); m_ActionMap.m_Bindings[m_BindingIndexInMap].name = name; - m_ActionMap.ClearCachedActionData(); - m_ActionMap.LazyResolveBindings(); + m_ActionMap.OnBindingModified(); return this; } @@ -1084,8 +1076,7 @@ public BindingSyntax WithPath(string path) if (!valid) throw new InvalidOperationException("Accessor is not valid"); m_ActionMap.m_Bindings[m_BindingIndexInMap].path = path; - m_ActionMap.ClearCachedActionData(); - m_ActionMap.LazyResolveBindings(); + m_ActionMap.OnBindingModified(); return this; } @@ -1123,8 +1114,7 @@ public BindingSyntax WithGroups(string groups) // Set groups on binding. m_ActionMap.m_Bindings[m_BindingIndexInMap].groups = groups; - m_ActionMap.ClearCachedActionData(); - m_ActionMap.LazyResolveBindings(); + m_ActionMap.OnBindingModified(); return this; } @@ -1156,8 +1146,7 @@ public BindingSyntax WithInteractions(string interactions) // Set interactions on binding. m_ActionMap.m_Bindings[m_BindingIndexInMap].interactions = interactions; - m_ActionMap.ClearCachedActionData(); - m_ActionMap.LazyResolveBindings(); + m_ActionMap.OnBindingModified(); return this; } @@ -1202,8 +1191,7 @@ public BindingSyntax WithProcessors(string processors) // Set processors on binding. m_ActionMap.m_Bindings[m_BindingIndexInMap].processors = processors; - m_ActionMap.ClearCachedActionData(); - m_ActionMap.LazyResolveBindings(); + m_ActionMap.OnBindingModified(); return this; } @@ -1230,8 +1218,7 @@ public BindingSyntax Triggering(InputAction action) throw new ArgumentException( $"Cannot change the action a binding triggers on singleton action '{action}'", nameof(action)); m_ActionMap.m_Bindings[m_BindingIndexInMap].action = action.name; - m_ActionMap.ClearCachedActionData(); - m_ActionMap.LazyResolveBindings(); + m_ActionMap.OnBindingModified(); return this; } @@ -1251,13 +1238,13 @@ public BindingSyntax To(InputBinding binding) throw new InvalidOperationException("Accessor is not valid"); m_ActionMap.m_Bindings[m_BindingIndexInMap] = binding; - m_ActionMap.ClearCachedActionData(); - m_ActionMap.LazyResolveBindings(); // If it's a singleton action, we force the binding to stay with the action. if (m_ActionMap.m_SingletonAction != null) m_ActionMap.m_Bindings[m_BindingIndexInMap].action = m_ActionMap.m_SingletonAction.name; + m_ActionMap.OnBindingModified(); + return this; } @@ -1473,8 +1460,7 @@ public void Erase() ArrayHelpers.EraseAt(ref m_ActionMap.m_Bindings, m_BindingIndexInMap); } - m_ActionMap.ClearCachedActionData(); - m_ActionMap.LazyResolveBindings(); + m_ActionMap.OnBindingModified(); // We have switched to a different binding array. For singleton actions, we need to // sync up the reference that the action itself has. diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs index 49867d8035..8d433bd34c 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs @@ -130,7 +130,7 @@ public void Initialize(InputBindingResolver resolver) AddToGlobalList(); } - internal void ClaimDataFrom(InputBindingResolver resolver) + public void ClaimDataFrom(InputBindingResolver resolver) { totalProcessorCount = resolver.totalProcessorCount; @@ -308,7 +308,7 @@ public bool HasEnabledActions() return false; } - public void FinishBindingCompositeSetups() + private void FinishBindingCompositeSetups() { for (var i = 0; i < totalBindingCount; ++i) { @@ -322,6 +322,107 @@ public void FinishBindingCompositeSetups() } } + internal void PrepareForBindingReResolution(bool needFullResolve, + ref InputControlList activeControls, ref bool hasEnabledActions) + { + // Let listeners know we're about to modify bindings. + var needToCloneActiveControls = false; + for (var i = 0; i < totalMapCount; ++i) + { + var map = maps[i]; + + if (map.enabled) + { + hasEnabledActions = true; + + if (needFullResolve) + { + // For a full-resolve, we temporarily disable all actions and then re-enable + // all that were enabled after bindings have been resolved (plus we also flip on + // initial state checks for those actions to make sure they react right away + // to whatever state controls are in). + DisableAllActions(map); + } + else + { + // Cancel any action that is driven from a control we will lose when we re-resolve. + // For any other on-going action, save active controls. + foreach (var action in map.actions) + { + if (!action.phase.IsInProgress()) + continue; + + // Skip action's that are in progress but whose active control is not affected + // by the changes that lead to re-resolution. + if (action.ActiveControlIsValid(action.activeControl)) + { + // As part of re-resolving, we're losing m_State.controls. So, while we retain + // the current execution state of the method including the index of the currently + // active control, we lose the actual references to the control. + // Thus, we retain an explicit list of active controls into which we *only* copy + // those few controls that are currently active. Also, this list is kept in unmanaged + // memory so we don't add an additional GC allocation here. + if (needToCloneActiveControls == false) + { + activeControls = new InputControlList(Allocator.Temp); + activeControls.Resize(totalControlCount); + needToCloneActiveControls = true; + } + + ref var actionState = ref actionStates[action.m_ActionIndexInState]; + var activeControlIndex = actionState.controlIndex; + activeControls[activeControlIndex] = controls[activeControlIndex]; + + // Also save active controls for other ongoing interactions. + var bindingState = bindingStates[actionState.bindingIndex]; + for (var n = 0; n < bindingState.interactionCount; ++n) + { + var interactionIndex = bindingState.interactionStartIndex + n; + if (!interactionStates[interactionIndex].phase.IsInProgress()) + continue; + + activeControlIndex = interactionStates[interactionIndex] + .triggerControlIndex; + if (action.ActiveControlIsValid(controls[activeControlIndex])) + activeControls[activeControlIndex] = controls[activeControlIndex]; + else + ResetInteractionState(interactionIndex); + } + } + else + { + ResetActionState(action.m_ActionIndexInState); + } + } + + // NOTE: Removing state monitors here also means we're terminating any pending + // timeouts. However, we have information in the action state about how much + // is time is remaining on each of them so we can resume them later. + + DisableControls(map); + } + } + + map.ClearCachedActionData(onlyControls: !needFullResolve); + } + + NotifyListenersOfActionChange(InputActionChange.BoundControlsAboutToChange); + } + + public void FinishBindingResolution(bool hasEnabledActions, UnmanagedMemory oldMemory, InputControlList activeControls, bool isFullResolve) + { + // Fire InputBindingComposite.FinishSetup() calls. + FinishBindingCompositeSetups(); + + // Sync action states between the old and the new state. This also ensures + // that any action that was already in progress just keeps going -- except + // if we actually lost the control that was driving it. + if (hasEnabledActions) + RestoreActionStatesAfterReResolvingBindings(oldMemory, activeControls, isFullResolve); + else + NotifyListenersOfActionChange(InputActionChange.BoundControlsChanged); + } + /// /// Synchronize the current action states based on what they were before. /// @@ -335,78 +436,234 @@ public void FinishBindingCompositeSetups() /// reenable all the actions and controls that were enabled before and then let the next update /// take it from there. /// - public void RestoreActionStates(UnmanagedMemory oldState) + private void RestoreActionStatesAfterReResolvingBindings(UnmanagedMemory oldState, InputControlList activeControls, bool isFullResolve) { Debug.Assert(oldState.isAllocated, "Old state contains no memory"); - // This method cannot deal with actions and/or maps having been removed. - // It DOES cope with bindings have been added and/or removed, though! + // No maps and/or actions must have been added, replaced, or removed. + // + // IF + // isFullResolve==true: + // - No bindings must have been added, replaced, or removed or touched in any other way. + // - The only thing that is allowed to have changed is the list of controls used by the actions. + // - Binding masks must not have changed. + // + // isFullResolve==false: + // - Bindings may have been added, replaced, modified, and/or removed. + // - Also, the list of controls may have changed. + // - Binding masks may have changed. + // + // This means that when we compare UnmanagedMemory from before and after: + // - Map indices are identical. + // - Action indices are identical. + // - Binding indices may have changed arbitrarily. + // - Control indices may have changed arbitrarily (controls[] before and after need not relate at all). + // - Processor indices may have changed arbitrarily. + // - Interaction indices may have changed arbitrarily. + // + // HOWEVER, if isFullResolve==false, then ONLY control indices may have changed. All other + // indices must have remained unchanged. Debug.Assert(oldState.actionCount == memory.actionCount, "Action count in old and new state must be the same"); Debug.Assert(oldState.mapCount == memory.mapCount, "Map count in old and new state must be the same"); + if (!isFullResolve) + { + Debug.Assert(oldState.bindingCount == memory.bindingCount, "Binding count in old and new state must be the same"); + Debug.Assert(oldState.interactionCount == memory.interactionCount, "Interaction count in old and new state must be the same"); + Debug.Assert(oldState.compositeCount == memory.compositeCount, "Composite count in old and new state must be the same"); + } - // Go through the state map by map and in each map, binding by binding. Enable - // all bound controls for which the respective action isn't disabled. - for (var i = 0; i < memory.bindingCount; ++i) + // Restore action states. + for (var actionIndex = 0; actionIndex < totalActionCount; ++actionIndex) { - var bindingState = &memory.bindingStates[i]; - if (bindingState->isPartOfComposite) + ref var oldActionState = ref oldState.actionStates[actionIndex]; + ref var newActionState = ref actionStates[actionIndex]; + + newActionState.lastCanceledInUpdate = oldActionState.lastCanceledInUpdate; + newActionState.lastPerformedInUpdate = oldActionState.lastPerformedInUpdate; + newActionState.pressedInUpdate = oldActionState.pressedInUpdate; + newActionState.releasedInUpdate = oldActionState.releasedInUpdate; + newActionState.startTime = oldActionState.startTime; + + if (oldActionState.phase != InputActionPhase.Disabled) + { + // In this step, we only put enabled actions into Waiting phase. + // When isFullResolve==false, we will restore the actual phase from + // before when we look at bindings further down in the code. + newActionState.phase = InputActionPhase.Waiting; + + // In a full resolve, we actually disable any action we find enabled. + // So count any action we reenable here. + if (isFullResolve) + ++maps[newActionState.mapIndex].m_EnabledActionsCount; + } + } + + // Restore binding (and interaction) states. + for (var bindingIndex = 0; bindingIndex < totalBindingCount; ++bindingIndex) + { + ref var newBindingState = ref memory.bindingStates[bindingIndex]; + if (newBindingState.isPartOfComposite) { // Bindings that are part of composites get enabled through the composite itself. continue; } - var actionIndex = bindingState->actionIndex; + var actionIndex = newBindingState.actionIndex; if (actionIndex == kInvalidIndex) { // Binding is not targeting an action. continue; } - // Skip any binding for which the action was disabled. - // NOTE: We check the OLD STATE here. The phase in the new state will change immediately - // on the first binding to an action but there may be multiple bindings leading to the - // same action. - if (oldState.actionStates[actionIndex].phase == InputActionPhase.Disabled) + // Skip if action is disabled. + ref var newActionState = ref actionStates[actionIndex]; + if (newActionState.isDisabled) + continue; + + // For all bindings to actions that are enabled, we flip on initial state checks to make sure + // we're checking the action's current state against the most up-to-date actuation state of controls. + // NOTE: We're only restore execution state for currently active controls. So, if there were multiple + // concurrent actuations on an action that was in progress, we let initial state checks restore + // relevant state. + newBindingState.initialStateCheckPending = true; + + // Enable all controls on the binding. + EnableControls(newBindingState.mapIndex, newBindingState.controlStartIndex, + newBindingState.controlCount); + + // For the remainder of what we do, we need binding indices to be stable. + if (isFullResolve) continue; - // Mark the action as enabled, if not already done. - var actionState = &memory.actionStates[actionIndex]; - if (actionState->phase == InputActionPhase.Disabled) + ref var oldBindingState = ref memory.bindingStates[bindingIndex]; + newBindingState.triggerEventIdForComposite = oldBindingState.triggerEventIdForComposite; + + // If we only re-resolved controls and the action was in progress from the binding we're currently + // looking at and we still have the control that was driving the action, we can simply keep the + // action going from its previous state. However, control indices may have shifted (devices may have been added + // or removed) so we need to be careful to update those. Other indices (bindings, actions, maps, etc.) + // are guaranteed to still match. + ref var oldActionState = ref oldState.actionStates[actionIndex]; + if (bindingIndex == oldActionState.bindingIndex && oldActionState.phase.IsInProgress() && + activeControls.Count > 0 && activeControls[oldActionState.controlIndex] != null) { - actionState->phase = InputActionPhase.Waiting; + var control = activeControls[oldActionState.controlIndex]; - // Keep track of actions we enable in each map. - var mapIndex = actionState->mapIndex; - var map = maps[mapIndex]; - ++map.m_EnabledActionsCount; - } + // Find the new control index. Binding index is guaranteed to be the same, + // so we can simply look on the binding for where the control is now. + var newControlIndex = FindControlIndexOnBinding(bindingIndex, control); - // Enable all controls on the binding. - EnableControls(actionState->mapIndex, bindingState->controlStartIndex, - bindingState->controlCount); + Debug.Assert(newControlIndex != kInvalidIndex, "Could not find active control after binding resolution"); + if (newControlIndex != kInvalidIndex) + { + newActionState.phase = oldActionState.phase; + newActionState.controlIndex = newControlIndex; + newActionState.magnitude = oldActionState.magnitude; + newActionState.interactionIndex = oldActionState.interactionIndex; + + memory.controlMagnitudes[newControlIndex] = oldActionState.magnitude; + } + + // Also bring over interaction states. + Debug.Assert(newBindingState.interactionCount == oldBindingState.interactionCount, + "Interaction count on binding must not have changed when doing a control-only resolve"); + for (var n = 0; n < newBindingState.interactionCount; ++n) + { + ref var oldInteractionState = ref oldState.interactionStates[oldBindingState.interactionStartIndex + n]; + if (!oldInteractionState.phase.IsInProgress()) + continue; + + control = activeControls[oldInteractionState.triggerControlIndex]; + if (control == null) + continue; + + newControlIndex = FindControlIndexOnBinding(bindingIndex, control); + Debug.Assert(newControlIndex != kInvalidIndex, "Could not find active control on interaction after binding resolution"); + + ref var newInteractionState = ref interactionStates[newBindingState.interactionStartIndex + n]; + newInteractionState.phase = oldInteractionState.phase; + newInteractionState.performedTime = oldInteractionState.performedTime; + newInteractionState.startTime = oldInteractionState.startTime; + newInteractionState.triggerControlIndex = newControlIndex; + + // If there was a running timeout on the interaction, resume it now. + if (oldInteractionState.isTimerRunning) + { + var trigger = new TriggerState + { + mapIndex = newBindingState.mapIndex, + controlIndex = newControlIndex, + bindingIndex = bindingIndex, + time = oldInteractionState.timerStartTime, + interactionIndex = newBindingState.interactionStartIndex + n + }; + StartTimeout(oldInteractionState.timerDuration, ref trigger); + + newInteractionState.totalTimeoutCompletionDone = oldInteractionState.totalTimeoutCompletionDone; + newInteractionState.totalTimeoutCompletionTimeRemaining = oldInteractionState.totalTimeoutCompletionTimeRemaining; + } + } + } } // Make sure we get an initial state check. HookOnBeforeUpdate(); - // Fire notifications. - if (s_GlobalState.onActionChange.length > 0) + // Let listeners know we have changed controls. + NotifyListenersOfActionChange(InputActionChange.BoundControlsChanged); + + // For a full resolve, we will have temporarily disabled actions and reenabled them now. + // Let listeners now. + if (isFullResolve && s_GlobalState.onActionChange.length > 0) { for (var i = 0; i < totalMapCount; ++i) { var map = maps[i]; if (map.m_SingletonAction == null && map.m_EnabledActionsCount == map.m_Actions.LengthSafe()) + { NotifyListenersOfActionChange(InputActionChange.ActionMapEnabled, map); + } else { var actions = map.actions; - for (var n = 0; n < actions.Count; ++n) - NotifyListenersOfActionChange(InputActionChange.ActionEnabled, actions[n]); + foreach (var action in actions) + if (action.enabled) + NotifyListenersOfActionChange(InputActionChange.ActionEnabled, action); } } } } + // Return true if the action that bindingIndex is bound to is currently driven from the given control + // -OR- if any of the interactions on the binding are currently driven from the control. + private bool IsActiveControl(int bindingIndex, int controlIndex) + { + ref var bindingState = ref bindingStates[bindingIndex]; + var actionIndex = bindingState.actionIndex; + if (actionIndex == kInvalidIndex) + return false; + if (actionStates[actionIndex].controlIndex == controlIndex) + return true; + for (var i = 0; i < bindingState.interactionCount; ++i) + if (interactionStates[bindingStates->interactionStartIndex + i].triggerControlIndex == controlIndex) + return true; + return false; + } + + private int FindControlIndexOnBinding(int bindingIndex, InputControl control) + { + var controlStartIndex = bindingStates[bindingIndex].controlStartIndex; + var controlCount = bindingStates[bindingIndex].controlCount; + + for (var n = 0; n < controlCount; ++n) + { + if (control == controls[controlStartIndex + n]) + return controlStartIndex + n; + } + + return kInvalidIndex; + } + private void ResetActionStatesDrivenBy(InputDevice device) { using (InputActionRebindingExtensions.DeferBindingResolution()) @@ -685,11 +942,16 @@ public void DisableAllActions(InputActionMap map) Debug.Assert(mapIndex >= 0 && mapIndex < totalMapCount, "Map index out of range in DisableAllActions"); var actionStartIndex = mapIndices[mapIndex].actionStartIndex; var actionCount = mapIndices[mapIndex].actionCount; + var allActionsEnabled = map.m_EnabledActionsCount == actionCount; for (var i = 0; i < actionCount; ++i) { var actionIndex = actionStartIndex + i; if (actionStates[actionIndex].phase != InputActionPhase.Disabled) + { ResetActionState(actionIndex, toPhase: InputActionPhase.Disabled); + if (!allActionsEnabled) + NotifyListenersOfActionChange(InputActionChange.ActionDisabled, map.m_Actions[i]); + } } map.m_EnabledActionsCount = 0; @@ -697,11 +959,11 @@ public void DisableAllActions(InputActionMap map) // action, we notify on the action, not the hidden map. if (map.m_SingletonAction != null) NotifyListenersOfActionChange(InputActionChange.ActionDisabled, map.m_SingletonAction); - else + else if (allActionsEnabled) NotifyListenersOfActionChange(InputActionChange.ActionMapDisabled, map); } - private void DisableControls(InputActionMap map) + public void DisableControls(InputActionMap map) { Debug.Assert(map != null, "Map must not be null"); Debug.Assert(map.m_Actions != null, "Map must have actions"); @@ -810,6 +1072,7 @@ private void DisableControls(int mapIndex, int controlStartIndex, int numControl for (var i = 0; i < numControls; ++i) { var controlIndex = controlStartIndex + i; + ////TODO: This can be done much more efficiently by at least going byte by byte in the mask instead of just bit by bit if (!IsControlEnabled(controlIndex)) continue; @@ -824,6 +1087,19 @@ private void DisableControls(int mapIndex, int controlStartIndex, int numControl } } + public void SetInitialStateCheckPending(int actionIndex, bool value = true) + { + var mapIndex = actionStates[actionIndex].mapIndex; + var bindingStartIndex = mapIndices[mapIndex].bindingStartIndex; + var bindingCount = mapIndices[mapIndex].bindingCount; + for (var i = 0; i < bindingCount; ++i) + { + ref var bindingState = ref bindingStates[bindingStartIndex + i]; + if (bindingState.actionIndex == actionIndex && !bindingState.isPartOfComposite) + bindingState.initialStateCheckPending = value; + } + } + private void SetInitialStateCheckPending(BindingState* bindingStatePtr, bool value) { if (bindingStatePtr->isPartOfComposite) @@ -909,23 +1185,27 @@ private void OnBeforeInitialUpdate() // that the control just got actuated. for (var bindingIndex = 0; bindingIndex < totalBindingCount; ++bindingIndex) { - var bindingStatePtr = &bindingStates[bindingIndex]; - if (!bindingStatePtr->initialStateCheckPending) + ref var bindingState = ref bindingStates[bindingIndex]; + if (!bindingState.initialStateCheckPending) continue; - Debug.Assert(!bindingStatePtr->isPartOfComposite, "Initial state check flag must be set on composite, not on its parts"); - bindingStatePtr->initialStateCheckPending = false; + Debug.Assert(!bindingState.isPartOfComposite, "Initial state check flag must be set on composite, not on its parts"); + bindingState.initialStateCheckPending = false; - var mapIndex = bindingStatePtr->mapIndex; - var controlStartIndex = bindingStatePtr->controlStartIndex; - var controlCount = bindingStatePtr->controlCount; + var mapIndex = bindingState.mapIndex; + var controlStartIndex = bindingState.controlStartIndex; + var controlCount = bindingState.controlCount; - var isComposite = bindingStatePtr->isComposite; + var isComposite = bindingState.isComposite; for (var n = 0; n < controlCount; ++n) { var controlIndex = controlStartIndex + n; var control = controls[controlIndex]; + // Leave any control alone that is already driving an interaction and/or action. + if (IsActiveControl(bindingIndex, controlIndex)) + continue; + if (!control.CheckStateIsAtDefault()) { // For composites, the binding index we have at this point is for the composite binding, not for the part @@ -1409,7 +1689,7 @@ private bool IsConflictingInput(ref TriggerState trigger, int actionIndex) // a 1 second "Hold" when the user shifts to a different control, then this code here // will *cancel* the current "Hold" and restart from scratch. if (actionState->interactionIndex != kInvalidIndex) - ResetInteractionState(trigger.mapIndex, actionState->bindingIndex, actionState->interactionIndex); + ResetInteractionState(actionState->interactionIndex); // If there's an interaction in progress on the new binding, let // it drive the action. @@ -1849,7 +2129,7 @@ private void StopTimeout(int interactionIndex) { var index = interactionStartIndex + i; if (index != trigger.interactionIndex) - ResetInteractionState(trigger.mapIndex, trigger.bindingIndex, index); + ResetInteractionState(index); } } } @@ -1872,7 +2152,7 @@ private void StopTimeout(int interactionIndex) } else if (newPhase == InputActionPhase.Performed || newPhase == InputActionPhase.Canceled) { - ResetInteractionState(trigger.mapIndex, trigger.bindingIndex, trigger.interactionIndex); + ResetInteractionState(trigger.interactionIndex); } } @@ -2195,13 +2475,12 @@ private void ResetInteractionStateAndCancelIfNecessary(int mapIndex, int binding actionStates[actionIndex].interactionIndex = kInvalidIndex; } - ResetInteractionState(mapIndex, bindingIndex, interactionIndex); + ResetInteractionState(interactionIndex); } - private void ResetInteractionState(int mapIndex, int bindingIndex, int interactionIndex) + private void ResetInteractionState(int interactionIndex) { Debug.Assert(interactionIndex >= 0 && interactionIndex < totalInteractionCount, "Interaction index out of range"); - Debug.Assert(bindingIndex >= 0 && bindingIndex < totalBindingCount, "Binding index out of range"); // Clean up internal state that the interaction may keep. interactions[interactionIndex].Reset(); @@ -2217,6 +2496,7 @@ private void ResetInteractionState(int mapIndex, int bindingIndex, int interacti // We never set interactions to disabled. This way we don't have to go through them // when we disable/enable actions. phase = InputActionPhase.Waiting, + triggerControlIndex = kInvalidIndex }; } @@ -2718,13 +2998,22 @@ internal struct InteractionState public int triggerControlIndex { - get => m_TriggerControlIndex; + get + { + if (m_TriggerControlIndex == ushort.MaxValue) + return kInvalidIndex; + return m_TriggerControlIndex; + } set { - Debug.Assert(value >= 0 && value <= ushort.MaxValue, "Trigger control index is out of range"); - if (value < 0 || value > ushort.MaxValue) - throw new NotSupportedException("Cannot have more than ushort.MaxValue controls in a single InputActionState"); - m_TriggerControlIndex = (ushort)value; + if (value == kInvalidIndex) + m_TriggerControlIndex = ushort.MaxValue; + else + { + if (value < 0 || value >= ushort.MaxValue) + throw new NotSupportedException("More than ushort.MaxValue-1 controls in a single InputActionState"); + m_TriggerControlIndex = (ushort)value; + } } } @@ -3780,6 +4069,27 @@ private static void CompactGlobalList() s_GlobalState.globalList.length = head; } + internal void NotifyListenersOfActionChange(InputActionChange change) + { + for (var i = 0; i < totalMapCount; ++i) + { + var map = maps[i]; + if (map.m_SingletonAction != null) + { + NotifyListenersOfActionChange(change, map.m_SingletonAction); + } + else if (map.m_Asset == null) + { + NotifyListenersOfActionChange(change, map); + } + else + { + NotifyListenersOfActionChange(change, map.m_Asset); + return; + } + } + } + internal static void NotifyListenersOfActionChange(InputActionChange change, object actionOrMapOrAsset) { Debug.Assert(actionOrMapOrAsset != null, "Should have action or action map or asset object to notify about"); @@ -3891,11 +4201,13 @@ internal static void OnDeviceChange(InputDevice device, InputDeviceChange change var state = (InputActionState)handle.Target; // If this state is not affected by the change, skip. + var needsFullResolve = true; switch (change) { case InputDeviceChange.Added: if (!state.CanUseDevice(device)) continue; + needsFullResolve = false; break; case InputDeviceChange.Removed: @@ -3911,6 +4223,7 @@ internal static void OnDeviceChange(InputDevice device, InputDeviceChange change map.asset?.m_Devices.Remove(device); } + needsFullResolve = false; break; // NOTE: ConfigurationChanges can affect display names of controls which may make a device usable that @@ -3919,6 +4232,7 @@ internal static void OnDeviceChange(InputDevice device, InputDeviceChange change case InputDeviceChange.UsageChanged: if (!state.IsUsingDevice(device) && !state.CanUseDevice(device)) continue; + // Full resolve necessary! break; // On reset, cancel all actions currently in progress from the device that got reset. @@ -3934,12 +4248,14 @@ internal static void OnDeviceChange(InputDevice device, InputDeviceChange change // Trigger a lazy-resolve on all action maps in the state. for (var n = 0; n < state.totalMapCount; ++n) - if (state.maps[n].LazyResolveBindings()) + { + if (state.maps[n].LazyResolveBindings(fullResolve: needsFullResolve)) { // Map has chosen to resolve right away. This will resolve bindings for *all* // maps in the state, so we're done here. break; } + } } } diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingResolver.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingResolver.cs index 95a32f50c0..b5577c1f4a 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingResolver.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingResolver.cs @@ -54,7 +54,7 @@ internal struct InputBindingResolver : IDisposable /// public InputBinding? bindingMask; - private List m_Parameters; + private bool m_IsControlOnlyResolve; /// /// Release native memory held by the resolver. @@ -68,15 +68,18 @@ public void Dispose() /// Steal the already allocated arrays from the given state. /// /// Action map state that was previously created. - /// - /// This is useful to avoid allocating new arrays from scratch when re-resolving bindings. - /// - public void StartWithArraysFrom(InputActionState state) + /// If false, the only thing that is allowed to change in the re-resolution + /// is the list of controls. In other words, devices may have been added or removed but otherwise the configuration + /// is exactly the same as in the last resolve. If true, anything may have changed and the resolver will only reuse + /// allocations but not contents. + public void StartWithPreviousResolve(InputActionState state, bool isFullResolve) { Debug.Assert(state != null, "Received null state"); Debug.Assert(!state.isProcessingControlStateChange, "Cannot re-resolve bindings for an InputActionState that is currently executing an action callback; binding resolution must be deferred to until after the callback has completed"); + m_IsControlOnlyResolve = !isFullResolve; + maps = state.maps; interactions = state.interactions; processors = state.processors; @@ -84,15 +87,18 @@ public void StartWithArraysFrom(InputActionState state) controls = state.controls; // Clear the arrays so that we don't leave references around. - if (maps != null) - Array.Clear(maps, 0, state.totalMapCount); - if (interactions != null) - Array.Clear(interactions, 0, state.totalInteractionCount); - if (processors != null) - Array.Clear(processors, 0, state.totalProcessorCount); - if (composites != null) - Array.Clear(composites, 0, state.totalCompositeCount); - if (controls != null) + if (isFullResolve) + { + if (maps != null) + Array.Clear(maps, 0, state.totalMapCount); + if (interactions != null) + Array.Clear(interactions, 0, state.totalInteractionCount); + if (processors != null) + Array.Clear(processors, 0, state.totalProcessorCount); + if (composites != null) + Array.Clear(composites, 0, state.totalCompositeCount); + } + if (controls != null) // Always clear this one as every resolve will change it. Array.Clear(controls, 0, state.totalControlCount); // Null out the arrays on the state so that there is no strange bugs with @@ -282,30 +288,27 @@ public unsafe void AddActionMap(InputActionMap map) // Search globally. numControls = InputSystem.FindControls(path, ref resolvedControls); } - - // Disable binding if it doesn't resolve to any controls. - // NOTE: This also happens to bindings that got all their resolved controls removed because other bindings from the same - // action already grabbed them. - if (numControls == 0) - bindingIsDisabled = true; } // If the binding isn't disabled, resolve its controls, processors, and interactions. if (!bindingIsDisabled) { + // NOTE: When isFullResolve==false, it is *imperative* that we do count processor and interaction + // counts here come out exactly the same as in the previous full resolve. + // Instantiate processors. var processorString = unresolvedBinding.effectiveProcessors; if (!string.IsNullOrEmpty(processorString)) { // Add processors from binding. - firstProcessorIndex = ResolveProcessors(processorString); + firstProcessorIndex = InstantiateWithParameters(InputProcessor.s_Processors, processorString, ref processors, ref totalProcessorCount); if (firstProcessorIndex != InputActionState.kInvalidIndex) numProcessors = totalProcessorCount - firstProcessorIndex; } if (!string.IsNullOrEmpty(action.m_Processors)) { // Add processors from action. - var index = ResolveProcessors(action.m_Processors); + var index = InstantiateWithParameters(InputProcessor.s_Processors, action.m_Processors, ref processors, ref totalProcessorCount); if (index != InputActionState.kInvalidIndex) { if (firstProcessorIndex == InputActionState.kInvalidIndex) @@ -319,14 +322,14 @@ public unsafe void AddActionMap(InputActionMap map) if (!string.IsNullOrEmpty(interactionString)) { // Add interactions from binding. - firstInteractionIndex = ResolveInteractions(interactionString); + firstInteractionIndex = InstantiateWithParameters(InputInteraction.s_Interactions, interactionString, ref interactions, ref totalInteractionCount); if (firstInteractionIndex != InputActionState.kInvalidIndex) numInteractions = totalInteractionCount - firstInteractionIndex; } if (!string.IsNullOrEmpty(action.m_Interactions)) { // Add interactions from action. - var index = ResolveInteractions(action.m_Interactions); + var index = InstantiateWithParameters(InputInteraction.s_Interactions, action.m_Interactions, ref interactions, ref totalInteractionCount); if (index != InputActionState.kInvalidIndex) { if (firstInteractionIndex == InputActionState.kInvalidIndex) @@ -335,8 +338,7 @@ public unsafe void AddActionMap(InputActionMap map) } } - // If it's the start of a composite chain, create the composite. Otherwise, go and - // resolve controls for the binding. + // If it's the start of a composite chain, create the composite. if (isComposite) { // The composite binding entry itself does not resolve to any controls. @@ -467,7 +469,11 @@ public unsafe void AddActionMap(InputActionMap map) // Initialize initial interaction states. for (var i = memory.interactionCount; i < newMemory.interactionCount; ++i) - newMemory.interactionStates[i].phase = InputActionPhase.Waiting; + { + ref var interactionState = ref newMemory.interactionStates[i]; + interactionState.phase = InputActionPhase.Waiting; + interactionState.triggerControlIndex = InputActionState.kInvalidIndex; + } // Initialize action data. var runningIndexInBindingIndices = memory.bindingCount; @@ -578,65 +584,42 @@ public unsafe void AddActionMap(InputActionMap map) } } - private int ResolveInteractions(string interactionString) + private List m_Parameters; // We retain this to reuse the allocation. + private int InstantiateWithParameters(TypeTable registrations, string namesAndParameters, ref TType[] array, ref int count) { - ////REVIEW: We're piggybacking off the processor parsing here as the two syntaxes are identical. Might consider - //// moving the logic to a shared place. - //// Alternatively, may split the paths. May help in getting rid of unnecessary allocations. - - if (!NameAndParameters.ParseMultiple(interactionString, ref m_Parameters)) + if (!NameAndParameters.ParseMultiple(namesAndParameters, ref m_Parameters)) return InputActionState.kInvalidIndex; - var firstInteractionIndex = totalInteractionCount; + var firstIndex = count; for (var i = 0; i < m_Parameters.Count; ++i) { - // Look up interaction. - var type = InputInteraction.s_Interactions.LookupTypeRegistration(m_Parameters[i].name); + // Look up type. + var type = registrations.LookupTypeRegistration(m_Parameters[i].name); if (type == null) throw new InvalidOperationException( - $"No interaction with name '{m_Parameters[i].name}' (mentioned in '{interactionString}') has been registered"); - - // Instantiate it. - if (!(Activator.CreateInstance(type) is IInputInteraction interaction)) - throw new InvalidOperationException($"Interaction '{m_Parameters[i].name}' (mentioned in '{interactionString}') is not an IInputInteraction"); - - // Pass parameters to it. - NamedValue.ApplyAllToObject(interaction, m_Parameters[i].parameters); + $"No {typeof(TType).Name} with name '{m_Parameters[i].name}' (mentioned in '{namesAndParameters}') has been registered"); - // Add to list. - ArrayHelpers.AppendWithCapacity(ref interactions, ref totalInteractionCount, interaction); - } - - return firstInteractionIndex; - } - - private int ResolveProcessors(string processorString) - { - if (!NameAndParameters.ParseMultiple(processorString, ref m_Parameters)) - return InputActionState.kInvalidIndex; - - var firstProcessorIndex = totalProcessorCount; - for (var i = 0; i < m_Parameters.Count; ++i) - { - // Look up processor. - var type = InputProcessor.s_Processors.LookupTypeRegistration(m_Parameters[i].name); - if (type == null) - throw new InvalidOperationException( - $"No processor with name '{m_Parameters[i].name}' (mentioned in '{processorString}') has been registered"); - - // Instantiate it. - if (!(Activator.CreateInstance(type) is InputProcessor processor)) - throw new InvalidOperationException( - $"Type '{type.Name}' registered as processor called '{m_Parameters[i].name}' (mentioned in '{processorString}') is not an InputProcessor"); + if (!m_IsControlOnlyResolve) + { + // Instantiate it. + if (!(Activator.CreateInstance(type) is TType instance)) + throw new InvalidOperationException( + $"Type '{type.Name}' registered '{m_Parameters[i].name}' (mentioned in '{namesAndParameters}') is not an {typeof(TType).Name}"); - // Pass parameters to it. - NamedValue.ApplyAllToObject(processor, m_Parameters[i].parameters); + // Pass parameters to it. + NamedValue.ApplyAllToObject(instance, m_Parameters[i].parameters); - // Add to list. - ArrayHelpers.AppendWithCapacity(ref processors, ref totalProcessorCount, processor); + // Add to list. + ArrayHelpers.AppendWithCapacity(ref array, ref count, instance); + } + else + { + Debug.Assert(type.IsInstanceOfType(array[count]), "Type of instance in array does not match expected type"); + ++count; + } } - return firstProcessorIndex; + return firstIndex; } private static InputBindingComposite InstantiateBindingComposite(string nameAndParameters) diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlList.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlList.cs index 58c8b8fe4f..92f123ac2e 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlList.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlList.cs @@ -12,8 +12,6 @@ ////REVIEW: can we have a read-only version of this -////REVIEW: this would *really* profit from having a global ordering of InputControls that can be indexed - ////REVIEW: move this to .LowLevel? this one is pretty peculiar to use and doesn't really work like what you'd expect given C#'s List<> namespace UnityEngine.InputSystem @@ -197,6 +195,32 @@ public InputControlList(params TControl[] values) Add(values[i]); } + /// + /// Resizes the list to be exactly entries. If this is less than the + /// current , additional entries are dropped. If it is more than the + /// current , additional null entries are appended to the list. + /// + /// The new value for . + /// is negative. + /// + /// is increased if necessary. It will, however, not be decreased if it + /// is larger than entries. + /// + public void Resize(int size) + { + if (size < 0) + throw new ArgumentOutOfRangeException(nameof(size), "Size cannot be negative"); + + if (Capacity < size) + Capacity = size; + + // Initialize newly added entries (if any) such that they produce NULL entries. + if (size > Count) + UnsafeUtility.MemSet((byte*)m_Indices.GetUnsafePtr() + Count * sizeof(ulong), Byte.MaxValue, size - Count); + + m_Count = size; + } + /// /// Add a control to the list. /// @@ -495,7 +519,7 @@ private static ulong ToIndex(TControl control) return kInvalidIndex; var device = control.device; - var deviceIndex = device.m_DeviceIndex; + var deviceId = device.m_DeviceId; var controlIndex = !ReferenceEquals(device, control) ? device.m_ChildrenForEachControl.IndexOfReference(control) + 1 : 0; @@ -505,11 +529,11 @@ private static ulong ToIndex(TControl control) // was perfectly legal in previous CSC compiler. // Below is silly conversion to get rid of warning, or we can pragma // out the warning. - //return ((ulong)deviceIndex << 32) | (ulong)controlIndex; - var shiftedDeviceIndex = (ulong)deviceIndex << 32; + //return ((ulong)deviceId << 32) | (ulong)controlIndex; + var shiftedDeviceId = (ulong)deviceId << 32; var unsignedControlIndex = (ulong)controlIndex; - return shiftedDeviceIndex | unsignedControlIndex; + return shiftedDeviceId | unsignedControlIndex; } private static TControl FromIndex(ulong index) @@ -517,10 +541,12 @@ private static TControl FromIndex(ulong index) if (index == kInvalidIndex) return null; - var deviceIndex = (int)(index >> 32); + var deviceId = (int)(index >> 32); var controlIndex = (int)(index & 0xFFFFFFFF); - var device = InputSystem.devices[deviceIndex]; + var device = InputSystem.GetDeviceById(deviceId); + if (device == null) + return null; if (controlIndex == 0) return (TControl)(InputControl)device; diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Remote/InputRemoting.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Remote/InputRemoting.cs index 1dd24e8263..92d2080152 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Devices/Remote/InputRemoting.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Devices/Remote/InputRemoting.cs @@ -586,6 +586,7 @@ public static void Process(InputRemoting receiver, Message msg) $"Could not create remote device '{data.description}' with layout '{data.layout}' locally (exception: {exception})"); return; } + ////FIXME: Setting this here like so means none of this is visible during onDeviceChange device.m_Description = data.description; device.m_DeviceFlags |= InputDevice.DeviceFlags.Remote; foreach (var usage in data.usages) diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/DefaultInputActions.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/DefaultInputActions.cs index e90ea28f92..9206101d9c 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/DefaultInputActions.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/DefaultInputActions.cs @@ -665,7 +665,7 @@ public @DefaultInputActions() ""path"": ""*/{Submit}"", ""interactions"": """", ""processors"": """", - ""groups"": """", + ""groups"": ""Keyboard&Mouse;Gamepad;Touch;Joystick;XR"", ""action"": ""Submit"", ""isComposite"": false, ""isPartOfComposite"": false @@ -676,7 +676,7 @@ public @DefaultInputActions() ""path"": ""*/{Cancel}"", ""interactions"": """", ""processors"": """", - ""groups"": """", + ""groups"": ""Keyboard&Mouse;Gamepad;Touch;Joystick;XR"", ""action"": ""Cancel"", ""isComposite"": false, ""isPartOfComposite"": false diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/DefaultInputActions.inputactions b/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/DefaultInputActions.inputactions index 8087e4e87a..6fa20869f1 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/DefaultInputActions.inputactions +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/DefaultInputActions.inputactions @@ -622,7 +622,7 @@ "path": "*/{Submit}", "interactions": "", "processors": "", - "groups": "", + "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", "action": "Submit", "isComposite": false, "isPartOfComposite": false @@ -633,7 +633,7 @@ "path": "*/{Cancel}", "interactions": "", "processors": "", - "groups": "", + "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", "action": "Cancel", "isComposite": false, "isPartOfComposite": false diff --git a/Packages/com.unity.inputsystem/InputSystem/Utilities/OneOrMore.cs b/Packages/com.unity.inputsystem/InputSystem/Utilities/OneOrMore.cs index bc1552ab81..7851b08eda 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Utilities/OneOrMore.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Utilities/OneOrMore.cs @@ -72,9 +72,9 @@ private class Enumerator : IEnumerator public bool MoveNext() { + ++m_Index; if (m_Index >= m_List.Count) return false; - ++m_Index; return true; } From 6d06b70d59dcc18d8a7a1c9cd8d354f655f2ef03 Mon Sep 17 00:00:00 2001 From: renedamm Date: Wed, 2 Feb 2022 19:36:28 +0100 Subject: [PATCH 22/53] FIX: NRE from OnScreenButton with custom devices (case 1380790, #1489). --- Assets/Tests/InputSystem/CoreTests_Devices.cs | 20 +++++++++ .../InputSystem/Plugins/OnScreenTests.cs | 45 +++++++++++++++++++ Packages/com.unity.inputsystem/CHANGELOG.md | 1 + .../InputSystem/Controls/InputControlPath.cs | 4 +- 4 files changed, 69 insertions(+), 1 deletion(-) diff --git a/Assets/Tests/InputSystem/CoreTests_Devices.cs b/Assets/Tests/InputSystem/CoreTests_Devices.cs index c3a4dca796..fefa741cab 100644 --- a/Assets/Tests/InputSystem/CoreTests_Devices.cs +++ b/Assets/Tests/InputSystem/CoreTests_Devices.cs @@ -265,6 +265,26 @@ public void Devices_CanSetUsagesOnDevices() Assert.That(device.usages, Is.Empty); } + // https://fogbugz.unity3d.com/f/cases/1380790/ + [Test] + [Category("Devices")] + public void Devices_CanSetUsagesOnDevice_WithoutAnyControlWithUsages() + { + var device = InputSystem.AddDevice(); + + InputSystem.AddDeviceUsage(device, "Usage"); + + Assert.That(device.usages, Has.Count.EqualTo(1)); + Assert.That(device.usages[0], Is.EqualTo(new InternedString("Usage"))); + Assert.That(InputControlPath.TryFindControl(device, "*/{Foo}"), Is.Null); + } + + private class DeviceWithNoControlUsages : InputDevice + { + [InputControl] + public ButtonControl button; + } + [Test] [Category("Devices")] public void Devices_CanFindDeviceByMultipleUsages() diff --git a/Assets/Tests/InputSystem/Plugins/OnScreenTests.cs b/Assets/Tests/InputSystem/Plugins/OnScreenTests.cs index 9fbaf1c046..3a04d43559 100644 --- a/Assets/Tests/InputSystem/Plugins/OnScreenTests.cs +++ b/Assets/Tests/InputSystem/Plugins/OnScreenTests.cs @@ -5,6 +5,7 @@ using UnityEngine.EventSystems; using UnityEngine.InputSystem; using UnityEngine.InputSystem.Controls; +using UnityEngine.InputSystem.Layouts; using UnityEngine.InputSystem.LowLevel; using UnityEngine.InputSystem.OnScreen; using UnityEngine.InputSystem.UI; @@ -284,6 +285,50 @@ public void Devices_CanUseKeyboardCurrentAfterDisablingOnScreenButton() Assert.That(Keyboard.current, Is.EqualTo(systemKeyboard)); } + // https://fogbugz.unity3d.com/f/cases/1380790/ + // This test only indirectly triggers the problem in that report (the specific cause is + // covered by Devices_CanSetUsagesOnDevice_WithoutAnyControlWithUsages) but it is useful + // in that it covers quite a bit of ground and thus provides a general sanity check. + [Test] + [Category("Devices")] + public void Devices_CanUseOnScreenButtonWithCustomDevice() + { + InputSystem.RegisterLayout(); + + var gameObject = new GameObject(); + var buttonObject = new GameObject(); + + gameObject.SetActive(false); + buttonObject.SetActive(false); + + gameObject.AddComponent(); + var canvas = gameObject.AddComponent(); + gameObject.AddComponent(); + gameObject.AddComponent(); + buttonObject.transform.SetParent(canvas.transform); + + var button = buttonObject.AddComponent(); + button.controlPath = "/button"; + + gameObject.SetActive(true); + buttonObject.SetActive(true); + + LogAssert.NoUnexpectedReceived(); + } + + public class CustomDevice : InputDevice + { + [InputControl] + public ButtonControl button { get; private set; } + + protected override void FinishSetup() + { + base.FinishSetup(); + + button = GetChildControl("button"); + } + } + private class TestEventSystem : EventSystem { public bool hasFocus; diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index e9c858d276..c45e515eb4 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -49,6 +49,7 @@ however, it has to be formatted properly to pass verification tests. * This would, for example, cause `Keyboard.eKey` to be matched by `/escape`. * Fix contributed by [Fredrik Ludvigsen](https://github.com/steinbitglis) in [#1485](https://github.com/Unity-Technologies/InputSystem/pull/1485). - Fixed accessing `InputAction`s directly during `RuntimeInitializeOnLoad` not initializing the input system as a whole and leading to exceptions ([case 1378614](https://issuetracker.unity3d.com/issues/input-system-nullreferenceexception-error-is-thrown-when-using-input-actions-in-builds)). +- Fixed `OnScreenButton` triggering `NullReferenceException` in combination with custom devices ([case 1380790 ](https://issuetracker.unity3d.com/issues/nullreferenceexception-error-when-setting-on-screen-button-to-a-custom-device)). #### Actions diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlPath.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlPath.cs index 027439a25b..d4659e8198 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlPath.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlPath.cs @@ -928,11 +928,13 @@ private static bool MatchesRecursive(ref PathParser parser, InputControl current ref InputControlList matches, bool matchMultiple) where TControl : InputControl { + // NOTE: m_UsagesForEachControl includes usages for the device. m_UsageToControl does not. + var usages = device.m_UsagesForEachControl; if (usages == null) return null; - var usageCount = device.m_UsageToControl.Length; + var usageCount = device.m_UsageToControl.LengthSafe(); var startIndex = indexInPath + 1; var pathCanMatchMultiple = PathComponentCanYieldMultipleMatches(path, indexInPath); var pathLength = path.Length; From fc56d2861e26e6ba0640e35f94a50b2b15318971 Mon Sep 17 00:00:00 2001 From: andrew-oc <78356434+andrew-oc@users.noreply.github.com> Date: Fri, 4 Feb 2022 10:07:12 +0100 Subject: [PATCH 23/53] FIX: Processors are now always applied when reading the value of an action. (#1501) --- Assets/Tests/InputSystem/CoreTests_Actions.cs | 36 ++++++++++++- Packages/com.unity.inputsystem/CHANGELOG.md | 1 + .../InputSystem/Actions/InputAction.cs | 33 ++++++------ .../InputSystem/Actions/InputActionState.cs | 53 ++++++++++++------- .../Actions/InputBindingResolver.cs | 15 ++++-- 5 files changed, 96 insertions(+), 42 deletions(-) diff --git a/Assets/Tests/InputSystem/CoreTests_Actions.cs b/Assets/Tests/InputSystem/CoreTests_Actions.cs index 7a70e66281..c2706188fb 100644 --- a/Assets/Tests/InputSystem/CoreTests_Actions.cs +++ b/Assets/Tests/InputSystem/CoreTests_Actions.cs @@ -30,7 +30,41 @@ // in terms of complexity. partial class CoreTests { - #if UNITY_EDITOR + [Test] + [Category("Actions")] + public void Actions_ReadingValueRightAfterEnabling_AppliesProcessorsFromFirstBinding() + { + InputSystem.AddDevice(); + + var map = new InputActionMap("map"); + map.AddAction("action2", binding: "/buttonNorth"); + var action1 = map.AddAction("action1", binding: "/leftStick/x", processors: "normalize(min=-1,max=1,zero=-1)"); + action1.AddBinding("/rightStick/x", processors: "normalize(min=0,max=1)"); + + map.Enable(); + + Assert.That(action1.ReadValue(), Is.EqualTo(0.5f)); + } + + [Test] + [Category("Actions")] + public void Actions_ReadingValueRightAfterResetting_AppliesProcessorsFromFirstBinding() + { + InputSystem.AddDevice(); + + var map = new InputActionMap("map"); + map.AddAction("action2", binding: "/buttonNorth"); + var action1 = map.AddAction("action1", binding: "/leftStick/x", processors: "normalize(min=-1,max=1,zero=-1)"); + action1.AddBinding("/rightStick/x", processors: "normalize(min=0,max=1)"); + + map.Enable(); + + action1.Reset(); + + Assert.That(action1.ReadValue(), Is.EqualTo(0.5f)); + } + +#if UNITY_EDITOR [Test] [Category("Actions")] public void Actions_DoNotGetTriggeredByEditorUpdates() diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index c45e515eb4..1de242edd8 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -28,6 +28,7 @@ however, it has to be formatted properly to pass verification tests. ``` * This also applies to `PressInteraction` when set to `Press` behavior. * In effect, it means that a button will be in `started` or `performed` phase for as long as its value is not 0 and will only go to `canceled` once dropping to 0. +- Processors are now always applied when reading action values through `InputAction.ReadValue<>` or `CallbackContext.ReadValue<>`. Previously, if no bound control was actuated, ReadValue calls would return the default value for the action type but not run the value through the processors.([case 1293728](https://issuetracker.unity3d.com/product/unity/issues/guid/1293728/)). - Made the following internal types public. These types can be useful when deconstructing raw events captured via `InputEventTrace`. * `UnityEngine.InputSystem.Android.LowLevel.AndroidAxis` * `UnityEngine.InputSystem.Android.LowLevel.AndroidGameControllerState` diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputAction.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputAction.cs index 04a5059bde..706a4c7659 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputAction.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputAction.cs @@ -925,11 +925,11 @@ object ICloneable.Clone() ////TODO: ReadValue(void*, int) /// - /// Read the current value of the action. This is the last value received on , - /// or . If the action is in canceled or waiting phase, returns default(TValue). + /// Read the current value of the control that is driving this action. If no bound control is actuated, returns + /// default(TValue), but note that binding processors are always applied. /// /// Value type to read. Must match the value type of the binding/control that triggered. - /// The current value of the action or default(TValue) if the action is not currently in-progress. + /// The current value of the control/binding that is driving this action with all binding processors applied. /// /// This method can be used as an alternative to hooking into , , /// and/or and reading out the value using @@ -980,21 +980,13 @@ object ICloneable.Clone() public unsafe TValue ReadValue() where TValue : struct { - var result = default(TValue); - var state = GetOrCreateActionMap().m_State; - if (state != null) - { - var actionStatePtr = &state.actionStates[m_ActionIndexInState]; - if (actionStatePtr->phase.IsInProgress()) - { - var controlIndex = actionStatePtr->controlIndex; - if (controlIndex != InputActionState.kInvalidIndex) - result = state.ReadValue(actionStatePtr->bindingIndex, controlIndex); - } - } + if (state == null) return default(TValue); - return result; + var actionStatePtr = &state.actionStates[m_ActionIndexInState]; + return actionStatePtr->phase.IsInProgress() + ? state.ReadValue(actionStatePtr->bindingIndex, actionStatePtr->controlIndex) + : state.ApplyProcessors(actionStatePtr->bindingIndex, default(TValue)); } /// @@ -1941,8 +1933,13 @@ public TValue ReadValue() where TValue : struct { var value = default(TValue); - if (m_State != null && phase.IsInProgress()) - value = m_State.ReadValue(bindingIndex, controlIndex); + if (m_State != null) + { + value = phase.IsInProgress() ? + m_State.ReadValue(bindingIndex, controlIndex) : + m_State.ApplyProcessors(bindingIndex, value); + } + return value; } diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs index 8d433bd34c..1185a3e905 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs @@ -782,7 +782,7 @@ public void ResetActionState(int actionIndex, InputActionPhase toPhase = InputAc // Wipe state. actionState->phase = toPhase; actionState->controlIndex = kInvalidIndex; - actionState->bindingIndex = 0; + actionState->bindingIndex = memory.actionBindingIndices[memory.actionBindingIndicesAndCounts[actionIndex]]; actionState->interactionIndex = kInvalidIndex; actionState->startTime = 0; actionState->time = 0; @@ -2639,7 +2639,6 @@ internal TValue ReadValue(int bindingIndex, int controlIndex, bool ignor where TValue : struct { Debug.Assert(bindingIndex >= 0 && bindingIndex < totalBindingCount, "Binding index is out of range"); - Debug.Assert(controlIndex >= 0 && controlIndex < totalControlCount, "Control index is out of range"); var value = default(TValue); @@ -2685,18 +2684,27 @@ internal TValue ReadValue(int bindingIndex, int controlIndex, bool ignor } else { - var control = controls[controlIndex]; - Debug.Assert(control != null, "Control is null"); + if (controlIndex != kInvalidIndex) + { + var control = controls[controlIndex]; + Debug.Assert(control != null, "Control is null"); - controlOfType = control as InputControl; - if (controlOfType == null) - throw new InvalidOperationException( - $"Cannot read value of type '{TypeHelpers.GetNiceTypeName(typeof(TValue))}' from control '{control.path}' bound to action '{GetActionOrNull(bindingIndex)}' (control is a '{control.GetType().Name}' with value type '{TypeHelpers.GetNiceTypeName(control.valueType)}')"); + controlOfType = control as InputControl; + if (controlOfType == null) + throw new InvalidOperationException( + $"Cannot read value of type '{TypeHelpers.GetNiceTypeName(typeof(TValue))}' from control '{control.path}' bound to action '{GetActionOrNull(bindingIndex)}' (control is a '{control.GetType().Name}' with value type '{TypeHelpers.GetNiceTypeName(control.valueType)}')"); - value = controlOfType.ReadValue(); + value = controlOfType.ReadValue(); + } } // Run value through processors, if any. + return ApplyProcessors(bindingIndex, value, controlOfType); + } + + internal TValue ApplyProcessors(int bindingIndex, TValue value, InputControl controlOfType = null) + where TValue : struct + { var processorCount = bindingStates[bindingIndex].processorCount; if (processorCount > 0) { @@ -2918,10 +2926,9 @@ internal object ReadCompositePartValueAsObject(int bindingIndex, int partNumber) internal object ReadValueAsObject(int bindingIndex, int controlIndex, bool ignoreComposites = false) { Debug.Assert(bindingIndex >= 0 && bindingIndex < totalBindingCount, "Binding index is out of range"); - Debug.Assert(controlIndex >= 0 && controlIndex < totalControlCount, "Control index is out of range"); InputControl control = null; - object value; + object value = null; // If the binding that triggered the action is part of a composite, let // the composite determine the value we return. @@ -2946,18 +2953,24 @@ internal object ReadValueAsObject(int bindingIndex, int controlIndex, bool ignor } else { - control = controls[controlIndex]; - Debug.Assert(control != null, "Control is null"); - value = control.ReadValueAsObject(); + if (controlIndex != kInvalidIndex) + { + control = controls[controlIndex]; + Debug.Assert(control != null, "Control is null"); + value = control.ReadValueAsObject(); + } } - // Run value through processors, if any. - var processorCount = bindingStates[bindingIndex].processorCount; - if (processorCount > 0) + if (value != null) { - var processorStartIndex = bindingStates[bindingIndex].processorStartIndex; - for (var i = 0; i < processorCount; ++i) - value = processors[processorStartIndex + i].ProcessAsObject(value, control); + // Run value through processors, if any. + var processorCount = bindingStates[bindingIndex].processorCount; + if (processorCount > 0) + { + var processorStartIndex = bindingStates[bindingIndex].processorStartIndex; + for (var i = 0; i < processorCount; ++i) + value = processors[processorStartIndex + i].ProcessAsObject(value, control); + } } return value; diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingResolver.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingResolver.cs index b5577c1f4a..d817980f04 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingResolver.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingResolver.cs @@ -485,8 +485,11 @@ public unsafe void AddActionMap(InputActionMap map) // Correlate action with its trigger state. action.m_ActionIndexInState = actionIndex; + Debug.Assert(runningIndexInBindingIndices < ushort.MaxValue, "Binding start index on action exceeds limit"); + newMemory.actionBindingIndicesAndCounts[actionIndex * 2] = (ushort)runningIndexInBindingIndices; + // Collect bindings for action. - var bindingStartIndexForAction = runningIndexInBindingIndices; + var firstBindingIndexForAction = -1; var bindingCountForAction = 0; var numPossibleConcurrentActuations = 0; @@ -504,6 +507,9 @@ public unsafe void AddActionMap(InputActionMap map) ++runningIndexInBindingIndices; ++bindingCountForAction; + if (firstBindingIndexForAction == -1) + firstBindingIndexForAction = bindingIndex; + // Keep track of how many concurrent actuations we may be seeing on the action so that // we know whether we need to enable conflict resolution or not. if (bindingState->isComposite) @@ -519,9 +525,11 @@ public unsafe void AddActionMap(InputActionMap map) numPossibleConcurrentActuations += bindingState->controlCount; } } - Debug.Assert(bindingStartIndexForAction < ushort.MaxValue, "Binding start index on action exceeds limit"); + + if (firstBindingIndexForAction == -1) + firstBindingIndexForAction = 0; + Debug.Assert(bindingCountForAction < ushort.MaxValue, "Binding count on action exceeds limit"); - newMemory.actionBindingIndicesAndCounts[actionIndex * 2] = (ushort)bindingStartIndexForAction; newMemory.actionBindingIndicesAndCounts[actionIndex * 2 + 1] = (ushort)bindingCountForAction; // See if we may need conflict resolution on this action. Never needed for pass-through actions. @@ -542,6 +550,7 @@ public unsafe void AddActionMap(InputActionMap map) isPassThrough = isPassThroughAction, isButton = isButtonAction, mayNeedConflictResolution = mayNeedConflictResolution, + bindingIndex = firstBindingIndexForAction }; } From db67a7c4d0650e8504d5261b1641d313e4c8d4e4 Mon Sep 17 00:00:00 2001 From: Rene Damm Date: Fri, 4 Feb 2022 18:12:36 +0100 Subject: [PATCH 24/53] NEW: Add DeltaControl type (#1505). --- Assets/Tests/InputSystem/CoreTests_Actions.cs | 2 +- Assets/Tests/InputSystem/CoreTests_Devices.cs | 77 + Packages/com.unity.inputsystem/CHANGELOG.md | 6 +- .../Actions/Composites/Vector2Composite.cs | 8 +- .../Actions/Composites/Vector3Composite.cs | 12 +- .../InputSystem/Controls/DeltaControl.cs | 72 + .../InputSystem/Controls/DeltaControl.cs.meta | 3 + .../InputSystem/Controls/StickControl.cs | 24 +- .../InputSystem/Controls/TouchControl.cs | 4 +- .../InputSystem/Controls/Vector2Control.cs | 2 +- .../InputSystem/Devices/Mouse.cs | 8 +- .../InputSystem/Devices/Pen.cs | 2 +- .../InputSystem/Devices/Pointer.cs | 6 +- .../Devices/Precompiled/FastMouse.cs | 252 ++- .../Devices/Precompiled/FastTouchscreen.cs | 2008 +++++++++++++---- .../InputSystem/Devices/Touchscreen.cs | 4 +- .../InputSystem/InputManager.cs | 3 + 17 files changed, 2067 insertions(+), 426 deletions(-) create mode 100644 Packages/com.unity.inputsystem/InputSystem/Controls/DeltaControl.cs create mode 100644 Packages/com.unity.inputsystem/InputSystem/Controls/DeltaControl.cs.meta diff --git a/Assets/Tests/InputSystem/CoreTests_Actions.cs b/Assets/Tests/InputSystem/CoreTests_Actions.cs index c2706188fb..2054a85214 100644 --- a/Assets/Tests/InputSystem/CoreTests_Actions.cs +++ b/Assets/Tests/InputSystem/CoreTests_Actions.cs @@ -957,7 +957,7 @@ public unsafe void Actions_CanTriggerBindingResolutionOnAction_FromCallback(bool Set(gamepad.leftStick, new Vector2(0.234f, 0.345f)); - Assert.That(action.controls, Is.EquivalentTo(new[] {gamepad.leftStick, mouse.delta})); + Assert.That(action.controls, Is.EquivalentTo(new InputControl[] {gamepad.leftStick, mouse.delta})); } [Test] diff --git a/Assets/Tests/InputSystem/CoreTests_Devices.cs b/Assets/Tests/InputSystem/CoreTests_Devices.cs index fefa741cab..a876d8f89b 100644 --- a/Assets/Tests/InputSystem/CoreTests_Devices.cs +++ b/Assets/Tests/InputSystem/CoreTests_Devices.cs @@ -2444,6 +2444,47 @@ public void Devices_JoysticksHaveDeadzonesOnStick() Assert.That(joystick.stick.ReadValue(), Is.EqualTo(Vector2.zero)); } + [Test] + [Category("Devices")] + [TestCase("Pointer", "delta")] + [TestCase("Pen", "delta")] + [TestCase("Touchscreen", "delta")] + [TestCase("Mouse", "delta")] + [TestCase("Mouse", "scroll")] + public void Devices_PointerDeltasHaveDirectionalChildControls(string layoutName, string controlPath) + { + var device = InputSystem.AddDevice(layoutName); + var control = (DeltaControl)device[controlPath]; + + if (device is Touchscreen) // No delta events on Touchscreens. + { + // Delta on Begin will always be (0,0). + BeginTouch(1, new Vector2(0, 0)); + MoveTouch(1, new Vector2(123, 234)); + } + else + Set(control, new Vector2(123, 234)); + + Assert.That(control.x.ReadValue(), Is.EqualTo(123).Within(0.0001)); + Assert.That(control.left.ReadValue(), Is.EqualTo(0).Within(0.0001)); + Assert.That(control.right.ReadValue(), Is.EqualTo(123).Within(0.0001)); + Assert.That(control.y.ReadValue(), Is.EqualTo(234).Within(0.0001)); + Assert.That(control.up.ReadValue(), Is.EqualTo(234).Within(0.0001)); + Assert.That(control.down.ReadValue(), Is.EqualTo(0).Within(0.0001)); + + if (device is Touchscreen) // No delta events on Touchscreens. + MoveTouch(1, new Vector2(-123, -234), delta: new Vector2(-123, -234)); + else + Set(control, new Vector2(-123, -234)); + + Assert.That(control.x.ReadValue(), Is.EqualTo(-123).Within(0.0001)); + Assert.That(control.left.ReadValue(), Is.EqualTo(123).Within(0.0001)); + Assert.That(control.right.ReadValue(), Is.EqualTo(0).Within(0.0001)); + Assert.That(control.y.ReadValue(), Is.EqualTo(-234).Within(0.0001)); + Assert.That(control.up.ReadValue(), Is.EqualTo(0).Within(0.0001)); + Assert.That(control.down.ReadValue(), Is.EqualTo(234).Within(0.0001)); + } + [Test] [Category("Devices")] public void Devices_PointerDeltasDoNotAccumulateFromPreviousFrame() @@ -2463,6 +2504,42 @@ public void Devices_PointerDeltasDoNotAccumulateFromPreviousFrame() Assert.That(pointer.delta.y.ReadValue(), Is.EqualTo(0.5).Within(0.0000001)); } + [Test] + [Category("Devices")] + public void Devices_PointerDeltasHaveNoNormalizationAppliedToMagnitudes() + { + var mouse = InputSystem.AddDevice(); + var pen = InputSystem.AddDevice(); + var touch = InputSystem.AddDevice(); + + Assert.That(mouse.delta.m_MinValue.isEmpty); + Assert.That(pen.delta.m_MinValue.isEmpty); + Assert.That(touch.delta.m_MinValue.isEmpty); + + Assert.That(mouse.delta.m_MaxValue.isEmpty); + Assert.That(pen.delta.m_MaxValue.isEmpty); + Assert.That(touch.delta.m_MaxValue.isEmpty); + + Set(mouse.delta, new Vector2(123, 234), queueEventOnly: true); + Set(pen.delta, new Vector2(123, 234), queueEventOnly: true); + BeginTouch(1, Vector2.zero, queueEventOnly: true); + MoveTouch(1, new Vector2(123, 234), queueEventOnly: true); + + InputSystem.Update(); + + Assert.That(mouse.delta.x.EvaluateMagnitude(), Is.EqualTo(123)); + Assert.That(mouse.delta.y.EvaluateMagnitude(), Is.EqualTo(234)); + Assert.That(pen.delta.x.EvaluateMagnitude(), Is.EqualTo(123)); + Assert.That(pen.delta.y.EvaluateMagnitude(), Is.EqualTo(234)); + Assert.That(touch.delta.x.EvaluateMagnitude(), Is.EqualTo(123)); + Assert.That(touch.delta.y.EvaluateMagnitude(), Is.EqualTo(234)); + + // But also to the Vector2 controls as a whole. + Assert.That(mouse.delta.EvaluateMagnitude(), Is.EqualTo(new Vector2(123, 234).magnitude)); + Assert.That(pen.delta.EvaluateMagnitude(), Is.EqualTo(new Vector2(123, 234).magnitude)); + Assert.That(touch.delta.EvaluateMagnitude(), Is.EqualTo(new Vector2(123, 234).magnitude)); + } + [Test] [Category("Devices")] [TestCase("Pointer", "delta")] diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 1de242edd8..4ff1d54919 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -43,17 +43,17 @@ however, it has to be formatted properly to pass verification tests. - Fixed an issue where a layout-override registered via `InputSystem.RegisterLayoutOverride(...)` would cause the editor to malfunction or crash if the layout override had a name already used by an existing layout (case 1377685). - Fixed an issue where attempting to replace an existing layout-override by using an existing layout-override name didn't work as expected and would instead aggregate overrides instead of replacing them when an override with the given name already exists. - Fixed Switch Pro controller not working correctly in different scenarios ([case 1369091](https://issuetracker.unity3d.com/issues/nintendo-switch-pro-controller-output-garbage), [case 1190216](https://issuetracker.unity3d.com/issues/inputsystem-windows-switch-pro-controller-only-works-when-connected-via-bluetooth-but-not-via-usb), case 1314869). -- Fixed `InvalidCastException: Specified cast is not valid.` being thrown when clicking on menu separators in the control picker ([case 1388049](https://issuetracker.unity3d.com/issues/invalidcastexception-is-thrown-when-selecting-the-header-of-an-advanceddropdown)). - Fixed DualShock 4 controller not allowing input from other devices due to noisy input from its unmapped sensors ([case 1365891](https://issuetracker.unity3d.com/issues/input-from-the-keyboard-is-not-working-when-the-dualshock-4-controller-is-connected)). - Fixed `InputSystem.onAnyButtonPress` so that it doesn't throw exceptions when trying to process non state or delta events ([case 1376034](https://issuetracker.unity3d.com/product/unity/issues/guid/1376034/)). - Fixed `InputControlPath.Matches` incorrectly reporting matches when only a prefix was matching. * This would, for example, cause `Keyboard.eKey` to be matched by `/escape`. * Fix contributed by [Fredrik Ludvigsen](https://github.com/steinbitglis) in [#1485](https://github.com/Unity-Technologies/InputSystem/pull/1485). -- Fixed accessing `InputAction`s directly during `RuntimeInitializeOnLoad` not initializing the input system as a whole and leading to exceptions ([case 1378614](https://issuetracker.unity3d.com/issues/input-system-nullreferenceexception-error-is-thrown-when-using-input-actions-in-builds)). - Fixed `OnScreenButton` triggering `NullReferenceException` in combination with custom devices ([case 1380790 ](https://issuetracker.unity3d.com/issues/nullreferenceexception-error-when-setting-on-screen-button-to-a-custom-device)). #### Actions +- Fixed `InvalidCastException: Specified cast is not valid.` being thrown when clicking on menu separators in the control picker ([case 1388049](https://issuetracker.unity3d.com/issues/invalidcastexception-is-thrown-when-selecting-the-header-of-an-advanceddropdown)). +- Fixed accessing `InputAction`s directly during `RuntimeInitializeOnLoad` not initializing the input system as a whole and leading to exceptions ([case 1378614](https://issuetracker.unity3d.com/issues/input-system-nullreferenceexception-error-is-thrown-when-using-input-actions-in-builds)). - Fixed `InputAction.GetTimeoutCompletionPercentage` jumping to 100% completion early ([case 1377009](https://issuetracker.unity3d.com/issues/gettimeoutcompletionpercentage-returns-1-after-0-dot-1s-when-hold-action-was-started-even-though-it-is-not-performed-yet)). - Fixed d-pad inputs sometimes being ignored on actions that were binding to multiple controls ([case 1389858](https://unity.slack.com/archives/G01RVV1SPU4/p1642501574002300)). - Fixed `IndexOutOfRangeException` when having multiple interactions on an action and/or binding in an action map other than the first of an asset ([case 1392559](https://issuetracker.unity3d.com/issues/map-index-on-trigger-and-indexoutofrangeexception-are-thrown-when-using-interaction-on-both-binding-and-its-parent-action)). @@ -64,6 +64,8 @@ however, it has to be formatted properly to pass verification tests. ### Added - Added support for "Hori Co HORIPAD for Nintendo Switch", "PowerA NSW Fusion Wired FightPad", "PDP Wired Fight Pad Pro: Mario". +- Added a new `DeltaControl` control type that is now used for delta-style controls such as `Mouse.delta` and `Mouse.scroll`. + * Like `StickControl`, this control has individual `up`, `down`, `left`, and `right` controls (as well as `x` and `y` that it inherits from `Vector2Control`). This means it is now possible to directly bind to individual scroll directions (such as `/scroll/up`). ## [1.3.0] - 2021-12-10 diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/Vector2Composite.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/Vector2Composite.cs index d148a94eed..923624deeb 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/Vector2Composite.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/Vector2Composite.cs @@ -51,7 +51,7 @@ public class Vector2Composite : InputBindingComposite /// // ReSharper disable once MemberCanBePrivate.Global // ReSharper disable once FieldCanBeMadeReadOnly.Global - [InputControl(layout = "Button")] public int up = 0; + [InputControl(layout = "Axis")] public int up = 0; /// /// Binding for the button represents the down (that is, (0,-1)) direction of the vector. @@ -61,7 +61,7 @@ public class Vector2Composite : InputBindingComposite /// // ReSharper disable once MemberCanBePrivate.Global // ReSharper disable once FieldCanBeMadeReadOnly.Global - [InputControl(layout = "Button")] public int down = 0; + [InputControl(layout = "Axis")] public int down = 0; /// /// Binding for the button represents the left (that is, (-1,0)) direction of the vector. @@ -71,7 +71,7 @@ public class Vector2Composite : InputBindingComposite /// // ReSharper disable once MemberCanBePrivate.Global // ReSharper disable once FieldCanBeMadeReadOnly.Global - [InputControl(layout = "Button")] public int left = 0; + [InputControl(layout = "Axis")] public int left = 0; /// /// Binding for the button that represents the right (that is, (1,0)) direction of the vector. @@ -79,7 +79,7 @@ public class Vector2Composite : InputBindingComposite /// /// This property is automatically assigned by the input system. /// - [InputControl(layout = "Button")] public int right = 0; + [InputControl(layout = "Axis")] public int right = 0; [Obsolete("Use Mode.DigitalNormalized with 'mode' instead")] public bool normalize = true; diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/Vector3Composite.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/Vector3Composite.cs index 3701e2951d..cd0e1bdf39 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/Vector3Composite.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/Vector3Composite.cs @@ -43,7 +43,7 @@ public class Vector3Composite : InputBindingComposite /// // ReSharper disable once MemberCanBePrivate.Global // ReSharper disable once FieldCanBeMadeReadOnly.Global - [InputControl(layout = "Button")] public int up; + [InputControl(layout = "Axis")] public int up; /// /// Binding for the button that represents the down (that is, (0,-1,0)) direction of the vector. @@ -53,7 +53,7 @@ public class Vector3Composite : InputBindingComposite /// // ReSharper disable once MemberCanBePrivate.Global // ReSharper disable once FieldCanBeMadeReadOnly.Global - [InputControl(layout = "Button")] public int down; + [InputControl(layout = "Axis")] public int down; /// /// Binding for the button that represents the left (that is, (-1,0,0)) direction of the vector. @@ -63,7 +63,7 @@ public class Vector3Composite : InputBindingComposite /// // ReSharper disable once MemberCanBePrivate.Global // ReSharper disable once FieldCanBeMadeReadOnly.Global - [InputControl(layout = "Button")] public int left; + [InputControl(layout = "Axis")] public int left; /// /// Binding for the button that represents the right (that is, (1,0,0)) direction of the vector. @@ -73,7 +73,7 @@ public class Vector3Composite : InputBindingComposite /// // ReSharper disable once MemberCanBePrivate.Global // ReSharper disable once FieldCanBeMadeReadOnly.Global - [InputControl(layout = "Button")] public int right; + [InputControl(layout = "Axis")] public int right; /// /// Binding for the button that represents the right (that is, (0,0,1)) direction of the vector. @@ -83,7 +83,7 @@ public class Vector3Composite : InputBindingComposite /// // ReSharper disable once MemberCanBePrivate.Global // ReSharper disable once FieldCanBeMadeReadOnly.Global - [InputControl(layout = "Button")] public int forward; + [InputControl(layout = "Axis")] public int forward; /// /// Binding for the button that represents the right (that is, (0,0,-1)) direction of the vector. @@ -93,7 +93,7 @@ public class Vector3Composite : InputBindingComposite /// // ReSharper disable once MemberCanBePrivate.Global // ReSharper disable once FieldCanBeMadeReadOnly.Global - [InputControl(layout = "Button")] public int backward; + [InputControl(layout = "Axis")] public int backward; /// /// How to synthesize a Vector3 from the values read from , , diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/DeltaControl.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/DeltaControl.cs new file mode 100644 index 0000000000..602a37a1dd --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/DeltaControl.cs @@ -0,0 +1,72 @@ +using UnityEngine.InputSystem.Layouts; +using UnityEngine.Scripting; + +namespace UnityEngine.InputSystem.Controls +{ + /// + /// A control representing a two-dimensional motion vector that accumulates within a frame + /// and resets at the beginning of a frame. + /// + /// + /// Delta controls are + /// + /// + /// + [Preserve] + public class DeltaControl : Vector2Control + { + /// + /// A synthetic axis representing the upper half of the Y axis value, i.e. the 0 to 1 range. + /// + /// Control representing the control's upper half Y axis. + /// + /// The control is marked as . + /// + [InputControl(useStateFrom = "y", parameters = "clamp=1,clampMin=0,clampMax=3.402823E+38", synthetic = true, displayName = "Up")] + [Preserve] + public AxisControl up { get; set; } + + /// + /// A synthetic axis representing the lower half of the Y axis value, i.e. the -1 to 1 range (inverted). + /// + /// Control representing the control's lower half Y axis. + /// + /// The control is marked as . + /// + [InputControl(useStateFrom = "y", parameters = "clamp=1,clampMin=-3.402823E+38,clampMax=0,invert", synthetic = true, displayName = "Down")] + [Preserve] + public AxisControl down { get; set; } + + /// + /// A synthetic axis representing the left half of the X axis value, i.e. the -1 to 1 range (inverted). + /// + /// Control representing the control's left half X axis. + /// + /// The control is marked as . + /// + [InputControl(useStateFrom = "x", parameters = "clamp=1,clampMin=-3.402823E+38,clampMax=0,invert", synthetic = true, displayName = "Left")] + [Preserve] + public AxisControl left { get; set; } + + /// + /// A synthetic axis representing the right half of the X axis value, i.e. the 0 to 1 range. + /// + /// Control representing the control's right half X axis. + /// + /// The control is marked as . + /// + [InputControl(useStateFrom = "x", parameters = "clamp=1,clampMin=0,clampMax=3.402823E+38", synthetic = true, displayName = "Right")] + [Preserve] + public AxisControl right { get; set; } + + protected override void FinishSetup() + { + base.FinishSetup(); + + up = GetChildControl("up"); + down = GetChildControl("down"); + left = GetChildControl("left"); + right = GetChildControl("right"); + } + } +} diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/DeltaControl.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Controls/DeltaControl.cs.meta new file mode 100644 index 0000000000..1cd599ea00 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/DeltaControl.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 339c9c6bc0554ad79681e127d417ef3d +timeCreated: 1630420986 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/StickControl.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/StickControl.cs index c4b55a4908..2ecea7f7a5 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Controls/StickControl.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/StickControl.cs @@ -62,11 +62,10 @@ public class StickControl : Vector2Control //// from state correctly. /// - /// A synthetic button representing the upper half of the stick's Y axis. + /// A synthetic button representing the upper half of the stick's Y axis, i.e. the 0 to 1 range. /// /// Control representing the stick's upper half Y axis. /// - /// /// The control is marked as . /// [InputControl(useStateFrom = "y", processors = "axisDeadzone", parameters = "clamp=2,clampMin=0,clampMax=1", synthetic = true, displayName = "Up")] @@ -77,12 +76,33 @@ public class StickControl : Vector2Control [InputControl(name = "y", minValue = -1f, maxValue = 1f, layout = "Axis", processors = "axisDeadzone")] public ButtonControl up { get; set; } + /// + /// A synthetic button representing the lower half of the stick's Y axis, i.e. the -1 to 0 range (inverted). + /// + /// Control representing the stick's lower half Y axis. + /// + /// The control is marked as . + /// [InputControl(useStateFrom = "y", processors = "axisDeadzone", parameters = "clamp=2,clampMin=-1,clampMax=0,invert", synthetic = true, displayName = "Down")] public ButtonControl down { get; set; } + /// + /// A synthetic button representing the left half of the stick's X axis, i.e. the -1 to 0 range (inverted). + /// + /// Control representing the stick's left half X axis. + /// + /// The control is marked as . + /// [InputControl(useStateFrom = "x", processors = "axisDeadzone", parameters = "clamp=2,clampMin=-1,clampMax=0,invert", synthetic = true, displayName = "Left")] public ButtonControl left { get; set; } + /// + /// A synthetic button representing the right half of the stick's X axis, i.e. the 0 to 1 range. + /// + /// Control representing the stick's right half X axis. + /// + /// The control is marked as . + /// [InputControl(useStateFrom = "x", processors = "axisDeadzone", parameters = "clamp=2,clampMin=0,clampMax=1", synthetic = true, displayName = "Right")] public ButtonControl right { get; set; } diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/TouchControl.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/TouchControl.cs index f3e848d631..c40044083b 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Controls/TouchControl.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/TouchControl.cs @@ -69,7 +69,7 @@ public class TouchControl : InputControl /// controls. See for details. /// /// - public Vector2Control delta { get; set; } + public DeltaControl delta { get; set; } /// /// Normalized pressure of the touch against the touch surface. @@ -204,7 +204,7 @@ protected override void FinishSetup() press = GetChildControl("press"); touchId = GetChildControl("touchId"); position = GetChildControl("position"); - delta = GetChildControl("delta"); + delta = GetChildControl("delta"); pressure = GetChildControl("pressure"); radius = GetChildControl("radius"); phase = GetChildControl("phase"); diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/Vector2Control.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/Vector2Control.cs index 493804b2eb..557d0c9701 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Controls/Vector2Control.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/Vector2Control.cs @@ -15,9 +15,9 @@ namespace UnityEngine.InputSystem.Controls /// Mouse.current.position.x.ReadValue(), /// Mouse.current.position.y.ReadValue())); /// + /// /// /// Normalization is not implied. The X and Y coordinates can be in any range or units. - /// /// public class Vector2Control : InputControl { diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Mouse.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Mouse.cs index eee406c743..5ef58fbbec 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Devices/Mouse.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Devices/Mouse.cs @@ -36,7 +36,7 @@ public struct MouseState : IInputStateTypeInfo /// /// Mouse movement. /// - [InputControl(usage = "Secondary2DMotion")] + [InputControl(usage = "Secondary2DMotion", layout = "Delta")] [FieldOffset(8)] public Vector2 delta; @@ -46,7 +46,7 @@ public struct MouseState : IInputStateTypeInfo /// /// Scroll wheel delta. /// - [InputControl(displayName = "Scroll")] + [InputControl(displayName = "Scroll", layout = "Delta")] [InputControl(name = "scroll/x", aliases = new[] { "horizontal" }, usage = "ScrollHorizontal", displayName = "Left/Right")] [InputControl(name = "scroll/y", aliases = new[] { "vertical" }, usage = "ScrollVertical", displayName = "Up/Down", shortDisplayName = "Wheel")] [FieldOffset(16)] @@ -178,7 +178,7 @@ public class Mouse : Pointer, IInputStateCallbackReceiver /// y component to the vertical scroll wheel. Most mice do not have /// horizontal scroll wheels and will thus only see activity on y. /// - public Vector2Control scroll { get; protected set; } + public DeltaControl scroll { get; protected set; } /// /// The left mouse button. @@ -280,7 +280,7 @@ public void WarpCursorPosition(Vector2 position) /// protected override void FinishSetup() { - scroll = GetChildControl("scroll"); + scroll = GetChildControl("scroll"); leftButton = GetChildControl("leftButton"); middleButton = GetChildControl("middleButton"); rightButton = GetChildControl("rightButton"); diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Pen.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Pen.cs index a51749bae4..96b0257c67 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Devices/Pen.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Devices/Pen.cs @@ -44,7 +44,7 @@ public struct PenState : IInputStateTypeInfo /// /// Screen-space motion delta. /// - [InputControl(usage = "Secondary2DMotion")] + [InputControl(usage = "Secondary2DMotion", layout = "Delta")] [FieldOffset(8)] public Vector2 delta; diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Pointer.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Pointer.cs index 0d7a4b0a02..8ab6d1ddfd 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Devices/Pointer.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Devices/Pointer.cs @@ -48,7 +48,7 @@ internal struct PointerState : IInputStateTypeInfo public Vector2 position; ////REVIEW: if we have Secondary2DMotion on this, seems like this should be normalized - [InputControl(layout = "Vector2", displayName = "Delta", usage = "Secondary2DMotion")] + [InputControl(layout = "Delta", displayName = "Delta", usage = "Secondary2DMotion")] public Vector2 delta; [InputControl(layout = "Analog", displayName = "Pressure", usage = "Pressure", defaultState = 1f)] @@ -143,7 +143,7 @@ public class Pointer : InputDevice, IInputStateCallbackReceiver /// not (2,2) even though that's the value received from the event. /// /// - public Vector2Control delta { get; protected set; } + public DeltaControl delta { get; protected set; } ////REVIEW: move this down to only TouchScreen? /// @@ -206,7 +206,7 @@ protected override void OnRemoved() protected override void FinishSetup() { position = GetChildControl("position"); - delta = GetChildControl("delta"); + delta = GetChildControl("delta"); radius = GetChildControl("radius"); pressure = GetChildControl("pressure"); press = GetChildControl("press"); diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastMouse.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastMouse.cs index adbb88da18..6c722c021f 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastMouse.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastMouse.cs @@ -21,10 +21,10 @@ namespace UnityEngine.InputSystem { internal partial class FastMouse : UnityEngine.InputSystem.Mouse { - public const string metadata = "AutoWindowSpace;Vector2;Button;Axis;Digital;Integer;Mouse;Pointer"; + public const string metadata = "AutoWindowSpace;Vector2;Delta;Button;Axis;Digital;Integer;Mouse;Pointer"; public FastMouse() { - var builder = this.Setup(21, 10, 2) + var builder = this.Setup(29, 10, 2) .WithName("Mouse") .WithDisplayName("Mouse") .WithChildren(0, 13) @@ -32,6 +32,7 @@ public FastMouse() .WithStateBlock(new InputStateBlock { format = new FourCC(1297044819), sizeInBits = 392 }); var kVector2Layout = new InternedString("Vector2"); + var kDeltaLayout = new InternedString("Delta"); var kButtonLayout = new InternedString("Button"); var kAxisLayout = new InternedString("Axis"); var kDigitalLayout = new InternedString("Digital"); @@ -41,10 +42,10 @@ public FastMouse() var ctrlMouseposition = Initialize_ctrlMouseposition(kVector2Layout, this); // /Mouse/delta - var ctrlMousedelta = Initialize_ctrlMousedelta(kVector2Layout, this); + var ctrlMousedelta = Initialize_ctrlMousedelta(kDeltaLayout, this); // /Mouse/scroll - var ctrlMousescroll = Initialize_ctrlMousescroll(kVector2Layout, this); + var ctrlMousescroll = Initialize_ctrlMousescroll(kDeltaLayout, this); // /Mouse/press var ctrlMousepress = Initialize_ctrlMousepress(kButtonLayout, this); @@ -82,12 +83,36 @@ public FastMouse() // /Mouse/position/y var ctrlMousepositiony = Initialize_ctrlMousepositiony(kAxisLayout, ctrlMouseposition); + // /Mouse/delta/up + var ctrlMousedeltaup = Initialize_ctrlMousedeltaup(kAxisLayout, ctrlMousedelta); + + // /Mouse/delta/down + var ctrlMousedeltadown = Initialize_ctrlMousedeltadown(kAxisLayout, ctrlMousedelta); + + // /Mouse/delta/left + var ctrlMousedeltaleft = Initialize_ctrlMousedeltaleft(kAxisLayout, ctrlMousedelta); + + // /Mouse/delta/right + var ctrlMousedeltaright = Initialize_ctrlMousedeltaright(kAxisLayout, ctrlMousedelta); + // /Mouse/delta/x var ctrlMousedeltax = Initialize_ctrlMousedeltax(kAxisLayout, ctrlMousedelta); // /Mouse/delta/y var ctrlMousedeltay = Initialize_ctrlMousedeltay(kAxisLayout, ctrlMousedelta); + // /Mouse/scroll/up + var ctrlMousescrollup = Initialize_ctrlMousescrollup(kAxisLayout, ctrlMousescroll); + + // /Mouse/scroll/down + var ctrlMousescrolldown = Initialize_ctrlMousescrolldown(kAxisLayout, ctrlMousescroll); + + // /Mouse/scroll/left + var ctrlMousescrollleft = Initialize_ctrlMousescrollleft(kAxisLayout, ctrlMousescroll); + + // /Mouse/scroll/right + var ctrlMousescrollright = Initialize_ctrlMousescrollright(kAxisLayout, ctrlMousescroll); + // /Mouse/scroll/x var ctrlMousescrollx = Initialize_ctrlMousescrollx(kAxisLayout, ctrlMousescroll); @@ -131,8 +156,16 @@ public FastMouse() this.press = ctrlMousepress; ctrlMouseposition.x = ctrlMousepositionx; ctrlMouseposition.y = ctrlMousepositiony; + ctrlMousedelta.up = ctrlMousedeltaup; + ctrlMousedelta.down = ctrlMousedeltadown; + ctrlMousedelta.left = ctrlMousedeltaleft; + ctrlMousedelta.right = ctrlMousedeltaright; ctrlMousedelta.x = ctrlMousedeltax; ctrlMousedelta.y = ctrlMousedeltay; + ctrlMousescroll.up = ctrlMousescrollup; + ctrlMousescroll.down = ctrlMousescrolldown; + ctrlMousescroll.left = ctrlMousescrollleft; + ctrlMousescroll.right = ctrlMousescrollright; ctrlMousescroll.x = ctrlMousescrollx; ctrlMousescroll.y = ctrlMousescrolly; ctrlMouseradius.x = ctrlMouseradiusx; @@ -141,8 +174,9 @@ public FastMouse() // State offset to control index map. builder.WithStateOffsetToControlIndexMap(new uint[] { - 32781u, 16809998u, 33587215u, 50364432u, 67141649u, 83918866u, 100664323u, 100664324u, 101188613u, 101712902u - , 102237191u, 102761480u, 117456908u, 134250505u, 167804947u, 184582164u, 201327627u + 32781u, 16809998u, 33587217u, 33587218u, 33587219u, 50364431u, 50364432u, 50364436u, 67141655u, 67141656u + , 67141657u, 83918869u, 83918870u, 83918874u, 100664323u, 100664324u, 101188613u, 101712902u, 102237191u, 102761480u + , 117456908u, 134250505u, 167804955u, 184582172u, 201327627u }); builder.Finish(); @@ -174,16 +208,16 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlMouseposi return ctrlMouseposition; } - private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlMousedelta(InternedString kVector2Layout, InputControl parent) + private UnityEngine.InputSystem.Controls.DeltaControl Initialize_ctrlMousedelta(InternedString kDeltaLayout, InputControl parent) { - var ctrlMousedelta = new UnityEngine.InputSystem.Controls.Vector2Control(); + var ctrlMousedelta = new UnityEngine.InputSystem.Controls.DeltaControl(); ctrlMousedelta.Setup() .At(this, 1) .WithParent(parent) - .WithChildren(15, 2) + .WithChildren(15, 6) .WithName("delta") .WithDisplayName("Delta") - .WithLayout(kVector2Layout) + .WithLayout(kDeltaLayout) .WithUsages(1, 1) .WithStateBlock(new InputStateBlock { @@ -196,16 +230,16 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlMousedelt return ctrlMousedelta; } - private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlMousescroll(InternedString kVector2Layout, InputControl parent) + private UnityEngine.InputSystem.Controls.DeltaControl Initialize_ctrlMousescroll(InternedString kDeltaLayout, InputControl parent) { - var ctrlMousescroll = new UnityEngine.InputSystem.Controls.Vector2Control(); + var ctrlMousescroll = new UnityEngine.InputSystem.Controls.DeltaControl(); ctrlMousescroll.Setup() .At(this, 2) .WithParent(parent) - .WithChildren(17, 2) + .WithChildren(21, 6) .WithName("scroll") .WithDisplayName("Scroll") - .WithLayout(kVector2Layout) + .WithLayout(kDeltaLayout) .WithStateBlock(new InputStateBlock { format = new FourCC(1447379762), @@ -385,7 +419,7 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlMouseradi ctrlMouseradius.Setup() .At(this, 10) .WithParent(parent) - .WithChildren(19, 2) + .WithChildren(27, 2) .WithName("radius") .WithDisplayName("Radius") .WithLayout(kVector2Layout) @@ -486,11 +520,99 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlMousepositio return ctrlMousepositiony; } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlMousedeltaup(InternedString kAxisLayout, InputControl parent) + { + var ctrlMousedeltaup = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlMousedeltaup.Setup() + .At(this, 15) + .WithParent(parent) + .WithName("up") + .WithDisplayName("Delta Up") + .WithShortDisplayName("Delta Up") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 12, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlMousedeltaup; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlMousedeltadown(InternedString kAxisLayout, InputControl parent) + { + var ctrlMousedeltadown = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlMousedeltadown.Setup() + .At(this, 16) + .WithParent(parent) + .WithName("down") + .WithDisplayName("Delta Down") + .WithShortDisplayName("Delta Down") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 12, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlMousedeltadown; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlMousedeltaleft(InternedString kAxisLayout, InputControl parent) + { + var ctrlMousedeltaleft = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlMousedeltaleft.Setup() + .At(this, 17) + .WithParent(parent) + .WithName("left") + .WithDisplayName("Delta Left") + .WithShortDisplayName("Delta Left") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 8, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlMousedeltaleft; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlMousedeltaright(InternedString kAxisLayout, InputControl parent) + { + var ctrlMousedeltaright = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlMousedeltaright.Setup() + .At(this, 18) + .WithParent(parent) + .WithName("right") + .WithDisplayName("Delta Right") + .WithShortDisplayName("Delta Right") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 8, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlMousedeltaright; + } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlMousedeltax(InternedString kAxisLayout, InputControl parent) { var ctrlMousedeltax = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlMousedeltax.Setup() - .At(this, 15) + .At(this, 19) .WithParent(parent) .WithName("x") .WithDisplayName("Delta X") @@ -511,7 +633,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlMousedeltay( { var ctrlMousedeltay = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlMousedeltay.Setup() - .At(this, 16) + .At(this, 20) .WithParent(parent) .WithName("y") .WithDisplayName("Delta Y") @@ -528,11 +650,99 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlMousedeltay( return ctrlMousedeltay; } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlMousescrollup(InternedString kAxisLayout, InputControl parent) + { + var ctrlMousescrollup = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlMousescrollup.Setup() + .At(this, 21) + .WithParent(parent) + .WithName("up") + .WithDisplayName("Scroll Up") + .WithShortDisplayName("Scroll Up") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 20, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlMousescrollup; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlMousescrolldown(InternedString kAxisLayout, InputControl parent) + { + var ctrlMousescrolldown = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlMousescrolldown.Setup() + .At(this, 22) + .WithParent(parent) + .WithName("down") + .WithDisplayName("Scroll Down") + .WithShortDisplayName("Scroll Down") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 20, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlMousescrolldown; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlMousescrollleft(InternedString kAxisLayout, InputControl parent) + { + var ctrlMousescrollleft = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlMousescrollleft.Setup() + .At(this, 23) + .WithParent(parent) + .WithName("left") + .WithDisplayName("Scroll Left") + .WithShortDisplayName("Scroll Left") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 16, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlMousescrollleft; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlMousescrollright(InternedString kAxisLayout, InputControl parent) + { + var ctrlMousescrollright = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlMousescrollright.Setup() + .At(this, 24) + .WithParent(parent) + .WithName("right") + .WithDisplayName("Scroll Right") + .WithShortDisplayName("Scroll Right") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 16, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlMousescrollright; + } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlMousescrollx(InternedString kAxisLayout, InputControl parent) { var ctrlMousescrollx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlMousescrollx.Setup() - .At(this, 17) + .At(this, 25) .WithParent(parent) .WithName("x") .WithDisplayName("Scroll Left/Right") @@ -555,7 +765,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlMousescrolly { var ctrlMousescrolly = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlMousescrolly.Setup() - .At(this, 18) + .At(this, 26) .WithParent(parent) .WithName("y") .WithDisplayName("Scroll Up/Down") @@ -578,7 +788,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlMouseradiusx { var ctrlMouseradiusx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlMouseradiusx.Setup() - .At(this, 19) + .At(this, 27) .WithParent(parent) .WithName("x") .WithDisplayName("Radius X") @@ -599,7 +809,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlMouseradiusy { var ctrlMouseradiusy = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlMouseradiusy.Setup() - .At(this, 20) + .At(this, 28) .WithParent(parent) .WithName("y") .WithDisplayName("Radius Y") diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastTouchscreen.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastTouchscreen.cs index 0906592e86..ca36a71822 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastTouchscreen.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastTouchscreen.cs @@ -21,10 +21,10 @@ namespace UnityEngine.InputSystem { internal partial class FastTouchscreen : UnityEngine.InputSystem.Touchscreen { - public const string metadata = "AutoWindowSpace;Touch;Vector2;Analog;TouchPress;Button;Axis;Integer;TouchPhase;Double;Touchscreen;Pointer"; + public const string metadata = "AutoWindowSpace;Touch;Vector2;Delta;Analog;TouchPress;Button;Axis;Integer;TouchPhase;Double;Touchscreen;Pointer"; public FastTouchscreen() { - var builder = this.Setup(242, 5, 0) + var builder = this.Setup(290, 5, 0) .WithName("Touchscreen") .WithDisplayName("Touchscreen") .WithChildren(0, 16) @@ -33,6 +33,7 @@ public FastTouchscreen() var kTouchLayout = new InternedString("Touch"); var kVector2Layout = new InternedString("Vector2"); + var kDeltaLayout = new InternedString("Delta"); var kAnalogLayout = new InternedString("Analog"); var kTouchPressLayout = new InternedString("TouchPress"); var kIntegerLayout = new InternedString("Integer"); @@ -48,7 +49,7 @@ public FastTouchscreen() var ctrlTouchscreenposition = Initialize_ctrlTouchscreenposition(kVector2Layout, this); // /Touchscreen/delta - var ctrlTouchscreendelta = Initialize_ctrlTouchscreendelta(kVector2Layout, this); + var ctrlTouchscreendelta = Initialize_ctrlTouchscreendelta(kDeltaLayout, this); // /Touchscreen/pressure var ctrlTouchscreenpressure = Initialize_ctrlTouchscreenpressure(kAnalogLayout, this); @@ -96,7 +97,7 @@ public FastTouchscreen() var ctrlTouchscreenprimaryTouchposition = Initialize_ctrlTouchscreenprimaryTouchposition(kVector2Layout, ctrlTouchscreenprimaryTouch); // /Touchscreen/primaryTouch/delta - var ctrlTouchscreenprimaryTouchdelta = Initialize_ctrlTouchscreenprimaryTouchdelta(kVector2Layout, ctrlTouchscreenprimaryTouch); + var ctrlTouchscreenprimaryTouchdelta = Initialize_ctrlTouchscreenprimaryTouchdelta(kDeltaLayout, ctrlTouchscreenprimaryTouch); // /Touchscreen/primaryTouch/pressure var ctrlTouchscreenprimaryTouchpressure = Initialize_ctrlTouchscreenprimaryTouchpressure(kAxisLayout, ctrlTouchscreenprimaryTouch); @@ -131,6 +132,18 @@ public FastTouchscreen() // /Touchscreen/primaryTouch/position/y var ctrlTouchscreenprimaryTouchpositiony = Initialize_ctrlTouchscreenprimaryTouchpositiony(kAxisLayout, ctrlTouchscreenprimaryTouchposition); + // /Touchscreen/primaryTouch/delta/up + var ctrlTouchscreenprimaryTouchdeltaup = Initialize_ctrlTouchscreenprimaryTouchdeltaup(kAxisLayout, ctrlTouchscreenprimaryTouchdelta); + + // /Touchscreen/primaryTouch/delta/down + var ctrlTouchscreenprimaryTouchdeltadown = Initialize_ctrlTouchscreenprimaryTouchdeltadown(kAxisLayout, ctrlTouchscreenprimaryTouchdelta); + + // /Touchscreen/primaryTouch/delta/left + var ctrlTouchscreenprimaryTouchdeltaleft = Initialize_ctrlTouchscreenprimaryTouchdeltaleft(kAxisLayout, ctrlTouchscreenprimaryTouchdelta); + + // /Touchscreen/primaryTouch/delta/right + var ctrlTouchscreenprimaryTouchdeltaright = Initialize_ctrlTouchscreenprimaryTouchdeltaright(kAxisLayout, ctrlTouchscreenprimaryTouchdelta); + // /Touchscreen/primaryTouch/delta/x var ctrlTouchscreenprimaryTouchdeltax = Initialize_ctrlTouchscreenprimaryTouchdeltax(kAxisLayout, ctrlTouchscreenprimaryTouchdelta); @@ -155,6 +168,18 @@ public FastTouchscreen() // /Touchscreen/position/y var ctrlTouchscreenpositiony = Initialize_ctrlTouchscreenpositiony(kAxisLayout, ctrlTouchscreenposition); + // /Touchscreen/delta/up + var ctrlTouchscreendeltaup = Initialize_ctrlTouchscreendeltaup(kAxisLayout, ctrlTouchscreendelta); + + // /Touchscreen/delta/down + var ctrlTouchscreendeltadown = Initialize_ctrlTouchscreendeltadown(kAxisLayout, ctrlTouchscreendelta); + + // /Touchscreen/delta/left + var ctrlTouchscreendeltaleft = Initialize_ctrlTouchscreendeltaleft(kAxisLayout, ctrlTouchscreendelta); + + // /Touchscreen/delta/right + var ctrlTouchscreendeltaright = Initialize_ctrlTouchscreendeltaright(kAxisLayout, ctrlTouchscreendelta); + // /Touchscreen/delta/x var ctrlTouchscreendeltax = Initialize_ctrlTouchscreendeltax(kAxisLayout, ctrlTouchscreendelta); @@ -174,7 +199,7 @@ public FastTouchscreen() var ctrlTouchscreentouch0position = Initialize_ctrlTouchscreentouch0position(kVector2Layout, ctrlTouchscreentouch0); // /Touchscreen/touch0/delta - var ctrlTouchscreentouch0delta = Initialize_ctrlTouchscreentouch0delta(kVector2Layout, ctrlTouchscreentouch0); + var ctrlTouchscreentouch0delta = Initialize_ctrlTouchscreentouch0delta(kDeltaLayout, ctrlTouchscreentouch0); // /Touchscreen/touch0/pressure var ctrlTouchscreentouch0pressure = Initialize_ctrlTouchscreentouch0pressure(kAxisLayout, ctrlTouchscreentouch0); @@ -209,6 +234,18 @@ public FastTouchscreen() // /Touchscreen/touch0/position/y var ctrlTouchscreentouch0positiony = Initialize_ctrlTouchscreentouch0positiony(kAxisLayout, ctrlTouchscreentouch0position); + // /Touchscreen/touch0/delta/up + var ctrlTouchscreentouch0deltaup = Initialize_ctrlTouchscreentouch0deltaup(kAxisLayout, ctrlTouchscreentouch0delta); + + // /Touchscreen/touch0/delta/down + var ctrlTouchscreentouch0deltadown = Initialize_ctrlTouchscreentouch0deltadown(kAxisLayout, ctrlTouchscreentouch0delta); + + // /Touchscreen/touch0/delta/left + var ctrlTouchscreentouch0deltaleft = Initialize_ctrlTouchscreentouch0deltaleft(kAxisLayout, ctrlTouchscreentouch0delta); + + // /Touchscreen/touch0/delta/right + var ctrlTouchscreentouch0deltaright = Initialize_ctrlTouchscreentouch0deltaright(kAxisLayout, ctrlTouchscreentouch0delta); + // /Touchscreen/touch0/delta/x var ctrlTouchscreentouch0deltax = Initialize_ctrlTouchscreentouch0deltax(kAxisLayout, ctrlTouchscreentouch0delta); @@ -234,7 +271,7 @@ public FastTouchscreen() var ctrlTouchscreentouch1position = Initialize_ctrlTouchscreentouch1position(kVector2Layout, ctrlTouchscreentouch1); // /Touchscreen/touch1/delta - var ctrlTouchscreentouch1delta = Initialize_ctrlTouchscreentouch1delta(kVector2Layout, ctrlTouchscreentouch1); + var ctrlTouchscreentouch1delta = Initialize_ctrlTouchscreentouch1delta(kDeltaLayout, ctrlTouchscreentouch1); // /Touchscreen/touch1/pressure var ctrlTouchscreentouch1pressure = Initialize_ctrlTouchscreentouch1pressure(kAxisLayout, ctrlTouchscreentouch1); @@ -269,6 +306,18 @@ public FastTouchscreen() // /Touchscreen/touch1/position/y var ctrlTouchscreentouch1positiony = Initialize_ctrlTouchscreentouch1positiony(kAxisLayout, ctrlTouchscreentouch1position); + // /Touchscreen/touch1/delta/up + var ctrlTouchscreentouch1deltaup = Initialize_ctrlTouchscreentouch1deltaup(kAxisLayout, ctrlTouchscreentouch1delta); + + // /Touchscreen/touch1/delta/down + var ctrlTouchscreentouch1deltadown = Initialize_ctrlTouchscreentouch1deltadown(kAxisLayout, ctrlTouchscreentouch1delta); + + // /Touchscreen/touch1/delta/left + var ctrlTouchscreentouch1deltaleft = Initialize_ctrlTouchscreentouch1deltaleft(kAxisLayout, ctrlTouchscreentouch1delta); + + // /Touchscreen/touch1/delta/right + var ctrlTouchscreentouch1deltaright = Initialize_ctrlTouchscreentouch1deltaright(kAxisLayout, ctrlTouchscreentouch1delta); + // /Touchscreen/touch1/delta/x var ctrlTouchscreentouch1deltax = Initialize_ctrlTouchscreentouch1deltax(kAxisLayout, ctrlTouchscreentouch1delta); @@ -294,7 +343,7 @@ public FastTouchscreen() var ctrlTouchscreentouch2position = Initialize_ctrlTouchscreentouch2position(kVector2Layout, ctrlTouchscreentouch2); // /Touchscreen/touch2/delta - var ctrlTouchscreentouch2delta = Initialize_ctrlTouchscreentouch2delta(kVector2Layout, ctrlTouchscreentouch2); + var ctrlTouchscreentouch2delta = Initialize_ctrlTouchscreentouch2delta(kDeltaLayout, ctrlTouchscreentouch2); // /Touchscreen/touch2/pressure var ctrlTouchscreentouch2pressure = Initialize_ctrlTouchscreentouch2pressure(kAxisLayout, ctrlTouchscreentouch2); @@ -329,6 +378,18 @@ public FastTouchscreen() // /Touchscreen/touch2/position/y var ctrlTouchscreentouch2positiony = Initialize_ctrlTouchscreentouch2positiony(kAxisLayout, ctrlTouchscreentouch2position); + // /Touchscreen/touch2/delta/up + var ctrlTouchscreentouch2deltaup = Initialize_ctrlTouchscreentouch2deltaup(kAxisLayout, ctrlTouchscreentouch2delta); + + // /Touchscreen/touch2/delta/down + var ctrlTouchscreentouch2deltadown = Initialize_ctrlTouchscreentouch2deltadown(kAxisLayout, ctrlTouchscreentouch2delta); + + // /Touchscreen/touch2/delta/left + var ctrlTouchscreentouch2deltaleft = Initialize_ctrlTouchscreentouch2deltaleft(kAxisLayout, ctrlTouchscreentouch2delta); + + // /Touchscreen/touch2/delta/right + var ctrlTouchscreentouch2deltaright = Initialize_ctrlTouchscreentouch2deltaright(kAxisLayout, ctrlTouchscreentouch2delta); + // /Touchscreen/touch2/delta/x var ctrlTouchscreentouch2deltax = Initialize_ctrlTouchscreentouch2deltax(kAxisLayout, ctrlTouchscreentouch2delta); @@ -354,7 +415,7 @@ public FastTouchscreen() var ctrlTouchscreentouch3position = Initialize_ctrlTouchscreentouch3position(kVector2Layout, ctrlTouchscreentouch3); // /Touchscreen/touch3/delta - var ctrlTouchscreentouch3delta = Initialize_ctrlTouchscreentouch3delta(kVector2Layout, ctrlTouchscreentouch3); + var ctrlTouchscreentouch3delta = Initialize_ctrlTouchscreentouch3delta(kDeltaLayout, ctrlTouchscreentouch3); // /Touchscreen/touch3/pressure var ctrlTouchscreentouch3pressure = Initialize_ctrlTouchscreentouch3pressure(kAxisLayout, ctrlTouchscreentouch3); @@ -389,6 +450,18 @@ public FastTouchscreen() // /Touchscreen/touch3/position/y var ctrlTouchscreentouch3positiony = Initialize_ctrlTouchscreentouch3positiony(kAxisLayout, ctrlTouchscreentouch3position); + // /Touchscreen/touch3/delta/up + var ctrlTouchscreentouch3deltaup = Initialize_ctrlTouchscreentouch3deltaup(kAxisLayout, ctrlTouchscreentouch3delta); + + // /Touchscreen/touch3/delta/down + var ctrlTouchscreentouch3deltadown = Initialize_ctrlTouchscreentouch3deltadown(kAxisLayout, ctrlTouchscreentouch3delta); + + // /Touchscreen/touch3/delta/left + var ctrlTouchscreentouch3deltaleft = Initialize_ctrlTouchscreentouch3deltaleft(kAxisLayout, ctrlTouchscreentouch3delta); + + // /Touchscreen/touch3/delta/right + var ctrlTouchscreentouch3deltaright = Initialize_ctrlTouchscreentouch3deltaright(kAxisLayout, ctrlTouchscreentouch3delta); + // /Touchscreen/touch3/delta/x var ctrlTouchscreentouch3deltax = Initialize_ctrlTouchscreentouch3deltax(kAxisLayout, ctrlTouchscreentouch3delta); @@ -414,7 +487,7 @@ public FastTouchscreen() var ctrlTouchscreentouch4position = Initialize_ctrlTouchscreentouch4position(kVector2Layout, ctrlTouchscreentouch4); // /Touchscreen/touch4/delta - var ctrlTouchscreentouch4delta = Initialize_ctrlTouchscreentouch4delta(kVector2Layout, ctrlTouchscreentouch4); + var ctrlTouchscreentouch4delta = Initialize_ctrlTouchscreentouch4delta(kDeltaLayout, ctrlTouchscreentouch4); // /Touchscreen/touch4/pressure var ctrlTouchscreentouch4pressure = Initialize_ctrlTouchscreentouch4pressure(kAxisLayout, ctrlTouchscreentouch4); @@ -449,6 +522,18 @@ public FastTouchscreen() // /Touchscreen/touch4/position/y var ctrlTouchscreentouch4positiony = Initialize_ctrlTouchscreentouch4positiony(kAxisLayout, ctrlTouchscreentouch4position); + // /Touchscreen/touch4/delta/up + var ctrlTouchscreentouch4deltaup = Initialize_ctrlTouchscreentouch4deltaup(kAxisLayout, ctrlTouchscreentouch4delta); + + // /Touchscreen/touch4/delta/down + var ctrlTouchscreentouch4deltadown = Initialize_ctrlTouchscreentouch4deltadown(kAxisLayout, ctrlTouchscreentouch4delta); + + // /Touchscreen/touch4/delta/left + var ctrlTouchscreentouch4deltaleft = Initialize_ctrlTouchscreentouch4deltaleft(kAxisLayout, ctrlTouchscreentouch4delta); + + // /Touchscreen/touch4/delta/right + var ctrlTouchscreentouch4deltaright = Initialize_ctrlTouchscreentouch4deltaright(kAxisLayout, ctrlTouchscreentouch4delta); + // /Touchscreen/touch4/delta/x var ctrlTouchscreentouch4deltax = Initialize_ctrlTouchscreentouch4deltax(kAxisLayout, ctrlTouchscreentouch4delta); @@ -474,7 +559,7 @@ public FastTouchscreen() var ctrlTouchscreentouch5position = Initialize_ctrlTouchscreentouch5position(kVector2Layout, ctrlTouchscreentouch5); // /Touchscreen/touch5/delta - var ctrlTouchscreentouch5delta = Initialize_ctrlTouchscreentouch5delta(kVector2Layout, ctrlTouchscreentouch5); + var ctrlTouchscreentouch5delta = Initialize_ctrlTouchscreentouch5delta(kDeltaLayout, ctrlTouchscreentouch5); // /Touchscreen/touch5/pressure var ctrlTouchscreentouch5pressure = Initialize_ctrlTouchscreentouch5pressure(kAxisLayout, ctrlTouchscreentouch5); @@ -509,6 +594,18 @@ public FastTouchscreen() // /Touchscreen/touch5/position/y var ctrlTouchscreentouch5positiony = Initialize_ctrlTouchscreentouch5positiony(kAxisLayout, ctrlTouchscreentouch5position); + // /Touchscreen/touch5/delta/up + var ctrlTouchscreentouch5deltaup = Initialize_ctrlTouchscreentouch5deltaup(kAxisLayout, ctrlTouchscreentouch5delta); + + // /Touchscreen/touch5/delta/down + var ctrlTouchscreentouch5deltadown = Initialize_ctrlTouchscreentouch5deltadown(kAxisLayout, ctrlTouchscreentouch5delta); + + // /Touchscreen/touch5/delta/left + var ctrlTouchscreentouch5deltaleft = Initialize_ctrlTouchscreentouch5deltaleft(kAxisLayout, ctrlTouchscreentouch5delta); + + // /Touchscreen/touch5/delta/right + var ctrlTouchscreentouch5deltaright = Initialize_ctrlTouchscreentouch5deltaright(kAxisLayout, ctrlTouchscreentouch5delta); + // /Touchscreen/touch5/delta/x var ctrlTouchscreentouch5deltax = Initialize_ctrlTouchscreentouch5deltax(kAxisLayout, ctrlTouchscreentouch5delta); @@ -534,7 +631,7 @@ public FastTouchscreen() var ctrlTouchscreentouch6position = Initialize_ctrlTouchscreentouch6position(kVector2Layout, ctrlTouchscreentouch6); // /Touchscreen/touch6/delta - var ctrlTouchscreentouch6delta = Initialize_ctrlTouchscreentouch6delta(kVector2Layout, ctrlTouchscreentouch6); + var ctrlTouchscreentouch6delta = Initialize_ctrlTouchscreentouch6delta(kDeltaLayout, ctrlTouchscreentouch6); // /Touchscreen/touch6/pressure var ctrlTouchscreentouch6pressure = Initialize_ctrlTouchscreentouch6pressure(kAxisLayout, ctrlTouchscreentouch6); @@ -569,6 +666,18 @@ public FastTouchscreen() // /Touchscreen/touch6/position/y var ctrlTouchscreentouch6positiony = Initialize_ctrlTouchscreentouch6positiony(kAxisLayout, ctrlTouchscreentouch6position); + // /Touchscreen/touch6/delta/up + var ctrlTouchscreentouch6deltaup = Initialize_ctrlTouchscreentouch6deltaup(kAxisLayout, ctrlTouchscreentouch6delta); + + // /Touchscreen/touch6/delta/down + var ctrlTouchscreentouch6deltadown = Initialize_ctrlTouchscreentouch6deltadown(kAxisLayout, ctrlTouchscreentouch6delta); + + // /Touchscreen/touch6/delta/left + var ctrlTouchscreentouch6deltaleft = Initialize_ctrlTouchscreentouch6deltaleft(kAxisLayout, ctrlTouchscreentouch6delta); + + // /Touchscreen/touch6/delta/right + var ctrlTouchscreentouch6deltaright = Initialize_ctrlTouchscreentouch6deltaright(kAxisLayout, ctrlTouchscreentouch6delta); + // /Touchscreen/touch6/delta/x var ctrlTouchscreentouch6deltax = Initialize_ctrlTouchscreentouch6deltax(kAxisLayout, ctrlTouchscreentouch6delta); @@ -594,7 +703,7 @@ public FastTouchscreen() var ctrlTouchscreentouch7position = Initialize_ctrlTouchscreentouch7position(kVector2Layout, ctrlTouchscreentouch7); // /Touchscreen/touch7/delta - var ctrlTouchscreentouch7delta = Initialize_ctrlTouchscreentouch7delta(kVector2Layout, ctrlTouchscreentouch7); + var ctrlTouchscreentouch7delta = Initialize_ctrlTouchscreentouch7delta(kDeltaLayout, ctrlTouchscreentouch7); // /Touchscreen/touch7/pressure var ctrlTouchscreentouch7pressure = Initialize_ctrlTouchscreentouch7pressure(kAxisLayout, ctrlTouchscreentouch7); @@ -629,6 +738,18 @@ public FastTouchscreen() // /Touchscreen/touch7/position/y var ctrlTouchscreentouch7positiony = Initialize_ctrlTouchscreentouch7positiony(kAxisLayout, ctrlTouchscreentouch7position); + // /Touchscreen/touch7/delta/up + var ctrlTouchscreentouch7deltaup = Initialize_ctrlTouchscreentouch7deltaup(kAxisLayout, ctrlTouchscreentouch7delta); + + // /Touchscreen/touch7/delta/down + var ctrlTouchscreentouch7deltadown = Initialize_ctrlTouchscreentouch7deltadown(kAxisLayout, ctrlTouchscreentouch7delta); + + // /Touchscreen/touch7/delta/left + var ctrlTouchscreentouch7deltaleft = Initialize_ctrlTouchscreentouch7deltaleft(kAxisLayout, ctrlTouchscreentouch7delta); + + // /Touchscreen/touch7/delta/right + var ctrlTouchscreentouch7deltaright = Initialize_ctrlTouchscreentouch7deltaright(kAxisLayout, ctrlTouchscreentouch7delta); + // /Touchscreen/touch7/delta/x var ctrlTouchscreentouch7deltax = Initialize_ctrlTouchscreentouch7deltax(kAxisLayout, ctrlTouchscreentouch7delta); @@ -654,7 +775,7 @@ public FastTouchscreen() var ctrlTouchscreentouch8position = Initialize_ctrlTouchscreentouch8position(kVector2Layout, ctrlTouchscreentouch8); // /Touchscreen/touch8/delta - var ctrlTouchscreentouch8delta = Initialize_ctrlTouchscreentouch8delta(kVector2Layout, ctrlTouchscreentouch8); + var ctrlTouchscreentouch8delta = Initialize_ctrlTouchscreentouch8delta(kDeltaLayout, ctrlTouchscreentouch8); // /Touchscreen/touch8/pressure var ctrlTouchscreentouch8pressure = Initialize_ctrlTouchscreentouch8pressure(kAxisLayout, ctrlTouchscreentouch8); @@ -689,6 +810,18 @@ public FastTouchscreen() // /Touchscreen/touch8/position/y var ctrlTouchscreentouch8positiony = Initialize_ctrlTouchscreentouch8positiony(kAxisLayout, ctrlTouchscreentouch8position); + // /Touchscreen/touch8/delta/up + var ctrlTouchscreentouch8deltaup = Initialize_ctrlTouchscreentouch8deltaup(kAxisLayout, ctrlTouchscreentouch8delta); + + // /Touchscreen/touch8/delta/down + var ctrlTouchscreentouch8deltadown = Initialize_ctrlTouchscreentouch8deltadown(kAxisLayout, ctrlTouchscreentouch8delta); + + // /Touchscreen/touch8/delta/left + var ctrlTouchscreentouch8deltaleft = Initialize_ctrlTouchscreentouch8deltaleft(kAxisLayout, ctrlTouchscreentouch8delta); + + // /Touchscreen/touch8/delta/right + var ctrlTouchscreentouch8deltaright = Initialize_ctrlTouchscreentouch8deltaright(kAxisLayout, ctrlTouchscreentouch8delta); + // /Touchscreen/touch8/delta/x var ctrlTouchscreentouch8deltax = Initialize_ctrlTouchscreentouch8deltax(kAxisLayout, ctrlTouchscreentouch8delta); @@ -714,7 +847,7 @@ public FastTouchscreen() var ctrlTouchscreentouch9position = Initialize_ctrlTouchscreentouch9position(kVector2Layout, ctrlTouchscreentouch9); // /Touchscreen/touch9/delta - var ctrlTouchscreentouch9delta = Initialize_ctrlTouchscreentouch9delta(kVector2Layout, ctrlTouchscreentouch9); + var ctrlTouchscreentouch9delta = Initialize_ctrlTouchscreentouch9delta(kDeltaLayout, ctrlTouchscreentouch9); // /Touchscreen/touch9/pressure var ctrlTouchscreentouch9pressure = Initialize_ctrlTouchscreentouch9pressure(kAxisLayout, ctrlTouchscreentouch9); @@ -749,6 +882,18 @@ public FastTouchscreen() // /Touchscreen/touch9/position/y var ctrlTouchscreentouch9positiony = Initialize_ctrlTouchscreentouch9positiony(kAxisLayout, ctrlTouchscreentouch9position); + // /Touchscreen/touch9/delta/up + var ctrlTouchscreentouch9deltaup = Initialize_ctrlTouchscreentouch9deltaup(kAxisLayout, ctrlTouchscreentouch9delta); + + // /Touchscreen/touch9/delta/down + var ctrlTouchscreentouch9deltadown = Initialize_ctrlTouchscreentouch9deltadown(kAxisLayout, ctrlTouchscreentouch9delta); + + // /Touchscreen/touch9/delta/left + var ctrlTouchscreentouch9deltaleft = Initialize_ctrlTouchscreentouch9deltaleft(kAxisLayout, ctrlTouchscreentouch9delta); + + // /Touchscreen/touch9/delta/right + var ctrlTouchscreentouch9deltaright = Initialize_ctrlTouchscreentouch9deltaright(kAxisLayout, ctrlTouchscreentouch9delta); + // /Touchscreen/touch9/delta/x var ctrlTouchscreentouch9deltax = Initialize_ctrlTouchscreentouch9deltax(kAxisLayout, ctrlTouchscreentouch9delta); @@ -806,6 +951,10 @@ public FastTouchscreen() ctrlTouchscreenprimaryTouch.startPosition = ctrlTouchscreenprimaryTouchstartPosition; ctrlTouchscreenposition.x = ctrlTouchscreenpositionx; ctrlTouchscreenposition.y = ctrlTouchscreenpositiony; + ctrlTouchscreendelta.up = ctrlTouchscreendeltaup; + ctrlTouchscreendelta.down = ctrlTouchscreendeltadown; + ctrlTouchscreendelta.left = ctrlTouchscreendeltaleft; + ctrlTouchscreendelta.right = ctrlTouchscreendeltaright; ctrlTouchscreendelta.x = ctrlTouchscreendeltax; ctrlTouchscreendelta.y = ctrlTouchscreendeltay; ctrlTouchscreenradius.x = ctrlTouchscreenradiusx; @@ -932,6 +1081,10 @@ public FastTouchscreen() ctrlTouchscreentouch9.startPosition = ctrlTouchscreentouch9startPosition; ctrlTouchscreenprimaryTouchposition.x = ctrlTouchscreenprimaryTouchpositionx; ctrlTouchscreenprimaryTouchposition.y = ctrlTouchscreenprimaryTouchpositiony; + ctrlTouchscreenprimaryTouchdelta.up = ctrlTouchscreenprimaryTouchdeltaup; + ctrlTouchscreenprimaryTouchdelta.down = ctrlTouchscreenprimaryTouchdeltadown; + ctrlTouchscreenprimaryTouchdelta.left = ctrlTouchscreenprimaryTouchdeltaleft; + ctrlTouchscreenprimaryTouchdelta.right = ctrlTouchscreenprimaryTouchdeltaright; ctrlTouchscreenprimaryTouchdelta.x = ctrlTouchscreenprimaryTouchdeltax; ctrlTouchscreenprimaryTouchdelta.y = ctrlTouchscreenprimaryTouchdeltay; ctrlTouchscreenprimaryTouchradius.x = ctrlTouchscreenprimaryTouchradiusx; @@ -940,6 +1093,10 @@ public FastTouchscreen() ctrlTouchscreenprimaryTouchstartPosition.y = ctrlTouchscreenprimaryTouchstartPositiony; ctrlTouchscreentouch0position.x = ctrlTouchscreentouch0positionx; ctrlTouchscreentouch0position.y = ctrlTouchscreentouch0positiony; + ctrlTouchscreentouch0delta.up = ctrlTouchscreentouch0deltaup; + ctrlTouchscreentouch0delta.down = ctrlTouchscreentouch0deltadown; + ctrlTouchscreentouch0delta.left = ctrlTouchscreentouch0deltaleft; + ctrlTouchscreentouch0delta.right = ctrlTouchscreentouch0deltaright; ctrlTouchscreentouch0delta.x = ctrlTouchscreentouch0deltax; ctrlTouchscreentouch0delta.y = ctrlTouchscreentouch0deltay; ctrlTouchscreentouch0radius.x = ctrlTouchscreentouch0radiusx; @@ -948,6 +1105,10 @@ public FastTouchscreen() ctrlTouchscreentouch0startPosition.y = ctrlTouchscreentouch0startPositiony; ctrlTouchscreentouch1position.x = ctrlTouchscreentouch1positionx; ctrlTouchscreentouch1position.y = ctrlTouchscreentouch1positiony; + ctrlTouchscreentouch1delta.up = ctrlTouchscreentouch1deltaup; + ctrlTouchscreentouch1delta.down = ctrlTouchscreentouch1deltadown; + ctrlTouchscreentouch1delta.left = ctrlTouchscreentouch1deltaleft; + ctrlTouchscreentouch1delta.right = ctrlTouchscreentouch1deltaright; ctrlTouchscreentouch1delta.x = ctrlTouchscreentouch1deltax; ctrlTouchscreentouch1delta.y = ctrlTouchscreentouch1deltay; ctrlTouchscreentouch1radius.x = ctrlTouchscreentouch1radiusx; @@ -956,6 +1117,10 @@ public FastTouchscreen() ctrlTouchscreentouch1startPosition.y = ctrlTouchscreentouch1startPositiony; ctrlTouchscreentouch2position.x = ctrlTouchscreentouch2positionx; ctrlTouchscreentouch2position.y = ctrlTouchscreentouch2positiony; + ctrlTouchscreentouch2delta.up = ctrlTouchscreentouch2deltaup; + ctrlTouchscreentouch2delta.down = ctrlTouchscreentouch2deltadown; + ctrlTouchscreentouch2delta.left = ctrlTouchscreentouch2deltaleft; + ctrlTouchscreentouch2delta.right = ctrlTouchscreentouch2deltaright; ctrlTouchscreentouch2delta.x = ctrlTouchscreentouch2deltax; ctrlTouchscreentouch2delta.y = ctrlTouchscreentouch2deltay; ctrlTouchscreentouch2radius.x = ctrlTouchscreentouch2radiusx; @@ -964,6 +1129,10 @@ public FastTouchscreen() ctrlTouchscreentouch2startPosition.y = ctrlTouchscreentouch2startPositiony; ctrlTouchscreentouch3position.x = ctrlTouchscreentouch3positionx; ctrlTouchscreentouch3position.y = ctrlTouchscreentouch3positiony; + ctrlTouchscreentouch3delta.up = ctrlTouchscreentouch3deltaup; + ctrlTouchscreentouch3delta.down = ctrlTouchscreentouch3deltadown; + ctrlTouchscreentouch3delta.left = ctrlTouchscreentouch3deltaleft; + ctrlTouchscreentouch3delta.right = ctrlTouchscreentouch3deltaright; ctrlTouchscreentouch3delta.x = ctrlTouchscreentouch3deltax; ctrlTouchscreentouch3delta.y = ctrlTouchscreentouch3deltay; ctrlTouchscreentouch3radius.x = ctrlTouchscreentouch3radiusx; @@ -972,6 +1141,10 @@ public FastTouchscreen() ctrlTouchscreentouch3startPosition.y = ctrlTouchscreentouch3startPositiony; ctrlTouchscreentouch4position.x = ctrlTouchscreentouch4positionx; ctrlTouchscreentouch4position.y = ctrlTouchscreentouch4positiony; + ctrlTouchscreentouch4delta.up = ctrlTouchscreentouch4deltaup; + ctrlTouchscreentouch4delta.down = ctrlTouchscreentouch4deltadown; + ctrlTouchscreentouch4delta.left = ctrlTouchscreentouch4deltaleft; + ctrlTouchscreentouch4delta.right = ctrlTouchscreentouch4deltaright; ctrlTouchscreentouch4delta.x = ctrlTouchscreentouch4deltax; ctrlTouchscreentouch4delta.y = ctrlTouchscreentouch4deltay; ctrlTouchscreentouch4radius.x = ctrlTouchscreentouch4radiusx; @@ -980,6 +1153,10 @@ public FastTouchscreen() ctrlTouchscreentouch4startPosition.y = ctrlTouchscreentouch4startPositiony; ctrlTouchscreentouch5position.x = ctrlTouchscreentouch5positionx; ctrlTouchscreentouch5position.y = ctrlTouchscreentouch5positiony; + ctrlTouchscreentouch5delta.up = ctrlTouchscreentouch5deltaup; + ctrlTouchscreentouch5delta.down = ctrlTouchscreentouch5deltadown; + ctrlTouchscreentouch5delta.left = ctrlTouchscreentouch5deltaleft; + ctrlTouchscreentouch5delta.right = ctrlTouchscreentouch5deltaright; ctrlTouchscreentouch5delta.x = ctrlTouchscreentouch5deltax; ctrlTouchscreentouch5delta.y = ctrlTouchscreentouch5deltay; ctrlTouchscreentouch5radius.x = ctrlTouchscreentouch5radiusx; @@ -988,6 +1165,10 @@ public FastTouchscreen() ctrlTouchscreentouch5startPosition.y = ctrlTouchscreentouch5startPositiony; ctrlTouchscreentouch6position.x = ctrlTouchscreentouch6positionx; ctrlTouchscreentouch6position.y = ctrlTouchscreentouch6positiony; + ctrlTouchscreentouch6delta.up = ctrlTouchscreentouch6deltaup; + ctrlTouchscreentouch6delta.down = ctrlTouchscreentouch6deltadown; + ctrlTouchscreentouch6delta.left = ctrlTouchscreentouch6deltaleft; + ctrlTouchscreentouch6delta.right = ctrlTouchscreentouch6deltaright; ctrlTouchscreentouch6delta.x = ctrlTouchscreentouch6deltax; ctrlTouchscreentouch6delta.y = ctrlTouchscreentouch6deltay; ctrlTouchscreentouch6radius.x = ctrlTouchscreentouch6radiusx; @@ -996,6 +1177,10 @@ public FastTouchscreen() ctrlTouchscreentouch6startPosition.y = ctrlTouchscreentouch6startPositiony; ctrlTouchscreentouch7position.x = ctrlTouchscreentouch7positionx; ctrlTouchscreentouch7position.y = ctrlTouchscreentouch7positiony; + ctrlTouchscreentouch7delta.up = ctrlTouchscreentouch7deltaup; + ctrlTouchscreentouch7delta.down = ctrlTouchscreentouch7deltadown; + ctrlTouchscreentouch7delta.left = ctrlTouchscreentouch7deltaleft; + ctrlTouchscreentouch7delta.right = ctrlTouchscreentouch7deltaright; ctrlTouchscreentouch7delta.x = ctrlTouchscreentouch7deltax; ctrlTouchscreentouch7delta.y = ctrlTouchscreentouch7deltay; ctrlTouchscreentouch7radius.x = ctrlTouchscreentouch7radiusx; @@ -1004,6 +1189,10 @@ public FastTouchscreen() ctrlTouchscreentouch7startPosition.y = ctrlTouchscreentouch7startPositiony; ctrlTouchscreentouch8position.x = ctrlTouchscreentouch8positionx; ctrlTouchscreentouch8position.y = ctrlTouchscreentouch8positiony; + ctrlTouchscreentouch8delta.up = ctrlTouchscreentouch8deltaup; + ctrlTouchscreentouch8delta.down = ctrlTouchscreentouch8deltadown; + ctrlTouchscreentouch8delta.left = ctrlTouchscreentouch8deltaleft; + ctrlTouchscreentouch8delta.right = ctrlTouchscreentouch8deltaright; ctrlTouchscreentouch8delta.x = ctrlTouchscreentouch8deltax; ctrlTouchscreentouch8delta.y = ctrlTouchscreentouch8deltay; ctrlTouchscreentouch8radius.x = ctrlTouchscreentouch8radiusx; @@ -1012,6 +1201,10 @@ public FastTouchscreen() ctrlTouchscreentouch8startPosition.y = ctrlTouchscreentouch8startPositiony; ctrlTouchscreentouch9position.x = ctrlTouchscreentouch9positionx; ctrlTouchscreentouch9position.y = ctrlTouchscreentouch9positiony; + ctrlTouchscreentouch9delta.up = ctrlTouchscreentouch9deltaup; + ctrlTouchscreentouch9delta.down = ctrlTouchscreentouch9deltadown; + ctrlTouchscreentouch9delta.left = ctrlTouchscreentouch9deltaleft; + ctrlTouchscreentouch9delta.right = ctrlTouchscreentouch9deltaright; ctrlTouchscreentouch9delta.x = ctrlTouchscreentouch9deltax; ctrlTouchscreentouch9delta.y = ctrlTouchscreentouch9deltay; ctrlTouchscreentouch9radius.x = ctrlTouchscreentouch9radiusx; @@ -1022,25 +1215,30 @@ public FastTouchscreen() // State offset to control index map. builder.WithStateOffsetToControlIndexMap(new uint[] { - 32784u, 16810012u, 16810020u, 33587229u, 33587237u, 50364446u, 50364454u, 67141663u, 67141671u, 83918851u - , 83918867u, 100696096u, 100696104u, 117473313u, 117473321u, 134225925u, 134225941u, 134225942u, 138420247u, 146801688u - , 148898841u, 167837722u, 201359394u, 218136611u, 234913834u, 251691062u, 268468279u, 285245496u, 302022713u, 318799917u - , 335577146u, 352354363u, 369106991u, 369106992u, 373301297u, 381682738u, 383779891u, 402718772u, 436240444u, 453017661u - , 469794878u, 486572106u, 503349323u, 520126540u, 536903757u, 553680961u, 570458190u, 587235407u, 603988035u, 603988036u - , 608182341u, 616563782u, 618660935u, 637599816u, 671121488u, 687898705u, 704675922u, 721453150u, 738230367u, 755007584u - , 771784801u, 788562005u, 805339234u, 822116451u, 838869079u, 838869080u, 843063385u, 851444826u, 853541979u, 872480860u - , 906002532u, 922779749u, 939556966u, 956334194u, 973111411u, 989888628u, 1006665845u, 1023443049u, 1040220278u, 1056997495u - , 1073750123u, 1073750124u, 1077944429u, 1086325870u, 1088423023u, 1107361904u, 1140883576u, 1157660793u, 1174438010u, 1191215238u - , 1207992455u, 1224769672u, 1241546889u, 1258324093u, 1275101322u, 1291878539u, 1308631167u, 1308631168u, 1312825473u, 1321206914u - , 1323304067u, 1342242948u, 1375764620u, 1392541837u, 1409319054u, 1426096282u, 1442873499u, 1459650716u, 1476427933u, 1493205137u - , 1509982366u, 1526759583u, 1543512211u, 1543512212u, 1547706517u, 1556087958u, 1558185111u, 1577123992u, 1610645664u, 1627422881u - , 1644200098u, 1660977326u, 1677754543u, 1694531760u, 1711308977u, 1728086181u, 1744863410u, 1761640627u, 1778393255u, 1778393256u - , 1782587561u, 1790969002u, 1793066155u, 1812005036u, 1845526708u, 1862303925u, 1879081142u, 1895858370u, 1912635587u, 1929412804u - , 1946190021u, 1962967225u, 1979744454u, 1996521671u, 2013274299u, 2013274300u, 2017468605u, 2025850046u, 2027947199u, 2046886080u - , 2080407752u, 2097184969u, 2113962186u, 2130739414u, 2147516631u, 2164293848u, 2181071065u, 2197848269u, 2214625498u, 2231402715u - , 2248155343u, 2248155344u, 2252349649u, 2260731090u, 2262828243u, 2281767124u, 2315288796u, 2332066013u, 2348843230u, 2365620458u - , 2382397675u, 2399174892u, 2415952109u, 2432729313u, 2449506542u, 2466283759u, 2483036387u, 2483036388u, 2487230693u, 2495612134u - , 2497709287u, 2516648168u, 2550169840u, 2566947057u + 32784u, 16810012u, 16810024u, 33587229u, 33587241u, 50364448u, 50364449u, 50364450u, 50364460u, 50364461u + , 50364462u, 67141662u, 67141663u, 67141667u, 67141674u, 67141675u, 67141679u, 83918851u, 83918867u, 100696100u + , 100696112u, 117473317u, 117473329u, 134225925u, 134225941u, 134225942u, 138420247u, 146801688u, 148898841u, 167837722u + , 201359398u, 218136615u, 234913842u, 251691070u, 268468287u, 285245506u, 285245507u, 285245508u, 302022720u, 302022721u + , 302022725u, 318799925u, 335577158u, 352354375u, 369106999u, 369107000u, 373301305u, 381682746u, 383779899u, 402718780u + , 436240456u, 453017673u, 469794890u, 486572118u, 503349335u, 520126554u, 520126555u, 520126556u, 536903768u, 536903769u + , 536903773u, 553680973u, 570458206u, 587235423u, 603988047u, 603988048u, 608182353u, 616563794u, 618660947u, 637599828u + , 671121504u, 687898721u, 704675938u, 721453166u, 738230383u, 755007602u, 755007603u, 755007604u, 771784816u, 771784817u + , 771784821u, 788562021u, 805339254u, 822116471u, 838869095u, 838869096u, 843063401u, 851444842u, 853541995u, 872480876u + , 906002552u, 922779769u, 939556986u, 956334214u, 973111431u, 989888650u, 989888651u, 989888652u, 1006665864u, 1006665865u + , 1006665869u, 1023443069u, 1040220302u, 1056997519u, 1073750143u, 1073750144u, 1077944449u, 1086325890u, 1088423043u, 1107361924u + , 1140883600u, 1157660817u, 1174438034u, 1191215262u, 1207992479u, 1224769698u, 1224769699u, 1224769700u, 1241546912u, 1241546913u + , 1241546917u, 1258324117u, 1275101350u, 1291878567u, 1308631191u, 1308631192u, 1312825497u, 1321206938u, 1323304091u, 1342242972u + , 1375764648u, 1392541865u, 1409319082u, 1426096310u, 1442873527u, 1459650746u, 1459650747u, 1459650748u, 1476427960u, 1476427961u + , 1476427965u, 1493205165u, 1509982398u, 1526759615u, 1543512239u, 1543512240u, 1547706545u, 1556087986u, 1558185139u, 1577124020u + , 1610645696u, 1627422913u, 1644200130u, 1660977358u, 1677754575u, 1694531794u, 1694531795u, 1694531796u, 1711309008u, 1711309009u + , 1711309013u, 1728086213u, 1744863446u, 1761640663u, 1778393287u, 1778393288u, 1782587593u, 1790969034u, 1793066187u, 1812005068u + , 1845526744u, 1862303961u, 1879081178u, 1895858406u, 1912635623u, 1929412842u, 1929412843u, 1929412844u, 1946190056u, 1946190057u + , 1946190061u, 1962967261u, 1979744494u, 1996521711u, 2013274335u, 2013274336u, 2017468641u, 2025850082u, 2027947235u, 2046886116u + , 2080407792u, 2097185009u, 2113962226u, 2130739454u, 2147516671u, 2164293890u, 2164293891u, 2164293892u, 2181071104u, 2181071105u + , 2181071109u, 2197848309u, 2214625542u, 2231402759u, 2248155383u, 2248155384u, 2252349689u, 2260731130u, 2262828283u, 2281767164u + , 2315288840u, 2332066057u, 2348843274u, 2365620502u, 2382397719u, 2399174938u, 2399174939u, 2399174940u, 2415952152u, 2415952153u + , 2415952157u, 2432729357u, 2449506590u, 2466283807u, 2483036431u, 2483036432u, 2487230737u, 2495612178u, 2497709331u, 2516648212u + , 2550169888u, 2566947105u }); builder.Finish(); @@ -1074,7 +1272,7 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre ctrlTouchscreenposition.Setup() .At(this, 1) .WithParent(parent) - .WithChildren(36, 2) + .WithChildren(40, 2) .WithName("position") .WithDisplayName("Position") .WithLayout(kVector2Layout) @@ -1094,16 +1292,16 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre return ctrlTouchscreenposition; } - private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscreendelta(InternedString kVector2Layout, InputControl parent) + private UnityEngine.InputSystem.Controls.DeltaControl Initialize_ctrlTouchscreendelta(InternedString kDeltaLayout, InputControl parent) { - var ctrlTouchscreendelta = new UnityEngine.InputSystem.Controls.Vector2Control(); + var ctrlTouchscreendelta = new UnityEngine.InputSystem.Controls.DeltaControl(); ctrlTouchscreendelta.Setup() .At(this, 2) .WithParent(parent) - .WithChildren(38, 2) + .WithChildren(42, 6) .WithName("delta") .WithDisplayName("Delta") - .WithLayout(kVector2Layout) + .WithLayout(kDeltaLayout) .WithUsages(2, 1) .WithStateBlock(new InputStateBlock { @@ -1144,7 +1342,7 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre ctrlTouchscreenradius.Setup() .At(this, 4) .WithParent(parent) - .WithChildren(40, 2) + .WithChildren(48, 2) .WithName("radius") .WithDisplayName("Radius") .WithLayout(kVector2Layout) @@ -1189,7 +1387,7 @@ private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreen ctrlTouchscreentouch0.Setup() .At(this, 6) .WithParent(parent) - .WithChildren(42, 12) + .WithChildren(50, 12) .WithName("touch0") .WithDisplayName("Touch") .WithLayout(kTouchLayout) @@ -1210,7 +1408,7 @@ private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreen ctrlTouchscreentouch1.Setup() .At(this, 7) .WithParent(parent) - .WithChildren(62, 12) + .WithChildren(74, 12) .WithName("touch1") .WithDisplayName("Touch") .WithLayout(kTouchLayout) @@ -1231,7 +1429,7 @@ private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreen ctrlTouchscreentouch2.Setup() .At(this, 8) .WithParent(parent) - .WithChildren(82, 12) + .WithChildren(98, 12) .WithName("touch2") .WithDisplayName("Touch") .WithLayout(kTouchLayout) @@ -1252,7 +1450,7 @@ private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreen ctrlTouchscreentouch3.Setup() .At(this, 9) .WithParent(parent) - .WithChildren(102, 12) + .WithChildren(122, 12) .WithName("touch3") .WithDisplayName("Touch") .WithLayout(kTouchLayout) @@ -1273,7 +1471,7 @@ private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreen ctrlTouchscreentouch4.Setup() .At(this, 10) .WithParent(parent) - .WithChildren(122, 12) + .WithChildren(146, 12) .WithName("touch4") .WithDisplayName("Touch") .WithLayout(kTouchLayout) @@ -1294,7 +1492,7 @@ private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreen ctrlTouchscreentouch5.Setup() .At(this, 11) .WithParent(parent) - .WithChildren(142, 12) + .WithChildren(170, 12) .WithName("touch5") .WithDisplayName("Touch") .WithLayout(kTouchLayout) @@ -1315,7 +1513,7 @@ private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreen ctrlTouchscreentouch6.Setup() .At(this, 12) .WithParent(parent) - .WithChildren(162, 12) + .WithChildren(194, 12) .WithName("touch6") .WithDisplayName("Touch") .WithLayout(kTouchLayout) @@ -1336,7 +1534,7 @@ private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreen ctrlTouchscreentouch7.Setup() .At(this, 13) .WithParent(parent) - .WithChildren(182, 12) + .WithChildren(218, 12) .WithName("touch7") .WithDisplayName("Touch") .WithLayout(kTouchLayout) @@ -1357,7 +1555,7 @@ private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreen ctrlTouchscreentouch8.Setup() .At(this, 14) .WithParent(parent) - .WithChildren(202, 12) + .WithChildren(242, 12) .WithName("touch8") .WithDisplayName("Touch") .WithLayout(kTouchLayout) @@ -1378,7 +1576,7 @@ private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreen ctrlTouchscreentouch9.Setup() .At(this, 15) .WithParent(parent) - .WithChildren(222, 12) + .WithChildren(266, 12) .WithName("touch9") .WithDisplayName("Touch") .WithLayout(kTouchLayout) @@ -1439,17 +1637,17 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre return ctrlTouchscreenprimaryTouchposition; } - private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscreenprimaryTouchdelta(InternedString kVector2Layout, InputControl parent) + private UnityEngine.InputSystem.Controls.DeltaControl Initialize_ctrlTouchscreenprimaryTouchdelta(InternedString kDeltaLayout, InputControl parent) { - var ctrlTouchscreenprimaryTouchdelta = new UnityEngine.InputSystem.Controls.Vector2Control(); + var ctrlTouchscreenprimaryTouchdelta = new UnityEngine.InputSystem.Controls.DeltaControl(); ctrlTouchscreenprimaryTouchdelta.Setup() .At(this, 18) .WithParent(parent) - .WithChildren(30, 2) + .WithChildren(30, 6) .WithName("delta") .WithDisplayName("Primary Touch Delta") .WithShortDisplayName("Primary Touch Delta") - .WithLayout(kVector2Layout) + .WithLayout(kDeltaLayout) .WithStateBlock(new InputStateBlock { format = new FourCC(1447379762), @@ -1488,7 +1686,7 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre ctrlTouchscreenprimaryTouchradius.Setup() .At(this, 20) .WithParent(parent) - .WithChildren(32, 2) + .WithChildren(36, 2) .WithName("radius") .WithDisplayName("Primary Touch Radius") .WithShortDisplayName("Primary Touch Radius") @@ -1646,7 +1844,7 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre ctrlTouchscreenprimaryTouchstartPosition.Setup() .At(this, 27) .WithParent(parent) - .WithChildren(34, 2) + .WithChildren(38, 2) .WithName("startPosition") .WithDisplayName("Primary Touch Start Position") .WithShortDisplayName("Primary Touch Start Position") @@ -1707,11 +1905,99 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreenp return ctrlTouchscreenprimaryTouchpositiony; } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreenprimaryTouchdeltaup(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreenprimaryTouchdeltaup = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreenprimaryTouchdeltaup.Setup() + .At(this, 30) + .WithParent(parent) + .WithName("up") + .WithDisplayName("Primary Touch Primary Touch Delta Up") + .WithShortDisplayName("Primary Touch Primary Touch Delta Up") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 16, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreenprimaryTouchdeltaup; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreenprimaryTouchdeltadown(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreenprimaryTouchdeltadown = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreenprimaryTouchdeltadown.Setup() + .At(this, 31) + .WithParent(parent) + .WithName("down") + .WithDisplayName("Primary Touch Primary Touch Delta Down") + .WithShortDisplayName("Primary Touch Primary Touch Delta Down") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 16, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreenprimaryTouchdeltadown; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreenprimaryTouchdeltaleft(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreenprimaryTouchdeltaleft = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreenprimaryTouchdeltaleft.Setup() + .At(this, 32) + .WithParent(parent) + .WithName("left") + .WithDisplayName("Primary Touch Primary Touch Delta Left") + .WithShortDisplayName("Primary Touch Primary Touch Delta Left") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 12, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreenprimaryTouchdeltaleft; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreenprimaryTouchdeltaright(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreenprimaryTouchdeltaright = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreenprimaryTouchdeltaright.Setup() + .At(this, 33) + .WithParent(parent) + .WithName("right") + .WithDisplayName("Primary Touch Primary Touch Delta Right") + .WithShortDisplayName("Primary Touch Primary Touch Delta Right") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 12, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreenprimaryTouchdeltaright; + } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreenprimaryTouchdeltax(InternedString kAxisLayout, InputControl parent) { var ctrlTouchscreenprimaryTouchdeltax = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreenprimaryTouchdeltax.Setup() - .At(this, 30) + .At(this, 34) .WithParent(parent) .WithName("x") .WithDisplayName("Primary Touch Primary Touch Delta X") @@ -1732,7 +2018,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreenp { var ctrlTouchscreenprimaryTouchdeltay = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreenprimaryTouchdeltay.Setup() - .At(this, 31) + .At(this, 35) .WithParent(parent) .WithName("y") .WithDisplayName("Primary Touch Primary Touch Delta Y") @@ -1753,7 +2039,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreenp { var ctrlTouchscreenprimaryTouchradiusx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreenprimaryTouchradiusx.Setup() - .At(this, 32) + .At(this, 36) .WithParent(parent) .WithName("x") .WithDisplayName("Primary Touch Primary Touch Radius X") @@ -1774,7 +2060,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreenp { var ctrlTouchscreenprimaryTouchradiusy = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreenprimaryTouchradiusy.Setup() - .At(this, 33) + .At(this, 37) .WithParent(parent) .WithName("y") .WithDisplayName("Primary Touch Primary Touch Radius Y") @@ -1795,7 +2081,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreenp { var ctrlTouchscreenprimaryTouchstartPositionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreenprimaryTouchstartPositionx.Setup() - .At(this, 34) + .At(this, 38) .WithParent(parent) .WithName("x") .WithDisplayName("Primary Touch Primary Touch Start Position X") @@ -1816,7 +2102,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreenp { var ctrlTouchscreenprimaryTouchstartPositiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreenprimaryTouchstartPositiony.Setup() - .At(this, 35) + .At(this, 39) .WithParent(parent) .WithName("y") .WithDisplayName("Primary Touch Primary Touch Start Position Y") @@ -1837,7 +2123,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreenp { var ctrlTouchscreenpositionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreenpositionx.Setup() - .At(this, 36) + .At(this, 40) .WithParent(parent) .WithName("x") .WithDisplayName("Position X") @@ -1859,7 +2145,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreenp { var ctrlTouchscreenpositiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreenpositiony.Setup() - .At(this, 37) + .At(this, 41) .WithParent(parent) .WithName("y") .WithDisplayName("Position Y") @@ -1877,11 +2163,99 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreenp return ctrlTouchscreenpositiony; } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreendeltaup(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreendeltaup = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreendeltaup.Setup() + .At(this, 42) + .WithParent(parent) + .WithName("up") + .WithDisplayName("Delta Up") + .WithShortDisplayName("Delta Up") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 16, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreendeltaup; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreendeltadown(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreendeltadown = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreendeltadown.Setup() + .At(this, 43) + .WithParent(parent) + .WithName("down") + .WithDisplayName("Delta Down") + .WithShortDisplayName("Delta Down") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 16, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreendeltadown; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreendeltaleft(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreendeltaleft = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreendeltaleft.Setup() + .At(this, 44) + .WithParent(parent) + .WithName("left") + .WithDisplayName("Delta Left") + .WithShortDisplayName("Delta Left") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 12, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreendeltaleft; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreendeltaright(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreendeltaright = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreendeltaright.Setup() + .At(this, 45) + .WithParent(parent) + .WithName("right") + .WithDisplayName("Delta Right") + .WithShortDisplayName("Delta Right") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 12, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreendeltaright; + } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreendeltax(InternedString kAxisLayout, InputControl parent) { var ctrlTouchscreendeltax = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreendeltax.Setup() - .At(this, 38) + .At(this, 46) .WithParent(parent) .WithName("x") .WithDisplayName("Delta X") @@ -1902,7 +2276,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreend { var ctrlTouchscreendeltay = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreendeltay.Setup() - .At(this, 39) + .At(this, 47) .WithParent(parent) .WithName("y") .WithDisplayName("Delta Y") @@ -1923,7 +2297,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreenr { var ctrlTouchscreenradiusx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreenradiusx.Setup() - .At(this, 40) + .At(this, 48) .WithParent(parent) .WithName("x") .WithDisplayName("Radius X") @@ -1944,7 +2318,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreenr { var ctrlTouchscreenradiusy = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreenradiusy.Setup() - .At(this, 41) + .At(this, 49) .WithParent(parent) .WithName("y") .WithDisplayName("Radius Y") @@ -1965,7 +2339,7 @@ private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscre { var ctrlTouchscreentouch0touchId = new UnityEngine.InputSystem.Controls.IntegerControl(); ctrlTouchscreentouch0touchId.Setup() - .At(this, 42) + .At(this, 50) .WithParent(parent) .WithName("touchId") .WithDisplayName("Touch Touch ID") @@ -1988,9 +2362,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch0position = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch0position.Setup() - .At(this, 43) + .At(this, 51) .WithParent(parent) - .WithChildren(54, 2) + .WithChildren(62, 2) .WithName("position") .WithDisplayName("Touch Position") .WithShortDisplayName("Touch Position") @@ -2007,17 +2381,17 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre return ctrlTouchscreentouch0position; } - private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscreentouch0delta(InternedString kVector2Layout, InputControl parent) + private UnityEngine.InputSystem.Controls.DeltaControl Initialize_ctrlTouchscreentouch0delta(InternedString kDeltaLayout, InputControl parent) { - var ctrlTouchscreentouch0delta = new UnityEngine.InputSystem.Controls.Vector2Control(); + var ctrlTouchscreentouch0delta = new UnityEngine.InputSystem.Controls.DeltaControl(); ctrlTouchscreentouch0delta.Setup() - .At(this, 44) + .At(this, 52) .WithParent(parent) - .WithChildren(56, 2) + .WithChildren(64, 6) .WithName("delta") .WithDisplayName("Touch Delta") .WithShortDisplayName("Touch Delta") - .WithLayout(kVector2Layout) + .WithLayout(kDeltaLayout) .WithStateBlock(new InputStateBlock { format = new FourCC(1447379762), @@ -2033,7 +2407,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch0pressure = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch0pressure.Setup() - .At(this, 45) + .At(this, 53) .WithParent(parent) .WithName("pressure") .WithDisplayName("Touch Pressure") @@ -2054,9 +2428,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch0radius = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch0radius.Setup() - .At(this, 46) + .At(this, 54) .WithParent(parent) - .WithChildren(58, 2) + .WithChildren(70, 2) .WithName("radius") .WithDisplayName("Touch Radius") .WithShortDisplayName("Touch Radius") @@ -2076,7 +2450,7 @@ private UnityEngine.InputSystem.Controls.TouchPhaseControl Initialize_ctrlTouchs { var ctrlTouchscreentouch0phase = new UnityEngine.InputSystem.Controls.TouchPhaseControl(); ctrlTouchscreentouch0phase.Setup() - .At(this, 47) + .At(this, 55) .WithParent(parent) .WithName("phase") .WithDisplayName("Touch Touch Phase") @@ -2098,7 +2472,7 @@ private UnityEngine.InputSystem.Controls.TouchPressControl Initialize_ctrlTouchs { var ctrlTouchscreentouch0press = new UnityEngine.InputSystem.Controls.TouchPressControl(); ctrlTouchscreentouch0press.Setup() - .At(this, 48) + .At(this, 56) .WithParent(parent) .WithName("press") .WithDisplayName("Touch Touch Contact?") @@ -2121,7 +2495,7 @@ private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscre { var ctrlTouchscreentouch0tapCount = new UnityEngine.InputSystem.Controls.IntegerControl(); ctrlTouchscreentouch0tapCount.Setup() - .At(this, 49) + .At(this, 57) .WithParent(parent) .WithName("tapCount") .WithDisplayName("Touch Tap Count") @@ -2142,7 +2516,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch0indirectTouch = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlTouchscreentouch0indirectTouch.Setup() - .At(this, 50) + .At(this, 58) .WithParent(parent) .WithName("indirectTouch") .WithDisplayName("Touch Indirect Touch?") @@ -2166,7 +2540,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch0tap = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlTouchscreentouch0tap.Setup() - .At(this, 51) + .At(this, 59) .WithParent(parent) .WithName("tap") .WithDisplayName("Touch Tap") @@ -2189,7 +2563,7 @@ private UnityEngine.InputSystem.Controls.DoubleControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch0startTime = new UnityEngine.InputSystem.Controls.DoubleControl(); ctrlTouchscreentouch0startTime.Setup() - .At(this, 52) + .At(this, 60) .WithParent(parent) .WithName("startTime") .WithDisplayName("Touch Start Time") @@ -2211,9 +2585,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch0startPosition = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch0startPosition.Setup() - .At(this, 53) + .At(this, 61) .WithParent(parent) - .WithChildren(60, 2) + .WithChildren(72, 2) .WithName("startPosition") .WithDisplayName("Touch Start Position") .WithShortDisplayName("Touch Start Position") @@ -2234,7 +2608,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch0positionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch0positionx.Setup() - .At(this, 54) + .At(this, 62) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Position X") @@ -2256,7 +2630,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch0positiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch0positiony.Setup() - .At(this, 55) + .At(this, 63) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Position Y") @@ -2274,37 +2648,39 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent return ctrlTouchscreentouch0positiony; } - private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch0deltax(InternedString kAxisLayout, InputControl parent) + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch0deltaup(InternedString kAxisLayout, InputControl parent) { - var ctrlTouchscreentouch0deltax = new UnityEngine.InputSystem.Controls.AxisControl(); - ctrlTouchscreentouch0deltax.Setup() - .At(this, 56) + var ctrlTouchscreentouch0deltaup = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreentouch0deltaup.Setup() + .At(this, 64) .WithParent(parent) - .WithName("x") - .WithDisplayName("Touch Touch Delta X") - .WithShortDisplayName("Touch Touch Delta X") + .WithName("up") + .WithDisplayName("Touch Touch Delta Up") + .WithShortDisplayName("Touch Touch Delta Up") .WithLayout(kAxisLayout) + .IsSynthetic(true) .WithStateBlock(new InputStateBlock { format = new FourCC(1179407392), - byteOffset = 68, + byteOffset = 72, bitOffset = 0, sizeInBits = 32 }) .Finish(); - return ctrlTouchscreentouch0deltax; + return ctrlTouchscreentouch0deltaup; } - private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch0deltay(InternedString kAxisLayout, InputControl parent) + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch0deltadown(InternedString kAxisLayout, InputControl parent) { - var ctrlTouchscreentouch0deltay = new UnityEngine.InputSystem.Controls.AxisControl(); - ctrlTouchscreentouch0deltay.Setup() - .At(this, 57) + var ctrlTouchscreentouch0deltadown = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreentouch0deltadown.Setup() + .At(this, 65) .WithParent(parent) - .WithName("y") - .WithDisplayName("Touch Touch Delta Y") - .WithShortDisplayName("Touch Touch Delta Y") + .WithName("down") + .WithDisplayName("Touch Touch Delta Down") + .WithShortDisplayName("Touch Touch Delta Down") .WithLayout(kAxisLayout) + .IsSynthetic(true) .WithStateBlock(new InputStateBlock { format = new FourCC(1179407392), @@ -2313,14 +2689,100 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent sizeInBits = 32 }) .Finish(); - return ctrlTouchscreentouch0deltay; + return ctrlTouchscreentouch0deltadown; } - private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch0radiusx(InternedString kAxisLayout, InputControl parent) + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch0deltaleft(InternedString kAxisLayout, InputControl parent) { - var ctrlTouchscreentouch0radiusx = new UnityEngine.InputSystem.Controls.AxisControl(); - ctrlTouchscreentouch0radiusx.Setup() - .At(this, 58) + var ctrlTouchscreentouch0deltaleft = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreentouch0deltaleft.Setup() + .At(this, 66) + .WithParent(parent) + .WithName("left") + .WithDisplayName("Touch Touch Delta Left") + .WithShortDisplayName("Touch Touch Delta Left") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 68, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch0deltaleft; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch0deltaright(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch0deltaright = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreentouch0deltaright.Setup() + .At(this, 67) + .WithParent(parent) + .WithName("right") + .WithDisplayName("Touch Touch Delta Right") + .WithShortDisplayName("Touch Touch Delta Right") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 68, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch0deltaright; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch0deltax(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch0deltax = new UnityEngine.InputSystem.Controls.AxisControl(); + ctrlTouchscreentouch0deltax.Setup() + .At(this, 68) + .WithParent(parent) + .WithName("x") + .WithDisplayName("Touch Touch Delta X") + .WithShortDisplayName("Touch Touch Delta X") + .WithLayout(kAxisLayout) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 68, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch0deltax; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch0deltay(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch0deltay = new UnityEngine.InputSystem.Controls.AxisControl(); + ctrlTouchscreentouch0deltay.Setup() + .At(this, 69) + .WithParent(parent) + .WithName("y") + .WithDisplayName("Touch Touch Delta Y") + .WithShortDisplayName("Touch Touch Delta Y") + .WithLayout(kAxisLayout) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 72, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch0deltay; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch0radiusx(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch0radiusx = new UnityEngine.InputSystem.Controls.AxisControl(); + ctrlTouchscreentouch0radiusx.Setup() + .At(this, 70) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Radius X") @@ -2341,7 +2803,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch0radiusy = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch0radiusy.Setup() - .At(this, 59) + .At(this, 71) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Radius Y") @@ -2362,7 +2824,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch0startPositionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch0startPositionx.Setup() - .At(this, 60) + .At(this, 72) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Start Position X") @@ -2383,7 +2845,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch0startPositiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch0startPositiony.Setup() - .At(this, 61) + .At(this, 73) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Start Position Y") @@ -2404,7 +2866,7 @@ private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscre { var ctrlTouchscreentouch1touchId = new UnityEngine.InputSystem.Controls.IntegerControl(); ctrlTouchscreentouch1touchId.Setup() - .At(this, 62) + .At(this, 74) .WithParent(parent) .WithName("touchId") .WithDisplayName("Touch Touch ID") @@ -2427,9 +2889,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch1position = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch1position.Setup() - .At(this, 63) + .At(this, 75) .WithParent(parent) - .WithChildren(74, 2) + .WithChildren(86, 2) .WithName("position") .WithDisplayName("Touch Position") .WithShortDisplayName("Touch Position") @@ -2446,17 +2908,17 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre return ctrlTouchscreentouch1position; } - private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscreentouch1delta(InternedString kVector2Layout, InputControl parent) + private UnityEngine.InputSystem.Controls.DeltaControl Initialize_ctrlTouchscreentouch1delta(InternedString kDeltaLayout, InputControl parent) { - var ctrlTouchscreentouch1delta = new UnityEngine.InputSystem.Controls.Vector2Control(); + var ctrlTouchscreentouch1delta = new UnityEngine.InputSystem.Controls.DeltaControl(); ctrlTouchscreentouch1delta.Setup() - .At(this, 64) + .At(this, 76) .WithParent(parent) - .WithChildren(76, 2) + .WithChildren(88, 6) .WithName("delta") .WithDisplayName("Touch Delta") .WithShortDisplayName("Touch Delta") - .WithLayout(kVector2Layout) + .WithLayout(kDeltaLayout) .WithStateBlock(new InputStateBlock { format = new FourCC(1447379762), @@ -2472,7 +2934,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch1pressure = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch1pressure.Setup() - .At(this, 65) + .At(this, 77) .WithParent(parent) .WithName("pressure") .WithDisplayName("Touch Pressure") @@ -2493,9 +2955,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch1radius = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch1radius.Setup() - .At(this, 66) + .At(this, 78) .WithParent(parent) - .WithChildren(78, 2) + .WithChildren(94, 2) .WithName("radius") .WithDisplayName("Touch Radius") .WithShortDisplayName("Touch Radius") @@ -2515,7 +2977,7 @@ private UnityEngine.InputSystem.Controls.TouchPhaseControl Initialize_ctrlTouchs { var ctrlTouchscreentouch1phase = new UnityEngine.InputSystem.Controls.TouchPhaseControl(); ctrlTouchscreentouch1phase.Setup() - .At(this, 67) + .At(this, 79) .WithParent(parent) .WithName("phase") .WithDisplayName("Touch Touch Phase") @@ -2537,7 +2999,7 @@ private UnityEngine.InputSystem.Controls.TouchPressControl Initialize_ctrlTouchs { var ctrlTouchscreentouch1press = new UnityEngine.InputSystem.Controls.TouchPressControl(); ctrlTouchscreentouch1press.Setup() - .At(this, 68) + .At(this, 80) .WithParent(parent) .WithName("press") .WithDisplayName("Touch Touch Contact?") @@ -2560,7 +3022,7 @@ private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscre { var ctrlTouchscreentouch1tapCount = new UnityEngine.InputSystem.Controls.IntegerControl(); ctrlTouchscreentouch1tapCount.Setup() - .At(this, 69) + .At(this, 81) .WithParent(parent) .WithName("tapCount") .WithDisplayName("Touch Tap Count") @@ -2581,7 +3043,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch1indirectTouch = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlTouchscreentouch1indirectTouch.Setup() - .At(this, 70) + .At(this, 82) .WithParent(parent) .WithName("indirectTouch") .WithDisplayName("Touch Indirect Touch?") @@ -2605,7 +3067,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch1tap = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlTouchscreentouch1tap.Setup() - .At(this, 71) + .At(this, 83) .WithParent(parent) .WithName("tap") .WithDisplayName("Touch Tap") @@ -2628,7 +3090,7 @@ private UnityEngine.InputSystem.Controls.DoubleControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch1startTime = new UnityEngine.InputSystem.Controls.DoubleControl(); ctrlTouchscreentouch1startTime.Setup() - .At(this, 72) + .At(this, 84) .WithParent(parent) .WithName("startTime") .WithDisplayName("Touch Start Time") @@ -2650,9 +3112,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch1startPosition = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch1startPosition.Setup() - .At(this, 73) + .At(this, 85) .WithParent(parent) - .WithChildren(80, 2) + .WithChildren(96, 2) .WithName("startPosition") .WithDisplayName("Touch Start Position") .WithShortDisplayName("Touch Start Position") @@ -2673,7 +3135,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch1positionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch1positionx.Setup() - .At(this, 74) + .At(this, 86) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Position X") @@ -2695,7 +3157,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch1positiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch1positiony.Setup() - .At(this, 75) + .At(this, 87) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Position Y") @@ -2713,11 +3175,99 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent return ctrlTouchscreentouch1positiony; } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch1deltaup(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch1deltaup = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreentouch1deltaup.Setup() + .At(this, 88) + .WithParent(parent) + .WithName("up") + .WithDisplayName("Touch Touch Delta Up") + .WithShortDisplayName("Touch Touch Delta Up") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 128, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch1deltaup; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch1deltadown(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch1deltadown = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreentouch1deltadown.Setup() + .At(this, 89) + .WithParent(parent) + .WithName("down") + .WithDisplayName("Touch Touch Delta Down") + .WithShortDisplayName("Touch Touch Delta Down") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 128, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch1deltadown; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch1deltaleft(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch1deltaleft = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreentouch1deltaleft.Setup() + .At(this, 90) + .WithParent(parent) + .WithName("left") + .WithDisplayName("Touch Touch Delta Left") + .WithShortDisplayName("Touch Touch Delta Left") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 124, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch1deltaleft; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch1deltaright(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch1deltaright = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreentouch1deltaright.Setup() + .At(this, 91) + .WithParent(parent) + .WithName("right") + .WithDisplayName("Touch Touch Delta Right") + .WithShortDisplayName("Touch Touch Delta Right") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 124, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch1deltaright; + } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch1deltax(InternedString kAxisLayout, InputControl parent) { var ctrlTouchscreentouch1deltax = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch1deltax.Setup() - .At(this, 76) + .At(this, 92) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Delta X") @@ -2738,7 +3288,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch1deltay = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch1deltay.Setup() - .At(this, 77) + .At(this, 93) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Delta Y") @@ -2759,7 +3309,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch1radiusx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch1radiusx.Setup() - .At(this, 78) + .At(this, 94) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Radius X") @@ -2780,7 +3330,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch1radiusy = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch1radiusy.Setup() - .At(this, 79) + .At(this, 95) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Radius Y") @@ -2801,7 +3351,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch1startPositionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch1startPositionx.Setup() - .At(this, 80) + .At(this, 96) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Start Position X") @@ -2822,7 +3372,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch1startPositiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch1startPositiony.Setup() - .At(this, 81) + .At(this, 97) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Start Position Y") @@ -2843,7 +3393,7 @@ private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscre { var ctrlTouchscreentouch2touchId = new UnityEngine.InputSystem.Controls.IntegerControl(); ctrlTouchscreentouch2touchId.Setup() - .At(this, 82) + .At(this, 98) .WithParent(parent) .WithName("touchId") .WithDisplayName("Touch Touch ID") @@ -2866,9 +3416,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch2position = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch2position.Setup() - .At(this, 83) + .At(this, 99) .WithParent(parent) - .WithChildren(94, 2) + .WithChildren(110, 2) .WithName("position") .WithDisplayName("Touch Position") .WithShortDisplayName("Touch Position") @@ -2885,17 +3435,17 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre return ctrlTouchscreentouch2position; } - private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscreentouch2delta(InternedString kVector2Layout, InputControl parent) + private UnityEngine.InputSystem.Controls.DeltaControl Initialize_ctrlTouchscreentouch2delta(InternedString kDeltaLayout, InputControl parent) { - var ctrlTouchscreentouch2delta = new UnityEngine.InputSystem.Controls.Vector2Control(); + var ctrlTouchscreentouch2delta = new UnityEngine.InputSystem.Controls.DeltaControl(); ctrlTouchscreentouch2delta.Setup() - .At(this, 84) + .At(this, 100) .WithParent(parent) - .WithChildren(96, 2) + .WithChildren(112, 6) .WithName("delta") .WithDisplayName("Touch Delta") .WithShortDisplayName("Touch Delta") - .WithLayout(kVector2Layout) + .WithLayout(kDeltaLayout) .WithStateBlock(new InputStateBlock { format = new FourCC(1447379762), @@ -2911,7 +3461,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch2pressure = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch2pressure.Setup() - .At(this, 85) + .At(this, 101) .WithParent(parent) .WithName("pressure") .WithDisplayName("Touch Pressure") @@ -2932,9 +3482,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch2radius = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch2radius.Setup() - .At(this, 86) + .At(this, 102) .WithParent(parent) - .WithChildren(98, 2) + .WithChildren(118, 2) .WithName("radius") .WithDisplayName("Touch Radius") .WithShortDisplayName("Touch Radius") @@ -2954,7 +3504,7 @@ private UnityEngine.InputSystem.Controls.TouchPhaseControl Initialize_ctrlTouchs { var ctrlTouchscreentouch2phase = new UnityEngine.InputSystem.Controls.TouchPhaseControl(); ctrlTouchscreentouch2phase.Setup() - .At(this, 87) + .At(this, 103) .WithParent(parent) .WithName("phase") .WithDisplayName("Touch Touch Phase") @@ -2976,7 +3526,7 @@ private UnityEngine.InputSystem.Controls.TouchPressControl Initialize_ctrlTouchs { var ctrlTouchscreentouch2press = new UnityEngine.InputSystem.Controls.TouchPressControl(); ctrlTouchscreentouch2press.Setup() - .At(this, 88) + .At(this, 104) .WithParent(parent) .WithName("press") .WithDisplayName("Touch Touch Contact?") @@ -2999,7 +3549,7 @@ private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscre { var ctrlTouchscreentouch2tapCount = new UnityEngine.InputSystem.Controls.IntegerControl(); ctrlTouchscreentouch2tapCount.Setup() - .At(this, 89) + .At(this, 105) .WithParent(parent) .WithName("tapCount") .WithDisplayName("Touch Tap Count") @@ -3020,7 +3570,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch2indirectTouch = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlTouchscreentouch2indirectTouch.Setup() - .At(this, 90) + .At(this, 106) .WithParent(parent) .WithName("indirectTouch") .WithDisplayName("Touch Indirect Touch?") @@ -3044,7 +3594,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch2tap = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlTouchscreentouch2tap.Setup() - .At(this, 91) + .At(this, 107) .WithParent(parent) .WithName("tap") .WithDisplayName("Touch Tap") @@ -3067,7 +3617,7 @@ private UnityEngine.InputSystem.Controls.DoubleControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch2startTime = new UnityEngine.InputSystem.Controls.DoubleControl(); ctrlTouchscreentouch2startTime.Setup() - .At(this, 92) + .At(this, 108) .WithParent(parent) .WithName("startTime") .WithDisplayName("Touch Start Time") @@ -3089,9 +3639,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch2startPosition = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch2startPosition.Setup() - .At(this, 93) + .At(this, 109) .WithParent(parent) - .WithChildren(100, 2) + .WithChildren(120, 2) .WithName("startPosition") .WithDisplayName("Touch Start Position") .WithShortDisplayName("Touch Start Position") @@ -3112,7 +3662,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch2positionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch2positionx.Setup() - .At(this, 94) + .At(this, 110) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Position X") @@ -3134,7 +3684,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch2positiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch2positiony.Setup() - .At(this, 95) + .At(this, 111) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Position Y") @@ -3152,11 +3702,99 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent return ctrlTouchscreentouch2positiony; } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch2deltaup(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch2deltaup = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreentouch2deltaup.Setup() + .At(this, 112) + .WithParent(parent) + .WithName("up") + .WithDisplayName("Touch Touch Delta Up") + .WithShortDisplayName("Touch Touch Delta Up") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 184, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch2deltaup; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch2deltadown(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch2deltadown = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreentouch2deltadown.Setup() + .At(this, 113) + .WithParent(parent) + .WithName("down") + .WithDisplayName("Touch Touch Delta Down") + .WithShortDisplayName("Touch Touch Delta Down") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 184, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch2deltadown; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch2deltaleft(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch2deltaleft = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreentouch2deltaleft.Setup() + .At(this, 114) + .WithParent(parent) + .WithName("left") + .WithDisplayName("Touch Touch Delta Left") + .WithShortDisplayName("Touch Touch Delta Left") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 180, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch2deltaleft; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch2deltaright(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch2deltaright = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreentouch2deltaright.Setup() + .At(this, 115) + .WithParent(parent) + .WithName("right") + .WithDisplayName("Touch Touch Delta Right") + .WithShortDisplayName("Touch Touch Delta Right") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 180, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch2deltaright; + } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch2deltax(InternedString kAxisLayout, InputControl parent) { var ctrlTouchscreentouch2deltax = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch2deltax.Setup() - .At(this, 96) + .At(this, 116) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Delta X") @@ -3177,7 +3815,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch2deltay = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch2deltay.Setup() - .At(this, 97) + .At(this, 117) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Delta Y") @@ -3198,7 +3836,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch2radiusx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch2radiusx.Setup() - .At(this, 98) + .At(this, 118) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Radius X") @@ -3219,7 +3857,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch2radiusy = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch2radiusy.Setup() - .At(this, 99) + .At(this, 119) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Radius Y") @@ -3240,7 +3878,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch2startPositionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch2startPositionx.Setup() - .At(this, 100) + .At(this, 120) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Start Position X") @@ -3261,7 +3899,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch2startPositiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch2startPositiony.Setup() - .At(this, 101) + .At(this, 121) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Start Position Y") @@ -3282,7 +3920,7 @@ private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscre { var ctrlTouchscreentouch3touchId = new UnityEngine.InputSystem.Controls.IntegerControl(); ctrlTouchscreentouch3touchId.Setup() - .At(this, 102) + .At(this, 122) .WithParent(parent) .WithName("touchId") .WithDisplayName("Touch Touch ID") @@ -3305,9 +3943,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch3position = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch3position.Setup() - .At(this, 103) + .At(this, 123) .WithParent(parent) - .WithChildren(114, 2) + .WithChildren(134, 2) .WithName("position") .WithDisplayName("Touch Position") .WithShortDisplayName("Touch Position") @@ -3324,17 +3962,17 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre return ctrlTouchscreentouch3position; } - private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscreentouch3delta(InternedString kVector2Layout, InputControl parent) + private UnityEngine.InputSystem.Controls.DeltaControl Initialize_ctrlTouchscreentouch3delta(InternedString kDeltaLayout, InputControl parent) { - var ctrlTouchscreentouch3delta = new UnityEngine.InputSystem.Controls.Vector2Control(); + var ctrlTouchscreentouch3delta = new UnityEngine.InputSystem.Controls.DeltaControl(); ctrlTouchscreentouch3delta.Setup() - .At(this, 104) + .At(this, 124) .WithParent(parent) - .WithChildren(116, 2) + .WithChildren(136, 6) .WithName("delta") .WithDisplayName("Touch Delta") .WithShortDisplayName("Touch Delta") - .WithLayout(kVector2Layout) + .WithLayout(kDeltaLayout) .WithStateBlock(new InputStateBlock { format = new FourCC(1447379762), @@ -3350,7 +3988,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch3pressure = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch3pressure.Setup() - .At(this, 105) + .At(this, 125) .WithParent(parent) .WithName("pressure") .WithDisplayName("Touch Pressure") @@ -3371,9 +4009,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch3radius = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch3radius.Setup() - .At(this, 106) + .At(this, 126) .WithParent(parent) - .WithChildren(118, 2) + .WithChildren(142, 2) .WithName("radius") .WithDisplayName("Touch Radius") .WithShortDisplayName("Touch Radius") @@ -3393,7 +4031,7 @@ private UnityEngine.InputSystem.Controls.TouchPhaseControl Initialize_ctrlTouchs { var ctrlTouchscreentouch3phase = new UnityEngine.InputSystem.Controls.TouchPhaseControl(); ctrlTouchscreentouch3phase.Setup() - .At(this, 107) + .At(this, 127) .WithParent(parent) .WithName("phase") .WithDisplayName("Touch Touch Phase") @@ -3415,7 +4053,7 @@ private UnityEngine.InputSystem.Controls.TouchPressControl Initialize_ctrlTouchs { var ctrlTouchscreentouch3press = new UnityEngine.InputSystem.Controls.TouchPressControl(); ctrlTouchscreentouch3press.Setup() - .At(this, 108) + .At(this, 128) .WithParent(parent) .WithName("press") .WithDisplayName("Touch Touch Contact?") @@ -3438,7 +4076,7 @@ private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscre { var ctrlTouchscreentouch3tapCount = new UnityEngine.InputSystem.Controls.IntegerControl(); ctrlTouchscreentouch3tapCount.Setup() - .At(this, 109) + .At(this, 129) .WithParent(parent) .WithName("tapCount") .WithDisplayName("Touch Tap Count") @@ -3459,7 +4097,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch3indirectTouch = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlTouchscreentouch3indirectTouch.Setup() - .At(this, 110) + .At(this, 130) .WithParent(parent) .WithName("indirectTouch") .WithDisplayName("Touch Indirect Touch?") @@ -3483,7 +4121,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch3tap = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlTouchscreentouch3tap.Setup() - .At(this, 111) + .At(this, 131) .WithParent(parent) .WithName("tap") .WithDisplayName("Touch Tap") @@ -3506,7 +4144,7 @@ private UnityEngine.InputSystem.Controls.DoubleControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch3startTime = new UnityEngine.InputSystem.Controls.DoubleControl(); ctrlTouchscreentouch3startTime.Setup() - .At(this, 112) + .At(this, 132) .WithParent(parent) .WithName("startTime") .WithDisplayName("Touch Start Time") @@ -3528,9 +4166,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch3startPosition = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch3startPosition.Setup() - .At(this, 113) + .At(this, 133) .WithParent(parent) - .WithChildren(120, 2) + .WithChildren(144, 2) .WithName("startPosition") .WithDisplayName("Touch Start Position") .WithShortDisplayName("Touch Start Position") @@ -3551,7 +4189,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch3positionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch3positionx.Setup() - .At(this, 114) + .At(this, 134) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Position X") @@ -3573,7 +4211,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch3positiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch3positiony.Setup() - .At(this, 115) + .At(this, 135) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Position Y") @@ -3591,11 +4229,99 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent return ctrlTouchscreentouch3positiony; } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch3deltaup(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch3deltaup = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreentouch3deltaup.Setup() + .At(this, 136) + .WithParent(parent) + .WithName("up") + .WithDisplayName("Touch Touch Delta Up") + .WithShortDisplayName("Touch Touch Delta Up") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 240, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch3deltaup; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch3deltadown(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch3deltadown = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreentouch3deltadown.Setup() + .At(this, 137) + .WithParent(parent) + .WithName("down") + .WithDisplayName("Touch Touch Delta Down") + .WithShortDisplayName("Touch Touch Delta Down") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 240, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch3deltadown; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch3deltaleft(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch3deltaleft = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreentouch3deltaleft.Setup() + .At(this, 138) + .WithParent(parent) + .WithName("left") + .WithDisplayName("Touch Touch Delta Left") + .WithShortDisplayName("Touch Touch Delta Left") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 236, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch3deltaleft; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch3deltaright(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch3deltaright = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreentouch3deltaright.Setup() + .At(this, 139) + .WithParent(parent) + .WithName("right") + .WithDisplayName("Touch Touch Delta Right") + .WithShortDisplayName("Touch Touch Delta Right") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 236, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch3deltaright; + } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch3deltax(InternedString kAxisLayout, InputControl parent) { var ctrlTouchscreentouch3deltax = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch3deltax.Setup() - .At(this, 116) + .At(this, 140) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Delta X") @@ -3616,7 +4342,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch3deltay = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch3deltay.Setup() - .At(this, 117) + .At(this, 141) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Delta Y") @@ -3637,7 +4363,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch3radiusx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch3radiusx.Setup() - .At(this, 118) + .At(this, 142) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Radius X") @@ -3658,7 +4384,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch3radiusy = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch3radiusy.Setup() - .At(this, 119) + .At(this, 143) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Radius Y") @@ -3679,7 +4405,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch3startPositionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch3startPositionx.Setup() - .At(this, 120) + .At(this, 144) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Start Position X") @@ -3700,7 +4426,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch3startPositiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch3startPositiony.Setup() - .At(this, 121) + .At(this, 145) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Start Position Y") @@ -3721,7 +4447,7 @@ private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscre { var ctrlTouchscreentouch4touchId = new UnityEngine.InputSystem.Controls.IntegerControl(); ctrlTouchscreentouch4touchId.Setup() - .At(this, 122) + .At(this, 146) .WithParent(parent) .WithName("touchId") .WithDisplayName("Touch Touch ID") @@ -3744,9 +4470,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch4position = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch4position.Setup() - .At(this, 123) + .At(this, 147) .WithParent(parent) - .WithChildren(134, 2) + .WithChildren(158, 2) .WithName("position") .WithDisplayName("Touch Position") .WithShortDisplayName("Touch Position") @@ -3763,17 +4489,17 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre return ctrlTouchscreentouch4position; } - private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscreentouch4delta(InternedString kVector2Layout, InputControl parent) + private UnityEngine.InputSystem.Controls.DeltaControl Initialize_ctrlTouchscreentouch4delta(InternedString kDeltaLayout, InputControl parent) { - var ctrlTouchscreentouch4delta = new UnityEngine.InputSystem.Controls.Vector2Control(); + var ctrlTouchscreentouch4delta = new UnityEngine.InputSystem.Controls.DeltaControl(); ctrlTouchscreentouch4delta.Setup() - .At(this, 124) + .At(this, 148) .WithParent(parent) - .WithChildren(136, 2) + .WithChildren(160, 6) .WithName("delta") .WithDisplayName("Touch Delta") .WithShortDisplayName("Touch Delta") - .WithLayout(kVector2Layout) + .WithLayout(kDeltaLayout) .WithStateBlock(new InputStateBlock { format = new FourCC(1447379762), @@ -3789,7 +4515,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch4pressure = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch4pressure.Setup() - .At(this, 125) + .At(this, 149) .WithParent(parent) .WithName("pressure") .WithDisplayName("Touch Pressure") @@ -3810,9 +4536,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch4radius = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch4radius.Setup() - .At(this, 126) + .At(this, 150) .WithParent(parent) - .WithChildren(138, 2) + .WithChildren(166, 2) .WithName("radius") .WithDisplayName("Touch Radius") .WithShortDisplayName("Touch Radius") @@ -3832,7 +4558,7 @@ private UnityEngine.InputSystem.Controls.TouchPhaseControl Initialize_ctrlTouchs { var ctrlTouchscreentouch4phase = new UnityEngine.InputSystem.Controls.TouchPhaseControl(); ctrlTouchscreentouch4phase.Setup() - .At(this, 127) + .At(this, 151) .WithParent(parent) .WithName("phase") .WithDisplayName("Touch Touch Phase") @@ -3854,7 +4580,7 @@ private UnityEngine.InputSystem.Controls.TouchPressControl Initialize_ctrlTouchs { var ctrlTouchscreentouch4press = new UnityEngine.InputSystem.Controls.TouchPressControl(); ctrlTouchscreentouch4press.Setup() - .At(this, 128) + .At(this, 152) .WithParent(parent) .WithName("press") .WithDisplayName("Touch Touch Contact?") @@ -3877,7 +4603,7 @@ private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscre { var ctrlTouchscreentouch4tapCount = new UnityEngine.InputSystem.Controls.IntegerControl(); ctrlTouchscreentouch4tapCount.Setup() - .At(this, 129) + .At(this, 153) .WithParent(parent) .WithName("tapCount") .WithDisplayName("Touch Tap Count") @@ -3898,7 +4624,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch4indirectTouch = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlTouchscreentouch4indirectTouch.Setup() - .At(this, 130) + .At(this, 154) .WithParent(parent) .WithName("indirectTouch") .WithDisplayName("Touch Indirect Touch?") @@ -3922,7 +4648,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch4tap = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlTouchscreentouch4tap.Setup() - .At(this, 131) + .At(this, 155) .WithParent(parent) .WithName("tap") .WithDisplayName("Touch Tap") @@ -3945,7 +4671,7 @@ private UnityEngine.InputSystem.Controls.DoubleControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch4startTime = new UnityEngine.InputSystem.Controls.DoubleControl(); ctrlTouchscreentouch4startTime.Setup() - .At(this, 132) + .At(this, 156) .WithParent(parent) .WithName("startTime") .WithDisplayName("Touch Start Time") @@ -3967,9 +4693,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch4startPosition = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch4startPosition.Setup() - .At(this, 133) + .At(this, 157) .WithParent(parent) - .WithChildren(140, 2) + .WithChildren(168, 2) .WithName("startPosition") .WithDisplayName("Touch Start Position") .WithShortDisplayName("Touch Start Position") @@ -3977,64 +4703,152 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre .IsSynthetic(true) .WithStateBlock(new InputStateBlock { - format = new FourCC(1447379762), - byteOffset = 328, + format = new FourCC(1447379762), + byteOffset = 328, + bitOffset = 0, + sizeInBits = 64 + }) + .Finish(); + return ctrlTouchscreentouch4startPosition; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch4positionx(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch4positionx = new UnityEngine.InputSystem.Controls.AxisControl(); + ctrlTouchscreentouch4positionx.Setup() + .At(this, 158) + .WithParent(parent) + .WithName("x") + .WithDisplayName("Touch Touch Position X") + .WithShortDisplayName("Touch Touch Position X") + .WithLayout(kAxisLayout) + .DontReset(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 284, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch4positionx; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch4positiony(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch4positiony = new UnityEngine.InputSystem.Controls.AxisControl(); + ctrlTouchscreentouch4positiony.Setup() + .At(this, 159) + .WithParent(parent) + .WithName("y") + .WithDisplayName("Touch Touch Position Y") + .WithShortDisplayName("Touch Touch Position Y") + .WithLayout(kAxisLayout) + .DontReset(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 288, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch4positiony; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch4deltaup(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch4deltaup = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreentouch4deltaup.Setup() + .At(this, 160) + .WithParent(parent) + .WithName("up") + .WithDisplayName("Touch Touch Delta Up") + .WithShortDisplayName("Touch Touch Delta Up") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 296, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch4deltaup; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch4deltadown(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch4deltadown = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreentouch4deltadown.Setup() + .At(this, 161) + .WithParent(parent) + .WithName("down") + .WithDisplayName("Touch Touch Delta Down") + .WithShortDisplayName("Touch Touch Delta Down") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 296, bitOffset = 0, - sizeInBits = 64 + sizeInBits = 32 }) .Finish(); - return ctrlTouchscreentouch4startPosition; + return ctrlTouchscreentouch4deltadown; } - private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch4positionx(InternedString kAxisLayout, InputControl parent) + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch4deltaleft(InternedString kAxisLayout, InputControl parent) { - var ctrlTouchscreentouch4positionx = new UnityEngine.InputSystem.Controls.AxisControl(); - ctrlTouchscreentouch4positionx.Setup() - .At(this, 134) + var ctrlTouchscreentouch4deltaleft = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreentouch4deltaleft.Setup() + .At(this, 162) .WithParent(parent) - .WithName("x") - .WithDisplayName("Touch Touch Position X") - .WithShortDisplayName("Touch Touch Position X") + .WithName("left") + .WithDisplayName("Touch Touch Delta Left") + .WithShortDisplayName("Touch Touch Delta Left") .WithLayout(kAxisLayout) - .DontReset(true) + .IsSynthetic(true) .WithStateBlock(new InputStateBlock { format = new FourCC(1179407392), - byteOffset = 284, + byteOffset = 292, bitOffset = 0, sizeInBits = 32 }) .Finish(); - return ctrlTouchscreentouch4positionx; + return ctrlTouchscreentouch4deltaleft; } - private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch4positiony(InternedString kAxisLayout, InputControl parent) + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch4deltaright(InternedString kAxisLayout, InputControl parent) { - var ctrlTouchscreentouch4positiony = new UnityEngine.InputSystem.Controls.AxisControl(); - ctrlTouchscreentouch4positiony.Setup() - .At(this, 135) + var ctrlTouchscreentouch4deltaright = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreentouch4deltaright.Setup() + .At(this, 163) .WithParent(parent) - .WithName("y") - .WithDisplayName("Touch Touch Position Y") - .WithShortDisplayName("Touch Touch Position Y") + .WithName("right") + .WithDisplayName("Touch Touch Delta Right") + .WithShortDisplayName("Touch Touch Delta Right") .WithLayout(kAxisLayout) - .DontReset(true) + .IsSynthetic(true) .WithStateBlock(new InputStateBlock { format = new FourCC(1179407392), - byteOffset = 288, + byteOffset = 292, bitOffset = 0, sizeInBits = 32 }) .Finish(); - return ctrlTouchscreentouch4positiony; + return ctrlTouchscreentouch4deltaright; } private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch4deltax(InternedString kAxisLayout, InputControl parent) { var ctrlTouchscreentouch4deltax = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch4deltax.Setup() - .At(this, 136) + .At(this, 164) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Delta X") @@ -4055,7 +4869,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch4deltay = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch4deltay.Setup() - .At(this, 137) + .At(this, 165) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Delta Y") @@ -4076,7 +4890,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch4radiusx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch4radiusx.Setup() - .At(this, 138) + .At(this, 166) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Radius X") @@ -4097,7 +4911,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch4radiusy = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch4radiusy.Setup() - .At(this, 139) + .At(this, 167) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Radius Y") @@ -4118,7 +4932,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch4startPositionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch4startPositionx.Setup() - .At(this, 140) + .At(this, 168) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Start Position X") @@ -4139,7 +4953,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch4startPositiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch4startPositiony.Setup() - .At(this, 141) + .At(this, 169) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Start Position Y") @@ -4160,7 +4974,7 @@ private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscre { var ctrlTouchscreentouch5touchId = new UnityEngine.InputSystem.Controls.IntegerControl(); ctrlTouchscreentouch5touchId.Setup() - .At(this, 142) + .At(this, 170) .WithParent(parent) .WithName("touchId") .WithDisplayName("Touch Touch ID") @@ -4183,9 +4997,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch5position = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch5position.Setup() - .At(this, 143) + .At(this, 171) .WithParent(parent) - .WithChildren(154, 2) + .WithChildren(182, 2) .WithName("position") .WithDisplayName("Touch Position") .WithShortDisplayName("Touch Position") @@ -4202,17 +5016,17 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre return ctrlTouchscreentouch5position; } - private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscreentouch5delta(InternedString kVector2Layout, InputControl parent) + private UnityEngine.InputSystem.Controls.DeltaControl Initialize_ctrlTouchscreentouch5delta(InternedString kDeltaLayout, InputControl parent) { - var ctrlTouchscreentouch5delta = new UnityEngine.InputSystem.Controls.Vector2Control(); + var ctrlTouchscreentouch5delta = new UnityEngine.InputSystem.Controls.DeltaControl(); ctrlTouchscreentouch5delta.Setup() - .At(this, 144) + .At(this, 172) .WithParent(parent) - .WithChildren(156, 2) + .WithChildren(184, 6) .WithName("delta") .WithDisplayName("Touch Delta") .WithShortDisplayName("Touch Delta") - .WithLayout(kVector2Layout) + .WithLayout(kDeltaLayout) .WithStateBlock(new InputStateBlock { format = new FourCC(1447379762), @@ -4228,7 +5042,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch5pressure = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch5pressure.Setup() - .At(this, 145) + .At(this, 173) .WithParent(parent) .WithName("pressure") .WithDisplayName("Touch Pressure") @@ -4249,9 +5063,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch5radius = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch5radius.Setup() - .At(this, 146) + .At(this, 174) .WithParent(parent) - .WithChildren(158, 2) + .WithChildren(190, 2) .WithName("radius") .WithDisplayName("Touch Radius") .WithShortDisplayName("Touch Radius") @@ -4271,7 +5085,7 @@ private UnityEngine.InputSystem.Controls.TouchPhaseControl Initialize_ctrlTouchs { var ctrlTouchscreentouch5phase = new UnityEngine.InputSystem.Controls.TouchPhaseControl(); ctrlTouchscreentouch5phase.Setup() - .At(this, 147) + .At(this, 175) .WithParent(parent) .WithName("phase") .WithDisplayName("Touch Touch Phase") @@ -4293,7 +5107,7 @@ private UnityEngine.InputSystem.Controls.TouchPressControl Initialize_ctrlTouchs { var ctrlTouchscreentouch5press = new UnityEngine.InputSystem.Controls.TouchPressControl(); ctrlTouchscreentouch5press.Setup() - .At(this, 148) + .At(this, 176) .WithParent(parent) .WithName("press") .WithDisplayName("Touch Touch Contact?") @@ -4316,7 +5130,7 @@ private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscre { var ctrlTouchscreentouch5tapCount = new UnityEngine.InputSystem.Controls.IntegerControl(); ctrlTouchscreentouch5tapCount.Setup() - .At(this, 149) + .At(this, 177) .WithParent(parent) .WithName("tapCount") .WithDisplayName("Touch Tap Count") @@ -4337,7 +5151,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch5indirectTouch = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlTouchscreentouch5indirectTouch.Setup() - .At(this, 150) + .At(this, 178) .WithParent(parent) .WithName("indirectTouch") .WithDisplayName("Touch Indirect Touch?") @@ -4361,7 +5175,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch5tap = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlTouchscreentouch5tap.Setup() - .At(this, 151) + .At(this, 179) .WithParent(parent) .WithName("tap") .WithDisplayName("Touch Tap") @@ -4384,7 +5198,7 @@ private UnityEngine.InputSystem.Controls.DoubleControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch5startTime = new UnityEngine.InputSystem.Controls.DoubleControl(); ctrlTouchscreentouch5startTime.Setup() - .At(this, 152) + .At(this, 180) .WithParent(parent) .WithName("startTime") .WithDisplayName("Touch Start Time") @@ -4406,9 +5220,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch5startPosition = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch5startPosition.Setup() - .At(this, 153) + .At(this, 181) .WithParent(parent) - .WithChildren(160, 2) + .WithChildren(192, 2) .WithName("startPosition") .WithDisplayName("Touch Start Position") .WithShortDisplayName("Touch Start Position") @@ -4429,7 +5243,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch5positionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch5positionx.Setup() - .At(this, 154) + .At(this, 182) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Position X") @@ -4451,7 +5265,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch5positiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch5positiony.Setup() - .At(this, 155) + .At(this, 183) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Position Y") @@ -4469,11 +5283,99 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent return ctrlTouchscreentouch5positiony; } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch5deltaup(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch5deltaup = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreentouch5deltaup.Setup() + .At(this, 184) + .WithParent(parent) + .WithName("up") + .WithDisplayName("Touch Touch Delta Up") + .WithShortDisplayName("Touch Touch Delta Up") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 352, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch5deltaup; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch5deltadown(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch5deltadown = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreentouch5deltadown.Setup() + .At(this, 185) + .WithParent(parent) + .WithName("down") + .WithDisplayName("Touch Touch Delta Down") + .WithShortDisplayName("Touch Touch Delta Down") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 352, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch5deltadown; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch5deltaleft(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch5deltaleft = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreentouch5deltaleft.Setup() + .At(this, 186) + .WithParent(parent) + .WithName("left") + .WithDisplayName("Touch Touch Delta Left") + .WithShortDisplayName("Touch Touch Delta Left") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 348, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch5deltaleft; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch5deltaright(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch5deltaright = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreentouch5deltaright.Setup() + .At(this, 187) + .WithParent(parent) + .WithName("right") + .WithDisplayName("Touch Touch Delta Right") + .WithShortDisplayName("Touch Touch Delta Right") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 348, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch5deltaright; + } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch5deltax(InternedString kAxisLayout, InputControl parent) { var ctrlTouchscreentouch5deltax = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch5deltax.Setup() - .At(this, 156) + .At(this, 188) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Delta X") @@ -4494,7 +5396,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch5deltay = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch5deltay.Setup() - .At(this, 157) + .At(this, 189) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Delta Y") @@ -4515,7 +5417,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch5radiusx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch5radiusx.Setup() - .At(this, 158) + .At(this, 190) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Radius X") @@ -4536,7 +5438,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch5radiusy = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch5radiusy.Setup() - .At(this, 159) + .At(this, 191) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Radius Y") @@ -4557,7 +5459,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch5startPositionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch5startPositionx.Setup() - .At(this, 160) + .At(this, 192) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Start Position X") @@ -4578,7 +5480,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch5startPositiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch5startPositiony.Setup() - .At(this, 161) + .At(this, 193) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Start Position Y") @@ -4599,7 +5501,7 @@ private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscre { var ctrlTouchscreentouch6touchId = new UnityEngine.InputSystem.Controls.IntegerControl(); ctrlTouchscreentouch6touchId.Setup() - .At(this, 162) + .At(this, 194) .WithParent(parent) .WithName("touchId") .WithDisplayName("Touch Touch ID") @@ -4622,9 +5524,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch6position = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch6position.Setup() - .At(this, 163) + .At(this, 195) .WithParent(parent) - .WithChildren(174, 2) + .WithChildren(206, 2) .WithName("position") .WithDisplayName("Touch Position") .WithShortDisplayName("Touch Position") @@ -4641,17 +5543,17 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre return ctrlTouchscreentouch6position; } - private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscreentouch6delta(InternedString kVector2Layout, InputControl parent) + private UnityEngine.InputSystem.Controls.DeltaControl Initialize_ctrlTouchscreentouch6delta(InternedString kDeltaLayout, InputControl parent) { - var ctrlTouchscreentouch6delta = new UnityEngine.InputSystem.Controls.Vector2Control(); + var ctrlTouchscreentouch6delta = new UnityEngine.InputSystem.Controls.DeltaControl(); ctrlTouchscreentouch6delta.Setup() - .At(this, 164) + .At(this, 196) .WithParent(parent) - .WithChildren(176, 2) + .WithChildren(208, 6) .WithName("delta") .WithDisplayName("Touch Delta") .WithShortDisplayName("Touch Delta") - .WithLayout(kVector2Layout) + .WithLayout(kDeltaLayout) .WithStateBlock(new InputStateBlock { format = new FourCC(1447379762), @@ -4667,7 +5569,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch6pressure = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch6pressure.Setup() - .At(this, 165) + .At(this, 197) .WithParent(parent) .WithName("pressure") .WithDisplayName("Touch Pressure") @@ -4688,9 +5590,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch6radius = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch6radius.Setup() - .At(this, 166) + .At(this, 198) .WithParent(parent) - .WithChildren(178, 2) + .WithChildren(214, 2) .WithName("radius") .WithDisplayName("Touch Radius") .WithShortDisplayName("Touch Radius") @@ -4710,7 +5612,7 @@ private UnityEngine.InputSystem.Controls.TouchPhaseControl Initialize_ctrlTouchs { var ctrlTouchscreentouch6phase = new UnityEngine.InputSystem.Controls.TouchPhaseControl(); ctrlTouchscreentouch6phase.Setup() - .At(this, 167) + .At(this, 199) .WithParent(parent) .WithName("phase") .WithDisplayName("Touch Touch Phase") @@ -4732,7 +5634,7 @@ private UnityEngine.InputSystem.Controls.TouchPressControl Initialize_ctrlTouchs { var ctrlTouchscreentouch6press = new UnityEngine.InputSystem.Controls.TouchPressControl(); ctrlTouchscreentouch6press.Setup() - .At(this, 168) + .At(this, 200) .WithParent(parent) .WithName("press") .WithDisplayName("Touch Touch Contact?") @@ -4755,7 +5657,7 @@ private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscre { var ctrlTouchscreentouch6tapCount = new UnityEngine.InputSystem.Controls.IntegerControl(); ctrlTouchscreentouch6tapCount.Setup() - .At(this, 169) + .At(this, 201) .WithParent(parent) .WithName("tapCount") .WithDisplayName("Touch Tap Count") @@ -4776,7 +5678,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch6indirectTouch = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlTouchscreentouch6indirectTouch.Setup() - .At(this, 170) + .At(this, 202) .WithParent(parent) .WithName("indirectTouch") .WithDisplayName("Touch Indirect Touch?") @@ -4800,7 +5702,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch6tap = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlTouchscreentouch6tap.Setup() - .At(this, 171) + .At(this, 203) .WithParent(parent) .WithName("tap") .WithDisplayName("Touch Tap") @@ -4823,7 +5725,7 @@ private UnityEngine.InputSystem.Controls.DoubleControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch6startTime = new UnityEngine.InputSystem.Controls.DoubleControl(); ctrlTouchscreentouch6startTime.Setup() - .At(this, 172) + .At(this, 204) .WithParent(parent) .WithName("startTime") .WithDisplayName("Touch Start Time") @@ -4845,9 +5747,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch6startPosition = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch6startPosition.Setup() - .At(this, 173) + .At(this, 205) .WithParent(parent) - .WithChildren(180, 2) + .WithChildren(216, 2) .WithName("startPosition") .WithDisplayName("Touch Start Position") .WithShortDisplayName("Touch Start Position") @@ -4868,7 +5770,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch6positionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch6positionx.Setup() - .At(this, 174) + .At(this, 206) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Position X") @@ -4890,7 +5792,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch6positiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch6positiony.Setup() - .At(this, 175) + .At(this, 207) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Position Y") @@ -4908,11 +5810,99 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent return ctrlTouchscreentouch6positiony; } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch6deltaup(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch6deltaup = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreentouch6deltaup.Setup() + .At(this, 208) + .WithParent(parent) + .WithName("up") + .WithDisplayName("Touch Touch Delta Up") + .WithShortDisplayName("Touch Touch Delta Up") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 408, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch6deltaup; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch6deltadown(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch6deltadown = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreentouch6deltadown.Setup() + .At(this, 209) + .WithParent(parent) + .WithName("down") + .WithDisplayName("Touch Touch Delta Down") + .WithShortDisplayName("Touch Touch Delta Down") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 408, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch6deltadown; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch6deltaleft(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch6deltaleft = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreentouch6deltaleft.Setup() + .At(this, 210) + .WithParent(parent) + .WithName("left") + .WithDisplayName("Touch Touch Delta Left") + .WithShortDisplayName("Touch Touch Delta Left") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 404, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch6deltaleft; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch6deltaright(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch6deltaright = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreentouch6deltaright.Setup() + .At(this, 211) + .WithParent(parent) + .WithName("right") + .WithDisplayName("Touch Touch Delta Right") + .WithShortDisplayName("Touch Touch Delta Right") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 404, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch6deltaright; + } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch6deltax(InternedString kAxisLayout, InputControl parent) { var ctrlTouchscreentouch6deltax = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch6deltax.Setup() - .At(this, 176) + .At(this, 212) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Delta X") @@ -4933,7 +5923,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch6deltay = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch6deltay.Setup() - .At(this, 177) + .At(this, 213) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Delta Y") @@ -4954,7 +5944,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch6radiusx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch6radiusx.Setup() - .At(this, 178) + .At(this, 214) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Radius X") @@ -4975,7 +5965,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch6radiusy = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch6radiusy.Setup() - .At(this, 179) + .At(this, 215) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Radius Y") @@ -4996,7 +5986,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch6startPositionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch6startPositionx.Setup() - .At(this, 180) + .At(this, 216) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Start Position X") @@ -5017,7 +6007,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch6startPositiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch6startPositiony.Setup() - .At(this, 181) + .At(this, 217) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Start Position Y") @@ -5038,7 +6028,7 @@ private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscre { var ctrlTouchscreentouch7touchId = new UnityEngine.InputSystem.Controls.IntegerControl(); ctrlTouchscreentouch7touchId.Setup() - .At(this, 182) + .At(this, 218) .WithParent(parent) .WithName("touchId") .WithDisplayName("Touch Touch ID") @@ -5061,9 +6051,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch7position = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch7position.Setup() - .At(this, 183) + .At(this, 219) .WithParent(parent) - .WithChildren(194, 2) + .WithChildren(230, 2) .WithName("position") .WithDisplayName("Touch Position") .WithShortDisplayName("Touch Position") @@ -5080,17 +6070,17 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre return ctrlTouchscreentouch7position; } - private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscreentouch7delta(InternedString kVector2Layout, InputControl parent) + private UnityEngine.InputSystem.Controls.DeltaControl Initialize_ctrlTouchscreentouch7delta(InternedString kDeltaLayout, InputControl parent) { - var ctrlTouchscreentouch7delta = new UnityEngine.InputSystem.Controls.Vector2Control(); + var ctrlTouchscreentouch7delta = new UnityEngine.InputSystem.Controls.DeltaControl(); ctrlTouchscreentouch7delta.Setup() - .At(this, 184) + .At(this, 220) .WithParent(parent) - .WithChildren(196, 2) + .WithChildren(232, 6) .WithName("delta") .WithDisplayName("Touch Delta") .WithShortDisplayName("Touch Delta") - .WithLayout(kVector2Layout) + .WithLayout(kDeltaLayout) .WithStateBlock(new InputStateBlock { format = new FourCC(1447379762), @@ -5106,7 +6096,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch7pressure = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch7pressure.Setup() - .At(this, 185) + .At(this, 221) .WithParent(parent) .WithName("pressure") .WithDisplayName("Touch Pressure") @@ -5127,9 +6117,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch7radius = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch7radius.Setup() - .At(this, 186) + .At(this, 222) .WithParent(parent) - .WithChildren(198, 2) + .WithChildren(238, 2) .WithName("radius") .WithDisplayName("Touch Radius") .WithShortDisplayName("Touch Radius") @@ -5149,7 +6139,7 @@ private UnityEngine.InputSystem.Controls.TouchPhaseControl Initialize_ctrlTouchs { var ctrlTouchscreentouch7phase = new UnityEngine.InputSystem.Controls.TouchPhaseControl(); ctrlTouchscreentouch7phase.Setup() - .At(this, 187) + .At(this, 223) .WithParent(parent) .WithName("phase") .WithDisplayName("Touch Touch Phase") @@ -5171,7 +6161,7 @@ private UnityEngine.InputSystem.Controls.TouchPressControl Initialize_ctrlTouchs { var ctrlTouchscreentouch7press = new UnityEngine.InputSystem.Controls.TouchPressControl(); ctrlTouchscreentouch7press.Setup() - .At(this, 188) + .At(this, 224) .WithParent(parent) .WithName("press") .WithDisplayName("Touch Touch Contact?") @@ -5194,7 +6184,7 @@ private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscre { var ctrlTouchscreentouch7tapCount = new UnityEngine.InputSystem.Controls.IntegerControl(); ctrlTouchscreentouch7tapCount.Setup() - .At(this, 189) + .At(this, 225) .WithParent(parent) .WithName("tapCount") .WithDisplayName("Touch Tap Count") @@ -5215,7 +6205,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch7indirectTouch = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlTouchscreentouch7indirectTouch.Setup() - .At(this, 190) + .At(this, 226) .WithParent(parent) .WithName("indirectTouch") .WithDisplayName("Touch Indirect Touch?") @@ -5239,7 +6229,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch7tap = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlTouchscreentouch7tap.Setup() - .At(this, 191) + .At(this, 227) .WithParent(parent) .WithName("tap") .WithDisplayName("Touch Tap") @@ -5262,7 +6252,7 @@ private UnityEngine.InputSystem.Controls.DoubleControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch7startTime = new UnityEngine.InputSystem.Controls.DoubleControl(); ctrlTouchscreentouch7startTime.Setup() - .At(this, 192) + .At(this, 228) .WithParent(parent) .WithName("startTime") .WithDisplayName("Touch Start Time") @@ -5284,9 +6274,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch7startPosition = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch7startPosition.Setup() - .At(this, 193) + .At(this, 229) .WithParent(parent) - .WithChildren(200, 2) + .WithChildren(240, 2) .WithName("startPosition") .WithDisplayName("Touch Start Position") .WithShortDisplayName("Touch Start Position") @@ -5307,7 +6297,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch7positionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch7positionx.Setup() - .At(this, 194) + .At(this, 230) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Position X") @@ -5329,7 +6319,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch7positiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch7positiony.Setup() - .At(this, 195) + .At(this, 231) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Position Y") @@ -5347,11 +6337,99 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent return ctrlTouchscreentouch7positiony; } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch7deltaup(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch7deltaup = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreentouch7deltaup.Setup() + .At(this, 232) + .WithParent(parent) + .WithName("up") + .WithDisplayName("Touch Touch Delta Up") + .WithShortDisplayName("Touch Touch Delta Up") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 464, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch7deltaup; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch7deltadown(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch7deltadown = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreentouch7deltadown.Setup() + .At(this, 233) + .WithParent(parent) + .WithName("down") + .WithDisplayName("Touch Touch Delta Down") + .WithShortDisplayName("Touch Touch Delta Down") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 464, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch7deltadown; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch7deltaleft(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch7deltaleft = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreentouch7deltaleft.Setup() + .At(this, 234) + .WithParent(parent) + .WithName("left") + .WithDisplayName("Touch Touch Delta Left") + .WithShortDisplayName("Touch Touch Delta Left") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 460, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch7deltaleft; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch7deltaright(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch7deltaright = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreentouch7deltaright.Setup() + .At(this, 235) + .WithParent(parent) + .WithName("right") + .WithDisplayName("Touch Touch Delta Right") + .WithShortDisplayName("Touch Touch Delta Right") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 460, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch7deltaright; + } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch7deltax(InternedString kAxisLayout, InputControl parent) { var ctrlTouchscreentouch7deltax = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch7deltax.Setup() - .At(this, 196) + .At(this, 236) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Delta X") @@ -5372,7 +6450,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch7deltay = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch7deltay.Setup() - .At(this, 197) + .At(this, 237) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Delta Y") @@ -5393,7 +6471,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch7radiusx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch7radiusx.Setup() - .At(this, 198) + .At(this, 238) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Radius X") @@ -5414,7 +6492,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch7radiusy = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch7radiusy.Setup() - .At(this, 199) + .At(this, 239) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Radius Y") @@ -5435,7 +6513,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch7startPositionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch7startPositionx.Setup() - .At(this, 200) + .At(this, 240) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Start Position X") @@ -5456,7 +6534,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch7startPositiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch7startPositiony.Setup() - .At(this, 201) + .At(this, 241) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Start Position Y") @@ -5477,7 +6555,7 @@ private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscre { var ctrlTouchscreentouch8touchId = new UnityEngine.InputSystem.Controls.IntegerControl(); ctrlTouchscreentouch8touchId.Setup() - .At(this, 202) + .At(this, 242) .WithParent(parent) .WithName("touchId") .WithDisplayName("Touch Touch ID") @@ -5500,9 +6578,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch8position = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch8position.Setup() - .At(this, 203) + .At(this, 243) .WithParent(parent) - .WithChildren(214, 2) + .WithChildren(254, 2) .WithName("position") .WithDisplayName("Touch Position") .WithShortDisplayName("Touch Position") @@ -5519,17 +6597,17 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre return ctrlTouchscreentouch8position; } - private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscreentouch8delta(InternedString kVector2Layout, InputControl parent) + private UnityEngine.InputSystem.Controls.DeltaControl Initialize_ctrlTouchscreentouch8delta(InternedString kDeltaLayout, InputControl parent) { - var ctrlTouchscreentouch8delta = new UnityEngine.InputSystem.Controls.Vector2Control(); + var ctrlTouchscreentouch8delta = new UnityEngine.InputSystem.Controls.DeltaControl(); ctrlTouchscreentouch8delta.Setup() - .At(this, 204) + .At(this, 244) .WithParent(parent) - .WithChildren(216, 2) + .WithChildren(256, 6) .WithName("delta") .WithDisplayName("Touch Delta") .WithShortDisplayName("Touch Delta") - .WithLayout(kVector2Layout) + .WithLayout(kDeltaLayout) .WithStateBlock(new InputStateBlock { format = new FourCC(1447379762), @@ -5545,7 +6623,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch8pressure = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch8pressure.Setup() - .At(this, 205) + .At(this, 245) .WithParent(parent) .WithName("pressure") .WithDisplayName("Touch Pressure") @@ -5566,9 +6644,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch8radius = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch8radius.Setup() - .At(this, 206) + .At(this, 246) .WithParent(parent) - .WithChildren(218, 2) + .WithChildren(262, 2) .WithName("radius") .WithDisplayName("Touch Radius") .WithShortDisplayName("Touch Radius") @@ -5588,7 +6666,7 @@ private UnityEngine.InputSystem.Controls.TouchPhaseControl Initialize_ctrlTouchs { var ctrlTouchscreentouch8phase = new UnityEngine.InputSystem.Controls.TouchPhaseControl(); ctrlTouchscreentouch8phase.Setup() - .At(this, 207) + .At(this, 247) .WithParent(parent) .WithName("phase") .WithDisplayName("Touch Touch Phase") @@ -5610,7 +6688,7 @@ private UnityEngine.InputSystem.Controls.TouchPressControl Initialize_ctrlTouchs { var ctrlTouchscreentouch8press = new UnityEngine.InputSystem.Controls.TouchPressControl(); ctrlTouchscreentouch8press.Setup() - .At(this, 208) + .At(this, 248) .WithParent(parent) .WithName("press") .WithDisplayName("Touch Touch Contact?") @@ -5633,7 +6711,7 @@ private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscre { var ctrlTouchscreentouch8tapCount = new UnityEngine.InputSystem.Controls.IntegerControl(); ctrlTouchscreentouch8tapCount.Setup() - .At(this, 209) + .At(this, 249) .WithParent(parent) .WithName("tapCount") .WithDisplayName("Touch Tap Count") @@ -5654,7 +6732,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch8indirectTouch = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlTouchscreentouch8indirectTouch.Setup() - .At(this, 210) + .At(this, 250) .WithParent(parent) .WithName("indirectTouch") .WithDisplayName("Touch Indirect Touch?") @@ -5678,7 +6756,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch8tap = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlTouchscreentouch8tap.Setup() - .At(this, 211) + .At(this, 251) .WithParent(parent) .WithName("tap") .WithDisplayName("Touch Tap") @@ -5701,7 +6779,7 @@ private UnityEngine.InputSystem.Controls.DoubleControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch8startTime = new UnityEngine.InputSystem.Controls.DoubleControl(); ctrlTouchscreentouch8startTime.Setup() - .At(this, 212) + .At(this, 252) .WithParent(parent) .WithName("startTime") .WithDisplayName("Touch Start Time") @@ -5723,9 +6801,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch8startPosition = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch8startPosition.Setup() - .At(this, 213) + .At(this, 253) .WithParent(parent) - .WithChildren(220, 2) + .WithChildren(264, 2) .WithName("startPosition") .WithDisplayName("Touch Start Position") .WithShortDisplayName("Touch Start Position") @@ -5746,7 +6824,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch8positionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch8positionx.Setup() - .At(this, 214) + .At(this, 254) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Position X") @@ -5768,7 +6846,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch8positiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch8positiony.Setup() - .At(this, 215) + .At(this, 255) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Position Y") @@ -5786,11 +6864,99 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent return ctrlTouchscreentouch8positiony; } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch8deltaup(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch8deltaup = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreentouch8deltaup.Setup() + .At(this, 256) + .WithParent(parent) + .WithName("up") + .WithDisplayName("Touch Touch Delta Up") + .WithShortDisplayName("Touch Touch Delta Up") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 520, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch8deltaup; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch8deltadown(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch8deltadown = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreentouch8deltadown.Setup() + .At(this, 257) + .WithParent(parent) + .WithName("down") + .WithDisplayName("Touch Touch Delta Down") + .WithShortDisplayName("Touch Touch Delta Down") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 520, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch8deltadown; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch8deltaleft(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch8deltaleft = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreentouch8deltaleft.Setup() + .At(this, 258) + .WithParent(parent) + .WithName("left") + .WithDisplayName("Touch Touch Delta Left") + .WithShortDisplayName("Touch Touch Delta Left") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 516, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch8deltaleft; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch8deltaright(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch8deltaright = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreentouch8deltaright.Setup() + .At(this, 259) + .WithParent(parent) + .WithName("right") + .WithDisplayName("Touch Touch Delta Right") + .WithShortDisplayName("Touch Touch Delta Right") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 516, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch8deltaright; + } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch8deltax(InternedString kAxisLayout, InputControl parent) { var ctrlTouchscreentouch8deltax = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch8deltax.Setup() - .At(this, 216) + .At(this, 260) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Delta X") @@ -5811,7 +6977,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch8deltay = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch8deltay.Setup() - .At(this, 217) + .At(this, 261) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Delta Y") @@ -5832,7 +6998,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch8radiusx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch8radiusx.Setup() - .At(this, 218) + .At(this, 262) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Radius X") @@ -5853,7 +7019,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch8radiusy = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch8radiusy.Setup() - .At(this, 219) + .At(this, 263) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Radius Y") @@ -5874,7 +7040,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch8startPositionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch8startPositionx.Setup() - .At(this, 220) + .At(this, 264) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Start Position X") @@ -5895,7 +7061,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch8startPositiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch8startPositiony.Setup() - .At(this, 221) + .At(this, 265) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Start Position Y") @@ -5916,7 +7082,7 @@ private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscre { var ctrlTouchscreentouch9touchId = new UnityEngine.InputSystem.Controls.IntegerControl(); ctrlTouchscreentouch9touchId.Setup() - .At(this, 222) + .At(this, 266) .WithParent(parent) .WithName("touchId") .WithDisplayName("Touch Touch ID") @@ -5939,9 +7105,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch9position = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch9position.Setup() - .At(this, 223) + .At(this, 267) .WithParent(parent) - .WithChildren(234, 2) + .WithChildren(278, 2) .WithName("position") .WithDisplayName("Touch Position") .WithShortDisplayName("Touch Position") @@ -5958,17 +7124,17 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre return ctrlTouchscreentouch9position; } - private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscreentouch9delta(InternedString kVector2Layout, InputControl parent) + private UnityEngine.InputSystem.Controls.DeltaControl Initialize_ctrlTouchscreentouch9delta(InternedString kDeltaLayout, InputControl parent) { - var ctrlTouchscreentouch9delta = new UnityEngine.InputSystem.Controls.Vector2Control(); + var ctrlTouchscreentouch9delta = new UnityEngine.InputSystem.Controls.DeltaControl(); ctrlTouchscreentouch9delta.Setup() - .At(this, 224) + .At(this, 268) .WithParent(parent) - .WithChildren(236, 2) + .WithChildren(280, 6) .WithName("delta") .WithDisplayName("Touch Delta") .WithShortDisplayName("Touch Delta") - .WithLayout(kVector2Layout) + .WithLayout(kDeltaLayout) .WithStateBlock(new InputStateBlock { format = new FourCC(1447379762), @@ -5984,7 +7150,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch9pressure = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch9pressure.Setup() - .At(this, 225) + .At(this, 269) .WithParent(parent) .WithName("pressure") .WithDisplayName("Touch Pressure") @@ -6005,9 +7171,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch9radius = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch9radius.Setup() - .At(this, 226) + .At(this, 270) .WithParent(parent) - .WithChildren(238, 2) + .WithChildren(286, 2) .WithName("radius") .WithDisplayName("Touch Radius") .WithShortDisplayName("Touch Radius") @@ -6027,7 +7193,7 @@ private UnityEngine.InputSystem.Controls.TouchPhaseControl Initialize_ctrlTouchs { var ctrlTouchscreentouch9phase = new UnityEngine.InputSystem.Controls.TouchPhaseControl(); ctrlTouchscreentouch9phase.Setup() - .At(this, 227) + .At(this, 271) .WithParent(parent) .WithName("phase") .WithDisplayName("Touch Touch Phase") @@ -6049,7 +7215,7 @@ private UnityEngine.InputSystem.Controls.TouchPressControl Initialize_ctrlTouchs { var ctrlTouchscreentouch9press = new UnityEngine.InputSystem.Controls.TouchPressControl(); ctrlTouchscreentouch9press.Setup() - .At(this, 228) + .At(this, 272) .WithParent(parent) .WithName("press") .WithDisplayName("Touch Touch Contact?") @@ -6072,7 +7238,7 @@ private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscre { var ctrlTouchscreentouch9tapCount = new UnityEngine.InputSystem.Controls.IntegerControl(); ctrlTouchscreentouch9tapCount.Setup() - .At(this, 229) + .At(this, 273) .WithParent(parent) .WithName("tapCount") .WithDisplayName("Touch Tap Count") @@ -6093,7 +7259,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch9indirectTouch = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlTouchscreentouch9indirectTouch.Setup() - .At(this, 230) + .At(this, 274) .WithParent(parent) .WithName("indirectTouch") .WithDisplayName("Touch Indirect Touch?") @@ -6117,7 +7283,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch9tap = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlTouchscreentouch9tap.Setup() - .At(this, 231) + .At(this, 275) .WithParent(parent) .WithName("tap") .WithDisplayName("Touch Tap") @@ -6140,7 +7306,7 @@ private UnityEngine.InputSystem.Controls.DoubleControl Initialize_ctrlTouchscree { var ctrlTouchscreentouch9startTime = new UnityEngine.InputSystem.Controls.DoubleControl(); ctrlTouchscreentouch9startTime.Setup() - .At(this, 232) + .At(this, 276) .WithParent(parent) .WithName("startTime") .WithDisplayName("Touch Start Time") @@ -6162,9 +7328,9 @@ private UnityEngine.InputSystem.Controls.Vector2Control Initialize_ctrlTouchscre { var ctrlTouchscreentouch9startPosition = new UnityEngine.InputSystem.Controls.Vector2Control(); ctrlTouchscreentouch9startPosition.Setup() - .At(this, 233) + .At(this, 277) .WithParent(parent) - .WithChildren(240, 2) + .WithChildren(288, 2) .WithName("startPosition") .WithDisplayName("Touch Start Position") .WithShortDisplayName("Touch Start Position") @@ -6185,7 +7351,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch9positionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch9positionx.Setup() - .At(this, 234) + .At(this, 278) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Position X") @@ -6207,7 +7373,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch9positiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch9positiony.Setup() - .At(this, 235) + .At(this, 279) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Position Y") @@ -6225,11 +7391,99 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent return ctrlTouchscreentouch9positiony; } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch9deltaup(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch9deltaup = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreentouch9deltaup.Setup() + .At(this, 280) + .WithParent(parent) + .WithName("up") + .WithDisplayName("Touch Touch Delta Up") + .WithShortDisplayName("Touch Touch Delta Up") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 576, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch9deltaup; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch9deltadown(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch9deltadown = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreentouch9deltadown.Setup() + .At(this, 281) + .WithParent(parent) + .WithName("down") + .WithDisplayName("Touch Touch Delta Down") + .WithShortDisplayName("Touch Touch Delta Down") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 576, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch9deltadown; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch9deltaleft(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch9deltaleft = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = -3.402823E+38f, invert = true }; + ctrlTouchscreentouch9deltaleft.Setup() + .At(this, 282) + .WithParent(parent) + .WithName("left") + .WithDisplayName("Touch Touch Delta Left") + .WithShortDisplayName("Touch Touch Delta Left") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 572, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch9deltaleft; + } + + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch9deltaright(InternedString kAxisLayout, InputControl parent) + { + var ctrlTouchscreentouch9deltaright = new UnityEngine.InputSystem.Controls.AxisControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 3.402823E+38f }; + ctrlTouchscreentouch9deltaright.Setup() + .At(this, 283) + .WithParent(parent) + .WithName("right") + .WithDisplayName("Touch Touch Delta Right") + .WithShortDisplayName("Touch Touch Delta Right") + .WithLayout(kAxisLayout) + .IsSynthetic(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1179407392), + byteOffset = 572, + bitOffset = 0, + sizeInBits = 32 + }) + .Finish(); + return ctrlTouchscreentouch9deltaright; + } + private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreentouch9deltax(InternedString kAxisLayout, InputControl parent) { var ctrlTouchscreentouch9deltax = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch9deltax.Setup() - .At(this, 236) + .At(this, 284) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Delta X") @@ -6250,7 +7504,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch9deltay = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch9deltay.Setup() - .At(this, 237) + .At(this, 285) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Delta Y") @@ -6271,7 +7525,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch9radiusx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch9radiusx.Setup() - .At(this, 238) + .At(this, 286) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Radius X") @@ -6292,7 +7546,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch9radiusy = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch9radiusy.Setup() - .At(this, 239) + .At(this, 287) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Radius Y") @@ -6313,7 +7567,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch9startPositionx = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch9startPositionx.Setup() - .At(this, 240) + .At(this, 288) .WithParent(parent) .WithName("x") .WithDisplayName("Touch Touch Start Position X") @@ -6334,7 +7588,7 @@ private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlTouchscreent { var ctrlTouchscreentouch9startPositiony = new UnityEngine.InputSystem.Controls.AxisControl(); ctrlTouchscreentouch9startPositiony.Setup() - .At(this, 241) + .At(this, 289) .WithParent(parent) .WithName("y") .WithDisplayName("Touch Touch Start Position Y") diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Touchscreen.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Touchscreen.cs index 1bc4aa2e25..9d67a29e5e 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Devices/Touchscreen.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Devices/Touchscreen.cs @@ -109,7 +109,7 @@ public struct TouchState : IInputStateTypeInfo /// /// Screen-space movement delta. /// - [InputControl(displayName = "Delta")] + [InputControl(displayName = "Delta", layout = "Delta")] [FieldOffset(12)] public Vector2 delta; @@ -368,7 +368,7 @@ internal unsafe struct TouchscreenState : IInputStateTypeInfo // them by assigning them invalid offsets (thus having automatic state // layout put them at the end of our fixed state). [InputControl(name = "position", useStateFrom = "primaryTouch/position")] - [InputControl(name = "delta", useStateFrom = "primaryTouch/delta")] + [InputControl(name = "delta", useStateFrom = "primaryTouch/delta", layout = "Delta")] [InputControl(name = "pressure", useStateFrom = "primaryTouch/pressure")] [InputControl(name = "radius", useStateFrom = "primaryTouch/radius")] [InputControl(name = "press", useStateFrom = "primaryTouch/phase", layout = "TouchPress", synthetic = true, usages = new string[0])] diff --git a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs index 98114c8018..e1a6f7ca6d 100755 --- a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs @@ -1832,6 +1832,8 @@ internal void InitializeData() m_PollingFrequency = 60; // Register layouts. + // NOTE: Base layouts must be registered before their derived layouts + // for the detection of base layouts to work. RegisterControlLayout("Axis", typeof(AxisControl)); // Controls. RegisterControlLayout("Button", typeof(ButtonControl)); RegisterControlLayout("DiscreteButton", typeof(DiscreteButtonControl)); @@ -1842,6 +1844,7 @@ internal void InitializeData() RegisterControlLayout("Double", typeof(DoubleControl)); RegisterControlLayout("Vector2", typeof(Vector2Control)); RegisterControlLayout("Vector3", typeof(Vector3Control)); + RegisterControlLayout("Delta", typeof(DeltaControl)); RegisterControlLayout("Quaternion", typeof(QuaternionControl)); RegisterControlLayout("Stick", typeof(StickControl)); RegisterControlLayout("Dpad", typeof(DpadControl)); From f3a9409de29732c00230ead23ecb1533b1874d42 Mon Sep 17 00:00:00 2001 From: Rene Damm Date: Fri, 4 Feb 2022 18:26:09 +0100 Subject: [PATCH 25/53] FIX: Device picker not showing some device layouts (#1476). --- Assets/Tests/InputSystem/Plugins/XRTests.cs | 5 ++++- Packages/com.unity.inputsystem/CHANGELOG.md | 1 + .../InputSystem/Controls/InputControlLayout.cs | 2 +- .../Editor/ControlPicker/InputControlPickerDropdown.cs | 6 ++++-- .../InputSystem/Editor/Debugger/InputDebuggerWindow.cs | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Assets/Tests/InputSystem/Plugins/XRTests.cs b/Assets/Tests/InputSystem/Plugins/XRTests.cs index a460efecd1..2e1270aadc 100644 --- a/Assets/Tests/InputSystem/Plugins/XRTests.cs +++ b/Assets/Tests/InputSystem/Plugins/XRTests.cs @@ -45,7 +45,10 @@ public void Devices_XRDeviceRoleDeterminesTypeOfDevice(InputDeviceRole role, str var generatedLayout = InputSystem.LoadLayout( $"{XRUtilities.InterfaceCurrent}::{deviceDescription.manufacturer}::{deviceDescription.product}"); Assert.That(generatedLayout, Is.Not.Null); - Assert.That(generatedLayout.baseLayouts, Is.EquivalentTo(new[] { new InternedString(baseLayoutName) })); + if (baseLayoutName == null) + Assert.That(generatedLayout.baseLayouts, Is.Empty); + else + Assert.That(generatedLayout.baseLayouts, Is.EquivalentTo(new[] { new InternedString(baseLayoutName) })); } [Test] diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 4ff1d54919..7b2affb3cc 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -49,6 +49,7 @@ however, it has to be formatted properly to pass verification tests. * This would, for example, cause `Keyboard.eKey` to be matched by `/escape`. * Fix contributed by [Fredrik Ludvigsen](https://github.com/steinbitglis) in [#1485](https://github.com/Unity-Technologies/InputSystem/pull/1485). - Fixed `OnScreenButton` triggering `NullReferenceException` in combination with custom devices ([case 1380790 ](https://issuetracker.unity3d.com/issues/nullreferenceexception-error-when-setting-on-screen-button-to-a-custom-device)). +- Fixed dropdown for "Supported Devices" in settings not showing all device layouts. #### Actions diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlLayout.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlLayout.cs index d263f1082a..501378afdc 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlLayout.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlLayout.cs @@ -935,7 +935,7 @@ public InputControlLayout Build() m_DisplayName = displayName, m_StateFormat = stateFormat, m_StateSizeInBytes = stateSizeInBytes, - m_BaseLayouts = new InlinedArray(new InternedString(extendsLayout)), + m_BaseLayouts = !string.IsNullOrEmpty(extendsLayout) ? new InlinedArray(new InternedString(extendsLayout)) : default, m_Controls = controls, m_UpdateBeforeRender = updateBeforeRender }; diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs index 64acb98e87..27aeb10d5a 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs @@ -155,7 +155,7 @@ private void AddItemsForDevices(AdvancedDropdownItem parent) var otherGroup = new AdvancedDropdownItem("Other"); foreach (var deviceLayout in EditorInputControlLayoutCache.allLayouts .Where(x => x.isDeviceLayout && !x.isOverride && !x.isGenericTypeOfDevice && - x.type.BaseType == typeof(InputDevice) && + (x.type.BaseType == typeof(InputDevice) || x.type == typeof(InputDevice)) && !x.hideInUI && !x.baseLayouts.Any()).OrderBy(a => a.displayName)) { AddDeviceTreeItemRecursive(deviceLayout, otherGroup); @@ -180,7 +180,6 @@ private void AddDeviceTreeItemRecursive(InputControlLayout layout, AdvancedDropd // Add toplevel item for device. var deviceItem = new DeviceDropdownItem(layout, searchable: searchable); - parent.AddChild(deviceItem); var defaultControlPickerLayout = new DefaultInputControlPickerLayout(); @@ -257,6 +256,9 @@ private void AddDeviceTreeItemRecursive(InputControlLayout layout, AdvancedDropd var item = new DeviceDropdownItem(layout); deviceItem.m_Children.Insert(0, item); } + + if (deviceItem.m_Children.Count > 0 || m_Mode == InputControlPicker.Mode.PickDevice) + parent.AddChild(deviceItem); } private void AddControlTreeItemsRecursive(IInputControlPickerLayout controlPickerLayout, InputControlLayout layout, diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Debugger/InputDebuggerWindow.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Debugger/InputDebuggerWindow.cs index 404eeceef9..0c78401a10 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Debugger/InputDebuggerWindow.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Debugger/InputDebuggerWindow.cs @@ -755,7 +755,7 @@ private TreeViewItem AddControlLayoutItem(InputControlLayout layout, TreeViewIte parent.AddChild(item); // Header. - AddChild(item, "Type: " + layout.type.Name, ref id); + AddChild(item, "Type: " + layout.type?.Name, ref id); if (!string.IsNullOrEmpty(layout.m_DisplayName)) AddChild(item, "Display Name: " + layout.m_DisplayName, ref id); if (!string.IsNullOrEmpty(layout.name)) From 3ab2f4eeb5cbfbab173999efac572c77e992073e Mon Sep 17 00:00:00 2001 From: Rene Damm Date: Fri, 4 Feb 2022 18:51:01 +0100 Subject: [PATCH 26/53] CHANGE: Move initialization to SubsystemRegistration (case 1292358, #1494). --- Packages/com.unity.inputsystem/CHANGELOG.md | 1 + Packages/com.unity.inputsystem/InputSystem/InputSystem.cs | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 7b2affb3cc..51fcb46a86 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -49,6 +49,7 @@ however, it has to be formatted properly to pass verification tests. * This would, for example, cause `Keyboard.eKey` to be matched by `/escape`. * Fix contributed by [Fredrik Ludvigsen](https://github.com/steinbitglis) in [#1485](https://github.com/Unity-Technologies/InputSystem/pull/1485). - Fixed `OnScreenButton` triggering `NullReferenceException` in combination with custom devices ([case 1380790 ](https://issuetracker.unity3d.com/issues/nullreferenceexception-error-when-setting-on-screen-button-to-a-custom-device)). +- Fixed no devices being available in `Start` and `Awake` methods if, in the player, any `InputSystem` API was accessed during the `SubsystemRegistration` phase ([case 1392358](https://issuetracker.unity3d.com/issues/inputsystem-does-not-initialize-properly-in-a-build-when-accessed-early)). - Fixed dropdown for "Supported Devices" in settings not showing all device layouts. #### Actions diff --git a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs index 86b9b86879..d87cf6fe37 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs @@ -3160,7 +3160,7 @@ static InputSystem() ////FIXME: Unity is not calling this method if it's inside an #if block that is not //// visible to the editor; that shouldn't be the case - [RuntimeInitializeOnLoadMethod(loadType: RuntimeInitializeLoadType.BeforeSceneLoad)] + [RuntimeInitializeOnLoadMethod(loadType: RuntimeInitializeLoadType.SubsystemRegistration)] private static void RunInitializeInPlayer() { // We're using this method just to make sure the class constructor is called @@ -3393,12 +3393,11 @@ private static void InitializeInPlayer(IInputRuntime runtime = null, InputSettin if (ShouldEnableRemoting()) SetUpRemoting(); #endif - - RunInitialUpdate(); } #endif // UNITY_EDITOR + [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)] private static void RunInitialUpdate() { // Request an initial Update so that user methods such as Start and Awake From c3badc60c3c89c4b9b02c013a304ffb737870a7c Mon Sep 17 00:00:00 2001 From: Dmytro Ivanov Date: Mon, 7 Feb 2022 13:26:22 +0100 Subject: [PATCH 27/53] FIX: Ignoring error if more than max amount of touches present (#1506) --- Assets/Tests/InputSystem/CoreTests_Devices.cs | 18 ++++++++++++++++++ Packages/com.unity.inputsystem/CHANGELOG.md | 1 + .../Controls/InputControlExtensions.cs | 14 ++++++++++++-- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/Assets/Tests/InputSystem/CoreTests_Devices.cs b/Assets/Tests/InputSystem/CoreTests_Devices.cs index a876d8f89b..a0d7300409 100644 --- a/Assets/Tests/InputSystem/CoreTests_Devices.cs +++ b/Assets/Tests/InputSystem/CoreTests_Devices.cs @@ -5577,4 +5577,22 @@ public void Devices_EventPreProcessor_Can(PreProcessorTestDevice.Behavior second Assert.That(device.value1.ReadValue(), Is.EqualTo(expectedValue1)); Assert.That(device.value2.ReadValue(), Is.EqualTo(expectedValue2)); } + + // https://fogbugz.unity3d.com/f/cases/1395648/ + [Test] + [Category("Devices")] + public unsafe void Devices_DoesntErrorOutOnMaxTouchCount() + { + var touch = InputSystem.AddDevice(); + + InputSystem.onEvent += (InputEventPtr eventPtr, InputDevice device) => + { + Assert.That(() => eventPtr.HasButtonPress(), Throws.Nothing); + }; + + Assert.That(() => { + for (var i = 0; i < TouchscreenState.MaxTouches + 5; ++i) + BeginTouch(i, new Vector2(i * 1.0f, i * 2.0f), time: 0); + }, Throws.Nothing); + } } diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 51fcb46a86..9b23fcf7e3 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -51,6 +51,7 @@ however, it has to be formatted properly to pass verification tests. - Fixed `OnScreenButton` triggering `NullReferenceException` in combination with custom devices ([case 1380790 ](https://issuetracker.unity3d.com/issues/nullreferenceexception-error-when-setting-on-screen-button-to-a-custom-device)). - Fixed no devices being available in `Start` and `Awake` methods if, in the player, any `InputSystem` API was accessed during the `SubsystemRegistration` phase ([case 1392358](https://issuetracker.unity3d.com/issues/inputsystem-does-not-initialize-properly-in-a-build-when-accessed-early)). - Fixed dropdown for "Supported Devices" in settings not showing all device layouts. +- Fixed "STAT event with state format TOUC cannot be used with device 'Touchscreen:/Touchscreen'" when more than max supported amount of fingers, currently 10, are present on the screen at a same time (case 1395648). #### Actions diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlExtensions.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlExtensions.cs index bf09dd8906..b598693655 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlExtensions.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControlExtensions.cs @@ -1511,8 +1511,18 @@ public void Reset() m_NoiseMask += stateOffset; } else - throw new InvalidOperationException( - $"{eventType} event with state format {stateFormat} cannot be used with device '{m_Device}'"); + { + // https://fogbugz.unity3d.com/f/cases/1395648/ + if (m_Device is Touchscreen && m_EventPtr.IsA() && + StateEvent.FromUnchecked(m_EventPtr)->stateFormat == TouchState.Format) + { + // if GetStateOffsetForEvent(null, ...) return false on touchscreen it means that + // we don't have a free slot for incoming touch, so ignore it for now + } + else + throw new InvalidOperationException( + $"{eventType} event with state format {stateFormat} cannot be used with device '{m_Device}'"); + } } // NOTE: We *could* run a CheckDefault() or even CheckCurrent() over the entire event here to rule From 61a8bf4f8b7f6b30cd091ad224e6c2a235099a4f Mon Sep 17 00:00:00 2001 From: Dmytro Ivanov Date: Tue, 8 Feb 2022 09:57:05 +0100 Subject: [PATCH 28/53] FIX: Fixed event merger ignoring timeslicing boundaries (#1482) --- Assets/Tests/InputSystem/CoreTests_Devices.cs | 81 +++++++++++++++++++ Packages/com.unity.inputsystem/CHANGELOG.md | 1 + .../InputSystem/InputManager.cs | 11 ++- 3 files changed, 91 insertions(+), 2 deletions(-) diff --git a/Assets/Tests/InputSystem/CoreTests_Devices.cs b/Assets/Tests/InputSystem/CoreTests_Devices.cs index a0d7300409..f4165c56c1 100644 --- a/Assets/Tests/InputSystem/CoreTests_Devices.cs +++ b/Assets/Tests/InputSystem/CoreTests_Devices.cs @@ -5470,6 +5470,87 @@ public void Devices_EventMerging_OnlyConsecutiveMoveEventsAreMerged() Assert.That(mouseScrollAtKeyPressEvent, Is.EqualTo(new Vector2(5, 5))); } + [Test] + [Category("Devices")] + public void Devices_EventMerging_DoesntMergeOverFixedUpdateTimeBoundary() + { + InputSystem.settings.updateMode = InputSettings.UpdateMode.ProcessEventsInFixedUpdate; + + runtime.currentTimeOffsetToRealtimeSinceStartup = 0; + + var moveAction = new InputAction("Move", binding: "/position"); + int performedCount = 0; + Vector2 mousePosition = Vector2.zero; + moveAction.performed += ctx => + { + performedCount++; + mousePosition = ctx.ReadValue(); + }; + moveAction.Enable(); + + var mouse = InputSystem.AddDevice(); + + InputSystem.QueueStateEvent(mouse, + new MouseState + { + position = new Vector2(1.0f, 2.0f), + delta = new Vector2(1.0f, 1.0f), + }, time: 1); + InputSystem.QueueStateEvent(mouse, + new MouseState + { + position = new Vector2(2.0f, 3.0f), + delta = new Vector2(1.0f, 1.0f), + }, time: 2); + InputSystem.QueueStateEvent(mouse, + new MouseState + { + position = new Vector2(3.0f, 4.0f), + delta = new Vector2(1.0f, 1.0f), + }, time: 3); + InputSystem.QueueStateEvent(mouse, + new MouseState + { + position = new Vector2(4.0f, 5.0f), + delta = new Vector2(1.0f, 1.0f), + }, time: 4); + + // only first two events should be processed and merged together + { + runtime.currentTimeForFixedUpdate = 2.1f; + + InputSystem.Update(InputUpdateType.Fixed); + + Assert.That(performedCount, Is.EqualTo(1)); + Assert.That(mousePosition, Is.EqualTo(new Vector2(2, 3))); + Assert.That(Mouse.current.delta.ReadValue(), Is.EqualTo(new Vector2(2, 2))); + + performedCount = 0; + mousePosition = Vector2.zero; + } + + // if we advance fixed update slightly forward, no events get processed + { + runtime.currentTimeForFixedUpdate = 2.8f; + + InputSystem.Update(InputUpdateType.Fixed); + + Assert.That(performedCount, Is.EqualTo(0)); + Assert.That(Mouse.current.delta.ReadValue(), Is.EqualTo(new Vector2(0, 0))); + } + + // and last two events should be processed and merged together + { + runtime.currentTimeForFixedUpdate = 4.1f; + + InputSystem.Update(InputUpdateType.Fixed); + + Assert.That(performedCount, Is.EqualTo(1)); + Assert.That(mousePosition, Is.EqualTo(new Vector2(4, 5))); + Assert.That(Mouse.current.delta.ReadValue(), Is.EqualTo(new Vector2(2, 2))); + } + } + [StructLayout(LayoutKind.Sequential)] public struct PreProcessorTestDeviceState : IInputStateTypeInfo { diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 9b23fcf7e3..35fe7f770f 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -63,6 +63,7 @@ however, it has to be formatted properly to pass verification tests. * Fix contributed by [Russell Quinn](https://github.com/russellquinn) in [#1483](https://github.com/Unity-Technologies/InputSystem/pull/1483). - Fixed `AxisComposite` not respecting processors applied to `positive` and `negative` bindings (case 1398942). * This was a regression introduced in [1.0.0-pre.6](#axiscomposite-min-max-value-fix). +- Fixed mouse events not being timesliced when input system is switched to process input in fixed updates (case 1386738). ### Added diff --git a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs index e1a6f7ca6d..129916c068 100755 --- a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs @@ -3239,11 +3239,18 @@ private unsafe void OnUpdate(InputUpdateType updateType, ref InputEventBuffer ev // new buffering scheme for input events working in the native runtime. var nextEvent = m_InputEventStream.Peek(); - if (nextEvent != null && currentEventReadPtr->deviceId == nextEvent->deviceId) + // If there is next event after current one. + if ((nextEvent != null) + // And if next event is for the same device. + && (currentEventReadPtr->deviceId == nextEvent->deviceId) + // And if next event is in the same timeslicing slot. + && (timesliceEvents ? (nextEvent->internalTime < currentTime) : true) + ) { + // Then try to merge current event into next event. if (((IEventMerger)device).MergeForward(currentEventReadPtr, nextEvent)) { - // Event was merged into next event, skipping. + // And if succeeded, skip current event, as it was merged into next event. m_InputEventStream.Advance(false); continue; } From c1602e70e9469b6711ddf70cae5ff3c0b3f7d8e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kan=20Sidenvall?= Date: Tue, 8 Feb 2022 16:01:02 +0100 Subject: [PATCH 29/53] Nimbus+ mac HID support (#1502) * Added support for Nimbus+ gamepad on OSX. --- Assets/Tests/InputSystem/Plugins/OSXTests.cs | 187 ++++++++++++++++++ .../InputSystem/Plugins/OSXTests.cs.meta | 11 ++ Packages/com.unity.inputsystem/CHANGELOG.md | 3 + .../Documentation~/SupportedDevices.md | 3 +- .../InputSystem/InputSystem.cs | 4 + .../InputSystem/Plugins/OSX.meta | 8 + .../Plugins/OSX/OSXGameController.cs | 109 ++++++++++ .../Plugins/OSX/OSXGameController.cs.meta | 11 ++ .../InputSystem/Plugins/OSX/OSXSupport.cs | 32 +++ .../Plugins/OSX/OSXSupport.cs.meta | 11 ++ 10 files changed, 378 insertions(+), 1 deletion(-) create mode 100644 Assets/Tests/InputSystem/Plugins/OSXTests.cs create mode 100644 Assets/Tests/InputSystem/Plugins/OSXTests.cs.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Plugins/OSX.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Plugins/OSX/OSXGameController.cs create mode 100644 Packages/com.unity.inputsystem/InputSystem/Plugins/OSX/OSXGameController.cs.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Plugins/OSX/OSXSupport.cs create mode 100644 Packages/com.unity.inputsystem/InputSystem/Plugins/OSX/OSXSupport.cs.meta diff --git a/Assets/Tests/InputSystem/Plugins/OSXTests.cs b/Assets/Tests/InputSystem/Plugins/OSXTests.cs new file mode 100644 index 0000000000..a49bcb3b02 --- /dev/null +++ b/Assets/Tests/InputSystem/Plugins/OSXTests.cs @@ -0,0 +1,187 @@ +#if UNITY_EDITOR || UNITY_OSX + +using NUnit.Framework; +using UnityEngine; +using UnityEngine.InputSystem; +using UnityEngine.InputSystem.HID; +using UnityEngine.InputSystem.Layouts; +using UnityEngine.InputSystem.OSX; +using UnityEngine.InputSystem.OSX.LowLevel; +using UnityEngine.TestTools.Utils; + +internal class OSXTests : CoreTestsFixture +{ + [Test] + [Category("Devices")] + [TestCase(0xd, 0x0)] // OSX dummy VID/PID + public void Devices_SupportsNimbusPlusAsHID_WithProductNameAndPIDAndVID(int vendorId, int productId) + { + var device = InputSystem.AddDevice(new InputDeviceDescription + { + interfaceName = "HID", + product = "Nimbus+", + capabilities = new HID.HIDDeviceDescriptor + { + vendorId = vendorId, + productId = productId, + }.ToJson() + }); + + Assert.That(device, Is.AssignableTo()); + Assert.That(device.displayName, Is.EqualTo("Nimbus+")); + } + + [Test] + [Category("Devices")] + public void Devices_DoNotSupportNimbusPlusAsHID_WithProductName() + { + Assert.Throws(() => InputSystem.AddDevice(new InputDeviceDescription + { + product = "Nimbus+", + interfaceName = "HID", + })); + } + + [Test] + [Category("Devices")] + [TestCase(0xd, 0x0)] // OSX dummy VID/PID + public void Devices_DoNotSupportNimbusPlusAsHID_WithOnlyPidAndVid(int vendorId, int productId) + { + Assert.Throws(() => InputSystem.AddDevice(new InputDeviceDescription + { + interfaceName = "HID", + capabilities = new HID.HIDDeviceDescriptor + { + vendorId = vendorId, + productId = productId, + }.ToJson() + })); + } + + [Test] + [Category("Devices")] + [TestCase(true)] + [TestCase(false)] + public void Devices_SupportsNimbusPlusAsHID(bool precompiled) + { + if (!precompiled) + InputControlLayout.s_Layouts.precompiledLayouts.Clear(); + + var gamepad = InputSystem.AddDevice(); + + // Variance 1 + InputSystem.QueueStateEvent(gamepad, new NimbusPlusHIDInputReport() {}); + InputSystem.Update(); + + var comparer = new Vector2EqualityComparer(0.04f); + Assert.That(gamepad.leftStick.ReadValue(), Is.EqualTo(Vector2.zero).Using(comparer)); + Assert.That(gamepad.rightStick.ReadValue(), Is.EqualTo(Vector2.zero).Using(comparer)); + + Assert.That(gamepad.leftTrigger.isPressed, Is.False); + Assert.That(gamepad.rightTrigger.isPressed, Is.False); + + Assert.That(gamepad.dpad.up.isPressed, Is.False); + Assert.That(gamepad.dpad.right.isPressed, Is.False); + Assert.That(gamepad.dpad.left.isPressed, Is.False); + Assert.That(gamepad.dpad.down.isPressed, Is.False); + + Assert.That(gamepad.buttonSouth.isPressed, Is.False); + Assert.That(gamepad.buttonNorth.isPressed, Is.False); + Assert.That(gamepad.buttonWest.isPressed, Is.False); + Assert.That(gamepad.buttonEast.isPressed, Is.False); + + Assert.That(gamepad.leftShoulder.isPressed, Is.False); + Assert.That(gamepad.rightShoulder.isPressed, Is.False); + Assert.That(gamepad.leftStickButton.isPressed, Is.False); + Assert.That(gamepad.rightStickButton.isPressed, Is.False); + + Assert.That(gamepad.homeButton.isPressed, Is.False); + + Assert.That(gamepad.startButton.isPressed, Is.False); + Assert.That(gamepad.selectButton.isPressed, Is.False); + + Assert.That(gamepad.homeButton.isPressed, Is.False); + + // Variance 2 + InputSystem.QueueStateEvent(gamepad, new NimbusPlusHIDInputReport() + { + leftStickX = 127, + leftStickY = 0, + rightStickX = 0, + rightStickY = -64, + leftTrigger = 10, + rightTrigger = 180, + buttons1 = (1 << 4) | (1 << 7) | (1 << 3) | (1 << 2), + buttons2 = (1 << 0) | (1 << 3) | (1 << 4) | (1 << 5) + }); + InputSystem.Update(); + + Assert.That(gamepad.leftStick.ReadValue(), Is.EqualTo(new Vector2(1.0f, 0.0f)).Using(comparer)); + Assert.That(gamepad.rightStick.ReadValue(), Is.EqualTo(new Vector2(0.0f, -0.5f)).Using(comparer)); + + Assert.That(gamepad.leftTrigger.isPressed, Is.False); + Assert.That(gamepad.rightTrigger.isPressed, Is.True); + + Assert.That(gamepad.dpad.up.isPressed, Is.False); + Assert.That(gamepad.dpad.right.isPressed, Is.False); + Assert.That(gamepad.dpad.left.isPressed, Is.True); + Assert.That(gamepad.dpad.down.isPressed, Is.True); + + Assert.That(gamepad.buttonSouth.isPressed, Is.True); + Assert.That(gamepad.buttonNorth.isPressed, Is.True); + Assert.That(gamepad.buttonWest.isPressed, Is.False); + Assert.That(gamepad.buttonEast.isPressed, Is.False); + + Assert.That(gamepad.leftShoulder.isPressed, Is.True); + Assert.That(gamepad.rightShoulder.isPressed, Is.False); + Assert.That(gamepad.leftStickButton.isPressed, Is.False); + Assert.That(gamepad.rightStickButton.isPressed, Is.True); + + Assert.That(gamepad.startButton.isPressed, Is.False); + Assert.That(gamepad.selectButton.isPressed, Is.True); + + Assert.That(gamepad.homeButton.isPressed, Is.True); + + // Variance 3 + InputSystem.QueueStateEvent(gamepad, new NimbusPlusHIDInputReport() + { + leftStickX = 0, + leftStickY = 127, + rightStickX = -64, + rightStickY = 0, + leftTrigger = 130, + rightTrigger = 5, + buttons1 = (1 << 6) | (1 << 0) | (1 << 1), + buttons2 = (1 << 1) | (1 << 2) | (1 << 6) + }); + InputSystem.Update(); + + Assert.That(gamepad.leftStick.ReadValue(), Is.EqualTo(new Vector2(0.0f, 1.0f)).Using(comparer)); + Assert.That(gamepad.rightStick.ReadValue(), Is.EqualTo(new Vector2(-0.5f, 0.0f)).Using(comparer)); + + Assert.That(gamepad.leftTrigger.isPressed, Is.True); + Assert.That(gamepad.rightTrigger.isPressed, Is.False); + + Assert.That(gamepad.dpad.up.isPressed, Is.True); + Assert.That(gamepad.dpad.right.isPressed, Is.True); + Assert.That(gamepad.dpad.left.isPressed, Is.False); + Assert.That(gamepad.dpad.down.isPressed, Is.False); + + Assert.That(gamepad.buttonSouth.isPressed, Is.False); + Assert.That(gamepad.buttonNorth.isPressed, Is.False); + Assert.That(gamepad.buttonWest.isPressed, Is.True); + Assert.That(gamepad.buttonEast.isPressed, Is.False); + + Assert.That(gamepad.leftShoulder.isPressed, Is.False); + Assert.That(gamepad.rightShoulder.isPressed, Is.True); + Assert.That(gamepad.leftStickButton.isPressed, Is.True); + Assert.That(gamepad.rightStickButton.isPressed, Is.False); + + Assert.That(gamepad.startButton.isPressed, Is.True); + Assert.That(gamepad.selectButton.isPressed, Is.False); + + Assert.That(gamepad.homeButton.isPressed, Is.False); + } +} + +#endif // UNITY_EDITOR || UNITY_OSX diff --git a/Assets/Tests/InputSystem/Plugins/OSXTests.cs.meta b/Assets/Tests/InputSystem/Plugins/OSXTests.cs.meta new file mode 100644 index 0000000000..e80633c1f8 --- /dev/null +++ b/Assets/Tests/InputSystem/Plugins/OSXTests.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5f46b7472a2db344aa58124a452fabed +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 35fe7f770f..755416a38a 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -71,6 +71,9 @@ however, it has to be formatted properly to pass verification tests. - Added a new `DeltaControl` control type that is now used for delta-style controls such as `Mouse.delta` and `Mouse.scroll`. * Like `StickControl`, this control has individual `up`, `down`, `left`, and `right` controls (as well as `x` and `y` that it inherits from `Vector2Control`). This means it is now possible to directly bind to individual scroll directions (such as `/scroll/up`). +### Added +- Added support for SteelSeries Nimbus+ gamepad on Mac (Addition contributed by [Mollyjameson](https://github.com/MollyJameson)). + ## [1.3.0] - 2021-12-10 ### Changed diff --git a/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md b/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md index 67b2cdc625..a0c54ead3f 100644 --- a/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md +++ b/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md @@ -31,7 +31,7 @@ Support for the following Devices doesn't require specialized support of particu |PS3/PS4|Yes (5)|Yes (5)|Yes (5)|Yes (5)|Yes (5, 8)|Yes (5, 6)|Yes (5, 6)|No|Yes|No|Sometimes (2)| |PS5|Yes (10)|Yes (10)|No (10)|Yes (10)|Yes (10)|No (10)|No (10)|No|Yes|No|Sometimes (2)| |Switch|Yes (9)|Yes (9)|Yes|Yes|No|No|No|No|No|Yes|Sometimes (2)| -|MFi (such as SteelSeries)|No|No|No|No|No|Yes|Yes|No|No|No|No| +|MFi (such as SteelSeries)|No|Sometimes (11)|No|No|No|Yes|Yes|No|No|No|No| >__Notes__: >1. The trigger motors on the Xbox One controller are only supported on UWP and Xbox. @@ -45,6 +45,7 @@ On UWP only USB connection is supported, motor rumble and lightbar are not worki >8. Unity officially supports PS4 controllers only on [Android 10 or higher](https://playstation.com/en-us/support/hardware/ps4-pair-dualshock-4-wireless-with-sony-xperia-and-android). >9. Switch Joy-Cons are not currently supported on Windows and Mac. Some of official accessories are supported on Windows and Mac: "Hori Co HORIPAD for Nintendo Switch", "PowerA NSW Fusion Wired FightPad", "PDP Wired Fight Pad Pro: Mario". >10. PS5 DualSense is supported on Windows and macOS via USB HID, though setting motor rumble and lightbar color when connected over Bluetooth is currently not supported. +>11. SteelSeries Nimbus+ supported via HID on macOS. On UWP only USB connection is supported, motor rumble and lightbar are not working correctly. On Android it's expected to be working from Android 12. On iOS/tvOS it's currently recognized as a generic gamepad and most controls do work. diff --git a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs index d87cf6fe37..177dad179e 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs @@ -3435,6 +3435,10 @@ private static void PerformDefaultPluginInitialization() iOS.iOSSupport.Initialize(); #endif + #if UNITY_EDITOR || UNITY_STANDALONE_OSX + OSX.OSXSupport.Initialize(); + #endif + #if UNITY_EDITOR || UNITY_WEBGL WebGL.WebGLSupport.Initialize(); #endif diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/OSX.meta b/Packages/com.unity.inputsystem/InputSystem/Plugins/OSX.meta new file mode 100644 index 0000000000..54e8f4e132 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/OSX.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ea65eddf43398654fa32b724723c71a4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/OSX/OSXGameController.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/OSX/OSXGameController.cs new file mode 100644 index 0000000000..4919dc8f2e --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/OSX/OSXGameController.cs @@ -0,0 +1,109 @@ +#if UNITY_EDITOR || UNITY_STANDALONE_OSX || PACKAGE_DOCS_GENERATION +using System.Runtime.InteropServices; +using UnityEngine.InputSystem.Layouts; +using UnityEngine.InputSystem.LowLevel; +using UnityEngine.InputSystem.Utilities; +using UnityEngine.InputSystem.OSX.LowLevel; +using UnityEngine.InputSystem.Controls; + +namespace UnityEngine.InputSystem.OSX.LowLevel +{ + /// + /// Structure of HID input reports for SteelSeries Nimbus+ controllers supported + /// via HID on OSX. + /// + [StructLayout(LayoutKind.Explicit, Size = 8)] + internal struct NimbusPlusHIDInputReport : IInputStateTypeInfo + { + /// + /// A dummy vendor ID made available by OSX when supporting Nimbus+ via HID. + /// This is exposed by OSX instead of the true SteelSeries vendor ID 0x1038. + /// + public const int OSXVendorId = 0xd; + + /// + /// A dummy product ID made available by OSX when supporting Nimbus+ via HID. + /// This is exposed by OSX instead of the true Nimbus+ product ID 0x1422. + /// + public const int OSXProductId = 0x0; + + public FourCC format => new FourCC('H', 'I', 'D'); + + [InputControl(name = "leftStick", layout = "Stick", format = "VC2B")] + [InputControl(name = "leftStick/x", offset = 0, format = "SBYT", parameters = "")] + [InputControl(name = "leftStick/left", offset = 0, format = "SBYT", parameters = "clamp=1,clampMin=-1,clampMax=0,invert")] + [InputControl(name = "leftStick/right", offset = 0, format = "SBYT", parameters = "clamp=1,clampMin=0,clampMax=1")] + [InputControl(name = "leftStick/y", offset = 1, format = "SBYT", parameters = "")] + [InputControl(name = "leftStick/up", offset = 1, format = "SBYT", parameters = "clamp=1,clampMin=0,clampMax=1")] + [InputControl(name = "leftStick/down", offset = 1, format = "SBYT", parameters = "clamp=1,clampMin=-1,clampMax=0,invert")] + [FieldOffset(0)] public sbyte leftStickX; + [FieldOffset(1)] public sbyte leftStickY; + + [InputControl(name = "rightStick", layout = "Stick", format = "VC2B")] + [InputControl(name = "rightStick/x", offset = 0, format = "SBYT")] + [InputControl(name = "rightStick/left", offset = 0, format = "SBYT", parameters = "clamp=1,clampMin=-1,clampMax=0,invert")] + [InputControl(name = "rightStick/right", offset = 0, format = "SBYT", parameters = "clamp=1,clampMin=0,clampMax=1")] + [InputControl(name = "rightStick/y", offset = 1, format = "SBYT")] + [InputControl(name = "rightStick/up", offset = 1, format = "SBYT", parameters = "clamp=1,clampMin=0,clampMax=1")] + [InputControl(name = "rightStick/down", offset = 1, format = "SBYT", parameters = "clamp=1,clampMin=-1,clampMax=0,invert")] + [FieldOffset(2)] public sbyte rightStickX; + [FieldOffset(3)] public sbyte rightStickY; + + [InputControl(name = "leftTrigger", format = "BYTE")] + [FieldOffset(4)] public byte leftTrigger; + [InputControl(name = "rightTrigger", format = "BYTE")] + [FieldOffset(5)] public byte rightTrigger; + + [InputControl(name = "dpad", format = "BIT", layout = "Dpad", sizeInBits = 4)] + [InputControl(name = "dpad/up", format = "BIT", bit = 0)] + [InputControl(name = "dpad/right", format = "BIT", bit = 1)] + [InputControl(name = "dpad/down", format = "BIT", bit = 2)] + [InputControl(name = "dpad/left", format = "BIT", bit = 3)] + [InputControl(name = "buttonSouth", displayName = "A", bit = 4)] + [InputControl(name = "buttonEast", displayName = "B", bit = 5)] + [InputControl(name = "buttonWest", displayName = "X", bit = 6)] + [InputControl(name = "buttonNorth", displayName = "Y", bit = 7)] + [FieldOffset(6)] public byte buttons1; + [InputControl(name = "leftShoulder", bit = 0)] + [InputControl(name = "rightShoulder", bit = 1)] + [InputControl(name = "leftStickPress", bit = 2)] + [InputControl(name = "rightStickPress", bit = 3)] + [InputControl(name = "homeButton", layout = "Button", bit = 4)] + [InputControl(name = "select", bit = 5)] + [InputControl(name = "start", bit = 6)] + [FieldOffset(7)] public byte buttons2; + } +} + +namespace UnityEngine.InputSystem.OSX +{ + /// + /// Steel Series Nimbus+ uses iOSGameController MFI when on iOS but + /// is just a standard HID on OSX. Note that the gamepad is made available + /// with incorrect VID/PID by OSX instead of the true VID/PID registred with + /// USB.org for this device. + /// + [InputControlLayout(stateType = typeof(NimbusPlusHIDInputReport), displayName = "Nimbus+ Gamepad")] + [Scripting.Preserve] + public class NimbusGamepadHid : Gamepad + { + /// + /// The center button in the middle section of the controller. + /// + /// + /// Note that this button is also picked up by OS. + /// + [InputControl(name = "homeButton", displayName = "Home", shortDisplayName = "Home")] + public ButtonControl homeButton { get; protected set; } + + /// + protected override void FinishSetup() + { + homeButton = GetChildControl("homeButton"); + Debug.Assert(homeButton != null); + + base.FinishSetup(); + } + } +} +#endif // UNITY_EDITOR || UNITY_STANDALONE_OSX diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/OSX/OSXGameController.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Plugins/OSX/OSXGameController.cs.meta new file mode 100644 index 0000000000..7b4d6e3664 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/OSX/OSXGameController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b9817b64a59aab947a96a4cf6247d018 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/OSX/OSXSupport.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/OSX/OSXSupport.cs new file mode 100644 index 0000000000..363b0adb9a --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/OSX/OSXSupport.cs @@ -0,0 +1,32 @@ +#if UNITY_EDITOR || UNITY_STANDALONE_OSX +using UnityEngine.InputSystem.Layouts; +using UnityEngine.InputSystem.OSX.LowLevel; + +namespace UnityEngine.InputSystem.OSX +{ + /// + /// A small helper class to aid in initializing and registering HID device layout builders. + /// +#if UNITY_DISABLE_DEFAULT_INPUT_PLUGIN_INITIALIZATION + public +#else + internal +#endif + static class OSXSupport + { + /// + /// Registers HID device layouts for OSX. + /// + public static void Initialize() + { + // Note that OSX reports manufacturer "Unknown" and a bogus VID/PID according + // to matcher below. + InputSystem.RegisterLayout( + matches: new InputDeviceMatcher() + .WithProduct("Nimbus+", supportRegex: false) + .WithCapability("vendorId", NimbusPlusHIDInputReport.OSXVendorId) + .WithCapability("productId", NimbusPlusHIDInputReport.OSXProductId)); + } + } +} +#endif // UNITY_EDITOR || UNITY_STANDALONE_OSX diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/OSX/OSXSupport.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Plugins/OSX/OSXSupport.cs.meta new file mode 100644 index 0000000000..37ed226dfe --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/OSX/OSXSupport.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ec5b5d14e5b51f44abf18ab8f288cdb5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From da59f1f438c87d33da5d6e2bb423c789c5bbfeec Mon Sep 17 00:00:00 2001 From: StefanUnity <40492087+stefanunity@users.noreply.github.com> Date: Thu, 17 Feb 2022 13:34:23 +0100 Subject: [PATCH 30/53] NEW: Adding newly supported 3rd party Nintendo gamepads (#1508) --- Assets/Tests/InputSystem/SwitchTests.cs | 19 ++++- Packages/com.unity.inputsystem/CHANGELOG.md | 2 +- .../Documentation~/SupportedDevices.md | 2 +- .../Plugins/Switch/SwitchSupportHID.cs | 72 +++++++++++++++++-- 4 files changed, 88 insertions(+), 7 deletions(-) diff --git a/Assets/Tests/InputSystem/SwitchTests.cs b/Assets/Tests/InputSystem/SwitchTests.cs index e7da5e1826..36e42482c1 100644 --- a/Assets/Tests/InputSystem/SwitchTests.cs +++ b/Assets/Tests/InputSystem/SwitchTests.cs @@ -82,9 +82,26 @@ private static SwitchProControllerHIDInputState StateWithButton(SwitchProControl [Test] [Category("Devices")] + [TestCase(0x0f0d, 0x0092)] + [TestCase(0x0f0d, 0x00aa)] [TestCase(0x0f0d, 0x00c1)] - [TestCase(0x20d6, 0xa712)] + [TestCase(0x0f0d, 0x00dc)] + [TestCase(0x0f0d, 0x00f6)] + [TestCase(0x0e6f, 0x0180)] [TestCase(0x0e6f, 0x0185)] + [TestCase(0x0e6f, 0x0186)] + [TestCase(0x0e6f, 0x0187)] + [TestCase(0x20d6, 0xa712)] + [TestCase(0x20d6, 0xa716)] + + //these currently break Mac editor and standalone + #if !(UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX) + [TestCase(0x0e6f, 0x0184)] + [TestCase(0x0e6f, 0x0188)] + [TestCase(0x20d6, 0xa714)] + [TestCase(0x20d6, 0xa715)] + #endif + public void Devices_SupportsSwitchLikeControllers(int vendorId, int productId) { var hidDescriptor = new HID.HIDDeviceDescriptor diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 755416a38a..2523417b4b 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -67,7 +67,7 @@ however, it has to be formatted properly to pass verification tests. ### Added -- Added support for "Hori Co HORIPAD for Nintendo Switch", "PowerA NSW Fusion Wired FightPad", "PDP Wired Fight Pad Pro: Mario". +- Added support for "Hori Co HORIPAD for Nintendo Switch", "HORI Pokken Tournament DX Pro Pad", "HORI Wireless Switch Pad", "HORI Real Arcade Pro V Hayabusa in Switch Mode", "PowerA NSW Fusion Wired FightPad", "PowerA NSW Fusion Pro Controller (USB only)", "PDP Wired Fight Pad Pro: Mario", "PDP Faceoff Wired Pro Controller for Nintendo Switch", "PDP Afterglow Wireless Switch Controller", "PDP Rockcandy Wired Controller". - Added a new `DeltaControl` control type that is now used for delta-style controls such as `Mouse.delta` and `Mouse.scroll`. * Like `StickControl`, this control has individual `up`, `down`, `left`, and `right` controls (as well as `x` and `y` that it inherits from `Vector2Control`). This means it is now possible to directly bind to individual scroll directions (such as `/scroll/up`). diff --git a/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md b/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md index a0c54ead3f..cde94026af 100644 --- a/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md +++ b/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md @@ -43,7 +43,7 @@ On UWP only USB connection is supported, motor rumble and lightbar are not worki >6. Unity supports Made for iOS (Mfi) certified controllers on iOS. Xbox One and PS4 controllers are only supported on iOS 13 or higher. >7. Consoles are supported using separate packages. You need to install these packages in your Project to enable console support. >8. Unity officially supports PS4 controllers only on [Android 10 or higher](https://playstation.com/en-us/support/hardware/ps4-pair-dualshock-4-wireless-with-sony-xperia-and-android). ->9. Switch Joy-Cons are not currently supported on Windows and Mac. Some of official accessories are supported on Windows and Mac: "Hori Co HORIPAD for Nintendo Switch", "PowerA NSW Fusion Wired FightPad", "PDP Wired Fight Pad Pro: Mario". +>9. Switch Joy-Cons are not currently supported on Windows and Mac. Some of official accessories are supported on Windows and Mac: "Hori Co HORIPAD for Nintendo Switch", "HORI Pokken Tournament DX Pro Pad", "HORI Wireless Switch Pad", "HORI Real Arcade Pro V Hayabusa in Switch Mode", "PowerA NSW Fusion Wired FightPad", "PowerA NSW Fusion Pro Controller (USB only)", "PDP Wired Fight Pad Pro: Mario", "PDP Faceoff Wired Pro Controller for Nintendo Switch", "PDP Afterglow Wireless Switch Controller", "PDP Rockcandy Wired Controller". >10. PS5 DualSense is supported on Windows and macOS via USB HID, though setting motor rumble and lightbar color when connected over Bluetooth is currently not supported. >11. SteelSeries Nimbus+ supported via HID on macOS. On UWP only USB connection is supported, motor rumble and lightbar are not working correctly. diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/Switch/SwitchSupportHID.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/Switch/SwitchSupportHID.cs index 77542ae8f3..1acc92cdd6 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/Switch/SwitchSupportHID.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/Switch/SwitchSupportHID.cs @@ -21,6 +21,16 @@ public static void Initialize() .WithInterface("HID") .WithCapability("vendorId", 0x057e) // Nintendo .WithCapability("productId", 0x2009)); // Pro Controller. + InputSystem.RegisterLayoutMatcher( + new InputDeviceMatcher() + .WithInterface("HID") + .WithCapability("vendorId", 0x0f0d) // Hori Co., Ltd + .WithCapability("productId", 0x0092)); // Pokken Tournament DX Pro Pad + InputSystem.RegisterLayoutMatcher( + new InputDeviceMatcher() + .WithInterface("HID") + .WithCapability("vendorId", 0x0f0d) // Hori Co., Ltd + .WithCapability("productId", 0x00aa)); // Real Arcade Pro InputSystem.RegisterLayoutMatcher( new InputDeviceMatcher() .WithInterface("HID") @@ -29,13 +39,67 @@ public static void Initialize() InputSystem.RegisterLayoutMatcher( new InputDeviceMatcher() .WithInterface("HID") - .WithCapability("vendorId", 0x20d6) // PowerA NSW Fusion Wired FightPad - .WithCapability("productId", 0xa712)); + .WithCapability("vendorId", 0x0f0d) // Hori Co., Ltd + .WithCapability("productId", 0x00dc)); // Fighting Commander + InputSystem.RegisterLayoutMatcher( + new InputDeviceMatcher() + .WithInterface("HID") + .WithCapability("vendorId", 0x0f0d) // Hori Co., Ltd + .WithCapability("productId", 0x00f6)); // HORI Wireless Switch Pad + InputSystem.RegisterLayoutMatcher( + new InputDeviceMatcher() + .WithInterface("HID") + .WithCapability("vendorId", 0x0e6f) // PDP + .WithCapability("productId", 0x0180)); // Faceoff Wired Pro Controller for Nintendo Switch + InputSystem.RegisterLayoutMatcher( + new InputDeviceMatcher() + .WithInterface("HID") + .WithCapability("vendorId", 0x0e6f) // PDP + .WithCapability("productId", 0x0185)); // Wired Fight Pad Pro + InputSystem.RegisterLayoutMatcher( + new InputDeviceMatcher() + .WithInterface("HID") + .WithCapability("vendorId", 0x0e6f) // PDP + .WithCapability("productId", 0x0186)); // Afterglow Wireless Switch Controller - "Nintento Wireless Gamepad" + InputSystem.RegisterLayoutMatcher( + new InputDeviceMatcher() + .WithInterface("HID") + .WithCapability("vendorId", 0x0e6f) // PDP + .WithCapability("productId", 0x0187)); // Rock Candy Wired Controller for Nintendo Switch + InputSystem.RegisterLayoutMatcher( + new InputDeviceMatcher() + .WithInterface("HID") + .WithCapability("vendorId", 0x20d6) // PowerA + .WithCapability("productId", 0xa712)); // NSW Fusion Wired FightPad + InputSystem.RegisterLayoutMatcher( + new InputDeviceMatcher() + .WithInterface("HID") + .WithCapability("vendorId", 0x20d6) // PowerA + .WithCapability("productId", 0xa716)); // NSW Fusion Pro Controller + + // gamepads below currently break Mac Editor and Standalone + #if !(UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX) + InputSystem.RegisterLayoutMatcher( + new InputDeviceMatcher() + .WithInterface("HID") + .WithCapability("vendorId", 0x0e6f) // PDP + .WithCapability("productId", 0x0184)); // Faceoff Premiere Wired Pro Controller for Nintendo Switch + InputSystem.RegisterLayoutMatcher( + new InputDeviceMatcher() + .WithInterface("HID") + .WithCapability("vendorId", 0x0e6f) // PDP + .WithCapability("productId", 0x0188)); // Afterglow Deluxe+ Audio Wired Controller + InputSystem.RegisterLayoutMatcher( + new InputDeviceMatcher() + .WithInterface("HID") + .WithCapability("vendorId", 0x20d6) // PowerA + .WithCapability("productId", 0xa714)); // NSW Spectra Wired Controller InputSystem.RegisterLayoutMatcher( new InputDeviceMatcher() .WithInterface("HID") - .WithCapability("vendorId", 0x0e6f) // PDP Wired Fight Pad Pro: Mario - .WithCapability("productId", 0x0185)); + .WithCapability("vendorId", 0x20d6) // PowerA + .WithCapability("productId", 0xa715)); // Fusion Wireless Arcade Stick + #endif #endif } } From d69c077a45cac0f74c48e6b93c1e3335a0813b21 Mon Sep 17 00:00:00 2001 From: StefanUnity <40492087+stefanunity@users.noreply.github.com> Date: Mon, 21 Feb 2022 11:23:10 +0100 Subject: [PATCH 31/53] NEW: Adding more Switch gamepads (#1509) --- Assets/Tests/InputSystem/SwitchTests.cs | 1 + Packages/com.unity.inputsystem/CHANGELOG.md | 2 +- .../com.unity.inputsystem/Documentation~/SupportedDevices.md | 2 +- .../InputSystem/Plugins/Switch/SwitchSupportHID.cs | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Assets/Tests/InputSystem/SwitchTests.cs b/Assets/Tests/InputSystem/SwitchTests.cs index 36e42482c1..673e7f6aa5 100644 --- a/Assets/Tests/InputSystem/SwitchTests.cs +++ b/Assets/Tests/InputSystem/SwitchTests.cs @@ -88,6 +88,7 @@ private static SwitchProControllerHIDInputState StateWithButton(SwitchProControl [TestCase(0x0f0d, 0x00dc)] [TestCase(0x0f0d, 0x00f6)] [TestCase(0x0e6f, 0x0180)] + [TestCase(0x0e6f, 0x0181)] [TestCase(0x0e6f, 0x0185)] [TestCase(0x0e6f, 0x0186)] [TestCase(0x0e6f, 0x0187)] diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 2523417b4b..6a1110d1e7 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -67,7 +67,7 @@ however, it has to be formatted properly to pass verification tests. ### Added -- Added support for "Hori Co HORIPAD for Nintendo Switch", "HORI Pokken Tournament DX Pro Pad", "HORI Wireless Switch Pad", "HORI Real Arcade Pro V Hayabusa in Switch Mode", "PowerA NSW Fusion Wired FightPad", "PowerA NSW Fusion Pro Controller (USB only)", "PDP Wired Fight Pad Pro: Mario", "PDP Faceoff Wired Pro Controller for Nintendo Switch", "PDP Afterglow Wireless Switch Controller", "PDP Rockcandy Wired Controller". +- Added support for "Hori Co HORIPAD for Nintendo Switch", "HORI Pokken Tournament DX Pro Pad", "HORI Wireless Switch Pad", "HORI Real Arcade Pro V Hayabusa in Switch Mode", "PowerA NSW Fusion Wired FightPad", "PowerA NSW Fusion Pro Controller (USB only)", "PDP Wired Fight Pad Pro: Mario", "PDP Faceoff Wired Pro Controller for Nintendo Switch", "PDP Faceoff Wired Pro Controller for Nintendo Switch", "PDP Afterglow Wireless Switch Controller", "PDP Rockcandy Wired Controller". - Added a new `DeltaControl` control type that is now used for delta-style controls such as `Mouse.delta` and `Mouse.scroll`. * Like `StickControl`, this control has individual `up`, `down`, `left`, and `right` controls (as well as `x` and `y` that it inherits from `Vector2Control`). This means it is now possible to directly bind to individual scroll directions (such as `/scroll/up`). diff --git a/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md b/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md index cde94026af..f863acfecd 100644 --- a/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md +++ b/Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md @@ -43,7 +43,7 @@ On UWP only USB connection is supported, motor rumble and lightbar are not worki >6. Unity supports Made for iOS (Mfi) certified controllers on iOS. Xbox One and PS4 controllers are only supported on iOS 13 or higher. >7. Consoles are supported using separate packages. You need to install these packages in your Project to enable console support. >8. Unity officially supports PS4 controllers only on [Android 10 or higher](https://playstation.com/en-us/support/hardware/ps4-pair-dualshock-4-wireless-with-sony-xperia-and-android). ->9. Switch Joy-Cons are not currently supported on Windows and Mac. Some of official accessories are supported on Windows and Mac: "Hori Co HORIPAD for Nintendo Switch", "HORI Pokken Tournament DX Pro Pad", "HORI Wireless Switch Pad", "HORI Real Arcade Pro V Hayabusa in Switch Mode", "PowerA NSW Fusion Wired FightPad", "PowerA NSW Fusion Pro Controller (USB only)", "PDP Wired Fight Pad Pro: Mario", "PDP Faceoff Wired Pro Controller for Nintendo Switch", "PDP Afterglow Wireless Switch Controller", "PDP Rockcandy Wired Controller". +>9. Switch Joy-Cons are not currently supported on Windows and Mac. Some of official accessories are supported on Windows and Mac: "Hori Co HORIPAD for Nintendo Switch", "HORI Pokken Tournament DX Pro Pad", "HORI Wireless Switch Pad", "HORI Real Arcade Pro V Hayabusa in Switch Mode", "PowerA NSW Fusion Wired FightPad", "PowerA NSW Fusion Pro Controller (USB only)", "PDP Wired Fight Pad Pro: Mario", "PDP Faceoff Wired Pro Controller for Nintendo Switch", "PDP Faceoff Deluxe Wired Pro Controller for Nintendo Switch", "PDP Afterglow Wireless Switch Controller", "PDP Rockcandy Wired Controller". >10. PS5 DualSense is supported on Windows and macOS via USB HID, though setting motor rumble and lightbar color when connected over Bluetooth is currently not supported. >11. SteelSeries Nimbus+ supported via HID on macOS. On UWP only USB connection is supported, motor rumble and lightbar are not working correctly. diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/Switch/SwitchSupportHID.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/Switch/SwitchSupportHID.cs index 1acc92cdd6..3451f95f23 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/Switch/SwitchSupportHID.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/Switch/SwitchSupportHID.cs @@ -51,6 +51,11 @@ public static void Initialize() .WithInterface("HID") .WithCapability("vendorId", 0x0e6f) // PDP .WithCapability("productId", 0x0180)); // Faceoff Wired Pro Controller for Nintendo Switch + InputSystem.RegisterLayoutMatcher( + new InputDeviceMatcher() + .WithInterface("HID") + .WithCapability("vendorId", 0x0e6f) // PDP + .WithCapability("productId", 0x0181)); // Faceoff Deluxe Wired Pro Controller for Nintendo Switch InputSystem.RegisterLayoutMatcher( new InputDeviceMatcher() .WithInterface("HID") From 4c3164725f35270499ddff6709737ee6e9489b0c Mon Sep 17 00:00:00 2001 From: Dmytro Ivanov Date: Mon, 14 Mar 2022 13:37:14 +0100 Subject: [PATCH 32/53] NEW: Added a setting to enable Windows.Gaming.Input on relevant platforms (#1512) --- .../Commands/UseWindowsGamingInputCommand.cs | 37 +++++++++++++++++++ .../UseWindowsGamingInputCommand.cs.meta | 11 ++++++ .../InputSystem/InputFeatureNames.cs | 1 + .../InputSystem/InputManager.cs | 15 ++++++++ 4 files changed, 64 insertions(+) create mode 100644 Packages/com.unity.inputsystem/InputSystem/Devices/Commands/UseWindowsGamingInputCommand.cs create mode 100644 Packages/com.unity.inputsystem/InputSystem/Devices/Commands/UseWindowsGamingInputCommand.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/UseWindowsGamingInputCommand.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/UseWindowsGamingInputCommand.cs new file mode 100644 index 0000000000..d4eb6c7ad1 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/UseWindowsGamingInputCommand.cs @@ -0,0 +1,37 @@ +using System.Runtime.InteropServices; +using UnityEngine.InputSystem.Utilities; + +namespace UnityEngine.InputSystem.LowLevel +{ + /// + // Command to enable or disable Windows.Gaming.Input native backend. + // Send it to deviceId 0 as it's a special "global" IOCTL that gets routed internally. + /// + [StructLayout(LayoutKind.Explicit, Size = kSize)] + internal struct UseWindowsGamingInputCommand : IInputDeviceCommandInfo + { + public static FourCC Type { get { return new FourCC('U', 'W', 'G', 'I'); } } + + internal const int kSize = InputDeviceCommand.kBaseCommandSize + sizeof(byte); + + [FieldOffset(0)] + public InputDeviceCommand baseCommand; + + [FieldOffset(InputDeviceCommand.kBaseCommandSize)] + public byte enable; + + public FourCC typeStatic + { + get { return Type; } + } + + public static UseWindowsGamingInputCommand Create(bool enable) + { + return new UseWindowsGamingInputCommand + { + baseCommand = new InputDeviceCommand(Type, kSize), + enable = (byte)(enable ? 1 : 0) + }; + } + } +} diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/UseWindowsGamingInputCommand.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/UseWindowsGamingInputCommand.cs.meta new file mode 100644 index 0000000000..a3299fcc27 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/UseWindowsGamingInputCommand.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f03e7044c375b7046b274ba59c850b2a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/InputFeatureNames.cs b/Packages/com.unity.inputsystem/InputSystem/InputFeatureNames.cs index 1d4cb13bd3..3cbfa4f27a 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputFeatureNames.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputFeatureNames.cs @@ -4,5 +4,6 @@ internal static class InputFeatureNames { public const string kRunPlayerUpdatesInEditMode = "RUN_PLAYER_UPDATES_IN_EDIT_MODE"; public const string kDisableUnityRemoteSupport = "DISABLE_UNITY_REMOTE_SUPPORT"; + public const string kUseWindowsGamingInputBackend = "USE_WINDOWS_GAMING_INPUT_BACKEND"; } } diff --git a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs index 129916c068..dd27b573d8 100755 --- a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs @@ -2725,6 +2725,13 @@ internal void ApplySettings() #if UNITY_EDITOR runPlayerUpdatesInEditMode = m_Settings.IsFeatureEnabled(InputFeatureNames.kRunPlayerUpdatesInEditMode); #endif + + if (m_Settings.IsFeatureEnabled(InputFeatureNames.kUseWindowsGamingInputBackend)) + { + var command = UseWindowsGamingInputCommand.Create(true); + if (ExecuteGlobalCommand(ref command) < 0) + Debug.LogError($"Could not enable Windows.Gaming.Input"); + } } // Cache some values. @@ -2740,6 +2747,14 @@ internal void ApplySettings() "InputSystem.onSettingsChange"); } + internal unsafe long ExecuteGlobalCommand(ref TCommand command) + where TCommand : struct, IInputDeviceCommandInfo + { + var ptr = (InputDeviceCommand*)UnsafeUtility.AddressOf(ref command); + // device id is irrelevant as we route it based on fourcc internally + return InputRuntime.s_Instance.DeviceCommand(0, ptr); + } + internal void AddAvailableDevicesThatAreNowRecognized() { for (var i = 0; i < m_AvailableDeviceCount; ++i) From 8bbbb137f8847e0e1ed9d1d58109ed84cf46036c Mon Sep 17 00:00:00 2001 From: jamesmcgill Date: Mon, 14 Mar 2022 16:11:43 +0100 Subject: [PATCH 33/53] FIX: Add missing tooltips on PlayerInputManagerEditor (#1511) * FIX: Add missing tooltips on PlayerInputManagerEditor * CHANGE: Replace hardcoded property strings in PlayerInput editors * FIX: Temporarily disable broken standalone mac XInput test on trunk --- .../Tests/InputSystem/Plugins/XInputTests.cs | 4 +++ .../Unity.InputSystem.Tests.asmdef | 5 +++ Packages/com.unity.inputsystem/CHANGELOG.md | 1 + .../Plugins/PlayerInput/PlayerInputEditor.cs | 22 ++++++------ .../Plugins/PlayerInput/PlayerInputManager.cs | 11 ++++++ .../PlayerInput/PlayerInputManagerEditor.cs | 34 ++++++++++--------- 6 files changed, 50 insertions(+), 27 deletions(-) diff --git a/Assets/Tests/InputSystem/Plugins/XInputTests.cs b/Assets/Tests/InputSystem/Plugins/XInputTests.cs index b058077a43..0b3309a93a 100644 --- a/Assets/Tests/InputSystem/Plugins/XInputTests.cs +++ b/Assets/Tests/InputSystem/Plugins/XInputTests.cs @@ -141,6 +141,8 @@ public void Devices_SupportXboxControllerOnOSX() AssertButtonPress(gamepad, new XInputControllerOSXState().WithButton(XInputControllerOSXState.Button.Select), gamepad.selectButton); } +// Temporary: Disables tests in standalone trunk builds (https://fogbugz.unity3d.com/f/cases/1410131/) +#if !UNITY_STANDALONE_OSX || !TEMP_DISABLE_STANDALONE_OSX_XINPUT_TEST [Test] [Category("Devices")] public void Devices_SupportXboxWirelessControllerOnOSX() @@ -231,6 +233,8 @@ public void Devices_SupportXboxWirelessControllerOnOSX() Assert.That(gamepad.leftTrigger.CheckStateIsAtDefault()); } +#endif // TEMP_DISABLE_STANDALONE_OSX_XINPUT_TEST + #endif diff --git a/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef b/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef index fe79bd3713..0752cc681a 100644 --- a/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef +++ b/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef @@ -44,6 +44,11 @@ "name": "Unity", "expression": "[2022.1,2022.2)", "define": "TEMP_DISABLE_UITOOLKIT_TEST" + }, + { + "name": "Unity", + "expression": "[2022.2.0a1,2022.2.0a10)", + "define": "TEMP_DISABLE_STANDALONE_OSX_XINPUT_TEST" } ], "noEngineReferences": false diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 6a1110d1e7..e44ce83cb7 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -52,6 +52,7 @@ however, it has to be formatted properly to pass verification tests. - Fixed no devices being available in `Start` and `Awake` methods if, in the player, any `InputSystem` API was accessed during the `SubsystemRegistration` phase ([case 1392358](https://issuetracker.unity3d.com/issues/inputsystem-does-not-initialize-properly-in-a-build-when-accessed-early)). - Fixed dropdown for "Supported Devices" in settings not showing all device layouts. - Fixed "STAT event with state format TOUC cannot be used with device 'Touchscreen:/Touchscreen'" when more than max supported amount of fingers, currently 10, are present on the screen at a same time (case 1395648). +- Fixed missing tooltips in PlayerInputManagerEditor for the Player Limit and Fixed Splitscreen sizes labels ([case 1396945](https://issuetracker.unity3d.com/issues/player-input-manager-pops-up-placeholder-text-when-hovering-over-it)). #### Actions diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputEditor.cs index 1a98db29ed..79eda12f98 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputEditor.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputEditor.cs @@ -32,19 +32,19 @@ public void OnEnable() InputUser.onChange += OnUserChange; // Look up properties. - m_ActionsProperty = serializedObject.FindProperty("m_Actions"); - m_DefaultControlSchemeProperty = serializedObject.FindProperty("m_DefaultControlScheme"); - m_NeverAutoSwitchControlSchemesProperty = serializedObject.FindProperty("m_NeverAutoSwitchControlSchemes"); - m_DefaultActionMapProperty = serializedObject.FindProperty("m_DefaultActionMap"); - m_NotificationBehaviorProperty = serializedObject.FindProperty("m_NotificationBehavior"); - m_CameraProperty = serializedObject.FindProperty("m_Camera"); - m_ActionEventsProperty = serializedObject.FindProperty("m_ActionEvents"); - m_DeviceLostEventProperty = serializedObject.FindProperty("m_DeviceLostEvent"); - m_DeviceRegainedEventProperty = serializedObject.FindProperty("m_DeviceRegainedEvent"); - m_ControlsChangedEventProperty = serializedObject.FindProperty("m_ControlsChangedEvent"); + m_ActionsProperty = serializedObject.FindProperty(nameof(PlayerInput.m_Actions)); + m_DefaultControlSchemeProperty = serializedObject.FindProperty(nameof(PlayerInput.m_DefaultControlScheme)); + m_NeverAutoSwitchControlSchemesProperty = serializedObject.FindProperty(nameof(PlayerInput.m_NeverAutoSwitchControlSchemes)); + m_DefaultActionMapProperty = serializedObject.FindProperty(nameof(PlayerInput.m_DefaultActionMap)); + m_NotificationBehaviorProperty = serializedObject.FindProperty(nameof(PlayerInput.m_NotificationBehavior)); + m_CameraProperty = serializedObject.FindProperty(nameof(PlayerInput.m_Camera)); + m_ActionEventsProperty = serializedObject.FindProperty(nameof(PlayerInput.m_ActionEvents)); + m_DeviceLostEventProperty = serializedObject.FindProperty(nameof(PlayerInput.m_DeviceLostEvent)); + m_DeviceRegainedEventProperty = serializedObject.FindProperty(nameof(PlayerInput.m_DeviceRegainedEvent)); + m_ControlsChangedEventProperty = serializedObject.FindProperty(nameof(PlayerInput.m_ControlsChangedEvent)); #if UNITY_INPUT_SYSTEM_ENABLE_UI - m_UIInputModuleProperty = serializedObject.FindProperty("m_UIInputModule"); + m_UIInputModuleProperty = serializedObject.FindProperty(nameof(PlayerInput.m_UIInputModule)); #endif } diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputManager.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputManager.cs index 1d72493190..e135186dcb 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputManager.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputManager.cs @@ -100,6 +100,15 @@ public bool splitScreen /// public bool maintainAspectRatioInSplitScreen => m_MaintainAspectRatioInSplitScreen; + /// + /// If is enabled, this property determines how many screen divisions there will be. + /// + /// + /// This is only used if is true. + /// + /// By default this is set to -1 which means the screen will automatically be divided to best fit the + /// current number of players i.e. the highest player index in + /// public int fixedNumberOfSplitScreens => m_FixedNumberOfSplitScreens; /// @@ -455,6 +464,7 @@ public PlayerInput JoinPlayer(int playerIndex = -1, int splitScreenIndex = -1, s } [SerializeField] internal PlayerNotifications m_NotificationBehavior; + [Tooltip("Set a limit for the maximum number of players who are able to join.")] [SerializeField] internal int m_MaxPlayerCount = -1; [SerializeField] internal bool m_AllowJoining = true; [SerializeField] internal PlayerJoinBehavior m_JoinBehavior; @@ -464,6 +474,7 @@ public PlayerInput JoinPlayer(int playerIndex = -1, int splitScreenIndex = -1, s [SerializeField] internal GameObject m_PlayerPrefab; [SerializeField] internal bool m_SplitScreen; [SerializeField] internal bool m_MaintainAspectRatioInSplitScreen; + [Tooltip("Explicitly set a fixed number of screens or otherwise allow the screen to be divided automatically to best fit the number of players.")] [SerializeField] internal int m_FixedNumberOfSplitScreens = -1; [SerializeField] internal Rect m_SplitScreenRect = new Rect(0, 0, 1, 1); diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputManagerEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputManagerEditor.cs index 51e6b45860..36cb4f72b8 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputManagerEditor.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputManagerEditor.cs @@ -48,7 +48,7 @@ public override void OnInspectorGUI() private void DoNotificationSectionUI() { - var notificationBehaviorProperty = serializedObject.FindProperty("m_NotificationBehavior"); + var notificationBehaviorProperty = serializedObject.FindProperty(nameof(PlayerInputManager.m_NotificationBehavior)); EditorGUILayout.PropertyField(notificationBehaviorProperty); switch ((PlayerNotifications)notificationBehaviorProperty.intValue) { @@ -70,8 +70,8 @@ private void DoNotificationSectionUI() m_EventsExpanded = EditorGUILayout.Foldout(m_EventsExpanded, m_EventsLabel, toggleOnLabelClick: true); if (m_EventsExpanded) { - var playerJoinedEventProperty = serializedObject.FindProperty("m_PlayerJoinedEvent"); - var playerLeftEventProperty = serializedObject.FindProperty("m_PlayerLeftEvent"); + var playerJoinedEventProperty = serializedObject.FindProperty(nameof(PlayerInputManager.m_PlayerJoinedEvent)); + var playerLeftEventProperty = serializedObject.FindProperty(nameof(PlayerInputManager.m_PlayerLeftEvent)); EditorGUILayout.PropertyField(playerJoinedEventProperty); EditorGUILayout.PropertyField(playerLeftEventProperty); @@ -85,7 +85,7 @@ private void DoJoinSectionUI() EditorGUILayout.LabelField(m_JoiningGroupLabel, EditorStyles.boldLabel); // Join behavior - var joinBehaviorProperty = serializedObject.FindProperty("m_JoinBehavior"); + var joinBehaviorProperty = serializedObject.FindProperty(nameof(PlayerInputManager.m_JoinBehavior)); EditorGUILayout.PropertyField(joinBehaviorProperty); if ((PlayerJoinBehavior)joinBehaviorProperty.intValue != PlayerJoinBehavior.JoinPlayersManually) { @@ -95,12 +95,12 @@ private void DoJoinSectionUI() if ((PlayerJoinBehavior)joinBehaviorProperty.intValue == PlayerJoinBehavior.JoinPlayersWhenJoinActionIsTriggered) { - var joinActionProperty = serializedObject.FindProperty("m_JoinAction"); + var joinActionProperty = serializedObject.FindProperty(nameof(PlayerInputManager.m_JoinAction)); EditorGUILayout.PropertyField(joinActionProperty); } // Player prefab. - var playerPrefabProperty = serializedObject.FindProperty("m_PlayerPrefab"); + var playerPrefabProperty = serializedObject.FindProperty(nameof(PlayerInputManager.m_PlayerPrefab)); EditorGUILayout.PropertyField(playerPrefabProperty); ValidatePlayerPrefab(joinBehaviorProperty, playerPrefabProperty); @@ -109,13 +109,15 @@ private void DoJoinSectionUI() } // Enabled-by-default. - var allowJoiningProperty = serializedObject.FindProperty("m_AllowJoining"); + var allowJoiningProperty = serializedObject.FindProperty(nameof(PlayerInputManager.m_AllowJoining)); if (m_AllowingJoiningLabel == null) m_AllowingJoiningLabel = new GUIContent("Joining Enabled By Default", allowJoiningProperty.GetTooltip()); EditorGUILayout.PropertyField(allowJoiningProperty, m_AllowingJoiningLabel); // Max player count. - var maxPlayerCountProperty = serializedObject.FindProperty("m_MaxPlayerCount"); + var maxPlayerCountProperty = serializedObject.FindProperty(nameof(PlayerInputManager.m_MaxPlayerCount)); + if (m_EnableMaxPlayerCountLabel == null) + m_EnableMaxPlayerCountLabel = EditorGUIUtility.TrTextContent("Limit Number of Players", maxPlayerCountProperty.GetTooltip()); if (maxPlayerCountProperty.intValue > 0) m_MaxPlayerCountEnabled = true; m_MaxPlayerCountEnabled = EditorGUILayout.Toggle(m_EnableMaxPlayerCountLabel, m_MaxPlayerCountEnabled); @@ -166,7 +168,7 @@ private void DoSplitScreenSectionUI() EditorGUILayout.LabelField(m_SplitScreenGroupLabel, EditorStyles.boldLabel); // Split-screen toggle. - var splitScreenProperty = serializedObject.FindProperty("m_SplitScreen"); + var splitScreenProperty = serializedObject.FindProperty(nameof(PlayerInputManager.m_SplitScreen)); if (m_SplitScreenLabel == null) m_SplitScreenLabel = new GUIContent("Enable Split-Screen", splitScreenProperty.GetTooltip()); EditorGUILayout.PropertyField(splitScreenProperty, m_SplitScreenLabel); @@ -176,14 +178,16 @@ private void DoSplitScreenSectionUI() ++EditorGUI.indentLevel; // Maintain-aspect-ratio toggle. - var maintainAspectRatioProperty = serializedObject.FindProperty("m_MaintainAspectRatioInSplitScreen"); + var maintainAspectRatioProperty = serializedObject.FindProperty(nameof(PlayerInputManager.m_MaintainAspectRatioInSplitScreen)); if (m_MaintainAspectRatioLabel == null) m_MaintainAspectRatioLabel = new GUIContent("Maintain Aspect Ratio", maintainAspectRatioProperty.GetTooltip()); EditorGUILayout.PropertyField(maintainAspectRatioProperty, m_MaintainAspectRatioLabel); // Fixed-number toggle. - var fixedNumberProperty = serializedObject.FindProperty("m_FixedNumberOfSplitScreens"); + var fixedNumberProperty = serializedObject.FindProperty(nameof(PlayerInputManager.m_FixedNumberOfSplitScreens)); + if (m_EnableFixedNumberOfSplitScreensLabel == null) + m_EnableFixedNumberOfSplitScreensLabel = EditorGUIUtility.TrTextContent("Set Fixed Number", fixedNumberProperty.GetTooltip()); if (fixedNumberProperty.intValue > 0) m_FixedNumberOfSplitScreensEnabled = true; m_FixedNumberOfSplitScreensEnabled = EditorGUILayout.Toggle(m_EnableFixedNumberOfSplitScreensLabel, @@ -205,7 +209,7 @@ private void DoSplitScreenSectionUI() } // Split-screen area. - var splitScreenAreaProperty = serializedObject.FindProperty("m_SplitScreenRect"); + var splitScreenAreaProperty = serializedObject.FindProperty(nameof(PlayerInputManager.m_SplitScreenRect)); if (m_SplitScreenAreaLabel == null) m_SplitScreenAreaLabel = new GUIContent("Screen Rectangle", splitScreenAreaProperty.GetTooltip()); EditorGUILayout.PropertyField(splitScreenAreaProperty, m_SplitScreenAreaLabel); @@ -252,10 +256,8 @@ private void DoDebugUI() [NonSerialized] private GUIContent m_MaintainAspectRatioLabel; [NonSerialized] private GUIContent m_SplitScreenAreaLabel; [NonSerialized] private GUIContent m_FixedNumberOfSplitScreensLabel; - [NonSerialized] private readonly GUIContent m_EnableMaxPlayerCountLabel = - EditorGUIUtility.TrTextContent("Limit Number of Players", "TODO"); - [NonSerialized] private readonly GUIContent m_EnableFixedNumberOfSplitScreensLabel = - EditorGUIUtility.TrTextContent("Set Fixed Number", "TODO"); + [NonSerialized] private GUIContent m_EnableMaxPlayerCountLabel; + [NonSerialized] private GUIContent m_EnableFixedNumberOfSplitScreensLabel; } } #endif // UNITY_EDITOR From ea8048a7375a8236ef9728ca38eb75ad7e44ff63 Mon Sep 17 00:00:00 2001 From: Dmytro Ivanov Date: Fri, 18 Mar 2022 14:07:27 +0100 Subject: [PATCH 34/53] FIX: Adding support for DualShock 4 extended mode to fix various issues (#1513) --- .../Tests/InputSystem/APIVerificationTests.cs | 5 +- Assets/Tests/InputSystem/CoreTests_Editor.cs | 1 - .../InputSystem/Plugins/DualShockTests.cs | 42 +- Packages/com.unity.inputsystem/CHANGELOG.md | 1 + .../Plugins/DualShock/DualShockGamepadHID.cs | 117 +- .../Plugins/DualShock/DualShockSupport.cs | 1 - .../DualShock/FastDualShock4GamepadHID.cs | 1125 ----------------- .../FastDualShock4GamepadHID.cs.meta | 11 - 8 files changed, 129 insertions(+), 1174 deletions(-) delete mode 100644 Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/FastDualShock4GamepadHID.cs delete mode 100644 Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/FastDualShock4GamepadHID.cs.meta diff --git a/Assets/Tests/InputSystem/APIVerificationTests.cs b/Assets/Tests/InputSystem/APIVerificationTests.cs index cd18ffa2d0..a50c6d37ce 100644 --- a/Assets/Tests/InputSystem/APIVerificationTests.cs +++ b/Assets/Tests/InputSystem/APIVerificationTests.cs @@ -553,7 +553,6 @@ private static void CheckHTMLFileLinkConsistency(string htmlFile, List u [TestCase("Keyboard", "Devices/Precompiled/FastKeyboard.cs")] [TestCase("Mouse", "Devices/Precompiled/FastMouse.cs")] [TestCase("Touchscreen", "Devices/Precompiled/FastTouchscreen.cs")] - [TestCase("DualShock4GamepadHID", "Plugins/DualShock/FastDualShock4GamepadHID.cs")] public void API_PrecompiledLayoutsAreUpToDate(string layoutName, string filePath) { var fullPath = "Packages/com.unity.inputsystem/InputSystem/" + filePath; @@ -782,6 +781,10 @@ public class Touchscreen : UnityEngine.InputSystem.Pointer, UnityEngine.InputSys [Property("Exclusions", @"1.0.0 public class SwitchProControllerHID : UnityEngine.InputSystem.Gamepad ")] + // DualShock4GamepadHID from IEventPreProcessor, which is an internal interface + [Property("Exclusions", @"1.0.0 + public class DualShock4GamepadHID : UnityEngine.InputSystem.DualShock.DualShockGamepad + ")] public void API_MinorVersionsHaveNoBreakingChanges() { var currentVersion = CoreTests.PackageJson.ReadVersion(); diff --git a/Assets/Tests/InputSystem/CoreTests_Editor.cs b/Assets/Tests/InputSystem/CoreTests_Editor.cs index 5646539eb4..9404016ff5 100644 --- a/Assets/Tests/InputSystem/CoreTests_Editor.cs +++ b/Assets/Tests/InputSystem/CoreTests_Editor.cs @@ -2889,7 +2889,6 @@ private void AssertAssetIsUnmodifiedAfterExitingPlayMode(Action DualShock4GamepadHID.DualShock4HIDGenericInputReport.Format; + } + [Test] [Category("Devices")] - [TestCase(true)] - [TestCase(false)] - public void Devices_SupportsDualShock4AsHID(bool precompiled) + public void Devices_SupportsDualShock4AsHID() { - if (!precompiled) - InputControlLayout.s_Layouts.precompiledLayouts.Clear(); - - var gamepad = Devices_SupportsDualShockAsHID( - new DualShock4HIDInputReport + var gamepad = Devices_SupportsDualShockAsHID( + new DualShock4HIDInputReportRaw { - leftStickX = 32, - leftStickY = 64, - rightStickX = 128, - rightStickY = 255, - leftTrigger = 20, - rightTrigger = 40, - buttons1 = 0xf7, // Low order 4 bits is Dpad but effectively uses only 3 bits. - buttons2 = 0xff, - buttons3 = 0xff + commandId = 0x01, + report = new DualShock4GamepadHID.DualShock4HIDGenericInputReport + { + leftStickX = 32, + leftStickY = 64, + rightStickX = 128, + rightStickY = 255, + leftTrigger = 20, + rightTrigger = 40, + buttons0 = 0xf7, // Low order 4 bits is Dpad but effectively uses only 3 bits. + buttons1 = 0xff, + buttons2 = 0xff + } } ); diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index e44ce83cb7..6aeb9bc995 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -53,6 +53,7 @@ however, it has to be formatted properly to pass verification tests. - Fixed dropdown for "Supported Devices" in settings not showing all device layouts. - Fixed "STAT event with state format TOUC cannot be used with device 'Touchscreen:/Touchscreen'" when more than max supported amount of fingers, currently 10, are present on the screen at a same time (case 1395648). - Fixed missing tooltips in PlayerInputManagerEditor for the Player Limit and Fixed Splitscreen sizes labels ([case 1396945](https://issuetracker.unity3d.com/issues/player-input-manager-pops-up-placeholder-text-when-hovering-over-it)). +- Fixed DualShock 4 controllers not working in some scenarios by adding support for extended mode HID reports ([case 1281633](https://issuetracker.unity3d.com/issues/input-system-dualshock4-controller-returns-random-input-values-when-connected-via-bluetooth-while-steam-is-running), case 1409867). #### Actions diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockGamepadHID.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockGamepadHID.cs index b362a01adc..8841d53a81 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockGamepadHID.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockGamepadHID.cs @@ -146,10 +146,11 @@ public static DualSenseHIDBluetoothOutputReport Create(DualSenseHIDOutputReportP /// /// Structure of HID input reports for PS4 DualShock 4 controllers. /// - [StructLayout(LayoutKind.Explicit, Size = 32)] + [StructLayout(LayoutKind.Explicit, Size = 9 /* !!! Beware !!! If you plan to increase this, think about how you gonna fit 10 byte state events because we can only shrink events in IEventPreProcessor */)] internal struct DualShock4HIDInputReport : IInputStateTypeInfo { - [FieldOffset(0)] public byte reportId; + public static FourCC Format = new FourCC('D', '4', 'V', 'S'); // DualShock4 Virtual State + public FourCC format => Format; [InputControl(name = "leftStick", layout = "Stick", format = "VC2B")] [InputControl(name = "leftStick/x", offset = 0, format = "BYTE", parameters = "normalize,normalizeMin=0,normalizeMax=1,normalizeZero=0.5")] @@ -158,8 +159,8 @@ internal struct DualShock4HIDInputReport : IInputStateTypeInfo [InputControl(name = "leftStick/y", offset = 1, format = "BYTE", parameters = "invert,normalize,normalizeMin=0,normalizeMax=1,normalizeZero=0.5")] [InputControl(name = "leftStick/up", offset = 1, format = "BYTE", parameters = "normalize,normalizeMin=0,normalizeMax=1,normalizeZero=0.5,clamp=1,clampMin=0,clampMax=0.5,invert")] [InputControl(name = "leftStick/down", offset = 1, format = "BYTE", parameters = "normalize,normalizeMin=0,normalizeMax=1,normalizeZero=0.5,clamp=1,clampMin=0.5,clampMax=1,invert=false")] - [FieldOffset(1)] public byte leftStickX; - [FieldOffset(2)] public byte leftStickY; + [FieldOffset(0)] public byte leftStickX; + [FieldOffset(1)] public byte leftStickY; [InputControl(name = "rightStick", layout = "Stick", format = "VC2B")] [InputControl(name = "rightStick/x", offset = 0, format = "BYTE", parameters = "normalize,normalizeMin=0,normalizeMax=1,normalizeZero=0.5")] @@ -168,8 +169,8 @@ internal struct DualShock4HIDInputReport : IInputStateTypeInfo [InputControl(name = "rightStick/y", offset = 1, format = "BYTE", parameters = "invert,normalize,normalizeMin=0,normalizeMax=1,normalizeZero=0.5")] [InputControl(name = "rightStick/up", offset = 1, format = "BYTE", parameters = "normalize,normalizeMin=0,normalizeMax=1,normalizeZero=0.5,clamp=1,clampMin=0,clampMax=0.5,invert")] [InputControl(name = "rightStick/down", offset = 1, format = "BYTE", parameters = "normalize,normalizeMin=0,normalizeMax=1,normalizeZero=0.5,clamp=1,clampMin=0.5,clampMax=1,invert=false")] - [FieldOffset(3)] public byte rightStickX; - [FieldOffset(4)] public byte rightStickY; + [FieldOffset(2)] public byte rightStickX; + [FieldOffset(3)] public byte rightStickY; [InputControl(name = "dpad", format = "BIT", layout = "Dpad", sizeInBits = 4, defaultState = 8)] [InputControl(name = "dpad/up", format = "BIT", layout = "DiscreteButton", parameters = "minValue=7,maxValue=1,nullValue=8,wrapAtValue=7", bit = 0, sizeInBits = 4)] @@ -180,7 +181,7 @@ internal struct DualShock4HIDInputReport : IInputStateTypeInfo [InputControl(name = "buttonSouth", displayName = "Cross", bit = 5)] [InputControl(name = "buttonEast", displayName = "Circle", bit = 6)] [InputControl(name = "buttonNorth", displayName = "Triangle", bit = 7)] - [FieldOffset(5)] public byte buttons1; + [FieldOffset(4)] public byte buttons1; [InputControl(name = "leftShoulder", bit = 0)] [InputControl(name = "rightShoulder", bit = 1)] [InputControl(name = "leftTriggerButton", layout = "Button", bit = 2, synthetic = true)] @@ -189,21 +190,15 @@ internal struct DualShock4HIDInputReport : IInputStateTypeInfo [InputControl(name = "start", displayName = "Options", bit = 5)] [InputControl(name = "leftStickPress", bit = 6)] [InputControl(name = "rightStickPress", bit = 7)] - [FieldOffset(6)] public byte buttons2; + [FieldOffset(5)] public byte buttons2; [InputControl(name = "systemButton", layout = "Button", displayName = "System", bit = 0)] [InputControl(name = "touchpadButton", layout = "Button", displayName = "Touchpad Press", bit = 1)] - [FieldOffset(7)] public byte buttons3; + [FieldOffset(6)] public byte buttons3; [InputControl(name = "leftTrigger", format = "BYTE")] - [FieldOffset(8)] public byte leftTrigger; + [FieldOffset(7)] public byte leftTrigger; [InputControl(name = "rightTrigger", format = "BYTE")] - [FieldOffset(9)] public byte rightTrigger; - - [FieldOffset(30)] public byte batteryLevel; - - ////TODO: touchpad - - public FourCC format => new FourCC('H', 'I', 'D'); + [FieldOffset(8)] public byte rightTrigger; } /// @@ -670,7 +665,7 @@ public DualSenseHIDInputReport ToHIDInputReport() /// PS4 DualShock controller that is interfaced to a HID backend. /// [InputControlLayout(stateType = typeof(DualShock4HIDInputReport), hideInUI = true, isNoisy = true)] - public class DualShock4GamepadHID : DualShockGamepad + public class DualShock4GamepadHID : DualShockGamepad, IEventPreProcessor { public ButtonControl leftTriggerButton { get; protected set; } public ButtonControl rightTriggerButton { get; protected set; } @@ -789,6 +784,92 @@ public bool SetMotorSpeedsAndLightBarColor(float lowFrequency, float highFrequen private float? m_LowFrequencyMotorSpeed; private float? m_HighFrequenceyMotorSpeed; private Color? m_LightBarColor; + + unsafe bool IEventPreProcessor.PreProcessEvent(InputEventPtr eventPtr) + { + if (eventPtr.type != StateEvent.Type) + return eventPtr.type != DeltaStateEvent.Type; // only skip delta state events + + var stateEvent = StateEvent.FromUnchecked(eventPtr); + var size = stateEvent->stateSizeInBytes; + + if (stateEvent->stateFormat != DualShock4HIDGenericInputReport.Format || size < sizeof(DualShock4HIDGenericInputReport)) + return false; // skip unrecognized state events otherwise they will corrupt control states + + var binaryData = (byte*)stateEvent->state; + + switch (binaryData[0]) + { + // normal USB or non-enhanced report + case 1: + { + if (size < sizeof(DualShock4HIDGenericInputReport) + 1) + return false; + + var data = ((DualShock4HIDGenericInputReport*)(binaryData + 1))->ToHIDInputReport(); + *((DualShock4HIDInputReport*)stateEvent->state) = data; + stateEvent->stateFormat = DualShock4HIDInputReport.Format; + return true; + } + // bluetooth or enhanced report + case 17: + case 18: + case 19: + case 20: + case 21: + case 22: + case 23: + case 24: + case 25: + if ((binaryData[1] & 0x80) != 0) + { + if (size < sizeof(DualShock4HIDGenericInputReport) + 3) + return false; + + var data = ((DualShock4HIDGenericInputReport*)(binaryData + 3))->ToHIDInputReport(); + *((DualShock4HIDInputReport*)stateEvent->state) = data; + stateEvent->stateFormat = DualShock4HIDInputReport.Format; + return true; + } + else + return false; + default: + return false; // skip unrecognized reportId + } + } + + [StructLayout(LayoutKind.Explicit)] + internal struct DualShock4HIDGenericInputReport + { + public static FourCC Format => new FourCC('H', 'I', 'D'); + + [FieldOffset(0)] public byte leftStickX; + [FieldOffset(1)] public byte leftStickY; + [FieldOffset(2)] public byte rightStickX; + [FieldOffset(3)] public byte rightStickY; + [FieldOffset(4)] public byte buttons0; + [FieldOffset(5)] public byte buttons1; + [FieldOffset(6)] public byte buttons2; + [FieldOffset(7)] public byte leftTrigger; + [FieldOffset(8)] public byte rightTrigger; + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public DualShock4HIDInputReport ToHIDInputReport() + { + return new DualShock4HIDInputReport + { + leftStickX = leftStickX, + leftStickY = leftStickY, + rightStickX = rightStickX, + rightStickY = rightStickY, + leftTrigger = leftTrigger, + rightTrigger = rightTrigger, + buttons1 = buttons0, + buttons2 = buttons1, + buttons3 = buttons2 + }; + } + } } [InputControlLayout(stateType = typeof(DualShock3HIDInputReport), hideInUI = true, displayName = "PS3 Controller")] diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockSupport.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockSupport.cs index 1600a4dcbf..efb5a4f3b3 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockSupport.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockSupport.cs @@ -42,7 +42,6 @@ public static void Initialize() .WithInterface("HID") .WithCapability("vendorId", 0x54C) // Sony Entertainment. .WithCapability("productId", 0x5C4)); // Wireless controller. - InputSystem.RegisterPrecompiledLayout(FastDualShock4GamepadHID.metadata); // Just to make sure, also set up a matcher that goes by strings so that we cover // all bases. diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/FastDualShock4GamepadHID.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/FastDualShock4GamepadHID.cs deleted file mode 100644 index 925ac4069d..0000000000 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/FastDualShock4GamepadHID.cs +++ /dev/null @@ -1,1125 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator -// version 1.4.0 -// from "DualShock4GamepadHID" layout -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -#if UNITY_EDITOR || UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN || UNITY_WSA - -using UnityEngine.InputSystem; -using UnityEngine.InputSystem.LowLevel; -using UnityEngine.InputSystem.Utilities; - -// Suppress warnings from local variables for control references -// that we don't end up using. -#pragma warning disable CS0219 - -namespace UnityEngine.InputSystem.DualShock -{ - internal partial class FastDualShock4GamepadHID : UnityEngine.InputSystem.DualShock.DualShock4GamepadHID - { - public const string metadata = "StickDeadzone;AxisDeadzone;Stick;Vector2;Dpad;Button;Axis;DpadAxis;DiscreteButton;DualShock4GamepadHID;DualShockGamepad;Gamepad"; - public FastDualShock4GamepadHID() - { - var builder = this.Setup(37, 11, 8) - .WithName("DualShock4GamepadHID") - .WithDisplayName("PlayStation Controller") - .WithChildren(0, 19) - .WithLayout(new InternedString("DualShock4GamepadHID")) - .WithStateBlock(new InputStateBlock { format = new FourCC(1212761120), sizeInBits = 80 }); - builder.IsNoisy(true); - - var kStickLayout = new InternedString("Stick"); - var kDpadLayout = new InternedString("Dpad"); - var kButtonLayout = new InternedString("Button"); - var kAxisLayout = new InternedString("Axis"); - var kDpadAxisLayout = new InternedString("DpadAxis"); - var kDiscreteButtonLayout = new InternedString("DiscreteButton"); - - // /DualShock4GamepadHID/leftStick - var ctrlDualShock4GamepadHIDleftStick = Initialize_ctrlDualShock4GamepadHIDleftStick(kStickLayout, this); - - // /DualShock4GamepadHID/rightStick - var ctrlDualShock4GamepadHIDrightStick = Initialize_ctrlDualShock4GamepadHIDrightStick(kStickLayout, this); - - // /DualShock4GamepadHID/dpad - var ctrlDualShock4GamepadHIDdpad = Initialize_ctrlDualShock4GamepadHIDdpad(kDpadLayout, this); - - // /DualShock4GamepadHID/buttonWest - var ctrlDualShock4GamepadHIDbuttonWest = Initialize_ctrlDualShock4GamepadHIDbuttonWest(kButtonLayout, this); - - // /DualShock4GamepadHID/buttonSouth - var ctrlDualShock4GamepadHIDbuttonSouth = Initialize_ctrlDualShock4GamepadHIDbuttonSouth(kButtonLayout, this); - - // /DualShock4GamepadHID/buttonEast - var ctrlDualShock4GamepadHIDbuttonEast = Initialize_ctrlDualShock4GamepadHIDbuttonEast(kButtonLayout, this); - - // /DualShock4GamepadHID/buttonNorth - var ctrlDualShock4GamepadHIDbuttonNorth = Initialize_ctrlDualShock4GamepadHIDbuttonNorth(kButtonLayout, this); - - // /DualShock4GamepadHID/leftShoulder - var ctrlDualShock4GamepadHIDleftShoulder = Initialize_ctrlDualShock4GamepadHIDleftShoulder(kButtonLayout, this); - - // /DualShock4GamepadHID/rightShoulder - var ctrlDualShock4GamepadHIDrightShoulder = Initialize_ctrlDualShock4GamepadHIDrightShoulder(kButtonLayout, this); - - // /DualShock4GamepadHID/leftTriggerButton - var ctrlDualShock4GamepadHIDleftTriggerButton = Initialize_ctrlDualShock4GamepadHIDleftTriggerButton(kButtonLayout, this); - - // /DualShock4GamepadHID/rightTriggerButton - var ctrlDualShock4GamepadHIDrightTriggerButton = Initialize_ctrlDualShock4GamepadHIDrightTriggerButton(kButtonLayout, this); - - // /DualShock4GamepadHID/select - var ctrlDualShock4GamepadHIDselect = Initialize_ctrlDualShock4GamepadHIDselect(kButtonLayout, this); - - // /DualShock4GamepadHID/start - var ctrlDualShock4GamepadHIDstart = Initialize_ctrlDualShock4GamepadHIDstart(kButtonLayout, this); - - // /DualShock4GamepadHID/leftStickPress - var ctrlDualShock4GamepadHIDleftStickPress = Initialize_ctrlDualShock4GamepadHIDleftStickPress(kButtonLayout, this); - - // /DualShock4GamepadHID/rightStickPress - var ctrlDualShock4GamepadHIDrightStickPress = Initialize_ctrlDualShock4GamepadHIDrightStickPress(kButtonLayout, this); - - // /DualShock4GamepadHID/systemButton - var ctrlDualShock4GamepadHIDsystemButton = Initialize_ctrlDualShock4GamepadHIDsystemButton(kButtonLayout, this); - - // /DualShock4GamepadHID/touchpadButton - var ctrlDualShock4GamepadHIDtouchpadButton = Initialize_ctrlDualShock4GamepadHIDtouchpadButton(kButtonLayout, this); - - // /DualShock4GamepadHID/leftTrigger - var ctrlDualShock4GamepadHIDleftTrigger = Initialize_ctrlDualShock4GamepadHIDleftTrigger(kButtonLayout, this); - - // /DualShock4GamepadHID/rightTrigger - var ctrlDualShock4GamepadHIDrightTrigger = Initialize_ctrlDualShock4GamepadHIDrightTrigger(kButtonLayout, this); - - // /DualShock4GamepadHID/leftStick/up - var ctrlDualShock4GamepadHIDleftStickup = Initialize_ctrlDualShock4GamepadHIDleftStickup(kButtonLayout, ctrlDualShock4GamepadHIDleftStick); - - // /DualShock4GamepadHID/leftStick/x - var ctrlDualShock4GamepadHIDleftStickx = Initialize_ctrlDualShock4GamepadHIDleftStickx(kAxisLayout, ctrlDualShock4GamepadHIDleftStick); - - // /DualShock4GamepadHID/leftStick/y - var ctrlDualShock4GamepadHIDleftSticky = Initialize_ctrlDualShock4GamepadHIDleftSticky(kAxisLayout, ctrlDualShock4GamepadHIDleftStick); - - // /DualShock4GamepadHID/leftStick/down - var ctrlDualShock4GamepadHIDleftStickdown = Initialize_ctrlDualShock4GamepadHIDleftStickdown(kButtonLayout, ctrlDualShock4GamepadHIDleftStick); - - // /DualShock4GamepadHID/leftStick/left - var ctrlDualShock4GamepadHIDleftStickleft = Initialize_ctrlDualShock4GamepadHIDleftStickleft(kButtonLayout, ctrlDualShock4GamepadHIDleftStick); - - // /DualShock4GamepadHID/leftStick/right - var ctrlDualShock4GamepadHIDleftStickright = Initialize_ctrlDualShock4GamepadHIDleftStickright(kButtonLayout, ctrlDualShock4GamepadHIDleftStick); - - // /DualShock4GamepadHID/rightStick/up - var ctrlDualShock4GamepadHIDrightStickup = Initialize_ctrlDualShock4GamepadHIDrightStickup(kButtonLayout, ctrlDualShock4GamepadHIDrightStick); - - // /DualShock4GamepadHID/rightStick/x - var ctrlDualShock4GamepadHIDrightStickx = Initialize_ctrlDualShock4GamepadHIDrightStickx(kAxisLayout, ctrlDualShock4GamepadHIDrightStick); - - // /DualShock4GamepadHID/rightStick/y - var ctrlDualShock4GamepadHIDrightSticky = Initialize_ctrlDualShock4GamepadHIDrightSticky(kAxisLayout, ctrlDualShock4GamepadHIDrightStick); - - // /DualShock4GamepadHID/rightStick/down - var ctrlDualShock4GamepadHIDrightStickdown = Initialize_ctrlDualShock4GamepadHIDrightStickdown(kButtonLayout, ctrlDualShock4GamepadHIDrightStick); - - // /DualShock4GamepadHID/rightStick/left - var ctrlDualShock4GamepadHIDrightStickleft = Initialize_ctrlDualShock4GamepadHIDrightStickleft(kButtonLayout, ctrlDualShock4GamepadHIDrightStick); - - // /DualShock4GamepadHID/rightStick/right - var ctrlDualShock4GamepadHIDrightStickright = Initialize_ctrlDualShock4GamepadHIDrightStickright(kButtonLayout, ctrlDualShock4GamepadHIDrightStick); - - // /DualShock4GamepadHID/dpad/x - var ctrlDualShock4GamepadHIDdpadx = Initialize_ctrlDualShock4GamepadHIDdpadx(kDpadAxisLayout, ctrlDualShock4GamepadHIDdpad); - - // /DualShock4GamepadHID/dpad/y - var ctrlDualShock4GamepadHIDdpady = Initialize_ctrlDualShock4GamepadHIDdpady(kDpadAxisLayout, ctrlDualShock4GamepadHIDdpad); - - // /DualShock4GamepadHID/dpad/up - var ctrlDualShock4GamepadHIDdpadup = Initialize_ctrlDualShock4GamepadHIDdpadup(kDiscreteButtonLayout, ctrlDualShock4GamepadHIDdpad); - - // /DualShock4GamepadHID/dpad/down - var ctrlDualShock4GamepadHIDdpaddown = Initialize_ctrlDualShock4GamepadHIDdpaddown(kDiscreteButtonLayout, ctrlDualShock4GamepadHIDdpad); - - // /DualShock4GamepadHID/dpad/left - var ctrlDualShock4GamepadHIDdpadleft = Initialize_ctrlDualShock4GamepadHIDdpadleft(kDiscreteButtonLayout, ctrlDualShock4GamepadHIDdpad); - - // /DualShock4GamepadHID/dpad/right - var ctrlDualShock4GamepadHIDdpadright = Initialize_ctrlDualShock4GamepadHIDdpadright(kDiscreteButtonLayout, ctrlDualShock4GamepadHIDdpad); - - // Usages. - builder.WithControlUsage(0, new InternedString("Primary2DMotion"), ctrlDualShock4GamepadHIDleftStick); - builder.WithControlUsage(1, new InternedString("Secondary2DMotion"), ctrlDualShock4GamepadHIDrightStick); - builder.WithControlUsage(2, new InternedString("Hatswitch"), ctrlDualShock4GamepadHIDdpad); - builder.WithControlUsage(3, new InternedString("SecondaryAction"), ctrlDualShock4GamepadHIDbuttonWest); - builder.WithControlUsage(4, new InternedString("PrimaryAction"), ctrlDualShock4GamepadHIDbuttonSouth); - builder.WithControlUsage(5, new InternedString("Submit"), ctrlDualShock4GamepadHIDbuttonSouth); - builder.WithControlUsage(6, new InternedString("Back"), ctrlDualShock4GamepadHIDbuttonEast); - builder.WithControlUsage(7, new InternedString("Cancel"), ctrlDualShock4GamepadHIDbuttonEast); - builder.WithControlUsage(8, new InternedString("Menu"), ctrlDualShock4GamepadHIDstart); - builder.WithControlUsage(9, new InternedString("SecondaryTrigger"), ctrlDualShock4GamepadHIDleftTrigger); - builder.WithControlUsage(10, new InternedString("SecondaryTrigger"), ctrlDualShock4GamepadHIDrightTrigger); - - // Aliases. - builder.WithControlAlias(0, new InternedString("x")); - builder.WithControlAlias(1, new InternedString("square")); - builder.WithControlAlias(2, new InternedString("a")); - builder.WithControlAlias(3, new InternedString("cross")); - builder.WithControlAlias(4, new InternedString("b")); - builder.WithControlAlias(5, new InternedString("circle")); - builder.WithControlAlias(6, new InternedString("y")); - builder.WithControlAlias(7, new InternedString("triangle")); - - // Control getters/arrays. - this.leftTriggerButton = ctrlDualShock4GamepadHIDleftTriggerButton; - this.rightTriggerButton = ctrlDualShock4GamepadHIDrightTriggerButton; - this.playStationButton = ctrlDualShock4GamepadHIDsystemButton; - this.touchpadButton = ctrlDualShock4GamepadHIDtouchpadButton; - this.optionsButton = ctrlDualShock4GamepadHIDstart; - this.shareButton = ctrlDualShock4GamepadHIDselect; - this.L1 = ctrlDualShock4GamepadHIDleftShoulder; - this.R1 = ctrlDualShock4GamepadHIDrightShoulder; - this.L2 = ctrlDualShock4GamepadHIDleftTrigger; - this.R2 = ctrlDualShock4GamepadHIDrightTrigger; - this.L3 = ctrlDualShock4GamepadHIDleftStickPress; - this.R3 = ctrlDualShock4GamepadHIDrightStickPress; - this.buttonWest = ctrlDualShock4GamepadHIDbuttonWest; - this.buttonNorth = ctrlDualShock4GamepadHIDbuttonNorth; - this.buttonSouth = ctrlDualShock4GamepadHIDbuttonSouth; - this.buttonEast = ctrlDualShock4GamepadHIDbuttonEast; - this.leftStickButton = ctrlDualShock4GamepadHIDleftStickPress; - this.rightStickButton = ctrlDualShock4GamepadHIDrightStickPress; - this.startButton = ctrlDualShock4GamepadHIDstart; - this.selectButton = ctrlDualShock4GamepadHIDselect; - this.dpad = ctrlDualShock4GamepadHIDdpad; - this.leftShoulder = ctrlDualShock4GamepadHIDleftShoulder; - this.rightShoulder = ctrlDualShock4GamepadHIDrightShoulder; - this.leftStick = ctrlDualShock4GamepadHIDleftStick; - this.rightStick = ctrlDualShock4GamepadHIDrightStick; - this.leftTrigger = ctrlDualShock4GamepadHIDleftTrigger; - this.rightTrigger = ctrlDualShock4GamepadHIDrightTrigger; - ctrlDualShock4GamepadHIDleftStick.up = ctrlDualShock4GamepadHIDleftStickup; - ctrlDualShock4GamepadHIDleftStick.down = ctrlDualShock4GamepadHIDleftStickdown; - ctrlDualShock4GamepadHIDleftStick.left = ctrlDualShock4GamepadHIDleftStickleft; - ctrlDualShock4GamepadHIDleftStick.right = ctrlDualShock4GamepadHIDleftStickright; - ctrlDualShock4GamepadHIDleftStick.x = ctrlDualShock4GamepadHIDleftStickx; - ctrlDualShock4GamepadHIDleftStick.y = ctrlDualShock4GamepadHIDleftSticky; - ctrlDualShock4GamepadHIDrightStick.up = ctrlDualShock4GamepadHIDrightStickup; - ctrlDualShock4GamepadHIDrightStick.down = ctrlDualShock4GamepadHIDrightStickdown; - ctrlDualShock4GamepadHIDrightStick.left = ctrlDualShock4GamepadHIDrightStickleft; - ctrlDualShock4GamepadHIDrightStick.right = ctrlDualShock4GamepadHIDrightStickright; - ctrlDualShock4GamepadHIDrightStick.x = ctrlDualShock4GamepadHIDrightStickx; - ctrlDualShock4GamepadHIDrightStick.y = ctrlDualShock4GamepadHIDrightSticky; - ctrlDualShock4GamepadHIDdpad.up = ctrlDualShock4GamepadHIDdpadup; - ctrlDualShock4GamepadHIDdpad.down = ctrlDualShock4GamepadHIDdpaddown; - ctrlDualShock4GamepadHIDdpad.left = ctrlDualShock4GamepadHIDdpadleft; - ctrlDualShock4GamepadHIDdpad.right = ctrlDualShock4GamepadHIDdpadright; - ctrlDualShock4GamepadHIDdpad.x = ctrlDualShock4GamepadHIDdpadx; - ctrlDualShock4GamepadHIDdpad.y = ctrlDualShock4GamepadHIDdpady; - - // State offset to control index map. - builder.WithStateOffsetToControlIndexMap(new uint[] - { - 4202516u, 4202519u, 4202520u, 8396819u, 8396821u, 8396822u, 12591130u, 12591133u, 12591134u, 16785433u - , 16785435u, 16785436u, 20975647u, 20975648u, 20975649u, 20975650u, 20975651u, 20975652u, 23069699u, 23593988u - , 24118277u, 24642566u, 25166855u, 25691144u, 26215433u, 26739722u, 27264011u, 27788300u, 28312589u, 28836878u - , 29361167u, 29885456u, 33562641u, 37756946u - }); - - builder.Finish(); - } - - private UnityEngine.InputSystem.Controls.StickControl Initialize_ctrlDualShock4GamepadHIDleftStick(InternedString kStickLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDleftStick = new UnityEngine.InputSystem.Controls.StickControl(); - ctrlDualShock4GamepadHIDleftStick.Setup() - .At(this, 0) - .WithParent(parent) - .WithChildren(19, 6) - .WithName("leftStick") - .WithDisplayName("Left Stick") - .WithShortDisplayName("LS") - .WithLayout(kStickLayout) - .WithUsages(0, 1) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1447244354), - byteOffset = 1, - bitOffset = 0, - sizeInBits = 16 - }) - .WithProcessor, UnityEngine.Vector2>(new UnityEngine.InputSystem.Processors.StickDeadzoneProcessor()) - .Finish(); - return ctrlDualShock4GamepadHIDleftStick; - } - - private UnityEngine.InputSystem.Controls.StickControl Initialize_ctrlDualShock4GamepadHIDrightStick(InternedString kStickLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDrightStick = new UnityEngine.InputSystem.Controls.StickControl(); - ctrlDualShock4GamepadHIDrightStick.Setup() - .At(this, 1) - .WithParent(parent) - .WithChildren(25, 6) - .WithName("rightStick") - .WithDisplayName("Right Stick") - .WithShortDisplayName("RS") - .WithLayout(kStickLayout) - .WithUsages(1, 1) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1447244354), - byteOffset = 3, - bitOffset = 0, - sizeInBits = 16 - }) - .WithProcessor, UnityEngine.Vector2>(new UnityEngine.InputSystem.Processors.StickDeadzoneProcessor()) - .Finish(); - return ctrlDualShock4GamepadHIDrightStick; - } - - private UnityEngine.InputSystem.Controls.DpadControl Initialize_ctrlDualShock4GamepadHIDdpad(InternedString kDpadLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDdpad = new UnityEngine.InputSystem.Controls.DpadControl(); - ctrlDualShock4GamepadHIDdpad.Setup() - .At(this, 2) - .WithParent(parent) - .WithChildren(31, 6) - .WithName("dpad") - .WithDisplayName("D-Pad") - .WithLayout(kDpadLayout) - .WithUsages(2, 1) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 5, - bitOffset = 0, - sizeInBits = 4 - }) - .WithDefaultState(8) - .Finish(); - return ctrlDualShock4GamepadHIDdpad; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDbuttonWest(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDbuttonWest = new UnityEngine.InputSystem.Controls.ButtonControl(); - ctrlDualShock4GamepadHIDbuttonWest.Setup() - .At(this, 3) - .WithParent(parent) - .WithName("buttonWest") - .WithDisplayName("Square") - .WithShortDisplayName("Square") - .WithLayout(kButtonLayout) - .WithUsages(3, 1) - .WithAliases(0, 2) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 5, - bitOffset = 4, - sizeInBits = 1 - }) - .WithMinAndMax(0, 1) - .Finish(); - return ctrlDualShock4GamepadHIDbuttonWest; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDbuttonSouth(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDbuttonSouth = new UnityEngine.InputSystem.Controls.ButtonControl(); - ctrlDualShock4GamepadHIDbuttonSouth.Setup() - .At(this, 4) - .WithParent(parent) - .WithName("buttonSouth") - .WithDisplayName("Cross") - .WithShortDisplayName("Cross") - .WithLayout(kButtonLayout) - .WithUsages(4, 2) - .WithAliases(2, 2) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 5, - bitOffset = 5, - sizeInBits = 1 - }) - .WithMinAndMax(0, 1) - .Finish(); - return ctrlDualShock4GamepadHIDbuttonSouth; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDbuttonEast(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDbuttonEast = new UnityEngine.InputSystem.Controls.ButtonControl(); - ctrlDualShock4GamepadHIDbuttonEast.Setup() - .At(this, 5) - .WithParent(parent) - .WithName("buttonEast") - .WithDisplayName("Circle") - .WithShortDisplayName("Circle") - .WithLayout(kButtonLayout) - .WithUsages(6, 2) - .WithAliases(4, 2) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 5, - bitOffset = 6, - sizeInBits = 1 - }) - .WithMinAndMax(0, 1) - .Finish(); - return ctrlDualShock4GamepadHIDbuttonEast; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDbuttonNorth(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDbuttonNorth = new UnityEngine.InputSystem.Controls.ButtonControl(); - ctrlDualShock4GamepadHIDbuttonNorth.Setup() - .At(this, 6) - .WithParent(parent) - .WithName("buttonNorth") - .WithDisplayName("Triangle") - .WithShortDisplayName("Triangle") - .WithLayout(kButtonLayout) - .WithAliases(6, 2) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 5, - bitOffset = 7, - sizeInBits = 1 - }) - .WithMinAndMax(0, 1) - .Finish(); - return ctrlDualShock4GamepadHIDbuttonNorth; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDleftShoulder(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDleftShoulder = new UnityEngine.InputSystem.Controls.ButtonControl(); - ctrlDualShock4GamepadHIDleftShoulder.Setup() - .At(this, 7) - .WithParent(parent) - .WithName("leftShoulder") - .WithDisplayName("L1") - .WithShortDisplayName("L1") - .WithLayout(kButtonLayout) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 6, - bitOffset = 0, - sizeInBits = 1 - }) - .WithMinAndMax(0, 1) - .Finish(); - return ctrlDualShock4GamepadHIDleftShoulder; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDrightShoulder(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDrightShoulder = new UnityEngine.InputSystem.Controls.ButtonControl(); - ctrlDualShock4GamepadHIDrightShoulder.Setup() - .At(this, 8) - .WithParent(parent) - .WithName("rightShoulder") - .WithDisplayName("R1") - .WithShortDisplayName("R1") - .WithLayout(kButtonLayout) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 6, - bitOffset = 1, - sizeInBits = 1 - }) - .WithMinAndMax(0, 1) - .Finish(); - return ctrlDualShock4GamepadHIDrightShoulder; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDleftTriggerButton(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDleftTriggerButton = new UnityEngine.InputSystem.Controls.ButtonControl(); - ctrlDualShock4GamepadHIDleftTriggerButton.Setup() - .At(this, 9) - .WithParent(parent) - .WithName("leftTriggerButton") - .WithDisplayName("leftTriggerButton") - .WithLayout(kButtonLayout) - .IsSynthetic(true) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 6, - bitOffset = 2, - sizeInBits = 1 - }) - .WithMinAndMax(0, 1) - .Finish(); - return ctrlDualShock4GamepadHIDleftTriggerButton; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDrightTriggerButton(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDrightTriggerButton = new UnityEngine.InputSystem.Controls.ButtonControl(); - ctrlDualShock4GamepadHIDrightTriggerButton.Setup() - .At(this, 10) - .WithParent(parent) - .WithName("rightTriggerButton") - .WithDisplayName("rightTriggerButton") - .WithLayout(kButtonLayout) - .IsSynthetic(true) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 6, - bitOffset = 3, - sizeInBits = 1 - }) - .WithMinAndMax(0, 1) - .Finish(); - return ctrlDualShock4GamepadHIDrightTriggerButton; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDselect(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDselect = new UnityEngine.InputSystem.Controls.ButtonControl(); - ctrlDualShock4GamepadHIDselect.Setup() - .At(this, 11) - .WithParent(parent) - .WithName("select") - .WithDisplayName("Share") - .WithLayout(kButtonLayout) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 6, - bitOffset = 4, - sizeInBits = 1 - }) - .WithMinAndMax(0, 1) - .Finish(); - return ctrlDualShock4GamepadHIDselect; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDstart(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDstart = new UnityEngine.InputSystem.Controls.ButtonControl(); - ctrlDualShock4GamepadHIDstart.Setup() - .At(this, 12) - .WithParent(parent) - .WithName("start") - .WithDisplayName("Options") - .WithLayout(kButtonLayout) - .WithUsages(8, 1) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 6, - bitOffset = 5, - sizeInBits = 1 - }) - .WithMinAndMax(0, 1) - .Finish(); - return ctrlDualShock4GamepadHIDstart; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDleftStickPress(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDleftStickPress = new UnityEngine.InputSystem.Controls.ButtonControl(); - ctrlDualShock4GamepadHIDleftStickPress.Setup() - .At(this, 13) - .WithParent(parent) - .WithName("leftStickPress") - .WithDisplayName("L3") - .WithShortDisplayName("L3") - .WithLayout(kButtonLayout) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 6, - bitOffset = 6, - sizeInBits = 1 - }) - .WithMinAndMax(0, 1) - .Finish(); - return ctrlDualShock4GamepadHIDleftStickPress; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDrightStickPress(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDrightStickPress = new UnityEngine.InputSystem.Controls.ButtonControl(); - ctrlDualShock4GamepadHIDrightStickPress.Setup() - .At(this, 14) - .WithParent(parent) - .WithName("rightStickPress") - .WithDisplayName("R3") - .WithShortDisplayName("R3") - .WithLayout(kButtonLayout) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 6, - bitOffset = 7, - sizeInBits = 1 - }) - .WithMinAndMax(0, 1) - .Finish(); - return ctrlDualShock4GamepadHIDrightStickPress; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDsystemButton(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDsystemButton = new UnityEngine.InputSystem.Controls.ButtonControl(); - ctrlDualShock4GamepadHIDsystemButton.Setup() - .At(this, 15) - .WithParent(parent) - .WithName("systemButton") - .WithDisplayName("System") - .WithLayout(kButtonLayout) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 7, - bitOffset = 0, - sizeInBits = 1 - }) - .WithMinAndMax(0, 1) - .Finish(); - return ctrlDualShock4GamepadHIDsystemButton; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDtouchpadButton(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDtouchpadButton = new UnityEngine.InputSystem.Controls.ButtonControl(); - ctrlDualShock4GamepadHIDtouchpadButton.Setup() - .At(this, 16) - .WithParent(parent) - .WithName("touchpadButton") - .WithDisplayName("Touchpad Press") - .WithLayout(kButtonLayout) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 7, - bitOffset = 1, - sizeInBits = 1 - }) - .WithMinAndMax(0, 1) - .Finish(); - return ctrlDualShock4GamepadHIDtouchpadButton; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDleftTrigger(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDleftTrigger = new UnityEngine.InputSystem.Controls.ButtonControl(); - ctrlDualShock4GamepadHIDleftTrigger.Setup() - .At(this, 17) - .WithParent(parent) - .WithName("leftTrigger") - .WithDisplayName("L2") - .WithShortDisplayName("L2") - .WithLayout(kButtonLayout) - .WithUsages(9, 1) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1113150533), - byteOffset = 8, - bitOffset = 0, - sizeInBits = 8 - }) - .WithMinAndMax(0, 1) - .Finish(); - return ctrlDualShock4GamepadHIDleftTrigger; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDrightTrigger(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDrightTrigger = new UnityEngine.InputSystem.Controls.ButtonControl(); - ctrlDualShock4GamepadHIDrightTrigger.Setup() - .At(this, 18) - .WithParent(parent) - .WithName("rightTrigger") - .WithDisplayName("R2") - .WithShortDisplayName("R2") - .WithLayout(kButtonLayout) - .WithUsages(10, 1) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1113150533), - byteOffset = 9, - bitOffset = 0, - sizeInBits = 8 - }) - .WithMinAndMax(0, 1) - .Finish(); - return ctrlDualShock4GamepadHIDrightTrigger; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDleftStickup(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDleftStickup = new UnityEngine.InputSystem.Controls.ButtonControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 0.5f, invert = true, normalize = true, normalizeMax = 1f, normalizeZero = 0.5f }; - ctrlDualShock4GamepadHIDleftStickup.Setup() - .At(this, 19) - .WithParent(parent) - .WithName("up") - .WithDisplayName("Left Stick Up") - .WithShortDisplayName("LS Up") - .WithLayout(kButtonLayout) - .IsSynthetic(true) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1113150533), - byteOffset = 2, - bitOffset = 0, - sizeInBits = 8 - }) - .WithDefaultState(127) - .WithMinAndMax(0, 1) - .WithProcessor, System.Single>(new UnityEngine.InputSystem.Processors.AxisDeadzoneProcessor()) - .Finish(); - return ctrlDualShock4GamepadHIDleftStickup; - } - - private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlDualShock4GamepadHIDleftStickx(InternedString kAxisLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDleftStickx = new UnityEngine.InputSystem.Controls.AxisControl { normalize = true, normalizeMax = 1f, normalizeZero = 0.5f }; - ctrlDualShock4GamepadHIDleftStickx.Setup() - .At(this, 20) - .WithParent(parent) - .WithName("x") - .WithDisplayName("Left Stick X") - .WithShortDisplayName("LS X") - .WithLayout(kAxisLayout) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1113150533), - byteOffset = 1, - bitOffset = 0, - sizeInBits = 8 - }) - .WithDefaultState(127) - .WithMinAndMax(-1, 1) - .WithProcessor, System.Single>(new UnityEngine.InputSystem.Processors.AxisDeadzoneProcessor()) - .Finish(); - return ctrlDualShock4GamepadHIDleftStickx; - } - - private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlDualShock4GamepadHIDleftSticky(InternedString kAxisLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDleftSticky = new UnityEngine.InputSystem.Controls.AxisControl { invert = true, normalize = true, normalizeMax = 1f, normalizeZero = 0.5f }; - ctrlDualShock4GamepadHIDleftSticky.Setup() - .At(this, 21) - .WithParent(parent) - .WithName("y") - .WithDisplayName("Left Stick Y") - .WithShortDisplayName("LS Y") - .WithLayout(kAxisLayout) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1113150533), - byteOffset = 2, - bitOffset = 0, - sizeInBits = 8 - }) - .WithDefaultState(127) - .WithMinAndMax(-1, 1) - .WithProcessor, System.Single>(new UnityEngine.InputSystem.Processors.AxisDeadzoneProcessor()) - .Finish(); - return ctrlDualShock4GamepadHIDleftSticky; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDleftStickdown(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDleftStickdown = new UnityEngine.InputSystem.Controls.ButtonControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = 0.5f, clampMax = 1f, normalize = true, normalizeMax = 1f, normalizeZero = 0.5f }; - ctrlDualShock4GamepadHIDleftStickdown.Setup() - .At(this, 22) - .WithParent(parent) - .WithName("down") - .WithDisplayName("Left Stick Down") - .WithShortDisplayName("LS Down") - .WithLayout(kButtonLayout) - .IsSynthetic(true) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1113150533), - byteOffset = 2, - bitOffset = 0, - sizeInBits = 8 - }) - .WithDefaultState(127) - .WithMinAndMax(0, 1) - .WithProcessor, System.Single>(new UnityEngine.InputSystem.Processors.AxisDeadzoneProcessor()) - .Finish(); - return ctrlDualShock4GamepadHIDleftStickdown; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDleftStickleft(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDleftStickleft = new UnityEngine.InputSystem.Controls.ButtonControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 0.5f, invert = true, normalize = true, normalizeMax = 1f, normalizeZero = 0.5f }; - ctrlDualShock4GamepadHIDleftStickleft.Setup() - .At(this, 23) - .WithParent(parent) - .WithName("left") - .WithDisplayName("Left Stick Left") - .WithShortDisplayName("LS Left") - .WithLayout(kButtonLayout) - .IsSynthetic(true) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1113150533), - byteOffset = 1, - bitOffset = 0, - sizeInBits = 8 - }) - .WithDefaultState(127) - .WithMinAndMax(0, 1) - .WithProcessor, System.Single>(new UnityEngine.InputSystem.Processors.AxisDeadzoneProcessor()) - .Finish(); - return ctrlDualShock4GamepadHIDleftStickleft; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDleftStickright(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDleftStickright = new UnityEngine.InputSystem.Controls.ButtonControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = 0.5f, clampMax = 1f, normalize = true, normalizeMax = 1f, normalizeZero = 0.5f }; - ctrlDualShock4GamepadHIDleftStickright.Setup() - .At(this, 24) - .WithParent(parent) - .WithName("right") - .WithDisplayName("Left Stick Right") - .WithShortDisplayName("LS Right") - .WithLayout(kButtonLayout) - .IsSynthetic(true) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1113150533), - byteOffset = 1, - bitOffset = 0, - sizeInBits = 8 - }) - .WithDefaultState(127) - .WithMinAndMax(0, 1) - .WithProcessor, System.Single>(new UnityEngine.InputSystem.Processors.AxisDeadzoneProcessor()) - .Finish(); - return ctrlDualShock4GamepadHIDleftStickright; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDrightStickup(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDrightStickup = new UnityEngine.InputSystem.Controls.ButtonControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 0.5f, invert = true, normalize = true, normalizeMax = 1f, normalizeZero = 0.5f }; - ctrlDualShock4GamepadHIDrightStickup.Setup() - .At(this, 25) - .WithParent(parent) - .WithName("up") - .WithDisplayName("Right Stick Up") - .WithShortDisplayName("RS Up") - .WithLayout(kButtonLayout) - .IsSynthetic(true) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1113150533), - byteOffset = 4, - bitOffset = 0, - sizeInBits = 8 - }) - .WithDefaultState(127) - .WithMinAndMax(0, 1) - .WithProcessor, System.Single>(new UnityEngine.InputSystem.Processors.AxisDeadzoneProcessor()) - .Finish(); - return ctrlDualShock4GamepadHIDrightStickup; - } - - private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlDualShock4GamepadHIDrightStickx(InternedString kAxisLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDrightStickx = new UnityEngine.InputSystem.Controls.AxisControl { normalize = true, normalizeMax = 1f, normalizeZero = 0.5f }; - ctrlDualShock4GamepadHIDrightStickx.Setup() - .At(this, 26) - .WithParent(parent) - .WithName("x") - .WithDisplayName("Right Stick X") - .WithShortDisplayName("RS X") - .WithLayout(kAxisLayout) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1113150533), - byteOffset = 3, - bitOffset = 0, - sizeInBits = 8 - }) - .WithDefaultState(127) - .WithMinAndMax(-1, 1) - .WithProcessor, System.Single>(new UnityEngine.InputSystem.Processors.AxisDeadzoneProcessor()) - .Finish(); - return ctrlDualShock4GamepadHIDrightStickx; - } - - private UnityEngine.InputSystem.Controls.AxisControl Initialize_ctrlDualShock4GamepadHIDrightSticky(InternedString kAxisLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDrightSticky = new UnityEngine.InputSystem.Controls.AxisControl { invert = true, normalize = true, normalizeMax = 1f, normalizeZero = 0.5f }; - ctrlDualShock4GamepadHIDrightSticky.Setup() - .At(this, 27) - .WithParent(parent) - .WithName("y") - .WithDisplayName("Right Stick Y") - .WithShortDisplayName("RS Y") - .WithLayout(kAxisLayout) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1113150533), - byteOffset = 4, - bitOffset = 0, - sizeInBits = 8 - }) - .WithDefaultState(127) - .WithMinAndMax(-1, 1) - .WithProcessor, System.Single>(new UnityEngine.InputSystem.Processors.AxisDeadzoneProcessor()) - .Finish(); - return ctrlDualShock4GamepadHIDrightSticky; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDrightStickdown(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDrightStickdown = new UnityEngine.InputSystem.Controls.ButtonControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = 0.5f, clampMax = 1f, normalize = true, normalizeMax = 1f, normalizeZero = 0.5f }; - ctrlDualShock4GamepadHIDrightStickdown.Setup() - .At(this, 28) - .WithParent(parent) - .WithName("down") - .WithDisplayName("Right Stick Down") - .WithShortDisplayName("RS Down") - .WithLayout(kButtonLayout) - .IsSynthetic(true) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1113150533), - byteOffset = 4, - bitOffset = 0, - sizeInBits = 8 - }) - .WithDefaultState(127) - .WithMinAndMax(0, 1) - .WithProcessor, System.Single>(new UnityEngine.InputSystem.Processors.AxisDeadzoneProcessor()) - .Finish(); - return ctrlDualShock4GamepadHIDrightStickdown; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDrightStickleft(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDrightStickleft = new UnityEngine.InputSystem.Controls.ButtonControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMax = 0.5f, invert = true, normalize = true, normalizeMax = 1f, normalizeZero = 0.5f }; - ctrlDualShock4GamepadHIDrightStickleft.Setup() - .At(this, 29) - .WithParent(parent) - .WithName("left") - .WithDisplayName("Right Stick Left") - .WithShortDisplayName("RS Left") - .WithLayout(kButtonLayout) - .IsSynthetic(true) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1113150533), - byteOffset = 3, - bitOffset = 0, - sizeInBits = 8 - }) - .WithDefaultState(127) - .WithMinAndMax(0, 1) - .WithProcessor, System.Single>(new UnityEngine.InputSystem.Processors.AxisDeadzoneProcessor()) - .Finish(); - return ctrlDualShock4GamepadHIDrightStickleft; - } - - private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlDualShock4GamepadHIDrightStickright(InternedString kButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDrightStickright = new UnityEngine.InputSystem.Controls.ButtonControl { clamp = UnityEngine.InputSystem.Controls.AxisControl.Clamp.BeforeNormalize, clampMin = 0.5f, clampMax = 1f, normalize = true, normalizeMax = 1f, normalizeZero = 0.5f }; - ctrlDualShock4GamepadHIDrightStickright.Setup() - .At(this, 30) - .WithParent(parent) - .WithName("right") - .WithDisplayName("Right Stick Right") - .WithShortDisplayName("RS Right") - .WithLayout(kButtonLayout) - .IsSynthetic(true) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1113150533), - byteOffset = 3, - bitOffset = 0, - sizeInBits = 8 - }) - .WithDefaultState(127) - .WithMinAndMax(0, 1) - .WithProcessor, System.Single>(new UnityEngine.InputSystem.Processors.AxisDeadzoneProcessor()) - .Finish(); - return ctrlDualShock4GamepadHIDrightStickright; - } - - private UnityEngine.InputSystem.Controls.DpadControl.DpadAxisControl Initialize_ctrlDualShock4GamepadHIDdpadx(InternedString kDpadAxisLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDdpadx = new UnityEngine.InputSystem.Controls.DpadControl.DpadAxisControl(); - ctrlDualShock4GamepadHIDdpadx.Setup() - .At(this, 31) - .WithParent(parent) - .WithName("x") - .WithDisplayName("D-Pad X") - .WithShortDisplayName("D-Pad X") - .WithLayout(kDpadAxisLayout) - .IsSynthetic(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 5, - bitOffset = 0, - sizeInBits = 4 - }) - .Finish(); - ctrlDualShock4GamepadHIDdpadx.component = 0; - return ctrlDualShock4GamepadHIDdpadx; - } - - private UnityEngine.InputSystem.Controls.DpadControl.DpadAxisControl Initialize_ctrlDualShock4GamepadHIDdpady(InternedString kDpadAxisLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDdpady = new UnityEngine.InputSystem.Controls.DpadControl.DpadAxisControl(); - ctrlDualShock4GamepadHIDdpady.Setup() - .At(this, 32) - .WithParent(parent) - .WithName("y") - .WithDisplayName("D-Pad Y") - .WithShortDisplayName("D-Pad Y") - .WithLayout(kDpadAxisLayout) - .IsSynthetic(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 5, - bitOffset = 0, - sizeInBits = 4 - }) - .Finish(); - ctrlDualShock4GamepadHIDdpady.component = 1; - return ctrlDualShock4GamepadHIDdpady; - } - - private UnityEngine.InputSystem.Controls.DiscreteButtonControl Initialize_ctrlDualShock4GamepadHIDdpadup(InternedString kDiscreteButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDdpadup = new UnityEngine.InputSystem.Controls.DiscreteButtonControl { minValue = 7, maxValue = 1, wrapAtValue = 7, nullValue = 8 }; - ctrlDualShock4GamepadHIDdpadup.Setup() - .At(this, 33) - .WithParent(parent) - .WithName("up") - .WithDisplayName("D-Pad Up") - .WithShortDisplayName("D-Pad Up") - .WithLayout(kDiscreteButtonLayout) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 5, - bitOffset = 0, - sizeInBits = 4 - }) - .WithMinAndMax(0, 1) - .Finish(); - return ctrlDualShock4GamepadHIDdpadup; - } - - private UnityEngine.InputSystem.Controls.DiscreteButtonControl Initialize_ctrlDualShock4GamepadHIDdpaddown(InternedString kDiscreteButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDdpaddown = new UnityEngine.InputSystem.Controls.DiscreteButtonControl { minValue = 3, maxValue = 5 }; - ctrlDualShock4GamepadHIDdpaddown.Setup() - .At(this, 34) - .WithParent(parent) - .WithName("down") - .WithDisplayName("D-Pad Down") - .WithShortDisplayName("D-Pad Down") - .WithLayout(kDiscreteButtonLayout) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 5, - bitOffset = 0, - sizeInBits = 4 - }) - .WithMinAndMax(0, 1) - .Finish(); - return ctrlDualShock4GamepadHIDdpaddown; - } - - private UnityEngine.InputSystem.Controls.DiscreteButtonControl Initialize_ctrlDualShock4GamepadHIDdpadleft(InternedString kDiscreteButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDdpadleft = new UnityEngine.InputSystem.Controls.DiscreteButtonControl { minValue = 5, maxValue = 7 }; - ctrlDualShock4GamepadHIDdpadleft.Setup() - .At(this, 35) - .WithParent(parent) - .WithName("left") - .WithDisplayName("D-Pad Left") - .WithShortDisplayName("D-Pad Left") - .WithLayout(kDiscreteButtonLayout) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 5, - bitOffset = 0, - sizeInBits = 4 - }) - .WithMinAndMax(0, 1) - .Finish(); - return ctrlDualShock4GamepadHIDdpadleft; - } - - private UnityEngine.InputSystem.Controls.DiscreteButtonControl Initialize_ctrlDualShock4GamepadHIDdpadright(InternedString kDiscreteButtonLayout, InputControl parent) - { - var ctrlDualShock4GamepadHIDdpadright = new UnityEngine.InputSystem.Controls.DiscreteButtonControl { minValue = 1, maxValue = 3 }; - ctrlDualShock4GamepadHIDdpadright.Setup() - .At(this, 36) - .WithParent(parent) - .WithName("right") - .WithDisplayName("D-Pad Right") - .WithShortDisplayName("D-Pad Right") - .WithLayout(kDiscreteButtonLayout) - .IsButton(true) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1112101920), - byteOffset = 5, - bitOffset = 0, - sizeInBits = 4 - }) - .WithMinAndMax(0, 1) - .Finish(); - return ctrlDualShock4GamepadHIDdpadright; - } - } -} -#endif // UNITY_EDITOR || UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN || UNITY_WSA diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/FastDualShock4GamepadHID.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/FastDualShock4GamepadHID.cs.meta deleted file mode 100644 index 6d708ee692..0000000000 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/FastDualShock4GamepadHID.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3633681b419f14c47a97f85106b69846 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: From a5fdedc76909ce1badcc17aa628881f287e0a739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kan=20Sidenvall?= Date: Wed, 23 Mar 2022 17:44:57 +0100 Subject: [PATCH 35/53] DOCS: Extended README based on content mentioned from UCS spec --- README.md | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2681c0ff81..8a3889550f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,58 @@ -A new Input System for Unity. +# Unity Input System (Package) + +The Unity Input System package is an extension package to the [Unity Platform](https://unity.com/products/unity-platform) which provides a system to configure game actions and access input devices to interact with Unity content. It is intended to be a more powerful, flexible, and configurable replacement to [Unity Input API](https://docs.unity3d.com/ScriptReference/Input.html) (the `UnityEngine.Input` class). + +## Prerequisites + +The current version of the Input System requires Unity 2019 LTS, Unity 2020 LTS, Unity 2021 or Unity Beta (may be subject to instabilities) and included tooling to compile and run. The recommended way of installing Unity is via [Unity Hub](https://unity3d.com/get-unity/download). + +## Getting Started + +For instructions on how to get started using the Input System within Unity see [Input System Manual - Installation](https://docs.unity3d.com/Packages/com.unity.inputsystem@latest/index.html?subfolder=/manual/Installation.html) and [Input System Manual - Quick Start Guide](https://docs.unity3d.com/Packages/com.unity.inputsystem@latest/index.html?subfolder=/manual/QuickStartGuide.html). + +Tutorials on how to use the Input System are available as part of: +- [Unity Learn - Using the Input System in Unity](https://learn.unity.com/project/using-the-input-system-in-unity) - Video tutorials on how to use the Input System in Unity. +- [Warriors Demo Project](https://github.com/UnityTechnologies/InputSystem_Warriors) - A demo project illustrating a wide range of tools and features in the Input System, including local multi-player using different input methods. +- Example projects part of this repository: + - [Custom Composite](Assets/Samples/CustomComposite) - Shows how to implement and register a custom `InputBindingComposite`. + - [Custom Device](Assets/Samples/CustomDevice) - Demonstrates how to add and author a custom device. + - [Custom Device Usages](Assets/Samples/CustomDeviceUsages) - An example of how to tag devices with custom "usages" and how to bind actions specifically to devices with only those usages. + - [Gamepad Mouse Cursor](Assets/Samples/GamepadMouseCursor) - An example of UI pointer navigation driven from gamepad input. + - [In-game Hints](Assets/Samples/InGameHints) - Illustrates how to display text in the UI that involves action bindings as well as object interaction. + - [Input Recorder](Assets/Samples/InputRecorder) - Demonstrates how to use [`InputEventTrace`](https://docs.unity3d.com/Packages/com.unity.inputsystem@latest/index.html?subfolder=/api/UnityEngine.InputSystem.LowLevel.InputEventTrace.html) and [`InputRecorder`](./InputRecorder.cs). + - [On-screen Controls](Assets/Samples/OnScreenControls) - Demonstrates how to set up and use on-screen gamepad-like controls. + - [Rebinding UI](Assets/Samples/RebindingUI) - Demonstrates how to set up a rebinding UI to reconfigure bindings during run-time. + - [Simple Demo](Assets/Samples/SimpleDemo) - Shows how to set up a simple character controller using actions, action asset as well as using the `PlayerInput` component. + - [Simple Multiplayer](Assets/Samples/SimpleMultiplayer) - Demonstrates a basic split-screen local multiplayer setup where players can join by pressing buttons on the supported devices to join the game. + - [UI vs Game Input](Assets/Samples/UIvsGameInput) - Illustrates how to handle input and resolve ambiguities that arise when overlaying UI elements in the game-view. + - [Visualizers](Assets/Samples/Visualizers) - Provides various input data visualizations for common devices. + +## How to use a released versions of the package within a Unity project + +All released versions of the Input System package are available via the Unity Package Manager, see [`Input System Manual - Installation`](https://docs.unity3d.com/Packages/com.unity.inputsystem@latest/index.html?subfolder=/manual/Installation.html) for instructions how to fetch the package and compatible versions of samples and install them into your Unity project. + +## How to use the latest changes of the package in a Unity project + +To test out the latest (unreleased) changes: + +1. Clone [develop](https://github.com/Unity-Technologies/InputSystem/tree/develop). The intention is to always keep the `develop` branch in a releasable state, but it reflects current development and may contain bugs or unexpected behavior that was not present in the latest released version. +2. Add the local package to your project by following the steps described in [Unity Manual - Installing a package from a local folder](https://docs.unity3d.com/Manual/upm-ui-local.html) and select `Packages/com.unity.inputsystem/package.json`. + +## Recommended way of developing the Input System + +1. Clone [develop](https://github.com/Unity-Technologies/InputSystem/tree/develop) or the desired branch or release tag. +2. Open the root folder of the repository in the Unity Editor. This way you have access to tests and samples that are excluded when importing only the package into another Unity project. + +During development, run Input System automated tests by selecting `Window > General > Test Runner` to access the Test Runner and select `Run All` for `PlayMode` or `EditMode` tests. + +## Contribution & Feedback +This project is developed by Unity Technologies but welcomes user contributions and feedback. + +If you have any feedback or questions about Unity's Input System, you are invited to join us on the [Unity Forums](https://forum.unity.com/forums/new-input-system.103/). + +If you want to contribute to the development of the Input System see [CONTRIBUTIONS.md](https://github.com/Unity-Technologies/InputSystem/blob/develop/CONTRIBUTIONS.md) for additional information. + +## License + +This package is distributed under the [Unity Companion License for Unity-dependent projects](LICENSE.md) license with addition of [third party licenses](Third%20Party%20Notices.md) which applies to the [Assets/Samples/RebindingUI](Assets/Samples/RebindingUI) example project specifically. -Check out the [Input System documentation](http://docs.unity3d.com/Packages/com.unity.inputsystem@latest/) for more info. From a843d1eac1092c75feb78263dcb7bde26696cb4d Mon Sep 17 00:00:00 2001 From: Rene Damm Date: Thu, 24 Mar 2022 10:19:34 +0100 Subject: [PATCH 36/53] NEW: Actions now consume their inputs (#1405). --- .../Tests/InputSystem/APIVerificationTests.cs | 4 + Assets/Tests/InputSystem/CoreTests_Actions.cs | 429 ++++++++++++++++- Packages/com.unity.inputsystem/CHANGELOG.md | 16 +- .../Documentation~/ActionBindings.md | 122 ++++- .../Documentation~/Actions.md | 4 +- .../Documentation~/Controls.md | 2 +- .../Documentation~/Events.md | 30 +- .../Documentation~/Interactions.md | 2 +- .../Documentation~/KnownLimitations.md | 7 +- .../Documentation~/Settings.md | 2 +- .../Composites/ButtonWithOneModifier.cs | 39 +- .../Composites/ButtonWithTwoModifiers.cs | 40 +- .../Composites/OneModifierComposite.cs | 53 +- .../Composites/TwoModifiersComposite.cs | 48 +- .../InputSystem/Actions/InputAction.cs | 1 + .../InputSystem/Actions/InputActionState.cs | 388 ++++++++++----- .../Actions/InputBindingCompositeContext.cs | 18 + .../Actions/InputInteractionContext.cs | 4 +- .../InputSystem/Controls/ButtonControl.cs | 2 +- .../InputSystem/Controls/InputControl.cs | 7 + .../InputSystem/Events/InputEventPtr.cs | 13 +- .../InputSystem/InputFeatureNames.cs | 1 + .../InputSystem/InputManager.cs | 362 +------------- .../InputSystem/InputManagerStateMonitors.cs | 452 ++++++++++++++++++ .../InputManagerStateMonitors.cs.meta | 3 + .../InputSystem/InputSystem.cs | 2 +- .../EnhancedTouch/EnhancedTouchSupport.cs | 2 +- .../Plugins/EnhancedTouch/Finger.cs | 3 + .../Plugins/EnhancedTouch/TouchSimulation.cs | 4 +- .../State/IInputStateChangeMonitor.cs | 33 +- .../InputSystem/State/InputState.cs | 67 ++- .../InputSystem/State/InputStateHistory.cs | 12 +- 32 files changed, 1588 insertions(+), 584 deletions(-) mode change 100755 => 100644 Packages/com.unity.inputsystem/InputSystem/InputManager.cs create mode 100644 Packages/com.unity.inputsystem/InputSystem/InputManagerStateMonitors.cs create mode 100644 Packages/com.unity.inputsystem/InputSystem/InputManagerStateMonitors.cs.meta diff --git a/Assets/Tests/InputSystem/APIVerificationTests.cs b/Assets/Tests/InputSystem/APIVerificationTests.cs index a50c6d37ce..198bfe5e0f 100644 --- a/Assets/Tests/InputSystem/APIVerificationTests.cs +++ b/Assets/Tests/InputSystem/APIVerificationTests.cs @@ -781,6 +781,10 @@ public class Touchscreen : UnityEngine.InputSystem.Pointer, UnityEngine.InputSys [Property("Exclusions", @"1.0.0 public class SwitchProControllerHID : UnityEngine.InputSystem.Gamepad ")] + // AddChangeMonitor has a new, optional groupIndex argument. + [Property("Exclusions", @"1.0.0 + public static void AddChangeMonitor(UnityEngine.InputSystem.InputControl control, UnityEngine.InputSystem.LowLevel.IInputStateChangeMonitor monitor, long monitorIndex = -1); + ")] // DualShock4GamepadHID from IEventPreProcessor, which is an internal interface [Property("Exclusions", @"1.0.0 public class DualShock4GamepadHID : UnityEngine.InputSystem.DualShock.DualShockGamepad diff --git a/Assets/Tests/InputSystem/CoreTests_Actions.cs b/Assets/Tests/InputSystem/CoreTests_Actions.cs index 2054a85214..538a1390a2 100644 --- a/Assets/Tests/InputSystem/CoreTests_Actions.cs +++ b/Assets/Tests/InputSystem/CoreTests_Actions.cs @@ -30,6 +30,342 @@ // in terms of complexity. partial class CoreTests { + // Premise: Binding the same control multiple times in different ways from multiple concurrently active + // actions should result in the input system figuring out which *one* action gets to act on the input. + [Test] + [Category("Actions")] + [TestCase(true)] + [TestCase(false)] + public void Actions_CanConsumeInput(bool legacyComposites) + { + var keyboard = InputSystem.AddDevice(); + + var map = new InputActionMap(); + + var action1 = map.AddAction("action1", type: InputActionType.Button); + var action2 = map.AddAction("action2", type: InputActionType.Button); + var action3 = map.AddAction("action3", type: InputActionType.Button); + var action4 = map.AddAction("action4", type: InputActionType.Value); + var action5 = map.AddAction("action5", type: InputActionType.Button); + var action6 = map.AddAction("action6", type: InputActionType.Button); + var action7 = map.AddAction("action7", type: InputActionType.Button); + var action8 = map.AddAction("action8", type: InputActionType.Button); + + // Enable some actions individually to make sure the code that deals + // with re-resolution of already enabled bindings handles the enabling + // of just individual actions out of the whole set correctlyuk. + action1.Enable(); + action2.Enable(); + + // State monitors on the space key (all end up in the same group): + // action3 complexity=3 + // action2 complexity=2 + // action1 complexity=1 + // action4 complexity=1 + // action5 complexity=1 + + action1.AddBinding("/space"); + action2.AddCompositeBinding(legacyComposites ? "ButtonWithOneModifier" : "OneModifier") + .With("Modifier", "/shift") + .With(legacyComposites ? "Button" : "Binding", "/space"); + action3.AddCompositeBinding(legacyComposites ? "ButtonWithTwoModifiers" : "TwoModifiers") + .With("Modifier1", "/ctrl") + .With("Modifier2", "/shift") + .With(legacyComposites ? "Button" : "Binding", "/space"); + action4.AddBinding("/space"); + + // This one is a clear conflict. Binds SPC exactly the same way as action1. + action5.AddBinding("/space"); + + map.Enable(); + + Press(keyboard.spaceKey); + + Assert.That(action1.WasPerformedThisFrame()); + Assert.That(action4.WasPerformedThisFrame()); + Assert.That(action5.WasPerformedThisFrame()); + + Assert.That(!action2.WasPerformedThisFrame()); + Assert.That(!action3.WasPerformedThisFrame()); + + Release(keyboard.spaceKey); + + ////REVIEW: Pressing LSHIFT does *not* lead to the OneModifier and TwoModifiers actions + //// going to Started phase because actuation remains at 0; intuitively, I would expect the actions to start + Press(keyboard.leftShiftKey); + Press(keyboard.spaceKey); + + Assert.That(!action1.WasPerformedThisFrame()); + Assert.That(!action4.WasPerformedThisFrame()); + Assert.That(!action5.WasPerformedThisFrame()); + + Assert.That(action2.WasPerformedThisFrame()); + Assert.That(!action3.WasPerformedThisFrame()); + + Release(keyboard.leftShiftKey); + Release(keyboard.spaceKey); + + Press(keyboard.spaceKey); + + Assert.That(action1.WasPerformedThisFrame()); + Assert.That(action4.WasPerformedThisFrame()); + Assert.That(action5.WasPerformedThisFrame()); + + Assert.That(!action2.WasPerformedThisFrame()); + Assert.That(!action3.WasPerformedThisFrame()); + + Press(keyboard.leftShiftKey); + + Assert.That(!action1.WasPerformedThisFrame()); + Assert.That(!action4.WasPerformedThisFrame()); + Assert.That(!action5.WasPerformedThisFrame()); + + Assert.That(!action2.WasPerformedThisFrame()); + Assert.That(!action3.WasPerformedThisFrame()); + } + + // For now, maintain a kill switch for the new behavior for users to have an out where the + // the behavior is simply breaking their project. + [Test] + [Category("Actions")] + public void Actions_CanDisableShortcutSupport() + { + InputSystem.settings.SetInternalFeatureFlag(InputFeatureNames.kDisableShortcutSupport, true); + + var keyboard = InputSystem.AddDevice(); + + var map = new InputActionMap(); + var action1 = map.AddAction("action1"); + var action2 = map.AddAction("action2"); + + action1.AddBinding("/space"); + action2.AddCompositeBinding("OneModifier") + .With("Modifier", "/ctrl") + .With("Binding", "/space"); + + map.Enable(); + + Press(keyboard.leftCtrlKey, queueEventOnly: true); + Press(keyboard.spaceKey); + + Assert.That(action1.WasPerformedThisFrame(), Is.True); + Assert.That(action2.WasPerformedThisFrame(), Is.True); + } + + [Test] + [Category("Actions")] + public void Actions_CanBindShortcutsInvolvingMultipleDevices() + { + var keyboard = InputSystem.AddDevice(); + var mouse = InputSystem.AddDevice(); + + var action = new InputAction(type: InputActionType.Value); + action.AddCompositeBinding("OneModifier") + .With("Modifier", "/shift") + .With("Binding", "/position"); + + action.Enable(); + + Press(keyboard.leftShiftKey); + + Assert.That(action.ReadValue(), Is.EqualTo(default(Vector2))); + + Set(mouse.position, new Vector2(123, 234)); + + Assert.That(action.ReadValue(), Is.EqualTo(new Vector2(123, 234))); + } + + [Test] + [Category("Actions")] + public void Actions_CanBindMultipleShortcutSequencesBasedOnSameModifiers() + { + var keyboard = InputSystem.AddDevice(); + + var map = new InputActionMap(); + var action1 = map.AddAction("action1"); + var action2 = map.AddAction("action2"); + + action1.AddCompositeBinding("OneModifier") + .With("Modifier", "/shift") + .With("Binding", "/a"); + action2.AddCompositeBinding("OneModifier") + .With("Modifier", "/shift") + .With("Binding", "/b"); + + map.Enable(); + + Press(keyboard.leftShiftKey); + + Assert.That(!action1.WasPerformedThisFrame()); + Assert.That(!action2.WasPerformedThisFrame()); + + Press(keyboard.aKey); + + Assert.That(action1.WasPerformedThisFrame()); + Assert.That(!action2.WasPerformedThisFrame()); + + Press(keyboard.bKey); + + Assert.That(!action1.WasPerformedThisFrame()); + Assert.That(action2.WasPerformedThisFrame()); + } + + [Test] + [Category("Actions")] + [TestCase("leftShift", null, "space", true)] + [TestCase("leftShift", "leftAlt", "space", true)] + [TestCase("leftShift", null, "space", false)] + [TestCase("leftShift", "leftAlt", "space", false)] + public void Actions_PressingShortcutSequenceInWrongOrder_DoesNotTriggerShortcut(string modifier1, string modifier2, string binding, bool legacyComposites) + { + var keyboard = InputSystem.AddDevice(); + + var action = new InputAction(); + if (!string.IsNullOrEmpty(modifier2)) + { + action.AddCompositeBinding(legacyComposites ? "ButtonWithTwoModifiers" : "TwoModifiers") + .With("Modifier1", "/" + modifier1) + .With("Modifier2", "/" + modifier2) + .With(legacyComposites ? "Button" : "Binding", "/" + binding); + } + else + { + action.AddCompositeBinding(legacyComposites ? "ButtonWithOneModifier" : "OneModifier") + .With("Modifier", "/" + modifier1) + .With(legacyComposites ? "Button" : "Binding", "/" + binding); + } + + action.Enable(); + + var wasPerformed = false; + action.performed += _ => wasPerformed = true; + + // Press binding first, then modifiers. + Press((ButtonControl)keyboard[binding]); + Press((ButtonControl)keyboard[modifier1]); + if (!string.IsNullOrEmpty(modifier2)) + Press((ButtonControl)keyboard[modifier2]); + + Assert.That(wasPerformed, Is.False); + } + + [Test] + [Category("Actions")] + [TestCase("leftShift", null, "space", true)] + [TestCase("leftShift", "leftAlt", "space", true)] + [TestCase("leftShift", null, "space", false)] + [TestCase("leftShift", "leftAlt", "space", false)] + public void Actions_PressingShortcutSequenceInWrongOrder_DoesNotTriggerShortcut_ExceptIfOverridden(string modifier1, string modifier2, string binding, + bool legacyComposites) + { + var keyboard = InputSystem.AddDevice(); + + var action = new InputAction(); + if (!string.IsNullOrEmpty(modifier2)) + { + action.AddCompositeBinding((legacyComposites ? "ButtonWithTwoModifiers" : "TwoModifiers") + "(overrideModifiersNeedToBePressedFirst)") + .With("Modifier1", "/" + modifier1) + .With("Modifier2", "/" + modifier2) + .With(legacyComposites ? "Button" : "Binding", "/" + binding); + } + else + { + action.AddCompositeBinding((legacyComposites ? "ButtonWithOneModifier" : "OneModifier") + "(overrideModifiersNeedToBePressedFirst)") + .With("Modifier", "/" + modifier1) + .With(legacyComposites ? "Button" : "Binding", "/" + binding); + } + + action.Enable(); + + // Press binding first, then modifiers. + Press((ButtonControl)keyboard[binding]); + Assert.That(action.WasPerformedThisFrame(), Is.False); + Press((ButtonControl)keyboard[modifier1]); + if (!string.IsNullOrEmpty(modifier2)) + { + Assert.That(action.WasPerformedThisFrame(), Is.False); + Press((ButtonControl)keyboard[modifier2]); + } + + Assert.That(action.WasPerformedThisFrame(), Is.True); + } + + [Test] + [Category("Actions")] + public void Actions_CanHaveShortcutsWithButtonsUsingInitialStateChecks() + { + var keyboard = InputSystem.AddDevice(); + + var map = new InputActionMap(); + var action1 = map.AddAction("action1"); + var action2 = map.AddAction("action2"); + action1.AddBinding("/space"); + action2.AddCompositeBinding("OneModifier") + .With("Modifier", "/shift") + .With("Binding", "/space"); + + action1.wantsInitialStateCheck = true; + action2.wantsInitialStateCheck = true; + + // Order is wrong but the ordering is lost when relying on initial state checks. + Press(keyboard.spaceKey); + Press(keyboard.leftShiftKey); + + map.Enable(); + + InputSystem.Update(); + + Assert.That(action1.WasPerformedThisFrame(), Is.False); + Assert.That(action2.WasPerformedThisFrame(), Is.True); + } + + //--------------BUT: can use press times to detect holds!! + + // elden ring: + // - "hold Y" is implicit in it being used as a modifier (has to be held) + // - "tap" can be put on Y action to make sure it doesn't trigger when you press and hold and then change your mind + + // imagine opposite case; can't use modifier composite to model the "modifier+button" input + + // So, right now we don't support interactions on part bindings. Which makes sense because interactions + // talk to the action directly, they don't participate in the value chain. + // + // For shortcuts, this means you can't use "hold X" as a modifier. Which would be very cool (Elden Ring, + // for example, does that with the Y button on the gamepad). + // + // When we redesign interactions as part of the gesture feature, we should make sure we can handle + // such a scenario. With interactions being able to directly drive values, there should be no reason + // why you couldn't have "hold Y" as a modifier. + [Test] + [Category("Actions")] + [Ignore("TODO")] + public void TODO_Actions_CanUseInteractionsOnShortcutModifiers() + { + var keyboard = InputSystem.AddDevice(); + + var map = new InputActionMap(); + var action1 = map.AddAction("action1"); + var action2 = map.AddAction("action2"); + action1.AddBinding("/space"); + action2.AddCompositeBinding("OneModifier") + .With("Modifier", "/shift") // + .With("Binding", "/space"); + + action1.wantsInitialStateCheck = true; + action2.wantsInitialStateCheck = true; + + // Order is wrong but the ordering is lost when relying on initial state checks. + Press(keyboard.spaceKey); + Press(keyboard.leftShiftKey); + + map.Enable(); + + InputSystem.Update(); + + Assert.That(action1.WasPerformedThisFrame(), Is.False); + Assert.That(action2.WasPerformedThisFrame(), Is.True); + } + [Test] [Category("Actions")] public void Actions_ReadingValueRightAfterEnabling_AppliesProcessorsFromFirstBinding() @@ -46,8 +382,6 @@ public void Actions_ReadingValueRightAfterEnabling_AppliesProcessorsFromFirstBin Assert.That(action1.ReadValue(), Is.EqualTo(0.5f)); } - [Test] - [Category("Actions")] public void Actions_ReadingValueRightAfterResetting_AppliesProcessorsFromFirstBinding() { InputSystem.AddDevice(); @@ -126,7 +460,7 @@ public void Actions_TimeoutsDoNotGetTriggeredInEditorUpdates() } } - #endif +#endif // UNITY_EDITOR [Test] [Category("Actions")] @@ -1743,10 +2077,10 @@ public void Actions_CanCreateActionAssetWithMultipleActionMaps() .AndThen(Performed(action4, value: new StickDeadzoneProcessor().Process(new Vector2(0.123f, 0.234f)) * new Vector2(1, -1), control: gamepad.leftStick, time: startTime + 0.234)) - // map2/action3 should have been started. - .AndThen(Started(action3, value: 1f, control: gamepad.buttonSouth, time: startTime + 0.345)) // map3/action5 should have been started. .AndThen(Started(action5, value: 1f, control: gamepad.buttonSouth, time: startTime + 0.345)) + // map2/action3 should have been started. + .AndThen(Started(action3, value: 1f, control: gamepad.buttonSouth, time: startTime + 0.345)) // map3/action4 should have been performed as the stick has been moved // beyond where it had already moved. .AndThen(Performed(action4, @@ -2718,11 +3052,7 @@ public void Actions_CanRecordActions_AndReadValueAsObject() action2.Disable(); Set(gamepad.leftTrigger, 0.234f); - var actions = trace.ToArray(); - - Assert.That(actions, Has.Length.EqualTo(2)); - Assert.That(actions[0].ReadValueAsObject(), Is.EqualTo(0.123).Within(0.00001)); - Assert.That(actions[1].ReadValueAsObject(), Is.EqualTo(-0.123).Within(0.00001)); + Assert.That(trace, Performed(action2, value: -0.123f).AndThen(Performed(action1, value: 0.123f))); } } @@ -7101,10 +7431,7 @@ public void Actions_CanCreateAxisComposite() InputSystem.QueueStateEvent(gamepad, new GamepadState {rightTrigger = 0.456f}); InputSystem.Update(); - // Bit of an odd case. leftTrigger and rightTrigger have both changed state here so - // in a way, it's up to the system which one to pick. Might be useful if it was deliberately - // picking the control with the highest magnitude but not sure it's worth the effort. - Assert.That(trace, Performed(action, control: gamepad.leftTrigger, value: 0.456f)); + Assert.That(trace, Performed(action, control: gamepad.rightTrigger, value: 0.456f)); trace.Clear(); @@ -7688,7 +8015,7 @@ public void Actions_CanCreateCompositesWithMultipleBindings() [Test] [Category("Actions")] - public void Actions_WithMultipleCompositesCancelsIfCompositeIsReleased() + public void Actions_WithMultipleComposites_CancelsIfCompositeIsReleased() { var keyboard = InputSystem.AddDevice(); var gamepad = InputSystem.AddDevice(); @@ -7746,10 +8073,18 @@ public void Actions_WithMultipleCompositesCancelsIfCompositeIsReleased() Assert.That(value, Is.EqualTo(Vector2.up)); performedControl = null; - InputSystem.QueueStateEvent(keyboard, new KeyboardState(Key.RightArrow)); + InputSystem.QueueStateEvent(keyboard, new KeyboardState()); InputSystem.Update(); Assert.That(canceledControl, Is.EqualTo(keyboard.wKey)); + Assert.That(performedControl, Is.Null); + Assert.That(value, Is.EqualTo(Vector2.zero)); + canceledControl = null; + + InputSystem.QueueStateEvent(keyboard, new KeyboardState(Key.RightArrow)); + InputSystem.Update(); + + Assert.That(canceledControl, Is.Null); Assert.That(performedControl, Is.EqualTo(keyboard.rightArrowKey)); Assert.That(value, Is.EqualTo(Vector2.right)); performedControl = null; @@ -7810,16 +8145,19 @@ public void Actions_CompositesReportControlThatTriggeredTheCompositeInCallback() InputSystem.QueueStateEvent(keyboard, new KeyboardState(Key.A, Key.S)); InputSystem.Update(); - Assert.That(performedControl, Is.EqualTo(keyboard.sKey)); + Assert.That(performedControl, Is.EqualTo(keyboard.aKey)); LogAssert.NoUnexpectedReceived(); } + // https://fogbugz.unity3d.com/f/cases/1183314 [Test] [Category("Actions")] - // Test for case 1183314 public void Actions_CompositesInDifferentMapsTiedToSameControlsWork() { + // This test relies on the same single input getting picked up by two different composites. + InputSystem.settings.SetInternalFeatureFlag(InputFeatureNames.kDisableShortcutSupport, true); + var keyboard = InputSystem.AddDevice(); var gamepad = InputSystem.AddDevice(); @@ -7958,7 +8296,7 @@ public void Actions_CanCreateButtonWithOneModifierComposite() var gamepad = InputSystem.AddDevice(); var action = new InputAction(type: InputActionType.Button); - action.AddCompositeBinding("ButtonWithOneModifier") + action.AddCompositeBinding("ButtonWithOneModifier(overrideModifiersNeedToBePressedFirst)") .With("Modifier", "/leftTrigger") .With("Modifier", "/dpad/up") .With("Button", "/rightTrigger"); @@ -8015,7 +8353,7 @@ public void Actions_CanCreateButtonWithTwoModifiersComposite() var gamepad = InputSystem.AddDevice(); var action = new InputAction(); - action.AddCompositeBinding("ButtonWithTwoModifiers") + action.AddCompositeBinding("ButtonWithTwoModifiers(overrideModifiersNeedToBePressedFirst)") .With("Modifier1", "/leftTrigger") .With("Modifier1", "/dpad/up") .With("Modifier2", "/rightTrigger") @@ -8458,6 +8796,57 @@ public void Actions_OnActionWithMultipleBindings_CanTransitionFromOneActuatedCon Assert.That(wasCanceled, Is.True); } + [Test] + [Category("Actions")] + public void Actions_OnActionWithMultipleBindings_ControlWithHighestActuationIsTrackedAsActiveControl() + { + var gamepad = InputSystem.AddDevice(); + + var buttonAction = new InputAction(type: InputActionType.Button, + binding: "/*Trigger"); + var passThroughAction = new InputAction(type: InputActionType.PassThrough, + binding: "/*Trigger"); + + buttonAction.Enable(); + passThroughAction.Enable(); + + Set(gamepad.leftTrigger, 1f); + + Assert.That(buttonAction.WasPerformedThisFrame()); + Assert.That(buttonAction.activeControl, Is.SameAs(gamepad.leftTrigger)); + Assert.That(passThroughAction.WasPerformedThisFrame()); + Assert.That(passThroughAction.activeControl, Is.SameAs(gamepad.leftTrigger)); + + Set(gamepad.rightTrigger, 0.5f); + + Assert.That(!buttonAction.WasPerformedThisFrame()); + Assert.That(buttonAction.activeControl, Is.SameAs(gamepad.leftTrigger)); + Assert.That(passThroughAction.WasPerformedThisFrame()); + Assert.That(passThroughAction.activeControl, Is.SameAs(gamepad.rightTrigger)); + + Set(gamepad.leftTrigger, 0f); + + Assert.That(!buttonAction.WasPerformedThisFrame()); + Assert.That(!buttonAction.WasReleasedThisFrame()); + Assert.That(buttonAction.activeControl, Is.SameAs(gamepad.rightTrigger)); + Assert.That(passThroughAction.WasPerformedThisFrame()); + Assert.That(passThroughAction.activeControl, Is.SameAs(gamepad.leftTrigger)); + + Set(gamepad.rightTrigger, 0.6f); + + Assert.That(!buttonAction.WasPerformedThisFrame()); + Assert.That(buttonAction.activeControl, Is.SameAs(gamepad.rightTrigger)); + Assert.That(passThroughAction.WasPerformedThisFrame()); + Assert.That(passThroughAction.activeControl, Is.SameAs(gamepad.rightTrigger)); + + Set(gamepad.rightTrigger, 0f); + + Assert.That(buttonAction.WasReleasedThisFrame()); + Assert.That(buttonAction.activeControl, Is.Null); + Assert.That(passThroughAction.WasPerformedThisFrame()); + Assert.That(passThroughAction.activeControl, Is.SameAs(gamepad.rightTrigger)); + } + // https://fogbugz.unity3d.com/f/cases/1267805/ [Test] [Category("Actions")] diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 6aeb9bc995..ca7511fa72 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -70,11 +70,23 @@ however, it has to be formatted properly to pass verification tests. ### Added - Added support for "Hori Co HORIPAD for Nintendo Switch", "HORI Pokken Tournament DX Pro Pad", "HORI Wireless Switch Pad", "HORI Real Arcade Pro V Hayabusa in Switch Mode", "PowerA NSW Fusion Wired FightPad", "PowerA NSW Fusion Pro Controller (USB only)", "PDP Wired Fight Pad Pro: Mario", "PDP Faceoff Wired Pro Controller for Nintendo Switch", "PDP Faceoff Wired Pro Controller for Nintendo Switch", "PDP Afterglow Wireless Switch Controller", "PDP Rockcandy Wired Controller". +- Added support for SteelSeries Nimbus+ gamepad on Mac (addition contributed by [Mollyjameson](https://github.com/MollyJameson)). - Added a new `DeltaControl` control type that is now used for delta-style controls such as `Mouse.delta` and `Mouse.scroll`. * Like `StickControl`, this control has individual `up`, `down`, `left`, and `right` controls (as well as `x` and `y` that it inherits from `Vector2Control`). This means it is now possible to directly bind to individual scroll directions (such as `/scroll/up`). -### Added -- Added support for SteelSeries Nimbus+ gamepad on Mac (Addition contributed by [Mollyjameson](https://github.com/MollyJameson)). +#### Actions + +- Added support for keyboard shortcuts and mutually exclusive use of modifiers. + * In short, this means that a "Shift+B" binding can now prevent a "B" binding from triggering. + * `OneModifierComposite`, `TwoModifiersComposite`, as well as the legacy `ButtonWithOneModifierComposite` and `ButtonWithTwoModifiersComposite` now require their modifiers to be pressed __before__ (or at least simultaneously with) pressing the target button. + * This check is performed only if the target is a button. For a binding such as `"CTRL+MouseDelta"` the check is bypassed. It can also be manually bypassed via the `overrideModifiersNeedToBePressedFirst`. + * State change monitors on a device (`IInputStateChangeMonitor`) are now sorted by their `monitorIndex` and will trigger in that order. + * Actions are now automatically arranging their bindings to trigger in the order of decreasing "complexity". This metric is derived automatically. The more complex a composite a binding is part of, the higher its complexity. So, `"Shift+B"` has a higher "complexity" than just `"B"`. + * If an binding of higher complexity "consumes" a given input, all bindings waiting to consume the same input will automatically get skipped. So, if a `"Shift+B"` binding composite consumes a `"B"` key press, a binding to `"B"` that is waiting in line will get skipped and not see the key press. + * If your project is broken by these changes, you can disable the new behaviors via a feature toggle in code: + ```CSharp + InputSystem.settings.SetInternalFeatureFlag("DISABLE_SHORTCUT_SUPPORT", true); + ``` ## [1.3.0] - 2021-12-10 diff --git a/Packages/com.unity.inputsystem/Documentation~/ActionBindings.md b/Packages/com.unity.inputsystem/Documentation~/ActionBindings.md index b0455fb928..513c41340f 100644 --- a/Packages/com.unity.inputsystem/Documentation~/ActionBindings.md +++ b/Packages/com.unity.inputsystem/Documentation~/ActionBindings.md @@ -22,7 +22,7 @@ * [Binding resolution](#binding-resolution) * [Binding resolution while Actions are enabled](#binding-resolution-while-actions-are-enabled) * [Choosing which Devices to use](#choosing-which-devices-to-use) - * [Conflict resolution](#conflict-resolution) + * [Conflicting inputs](#conflicting-inputs) * [Initial state check](#initial-state-check) An [`InputBinding`](../api/UnityEngine.InputSystem.InputBinding.html) represents a connection between an [Action](Actions.md) and one or more [Controls](Controls.md) identified by a [Control path](Controls.md#control-paths). An Action can have an arbitrary number of Bindings pointed at it. Multiple Bindings can reference the same Control. @@ -693,31 +693,70 @@ You can override this behavior by restricting [`InputActionAssets`](../api/Unity actionMap.devices = new[] { Gamepad.all[0] }; ``` -### Conflict Resolution +### Conflicting inputs -If multiple Controls are bound to an Action, conflicting inputs may arise. For example, if an Action is bound to both the left and the right trigger on a gamepad, then if the player presses *both* triggers at the same time, then which of the triggers needs to be released for the Action to be considered stopped? +There are two situations where a given input may lead to ambiguity: -To resolve this, the Input System uses a "rule of maximum actuation". Simply put, at any point, the Control with the highest level of [actuation](Controls.md#control-actuation) is chosen to "drive" the action and thus determine its value. +1. Several Controls are bound to the same Action and more than one is feeding input into the Action at the same time. Example: an Action that is bound to both the left and right trigger on a Gamepad and both triggers are pressed. +2. The input is part of a sequence of inputs and there are several possible such sequences. Example: one Action is bound to the `B` key and another Action is bound to `Shift-B`. -In the scenario with the two triggers, releasing one of the triggers would not cause the Action to stop as the other trigger is still held. Only once both triggers are fully released will the Action be stopped. +#### Multiple, concurrently used Controls -This rule can lead to outcomes that may not appear intuitive at first. Consider the following sequence of events: +>__Note:__ This section does not apply to [`PassThrough`](Actions.md#pass-through) Actions as they are by design meant to allow multiple concurrent inputs. -1. Left trigger is fully pressed (value=1). -2. Right trigger is partially pressed (value=0.6). -3. Left trigger is released. -4. Right trigger is released. +For a [`Button`](Actions.md#button) or [`Value`](Actions.md#value) Action, there can only be one Control at any time that is "driving" the Action. This Control is considered the [`activeControl`](../api/UnityEngine.InputSystem.InputAction.html#UnityEngine_InputSystem_InputAction_activeControl). -Applying the "rule of maximum actuation", this leads to the following sequence of changes on the Action: +When an Action is bound to multiple Controls, the [`activeControl`](../api/UnityEngine.InputSystem.InputAction.html#UnityEngine_InputSystem_InputAction_activeControl) at any point is the one with the greatest level of ["actuation"](Controls.md#control-actuation), that is, the largest value returned from [`EvaluateMagnitude`](../api/UnityEngine.InputSystem.InputControl.html#UnityEngine_InputSystem_InputControl_EvaluateMagnitude_). If a Control exceeds the actuation level of the current [`activeControl`](../api/UnityEngine.InputSystem.InputAction.html#UnityEngine_InputSystem_InputAction_activeControl), it will itself become the active Control. -1. Action is `started` and then `performed`. Value is 1, Control is left trigger. -2. Nothing happens. The right trigger is not actuated enough for it to override the input on the left trigger. -3. Action is `performed`. Value is 0.6, Control is right trigger. This is because now the left trigger has fallen below the level of the right trigger and thus the latter is chosen to now "drive" the action. -4. Action is `canceled` as no more active inputs are feeding into the Action. +The following example demonstrates this mechanism with a [`Button`](Actions.md#button) Action and also demonstrates the difference to a [`PassThrough`](Actions.md#pass-through) Action. -Note that when a Control is part of a Composite, the "rule of maximum actuation" is applied to the Composite as a whole, not to the individual Controls bound as part of it. So, a WASD keyboard binding, for example, has a single value of actuation corresponding to the magnitude of the resulting vector. +```CSharp +// Create a button and a pass-through action and bind each of them +// to both triggers on the gamepad. +var buttonAction = new InputAction(type: InputActionType.Button, + binding: "/*Trigger"); +var passThroughAction = new InputAction(type: InputActionType.PassThrough, + binding: "/*Trigger"); + +buttonAction.performed += c => Debug.Log("${c.control.name} pressed (Button)"); +passThroughAction.performed += c => Debug.Log("${c.control.name} changed (Pass-Through)"); + +buttonAction.Enable(); +passThroughAction.Enable(); + +// Press the left trigger all the way down. +// This will trigger both buttonAction and passThroughAction. Both will +// see leftTrigger becoming the activeControl. +Set(gamepad.leftTrigger, 1f); + +// Will log +// "leftTrigger pressed (Button)" and +// "leftTrigger changed (Pass-Through)" + +// Press the right trigger halfway down. +// This will *not* trigger or otherwise change buttonAction as the right trigger +// is actuated *less* than the left one that is already driving action. +// However, passThrough action is not performing such tracking and will thus respond +// directly to the value change. It will perform and make rightTrigger its activeControl. +Set(gamepad.rightTrigger, 0.5f); + +// Will log +// "rightTrigger changed (Pass-Through)" + +// Release the left trigger. +// For buttonAction, this will mean that now all controls feeding into the action have +// been released and thus the button releases. activeControl will go back to null. +// For passThrough action, this is just another value change. So, the action performs +// and its active control changes to leftTrigger. +Set(gamepad.leftTrigger, 0f); + +// Will log +// "leftTrigger changed (Pass-Through)" +``` -#### Disabling Conflict Resolution +For [composite bindings](#composite-bindings), magnitudes of the composite as a whole rather than for individual Controls are tracked. However, [`activeControl`](../api/UnityEngine.InputSystem.InputAction.html#UnityEngine_InputSystem_InputAction_activeControl) will stick track individual Controls from the composite. + +##### Disabling Conflict Resolution Conflict resolution is always applied to [Button](Actions.md#button) and [Value](Actions.md#value) type Actions. However, it can be undesirable in situations when an Action is simply used to gather any and all inputs from bound Controls. For example, the following Action would monitor the A button of all available gamepads: @@ -728,6 +767,55 @@ action.Enable(); By using the [Pass-Through](Actions.md#pass-through) Action type, conflict resolution is bypassed and thus, pressing the A button on one gamepad will not result in a press on a different gamepad being ignored. +#### Multiple input sequences (such as keyboard shortcuts) + +>__Note__: The mechanism described here only applies to Actions that are part of the same [`InputActionMap`](../api/UnityEngine.InputSystem.InputActionMap.html) or [`InputActionAsset`](../api/UnityEngine.InputSystem.InputActionAsset.html). + +Inputs that are used in combinations with other inputs may also lead to ambiguities. If, for example, the `b` key on the Keyboard is bound both on its own as well as in combination with the `shift` key, then if you first press `shift` and then `b`, the latter key press would be a valid input for either of the Actions. + +The way this is handled is that Bindings will be processed in the order of decreasing "complexity". This metric is derived automatically from the Binding: + +* A binding that is *not* part of a [composite](#composite-bindings) is assigned a complexity of 1. +* A binding that *is* part of a [composite](#composite-bindings) is assigned a complexity equal to the number of part bindings in the composite. + +In our example, this means that a [`OneModifier`](#one-modifier) composite Binding to `Shift+B` has a higher "complexity" than a Binding to `B` and thus is processed first. + +Additionally, the first Binding that results in the Action changing [phase](Actions.md#action-callbacks) will "consume" the input. This consuming will result in other Bindings to the same input not being processed. So in our example, when `Shift+B` "consumes" the `B` input, the Binding to `B` will be skipped. + +The following example illustrates how this works at the API level. + +```CSharp +// Create two actions in the same map. +var map = new InputActionMap(); +var bAction = map.AddAction("B"); +var shiftbAction = map.AddAction("ShiftB"); + +// Bind one of the actions to 'B' and the other to 'SHIFT+B'. +bAction.AddBinding("/b"); +shiftbAction.AddCompositeBinding("OneModifier") + .With("Modifier", "/shift") + .With("Binding", "/b"); + +// Print something to the console when the actions are triggered. +bAction.performed += _ => Debug.Log("B action performed"); +shiftbAction.performed += _ => Debug.Log("SHIFT+B action performed"); + +// Start listening to input. +map.Enable(); + +// Now, let's assume the left shift key on the keyboard is pressed (here, we manually +// press it with the InputTestFixture API). +Press(Keyboard.current.leftShiftKey); + +// And then the B is pressed. This is a valid input for both +// bAction as well as shiftbAction. +// +// What will happen now is that shiftbAction will do its processing first. In response, +// it will *perform* the action (i.e. we see the `performed` callback being invoked) and +// thus "consume" the input. bAction will stay silent as it will in turn be skipped over. +Press(keyboard.bKey); +``` + ### Initial state check After an Action is [enabled](../api/UnityEngine.InputSystem.InputAction.html#UnityEngine_InputSystem_InputAction_enabled), it will start reacting to input as it comes in. However, at the time the Action is enabled, one or more of the Controls that are [bound](../api/UnityEngine.InputSystem.InputAction.html#UnityEngine_InputSystem_InputAction_controls) to an action may already have a non-default state at that point. diff --git a/Packages/com.unity.inputsystem/Documentation~/Actions.md b/Packages/com.unity.inputsystem/Documentation~/Actions.md index ffb6434535..d2a8d27d51 100644 --- a/Packages/com.unity.inputsystem/Documentation~/Actions.md +++ b/Packages/com.unity.inputsystem/Documentation~/Actions.md @@ -445,7 +445,7 @@ Each Action can be one of three different [Action types](../api/UnityEngine.Inpu This is the default Action type. Use this for any inputs which should track continuous changes to the state of a Control. - [`Value`](../api/UnityEngine.InputSystem.InputActionType.html#UnityEngine_InputSystem_InputActionType_Value) type actions continuously monitor all the Controls which are bound to the Action, and then choose the one which is the most actuated to be the Control driving the Action, and report the values from that Control in callbacks, triggered whenever the value changes. If a different bound Control actuated more, then that Control becomes the Control driving the Action, and the Action starts reporting values from that Control. This process is called [conflict resolution](ActionBindings.md#conflict-resolution). This is useful if you want to allow different Controls to control an Action in the game, but only take input from one Control at the same time. + [`Value`](../api/UnityEngine.InputSystem.InputActionType.html#UnityEngine_InputSystem_InputActionType_Value) type actions continuously monitor all the Controls which are bound to the Action, and then choose the one which is the most actuated to be the Control driving the Action, and report the values from that Control in callbacks, triggered whenever the value changes. If a different bound Control actuated more, then that Control becomes the Control driving the Action, and the Action starts reporting values from that Control. This process is called [conflict resolution](ActionBindings.md#conflicting-inputs). This is useful if you want to allow different Controls to control an Action in the game, but only take input from one Control at the same time. When the Action initially enables, it performs an [initial state check](ActionBindings.md#initial-state-check) of all bound Controls. If any of them is actuated, the Action then triggers a callback with the current value. @@ -455,7 +455,7 @@ This is very similar to [`Value`](../api/UnityEngine.InputSystem.InputActionType #### Pass-Through - [`Pass-Through`](../api/UnityEngine.InputSystem.InputActionType.html#UnityEngine_InputSystem_InputActionType_PassThrough) Actions bypass the [conflict resolution](ActionBindings.md#conflict-resolution) process described above for `Value` Actions and don't use the concept of a specific Control driving the Action. Instead, any change to any bound Control triggers a callback with that Control's value. This is useful if you want to process all input from a set of Controls. + [`Pass-Through`](../api/UnityEngine.InputSystem.InputActionType.html#UnityEngine_InputSystem_InputActionType_PassThrough) Actions bypass the [conflict resolution](ActionBindings.md#conflicting-inputs) process described above for `Value` Actions and don't use the concept of a specific Control driving the Action. Instead, any change to any bound Control triggers a callback with that Control's value. This is useful if you want to process all input from a set of Controls. ### Debugging Actions diff --git a/Packages/com.unity.inputsystem/Documentation~/Controls.md b/Packages/com.unity.inputsystem/Documentation~/Controls.md index b73fe21e04..d2e86f5b76 100644 --- a/Packages/com.unity.inputsystem/Documentation~/Controls.md +++ b/Packages/com.unity.inputsystem/Documentation~/Controls.md @@ -204,7 +204,7 @@ if (Gamepad.current.leftStick.EvaluateMagnitude() > 0.25f) There are two mechanisms that most notably make use of Control actuation: - [Interactive rebinding](ActionBindings.md#interactive-rebinding) (`InputActionRebindingExceptions.RebindOperation`) uses it to select between multiple suitable Controls to find the one that is actuated the most. -- [Conflict resolution](ActionBindings.md#conflict-resolution) between multiple Controls that are bound to the same action uses it to decide which Control gets to drive the action. +- [Conflict resolution](ActionBindings.md#conflicting-inputs) between multiple Controls that are bound to the same action uses it to decide which Control gets to drive the action. ## Noisy Controls diff --git a/Packages/com.unity.inputsystem/Documentation~/Events.md b/Packages/com.unity.inputsystem/Documentation~/Events.md index 4fac3e4aaf..5c92c30f4f 100644 --- a/Packages/com.unity.inputsystem/Documentation~/Events.md +++ b/Packages/com.unity.inputsystem/Documentation~/Events.md @@ -146,7 +146,35 @@ Note that queuing an event doesn't immediately consume the event. Event processi #### Sending state events -The easiest way to create a state event is directly from the Device. +For Devices that have a corresponding "state struct" describing the state of the device, the easiest way of sending input to the Device is to simply queue instances of those structs: + +```CSharp +// Mouse. +InputSystem.QueueStateEvent(Mouse.current, new MouseState { position = new Vector2(123, 234) }); + +// Keyboard. +InputSystem.QueueStateEvent(Keyboard.current, new KeyboardState(Key.LeftCtrl, Key.A)); +``` + +`Touchscreen` is somewhat special in that it expects its input to be in [`TouchState`](../api/UnityEngine.InputSystem.LowLevel.TouchState.html) format. + +```CSharp +// Start touch. +InputSystem.QueueStateEvent(Touchscreen.current, + new TouchState { touchId = 1, phase = TouchPhase.Began, position = new Vector2(123, 234) }); + +// Move touch. +InputSystem.QueueStateEvent(Touchscreen.current, + new TouchState { touchId = 1, phase = TouchPhase.Moved, position = new Vector2(234, 345) }); + +// End touch. +InputSystem.QueueStateEvent(Touchscreen.current, + new TouchState { touchId = 1, phase = TouchPhase.Ended, position = new Vector2(123, 234) }); +``` + +>__IMPORTANT:__ [Touch IDs](../api/UnityEngine.InputSystem.Controls.TouchControl.html#UnityEngine_InputSystem_Controls_TouchControl_touchId) cannot be 0! A valid touch must have a non-zero touch ID. Concurrent touches must each have a unique ID. After a touch has ended, its ID can be reused – although it is recommended to not do so. + +If the exact format of the state used by a given Device is not known, the easiest way to send input to it is to simply create a [`StateEvent`](../api/UnityEngine.InputSystem.LowLevel.StateEvent.html) from the Device itself: ```CSharp // `StateEvent.From` creates a temporary buffer in unmanaged memory that holds diff --git a/Packages/com.unity.inputsystem/Documentation~/Interactions.md b/Packages/com.unity.inputsystem/Documentation~/Interactions.md index 9cd40d9e4c..2738bb0f32 100644 --- a/Packages/com.unity.inputsystem/Documentation~/Interactions.md +++ b/Packages/com.unity.inputsystem/Documentation~/Interactions.md @@ -67,7 +67,7 @@ fireAction.canceled += ### Multiple Controls on an Action -If you have multiple Controls bound to a Binding or an Action which has an Interaction, then the Input System first applies the [conflict resolution](ActionBindings.md#conflict-resolution) logic to get a single value for the Action, which it then feeds to the Interaction logic. Any of the bound Controls can perform the Interaction. +If you have multiple Controls bound to a Binding or an Action which has an Interaction, then the Input System first applies the [Control conflict resolution](ActionBindings.md#conflicting-inputs) logic to get a single value for the Action, which it then feeds to the Interaction logic. Any of the bound Controls can perform the Interaction. ### Multiple Interactions on a Binding diff --git a/Packages/com.unity.inputsystem/Documentation~/KnownLimitations.md b/Packages/com.unity.inputsystem/Documentation~/KnownLimitations.md index 833c1d81ac..a3f8a25799 100644 --- a/Packages/com.unity.inputsystem/Documentation~/KnownLimitations.md +++ b/Packages/com.unity.inputsystem/Documentation~/KnownLimitations.md @@ -2,12 +2,6 @@ The following is a list of known limitations that the Input System currently has. -## Actions - -* Actions cannot currently "pre-empt" each other's input. Meaning that it is currently not possible to "consume" input from one action to prevent it from triggering input on another action. - - A common scenario is having, for example, a binding for "A" on one action and a binding for "SHIFT+A" on another action. Currently, pressing "SHIFT+A" will trigger both actions. - - This also includes Actions that used by the [UI](UISupport.md) for input. Clicking a button in the UI does not by itself prevent an in-game Action that responds to pointer clicks from being triggered. See ["UI and game input"](UISupport.md#ui-and-game-input) for details. - ## Compatibility with other Unity features * Input processing in the background is tied to `Application.runInBackground` (i.e. the "Run In Background" setting in "Player Preferences") which, however, Unity always forces to `true` in __development__ players. This means that in development players, input will always be processed, even if the app is in the background. Of course, this only pertains to platforms where the player can actually run in the background (iOS and Android are thus unaffected). @@ -20,6 +14,7 @@ The following is a list of known limitations that the Input System currently has * After enabling, the UI will not react to a pointer's position until the position is changed. * The new input system cannot yet feed text input into uGUI and TextMesh Pro input field components. This means that text input ATM is still picked up directly and internally from the Unity native runtime. +* The UI will not consume input such that it will not also trigger in-game actions. ## Device support diff --git a/Packages/com.unity.inputsystem/Documentation~/Settings.md b/Packages/com.unity.inputsystem/Documentation~/Settings.md index ced07f5140..b62d0c5f46 100644 --- a/Packages/com.unity.inputsystem/Documentation~/Settings.md +++ b/Packages/com.unity.inputsystem/Documentation~/Settings.md @@ -135,7 +135,7 @@ This setting is stored as a user setting (that is, other users who open the same ![iOSSettings](Images/iOSSettings.png) * __Motion Usage__
- Governs access to the [pedometer](Sensors.md# on the device. If enabled, the __Description__ string supplied in the settings will be added to the application's Info.plist + Governs access to the [pedometer](Sensors.md#stepcounter) on the device. If enabled, the __Description__ string supplied in the settings will be added to the application's Info.plist ### Editor diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/ButtonWithOneModifier.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/ButtonWithOneModifier.cs index fd32e98799..485f94b998 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/ButtonWithOneModifier.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/ButtonWithOneModifier.cs @@ -74,6 +74,21 @@ public class ButtonWithOneModifier : InputBindingComposite // ReSharper disable once UnassignedField.Global [InputControl(layout = "Button")] public int button; + /// + /// If set to true, can be pressed after and the composite will + /// still trigger. Default is false. + /// + /// + /// By default, is required to be in pressed state before or at the same time that + /// goes into pressed state for the composite as a whole to trigger. This means that binding to, for example, Shift+B, + /// the shift key has to be pressed before pressing the B key. This is the behavior usually expected with + /// keyboard shortcuts. + /// + /// This parameter can be used to bypass this behavior and allow any timing between and . + /// The only requirement is for them both to concurrently be in pressed state. + /// + public bool overrideModifiersNeedToBePressedFirst; + /// /// Return the value of the part if is pressed. Otherwise /// return 0. @@ -82,12 +97,27 @@ public class ButtonWithOneModifier : InputBindingComposite /// The current value of the composite. public override float ReadValue(ref InputBindingCompositeContext context) { - if (context.ReadValueAsButton(modifier)) + if (ModifierIsPressed(ref context)) return context.ReadValue(button); return default; } + private bool ModifierIsPressed(ref InputBindingCompositeContext context) + { + var modifierDown = context.ReadValueAsButton(modifier); + + if (modifierDown && !overrideModifiersNeedToBePressedFirst) + { + var timestamp = context.GetPressTime(button); + var timestamp1 = context.GetPressTime(modifier); + + return timestamp1 <= timestamp; + } + + return modifierDown; + } + /// /// Same as in this case. /// @@ -97,5 +127,12 @@ public override float EvaluateMagnitude(ref InputBindingCompositeContext context { return ReadValue(ref context); } + + protected override void FinishSetup(ref InputBindingCompositeContext context) + { + if (!overrideModifiersNeedToBePressedFirst) + overrideModifiersNeedToBePressedFirst = + InputSystem.settings.IsFeatureEnabled(InputFeatureNames.kDisableShortcutSupport); + } } } diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/ButtonWithTwoModifiers.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/ButtonWithTwoModifiers.cs index a4f9b8245d..cab71a2132 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/ButtonWithTwoModifiers.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/ButtonWithTwoModifiers.cs @@ -89,6 +89,21 @@ public class ButtonWithTwoModifiers : InputBindingComposite // ReSharper disable once UnassignedField.Global [InputControl(layout = "Button")] public int button; + /// + /// If set to true, and/or can be pressed after + /// and the composite will still trigger. Default is false. + /// + /// + /// By default, and are required to be in pressed state before or at the same + /// time that goes into pressed state for the composite as a whole to trigger. This means that binding to, + /// for example, Ctrl+Shift+B, the ctrl shift keys have to be pressed before pressing the B key. + /// This is the behavior usually expected with keyboard shortcuts. + /// + /// This parameter can be used to bypass this behavior and allow any timing between , , + /// and . The only requirement is for all of them to concurrently be in pressed state. + /// + public bool overrideModifiersNeedToBePressedFirst; + /// /// Return the value of the part while both and /// are pressed. Otherwise return 0. @@ -97,12 +112,28 @@ public class ButtonWithTwoModifiers : InputBindingComposite /// The current value of the composite. public override float ReadValue(ref InputBindingCompositeContext context) { - if (context.ReadValueAsButton(modifier1) && context.ReadValueAsButton(modifier2)) + if (ModifiersArePressed(ref context)) return context.ReadValue(button); return default; } + private bool ModifiersArePressed(ref InputBindingCompositeContext context) + { + var modifiersDown = context.ReadValueAsButton(modifier1) && context.ReadValueAsButton(modifier2); + + if (modifiersDown && !overrideModifiersNeedToBePressedFirst) + { + var timestamp = context.GetPressTime(button); + var timestamp1 = context.GetPressTime(modifier1); + var timestamp2 = context.GetPressTime(modifier2); + + return timestamp1 <= timestamp && timestamp2 <= timestamp; + } + + return modifiersDown; + } + /// /// Same as in this case. /// @@ -112,5 +143,12 @@ public override float EvaluateMagnitude(ref InputBindingCompositeContext context { return ReadValue(ref context); } + + protected override void FinishSetup(ref InputBindingCompositeContext context) + { + if (!overrideModifiersNeedToBePressedFirst) + overrideModifiersNeedToBePressedFirst = + InputSystem.settings.IsFeatureEnabled(InputFeatureNames.kDisableShortcutSupport); + } } } diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/OneModifierComposite.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/OneModifierComposite.cs index 07107aa8ee..5a0a944699 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/OneModifierComposite.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/OneModifierComposite.cs @@ -83,12 +83,33 @@ public class OneModifierComposite : InputBindingComposite /// public override int valueSizeInBytes => m_ValueSizeInBytes; + /// + /// If set to true, the built-in logic to determine if modifiers need to be pressed first is overridden. + /// Default value is false. + /// + /// + /// By default, if is bound to only s, then the composite requires + /// to be pressed before pressing . This means that binding to, for example, + /// Ctrl+B, the ctrl keys have to be pressed before pressing the B key. This is the behavior usually expected + /// with keyboard shortcuts. + /// + /// However, when binding, for example, Ctrl+MouseDelta, it should be possible to press ctrl at any time. The default + /// logic will automatically detect the difference between this binding and the button binding in the example above and behave + /// accordingly. + /// + /// This field allows you to explicitly override this default inference and make it so that regardless of what + /// is bound to, any press sequence is acceptable. For the example binding to Ctrl+B, it would mean that pressing B and + /// only then pressing Ctrl will still trigger the binding. + /// + public bool overrideModifiersNeedToBePressedFirst; + private int m_ValueSizeInBytes; private Type m_ValueType; + private bool m_BindingIsButton; public override float EvaluateMagnitude(ref InputBindingCompositeContext context) { - if (context.ReadValueAsButton(modifier)) + if (ModifierIsPressed(ref context)) return context.EvaluateMagnitude(binding); return default; } @@ -96,16 +117,36 @@ public override float EvaluateMagnitude(ref InputBindingCompositeContext context /// public override unsafe void ReadValue(ref InputBindingCompositeContext context, void* buffer, int bufferSize) { - if (context.ReadValueAsButton(modifier)) + if (ModifierIsPressed(ref context)) context.ReadValue(binding, buffer, bufferSize); else UnsafeUtility.MemClear(buffer, m_ValueSizeInBytes); } + private bool ModifierIsPressed(ref InputBindingCompositeContext context) + { + var modifierDown = context.ReadValueAsButton(modifier); + + // When the modifiers are gating a button, we require the modifiers to be pressed *first*. + if (modifierDown && m_BindingIsButton && !overrideModifiersNeedToBePressedFirst) + { + var timestamp = context.GetPressTime(binding); + var timestamp1 = context.GetPressTime(modifier); + + return timestamp1 <= timestamp; + } + + return modifierDown; + } + /// protected override void FinishSetup(ref InputBindingCompositeContext context) { - DetermineValueTypeAndSize(ref context, binding, out m_ValueType, out m_ValueSizeInBytes); + DetermineValueTypeAndSize(ref context, binding, out m_ValueType, out m_ValueSizeInBytes, out m_BindingIsButton); + + if (!overrideModifiersNeedToBePressedFirst) + overrideModifiersNeedToBePressedFirst = + InputSystem.settings.IsFeatureEnabled(InputFeatureNames.kDisableShortcutSupport); } public override object ReadValueAsObject(ref InputBindingCompositeContext context) @@ -115,9 +156,10 @@ public override object ReadValueAsObject(ref InputBindingCompositeContext contex return null; } - internal static void DetermineValueTypeAndSize(ref InputBindingCompositeContext context, int part, out Type valueType, out int valueSizeInBytes) + internal static void DetermineValueTypeAndSize(ref InputBindingCompositeContext context, int part, out Type valueType, out int valueSizeInBytes, out bool isButton) { valueSizeInBytes = 0; + isButton = true; Type type = null; foreach (var control in context.controls) @@ -132,6 +174,9 @@ internal static void DetermineValueTypeAndSize(ref InputBindingCompositeContext type = typeof(Object); valueSizeInBytes = Math.Max(control.control.valueSizeInBytes, valueSizeInBytes); + + // *All* bound controls need to be buttons for us to classify this part as a "Button" part. + isButton &= control.control.isButton; } valueType = type; diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/TwoModifiersComposite.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/TwoModifiersComposite.cs index 982c8a7702..251681c383 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/TwoModifiersComposite.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/TwoModifiersComposite.cs @@ -96,6 +96,26 @@ public class TwoModifiersComposite : InputBindingComposite // ReSharper disable once UnassignedField.Global [InputControl(layout = "Button")] public int binding; + /// + /// If set to true, the built-in logic to determine if modifiers need to be pressed first is overridden. + /// Default value is false. + /// + /// + /// By default, if is bound to only s, then the composite requires + /// both and to be pressed before pressing . + /// This means that binding to, for example, Ctrl+Shift+B, the ctrl and shift keys have to be pressed + /// before pressing the B key. This is the behavior usually expected with keyboard shortcuts. + /// + /// However, when binding, for example, Ctrl+Shift+MouseDelta, it should be possible to press ctrl and shift + /// at any time and in any order. The default logic will automatically detect the difference between this binding and the button + /// binding in the example above and behave accordingly. + /// + /// This field allows you to explicitly override this default inference and make it so that regardless of what + /// is bound to, any press sequence is acceptable. For the example binding to Ctrl+Shift+B, it would mean that pressing + /// B and only then pressing Ctrl and Shift will still trigger the binding. + /// + public bool overrideModifiersNeedToBePressedFirst; + /// /// Type of values read from controls bound to . /// @@ -108,10 +128,11 @@ public class TwoModifiersComposite : InputBindingComposite private int m_ValueSizeInBytes; private Type m_ValueType; + private bool m_BindingIsButton; public override float EvaluateMagnitude(ref InputBindingCompositeContext context) { - if (context.ReadValueAsButton(modifier1) && context.ReadValueAsButton(modifier2)) + if (ModifiersArePressed(ref context)) return context.EvaluateMagnitude(binding); return default; } @@ -119,16 +140,37 @@ public override float EvaluateMagnitude(ref InputBindingCompositeContext context /// public override unsafe void ReadValue(ref InputBindingCompositeContext context, void* buffer, int bufferSize) { - if (context.ReadValueAsButton(modifier1) && context.ReadValueAsButton(modifier2)) + if (ModifiersArePressed(ref context)) context.ReadValue(binding, buffer, bufferSize); else UnsafeUtility.MemClear(buffer, m_ValueSizeInBytes); } + private bool ModifiersArePressed(ref InputBindingCompositeContext context) + { + var modifiersDown = context.ReadValueAsButton(modifier1) && context.ReadValueAsButton(modifier2); + + // When the modifiers are gating a button, we require the modifiers to be pressed *first*. + if (modifiersDown && m_BindingIsButton && !overrideModifiersNeedToBePressedFirst) + { + var timestamp = context.GetPressTime(binding); + var timestamp1 = context.GetPressTime(modifier1); + var timestamp2 = context.GetPressTime(modifier2); + + return timestamp1 <= timestamp && timestamp2 <= timestamp; + } + + return modifiersDown; + } + /// protected override void FinishSetup(ref InputBindingCompositeContext context) { - OneModifierComposite.DetermineValueTypeAndSize(ref context, binding, out m_ValueType, out m_ValueSizeInBytes); + OneModifierComposite.DetermineValueTypeAndSize(ref context, binding, out m_ValueType, out m_ValueSizeInBytes, out m_BindingIsButton); + + if (!overrideModifiersNeedToBePressedFirst) + overrideModifiersNeedToBePressedFirst = + InputSystem.settings.IsFeatureEnabled(InputFeatureNames.kDisableShortcutSupport); } public override object ReadValueAsObject(ref InputBindingCompositeContext context) diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputAction.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputAction.cs index 706a4c7659..b0efcbb9d8 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputAction.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputAction.cs @@ -1618,6 +1618,7 @@ internal int BindingIndexOnMapToBindingIndexOnAction(int indexOfBindingOnMap) } ////TODO: make current event available in some form + ////TODO: make source binding info available (binding index? binding instance?) /// /// Information provided to action callbacks about what triggered an action. diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs index 1185a3e905..b9d7262c00 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs @@ -110,6 +110,8 @@ internal unsafe class InputActionState : IInputStateChangeMonitor, ICloneable, I public BindingState* bindingStates => memory.bindingStates; public InteractionState* interactionStates => memory.interactionStates; public int* controlIndexToBindingIndex => memory.controlIndexToBindingIndex; + public ushort* controlGroupingAndComplexity => memory.controlGroupingAndComplexity; + public float* controlMagnitudes => memory.controlMagnitudes; public uint* enabledControls => (uint*)memory.enabledControls; public bool isProcessingControlStateChange => m_InProcessControlStateChange; @@ -117,6 +119,7 @@ internal unsafe class InputActionState : IInputStateChangeMonitor, ICloneable, I private bool m_OnBeforeUpdateHooked; private bool m_OnAfterUpdateHooked; private bool m_InProcessControlStateChange; + private InputEventPtr m_CurrentlyProcessingThisEvent; private Action m_OnBeforeUpdateDelegate; private Action m_OnAfterUpdateDelegate; @@ -130,6 +133,69 @@ public void Initialize(InputBindingResolver resolver) AddToGlobalList(); } + private void ComputeControlGroupingIfNecessary() + { + if (memory.controlGroupingInitialized) + return; + + // If shortcut support is disabled, we simply put put all bindings at complexity=1 and + // in their own group. + var disableControlGrouping = InputSystem.settings.IsFeatureEnabled(InputFeatureNames.kDisableShortcutSupport); + + var currentGroup = 1u; + for (var i = 0; i < totalControlCount; ++i) + { + var control = controls[i]; + var bindingIndex = controlIndexToBindingIndex[i]; + ref var binding = ref bindingStates[bindingIndex]; + + ////REVIEW: take processors and interactions into account?? + + // Compute complexity. + var complexity = 1; + if (binding.isPartOfComposite && !disableControlGrouping) + { + var compositeBindingIndex = binding.compositeOrCompositeBindingIndex; + + for (var n = compositeBindingIndex + 1; n < totalBindingCount; ++n) + { + ref var partBinding = ref bindingStates[n]; + if (!partBinding.isPartOfComposite || partBinding.compositeOrCompositeBindingIndex != compositeBindingIndex) + break; + ++complexity; + } + } + controlGroupingAndComplexity[i * 2 + 1] = (ushort)complexity; + + // Compute grouping. If already set, skip. + if (controlGroupingAndComplexity[i * 2] == 0) + { + if (!disableControlGrouping) + { + for (var n = 0; n < totalControlCount; ++n) + { + // NOTE: We could compute group numbers based on device index + control offsets + // and thus make them work globally in a stable way. But we'd need a mechanism + // to then determine ordering of actions globally such that it is clear which + // action gets a first shot at an input. + + var otherControl = controls[n]; + if (control != otherControl) + continue; + + controlGroupingAndComplexity[n * 2] = (ushort)currentGroup; + } + } + + controlGroupingAndComplexity[i * 2] = (ushort)currentGroup; + + ++currentGroup; + } + } + + memory.controlGroupingInitialized = true; + } + public void ClaimDataFrom(InputBindingResolver resolver) { totalProcessorCount = resolver.totalProcessorCount; @@ -142,6 +208,8 @@ public void ClaimDataFrom(InputBindingResolver resolver) memory = resolver.memory; resolver.memory = new UnmanagedMemory(); + + ComputeControlGroupingIfNecessary(); } ~InputActionState() @@ -508,6 +576,13 @@ private void RestoreActionStatesAfterReResolvingBindings(UnmanagedMemory oldStat continue; } + // For composites, bring magnitudes along. + if (newBindingState.isComposite) + { + var compositeIndex = newBindingState.compositeOrCompositeBindingIndex; + memory.compositeMagnitudes[compositeIndex] = oldState.compositeMagnitudes[compositeIndex]; + } + var actionIndex = newBindingState.actionIndex; if (actionIndex == kInvalidIndex) { @@ -525,7 +600,7 @@ private void RestoreActionStatesAfterReResolvingBindings(UnmanagedMemory oldStat // NOTE: We're only restore execution state for currently active controls. So, if there were multiple // concurrent actuations on an action that was in progress, we let initial state checks restore // relevant state. - newBindingState.initialStateCheckPending = true; + newBindingState.initialStateCheckPending = newBindingState.wantsInitialStateCheck; // Enable all controls on the binding. EnableControls(newBindingState.mapIndex, newBindingState.controlStartIndex, @@ -1052,10 +1127,11 @@ private void EnableControls(int mapIndex, int controlStartIndex, int numControls var bindingIndex = controlIndexToBindingIndex[controlIndex]; var mapControlAndBindingIndex = ToCombinedMapAndControlAndBindingIndex(mapIndex, controlIndex, bindingIndex); + var bindingStatePtr = &bindingStates[bindingIndex]; if (bindingStatePtr->wantsInitialStateCheck) SetInitialStateCheckPending(bindingStatePtr, true); - manager.AddStateChangeMonitor(controls[controlIndex], this, mapControlAndBindingIndex); + manager.AddStateChangeMonitor(controls[controlIndex], this, mapControlAndBindingIndex, controlGroupingAndComplexity[controlIndex * 2]); SetControlEnabled(controlIndex, true); } @@ -1183,6 +1259,7 @@ private void OnBeforeInitialUpdate() // Go through all binding states and for every binding that needs an initial state check, // go through all bound controls and for each one that isn't in its default state, pretend // that the control just got actuated. + var manager = InputSystem.s_Manager; for (var bindingIndex = 0; bindingIndex < totalBindingCount; ++bindingIndex) { ref var bindingState = ref bindingStates[bindingIndex]; @@ -1192,11 +1269,11 @@ private void OnBeforeInitialUpdate() Debug.Assert(!bindingState.isPartOfComposite, "Initial state check flag must be set on composite, not on its parts"); bindingState.initialStateCheckPending = false; - var mapIndex = bindingState.mapIndex; var controlStartIndex = bindingState.controlStartIndex; var controlCount = bindingState.controlCount; var isComposite = bindingState.isComposite; + var didFindControlToSignal = false; for (var n = 0; n < controlCount; ++n) { var controlIndex = controlStartIndex + n; @@ -1208,23 +1285,27 @@ private void OnBeforeInitialUpdate() if (!control.CheckStateIsAtDefault()) { - // For composites, the binding index we have at this point is for the composite binding, not for the part - // binding that contributes the control we're looking at. Adjust for that. - var bindingIndexForControl = bindingIndex; - if (isComposite) - bindingIndexForControl = controlIndexToBindingIndex[controlIndex]; - - ProcessControlStateChange(mapIndex, controlIndex, bindingIndexForControl, time, default); + // Update press times. + if (control.IsValueConsideredPressed(control.EvaluateMagnitude())) + { + // ReSharper disable once CompareOfFloatsByEqualityOperator + if (bindingState.pressTime == default || bindingState.pressTime > time) + bindingState.pressTime = time; + } // For composites, any one actuated control will lead to the composite being - // processed as a whole so we can stop here. This also ensure that we are + // processed as a whole so we can stop here. This also ensures that we are // not triggering the composite repeatedly if there are multiple actuated // controls bound to its parts. - if (isComposite) - break; + if (isComposite && didFindControlToSignal) + continue; + + manager.SignalStateChangeMonitor(control, this); + didFindControlToSignal = true; } } } + manager.FireStateChangeNotifications(); Profiler.EndSample(); } @@ -1257,20 +1338,24 @@ private void OnBeforeInitialUpdate() // all the information together avoids having to unnecessarily jump around in memory to grab // the various pieces of data. - private static long ToCombinedMapAndControlAndBindingIndex(int mapIndex, int controlIndex, int bindingIndex) + private long ToCombinedMapAndControlAndBindingIndex(int mapIndex, int controlIndex, int bindingIndex) { + // We have limits on the numbers of maps, controls, and bindings we allow in any single + // action state (see TriggerState.kMaxNumXXX). + var complexity = controlGroupingAndComplexity[controlIndex * 2 + 1]; var result = (long)controlIndex; - result |= (long)bindingIndex << 32; - result |= (long)mapIndex << 48; + result |= (long)bindingIndex << 24; + result |= (long)mapIndex << 40; + result |= (long)complexity << 48; return result; } - private static void SplitUpMapAndControlAndBindingIndex(long mapControlAndBindingIndex, out int mapIndex, + private void SplitUpMapAndControlAndBindingIndex(long mapControlAndBindingIndex, out int mapIndex, out int controlIndex, out int bindingIndex) { - controlIndex = (int)(mapControlAndBindingIndex & 0xffffffff); - bindingIndex = (int)((mapControlAndBindingIndex >> 32) & 0xffff); - mapIndex = (int)(mapControlAndBindingIndex >> 48); + controlIndex = (int)(mapControlAndBindingIndex & 0x00ffffff); + bindingIndex = (int)((mapControlAndBindingIndex >> 24) & 0xffff); + mapIndex = (int)((mapControlAndBindingIndex >> 40) & 0xff); } /// @@ -1308,6 +1393,7 @@ private void ProcessControlStateChange(int mapIndex, int controlIndex, int bindi // triggered by an action callback, the state will be marked dirty and re-resolved after // we have completed the callback. m_InProcessControlStateChange = true; + m_CurrentlyProcessingThisEvent = eventPtr; try { @@ -1333,6 +1419,19 @@ private void ProcessControlStateChange(int mapIndex, int controlIndex, int bindi if (m_OnBeforeUpdateHooked) bindingStatePtr->initialStateCheckPending = false; + // Store magnitude. We do this once and then only read it from here. + var control = controls[controlIndex]; + trigger.magnitude = control.CheckStateIsAtDefault() ? 0f : control.EvaluateMagnitude(); + controlMagnitudes[controlIndex] = trigger.magnitude; + + // Update press times. + if (control.IsValueConsideredPressed(trigger.magnitude)) + { + // ReSharper disable once CompareOfFloatsByEqualityOperator + if (bindingStatePtr->pressTime == default || bindingStatePtr->pressTime > trigger.time) + bindingStatePtr->pressTime = trigger.time; + } + // If the binding is part of a composite, check for interactions on the composite // itself and give them a first shot at processing the value change. var haveInteractionsOnComposite = false; @@ -1349,6 +1448,16 @@ private void ProcessControlStateChange(int mapIndex, int controlIndex, int bindi if (ShouldIgnoreInputOnCompositeBinding(compositeBindingPtr, eventPtr)) return; + // Update magnitude for composite. + var compositeIndex = bindingStates[compositeBindingIndex].compositeOrCompositeBindingIndex; + var compositeContext = new InputBindingCompositeContext + { + m_State = this, + m_BindingIndex = compositeBindingIndex + }; + trigger.magnitude = composites[compositeIndex].EvaluateMagnitude(ref compositeContext); + memory.compositeMagnitudes[compositeIndex] = trigger.magnitude; + // Run through interactions on composite. var interactionCountOnComposite = compositeBindingPtr->interactionCount; if (interactionCountOnComposite > 0) @@ -1368,27 +1477,9 @@ private void ProcessControlStateChange(int mapIndex, int controlIndex, int bindi var isConflictingInput = IsConflictingInput(ref trigger, actionIndex); bindingStatePtr = &bindingStates[trigger.bindingIndex]; // IsConflictingInput may switch us to a different binding. - // Check actuation level. + // Process button presses/releases. if (!isConflictingInput) - { - var actuation = ComputeMagnitude(ref trigger); - var actionState = &actionStates[actionIndex]; - var pressPoint = controls[trigger.controlIndex] is ButtonControl button ? button.pressPointOrDefault : ButtonControl.s_GlobalDefaultButtonPressPoint; - if (!actionState->isPressed && actuation >= pressPoint) - { - actionState->pressedInUpdate = InputUpdate.s_UpdateStepCount; - actionState->isPressed = true; - } - else if (actionState->isPressed) - { - var releasePoint = pressPoint * ButtonControl.s_GlobalDefaultButtonReleaseThreshold; - if (actuation <= releasePoint) - { - actionState->releasedInUpdate = InputUpdate.s_UpdateStepCount; - actionState->isPressed = false; - } - } - } + ProcessButtonState(ref trigger, actionIndex, bindingStatePtr); // If we have interactions, let them do all the processing. The presence of an interaction // essentially bypasses the default phase progression logic of an action. @@ -1404,7 +1495,43 @@ private void ProcessControlStateChange(int mapIndex, int controlIndex, int bindi } finally { - m_InProcessControlStateChange = false; + m_InProcessControlStateChange = default; + m_CurrentlyProcessingThisEvent = default; + } + } + } + + private void ProcessButtonState(ref TriggerState trigger, int actionIndex, BindingState* bindingStatePtr) + { + var control = controls[trigger.controlIndex]; + var pressPoint = control.isButton + ? ((ButtonControl)control).pressPointOrDefault + : ButtonControl.s_GlobalDefaultButtonPressPoint; + + // NOTE: This method relies on conflict resolution happening *first*. Otherwise, we may inadvertently + // detect a "release" from a control that is not actually driving the action. + + // Record release time on the binding. + // NOTE: Explicitly look up control magnitude here instead of using trigger.magnitude + // as for part bindings, the trigger will have the magnitude of the whole composite. + var controlActuation = controlMagnitudes[trigger.controlIndex]; + if (controlActuation <= pressPoint * ButtonControl.s_GlobalDefaultButtonReleaseThreshold) + bindingStatePtr->pressTime = 0d; + + var actuation = trigger.magnitude; + var actionState = &actionStates[actionIndex]; + if (!actionState->isPressed && actuation >= pressPoint) + { + actionState->pressedInUpdate = InputUpdate.s_UpdateStepCount; + actionState->isPressed = true; + } + else if (actionState->isPressed) + { + var releasePoint = pressPoint * ButtonControl.s_GlobalDefaultButtonReleaseThreshold; + if (actuation <= releasePoint) + { + actionState->releasedInUpdate = InputUpdate.s_UpdateStepCount; + actionState->isPressed = false; } } } @@ -1429,7 +1556,7 @@ private static bool ShouldIgnoreInputOnCompositeBinding(BindingState* binding, I return false; var eventId = eventPtr->eventId; - if (binding->triggerEventIdForComposite == eventId) + if (eventId != 0 && binding->triggerEventIdForComposite == eventId) return true; binding->triggerEventIdForComposite = eventId; @@ -1484,43 +1611,22 @@ private bool IsConflictingInput(ref TriggerState trigger, int actionIndex) Profiler.BeginSample("InputActionResolveConflict"); - // Compute magnitude, if necessary. - // NOTE: This will automatically take composites into account. - if (!trigger.haveMagnitude) - trigger.magnitude = ComputeMagnitude(trigger.bindingIndex, trigger.controlIndex); - // We take a local copy of this value, so we can change it to use the starting control of composites // for simpler conflict resolution (so composites always use the same value), but still report the actually // actuated control to the user. var triggerControlIndex = trigger.controlIndex; - - // Update magnitude stored in state. if (bindingStates[trigger.bindingIndex].isPartOfComposite) { - // Control is part of a composite. Store magnitude in compositeMagnitudes. - // NOTE: This path here implies that we never store magnitudes individually for controls - // that are part of composites. - var compositeBindingIndex = bindingStates[trigger.bindingIndex].compositeOrCompositeBindingIndex; - var compositeIndex = bindingStates[compositeBindingIndex].compositeOrCompositeBindingIndex; - memory.compositeMagnitudes[compositeIndex] = trigger.magnitude; - // For actions that need conflict resolution, we force TriggerState.controlIndex to the // first control in a composite. Otherwise it becomes much harder to tell if the we have // multiple concurrent actuations or not. // Since composites always evaluate as a whole instead of as single controls, having // triggerControlIndex differ from the state monitor that fired should be fine. + var compositeBindingIndex = bindingStates[trigger.bindingIndex].compositeOrCompositeBindingIndex; triggerControlIndex = bindingStates[compositeBindingIndex].controlStartIndex; Debug.Assert(triggerControlIndex >= 0 && triggerControlIndex < totalControlCount, "Control start index on composite binding out of range"); } - else - { - Debug.Assert(!bindingStates[trigger.bindingIndex].isComposite, - "Composite should not trigger directly from a control"); - - // "Normal" control. Store magnitude in controlMagnitudes. - memory.controlMagnitudes[triggerControlIndex] = trigger.magnitude; - } // Determine which control to consider the one currently associated with the action. // We do the same thing as for the triggered control and in the case of a composite, @@ -1778,7 +1884,7 @@ private void ProcessDefaultInteraction(ref TriggerState trigger, int actionIndex // Button actions need to cross the button-press threshold. if (trigger.isButton) { - var actuation = ComputeMagnitude(ref trigger); + var actuation = trigger.magnitude; if (actuation > 0) ChangePhaseOfAction(InputActionPhase.Started, ref trigger); var threshold = controls[trigger.controlIndex] is ButtonControl button ? button.pressPointOrDefault : ButtonControl.s_GlobalDefaultButtonPressPoint; @@ -1810,7 +1916,7 @@ private void ProcessDefaultInteraction(ref TriggerState trigger, int actionIndex { if (actionState->isButton) { - var actuation = ComputeMagnitude(ref trigger); + var actuation = trigger.magnitude; var threshold = controls[trigger.controlIndex] is ButtonControl button ? button.pressPointOrDefault : ButtonControl.s_GlobalDefaultButtonPressPoint; if (actuation >= threshold) { @@ -1846,7 +1952,7 @@ private void ProcessDefaultInteraction(ref TriggerState trigger, int actionIndex { if (actionState->isButton) { - var actuation = ComputeMagnitude(ref trigger); + var actuation = trigger.magnitude; var pressPoint = controls[trigger.controlIndex] is ButtonControl button ? button.pressPointOrDefault : ButtonControl.s_GlobalDefaultButtonPressPoint; if (Mathf.Approximately(0f, actuation)) { @@ -2260,9 +2366,7 @@ private void ChangePhaseOfActionInternal(int actionIndex, TriggerState* actionSt // is handled correctly (case 1239551). newState.flags = actionState->flags; // Preserve flags. if (newPhase != InputActionPhase.Canceled) - newState.magnitude = trigger.haveMagnitude - ? trigger.magnitude - : ComputeMagnitude(trigger.bindingIndex, trigger.controlIndex); + newState.magnitude = trigger.magnitude; else newState.magnitude = 0; @@ -2271,6 +2375,12 @@ private void ChangePhaseOfActionInternal(int actionIndex, TriggerState* actionSt { newState.lastPerformedInUpdate = InputUpdate.s_UpdateStepCount; newState.lastCanceledInUpdate = actionState->lastCanceledInUpdate; + + // When we perform an action, we mark the event handled such that FireStateChangeNotifications() + // can then reset state monitors in the same group. + // NOTE: We don't consume for controls at binding complexity 1. Those we fire in unison. + if (controlGroupingAndComplexity[trigger.controlIndex * 2 + 1] > 1) + m_CurrentlyProcessingThisEvent.handled = true; } else if (newPhase == InputActionPhase.Canceled) { @@ -2435,18 +2545,25 @@ internal int GetBindingIndexInState(int mapIndex, int bindingIndexInMap) } // Iterators may not use unsafe code so do the detour here. - internal BindingState GetBindingState(int bindingIndex) + internal ref BindingState GetBindingState(int bindingIndex) { Debug.Assert(bindingIndex >= 0 && bindingIndex < totalBindingCount, "Binding index out of range"); - return bindingStates[bindingIndex]; + return ref bindingStates[bindingIndex]; } - internal InputBinding GetBinding(int bindingIndex) + internal ref InputBinding GetBinding(int bindingIndex) { Debug.Assert(bindingIndex >= 0 && bindingIndex < totalBindingCount, "Binding index out of range"); var mapIndex = bindingStates[bindingIndex].mapIndex; var bindingStartIndex = mapIndices[mapIndex].bindingStartIndex; - return maps[mapIndex].m_Bindings[bindingIndex - bindingStartIndex]; + return ref maps[mapIndex].m_Bindings[bindingIndex - bindingStartIndex]; + } + + internal InputActionMap GetActionMap(int bindingIndex) + { + Debug.Assert(bindingIndex >= 0 && bindingIndex < totalBindingCount, "Binding index out of range"); + var mapIndex = bindingStates[bindingIndex].mapIndex; + return maps[mapIndex]; } private void ResetInteractionStateAndCancelIfNecessary(int mapIndex, int bindingIndex, int interactionIndex) @@ -2540,9 +2657,9 @@ internal Type GetValueType(int bindingIndex, int controlIndex) return control.valueType; } - internal bool IsActuated(ref TriggerState trigger, float threshold = 0) + internal static bool IsActuated(ref TriggerState trigger, float threshold = 0) { - var magnitude = ComputeMagnitude(ref trigger); + var magnitude = trigger.magnitude; if (magnitude < 0) return true; if (Mathf.Approximately(threshold, 0)) @@ -2550,45 +2667,6 @@ internal bool IsActuated(ref TriggerState trigger, float threshold = 0) return magnitude >= threshold; } - internal float ComputeMagnitude(ref TriggerState trigger) - { - if (!trigger.haveMagnitude) - trigger.magnitude = ComputeMagnitude(trigger.bindingIndex, trigger.controlIndex); - return trigger.magnitude; - } - - private float ComputeMagnitude(int bindingIndex, int controlIndex) - { - Debug.Assert(bindingIndex >= 0 && bindingIndex < totalBindingCount, "Binding index is out of range"); - Debug.Assert(controlIndex >= 0 && controlIndex < totalControlCount, "Control index is out of range"); - - // If the control is part of a composite, it's the InputBindingComposite - // object that computes a magnitude for the whole composite. - if (bindingStates[bindingIndex].isPartOfComposite) - { - var compositeBindingIndex = bindingStates[bindingIndex].compositeOrCompositeBindingIndex; - var compositeIndex = bindingStates[compositeBindingIndex].compositeOrCompositeBindingIndex; - var compositeObject = composites[compositeIndex]; - - var context = new InputBindingCompositeContext - { - m_State = this, - m_BindingIndex = compositeBindingIndex - }; - - return compositeObject.EvaluateMagnitude(ref context); - } - - var control = controls[controlIndex]; - if (control.CheckStateIsAtDefault()) - { - // Avoid magnitude computation if control state is at default. - return 0; - } - - return control.EvaluateMagnitude(); - } - ////REVIEW: we can unify the reading paths once we have blittable type constraints internal void ReadValue(int bindingIndex, int controlIndex, void* buffer, int bufferSize, bool ignoreComposites = false) @@ -2733,6 +2811,10 @@ public float EvaluateCompositePartMagnitude(int bindingIndex, int partNumber) for (var i = 0; i < controlCount; ++i) { var control = controls[controlStartIndex + i]; + + // NOTE: We do *NOT* go to controlMagnitudes here. The reason is we may not yet have received the ProcessControlStateChange + // call for a specific control that is part of the composite and thus controlMagnitudes may not yet have been updated + // for a specific control. currentMagnitude = Mathf.Max(control.EvaluateMagnitude(), currentMagnitude); } } @@ -2740,6 +2822,32 @@ public float EvaluateCompositePartMagnitude(int bindingIndex, int partNumber) return currentMagnitude; } + internal double GetCompositePartPressTime(int bindingIndex, int partNumber) + { + Debug.Assert(bindingIndex >= 0 && bindingIndex < totalBindingCount, "Binding index is out of range"); + Debug.Assert(bindingStates[bindingIndex].isComposite, "Binding must be a composite"); + + var firstChildBindingIndex = bindingIndex + 1; + var pressTime = double.MaxValue; + for (var index = firstChildBindingIndex; index < totalBindingCount && bindingStates[index].isPartOfComposite; ++index) + { + ref var bindingState = ref bindingStates[index]; + + if (bindingState.partIndex != partNumber) + continue; + + // ReSharper disable once CompareOfFloatsByEqualityOperator + if (bindingState.pressTime != default && bindingState.pressTime < pressTime) + pressTime = bindingState.pressTime; + } + + // ReSharper disable once CompareOfFloatsByEqualityOperator + if (pressTime == double.MaxValue) + return -1d; + + return pressTime; + } + /// /// Read the value of the given part of a composite binding. /// @@ -3107,7 +3215,7 @@ private enum Flags /// Correlated to the it corresponds to by the index in the binding /// array. /// - [StructLayout(LayoutKind.Explicit, Size = 20)] + [StructLayout(LayoutKind.Explicit, Size = 32)] internal struct BindingState { [FieldOffset(0)] private byte m_ControlCount; @@ -3121,7 +3229,9 @@ internal struct BindingState [FieldOffset(10)] private ushort m_ProcessorStartIndex; [FieldOffset(12)] private ushort m_InteractionStartIndex; [FieldOffset(14)] private ushort m_ControlStartIndex; - [FieldOffset(16)] private int m_TriggerEventIdForComposite; + [FieldOffset(16)] private double m_PressTime; + [FieldOffset(24)] private int m_TriggerEventIdForComposite; + [FieldOffset(28)] private int __padding; // m_PressTime double must be aligned [Flags] public enum Flags @@ -3318,6 +3428,13 @@ public int triggerEventIdForComposite set => m_TriggerEventIdForComposite = value; } + // For now, we only record this for part bindings! + public double pressTime + { + get => m_PressTime; + set => m_PressTime = value; + } + public Flags flags { get => (Flags)m_Flags; @@ -3423,15 +3540,19 @@ public int partIndex [StructLayout(LayoutKind.Explicit, Size = 48)] public struct TriggerState { + public const int kMaxNumMaps = byte.MaxValue; + public const int kMaxNumControls = ushort.MaxValue; + public const int kMaxNumBindings = ushort.MaxValue; + [FieldOffset(0)] private byte m_Phase; [FieldOffset(1)] private byte m_Flags; [FieldOffset(2)] private byte m_MapIndex; // One byte available here. - ////REVIEW: can we condense these to floats? would save us a whopping 8 bytes - [FieldOffset(4)] private double m_Time; - [FieldOffset(12)] private double m_StartTime; - [FieldOffset(20)] private ushort m_ControlIndex; + [FieldOffset(4)] private ushort m_ControlIndex; // Two bytes available here. + ////REVIEW: can we condense these to floats? would save us a whopping 8 bytes + [FieldOffset(8)] private double m_Time; + [FieldOffset(16)] private double m_StartTime; [FieldOffset(24)] private ushort m_BindingIndex; [FieldOffset(26)] private ushort m_InteractionIndex; [FieldOffset(28)] private float m_Magnitude; @@ -3510,7 +3631,7 @@ public int mapIndex get => m_MapIndex; set { - if (value < 0 || value > byte.MaxValue) + if (value < 0 || value > kMaxNumMaps) throw new NotSupportedException("More than byte.MaxValue InputActionMaps in a single InputActionState"); m_MapIndex = (byte)value; } @@ -3523,7 +3644,7 @@ public int controlIndex { get { - if (m_ControlIndex == ushort.MaxValue) + if (m_ControlIndex == kMaxNumControls) return kInvalidIndex; return m_ControlIndex; } @@ -3533,7 +3654,7 @@ public int controlIndex m_ControlIndex = ushort.MaxValue; else { - if (value < 0 || value >= ushort.MaxValue) + if (value < 0 || value >= kMaxNumControls) throw new NotSupportedException("More than ushort.MaxValue-1 controls in a single InputActionState"); m_ControlIndex = (ushort)value; } @@ -3551,7 +3672,7 @@ public int bindingIndex get => m_BindingIndex; set { - if (value < 0 || value > ushort.MaxValue) + if (value < 0 || value > kMaxNumBindings) throw new NotSupportedException("More than ushort.MaxValue bindings in a single InputActionState"); m_BindingIndex = (ushort)value; } @@ -3837,6 +3958,7 @@ public struct UnmanagedMemory : IDisposable controlCount * sizeof(float) + // controlMagnitudes compositeCount * sizeof(float) + // compositeMagnitudes controlCount * sizeof(int) + // controlIndexToBindingIndex + controlCount * sizeof(ushort) * 2 + // controlGrouping actionCount * sizeof(ushort) * 2 + // actionBindingIndicesAndCounts bindingCount * sizeof(ushort) + // actionBindingIndices (controlCount + 31) / 32 * sizeof(int); // enabledControlsArray @@ -3868,7 +3990,7 @@ public struct UnmanagedMemory : IDisposable public InteractionState* interactionStates; /// - /// + /// Current remembered level of actuation of each of the controls in . /// /// /// This array is NOT kept strictly up to date. In fact, we only use it for conflict resolution @@ -3900,6 +4022,10 @@ public struct UnmanagedMemory : IDisposable ////REVIEW: make this an array of shorts rather than ints? public int* controlIndexToBindingIndex; + // Two shorts per control. First one is group number. Second one is complexity count. + public ushort* controlGroupingAndComplexity; + public bool controlGroupingInitialized; + public ActionMapIndices* mapIndices; public void Allocate(int mapCount, int actionCount, int bindingCount, int controlCount, int interactionCount, int compositeCount) @@ -3919,20 +4045,22 @@ public void Allocate(int mapCount, int actionCount, int bindingCount, int contro this.compositeCount = compositeCount; var numBytes = sizeInBytes; - var ptr = (byte*)UnsafeUtility.Malloc(numBytes, 4, Allocator.Persistent); + var ptr = (byte*)UnsafeUtility.Malloc(numBytes, 8, Allocator.Persistent); UnsafeUtility.MemClear(ptr, numBytes); basePtr = ptr; // NOTE: This depends on the individual structs being sufficiently aligned in order to not - // cause any misalignment here. - mapIndices = (ActionMapIndices*)ptr; ptr += mapCount * sizeof(ActionMapIndices); + // cause any misalignment here. TriggerState, InteractionState, and BindingState all + // contain doubles so put them first in memory to make sure they get proper alignment. actionStates = (TriggerState*)ptr; ptr += actionCount * sizeof(TriggerState); interactionStates = (InteractionState*)ptr; ptr += interactionCount * sizeof(InteractionState); bindingStates = (BindingState*)ptr; ptr += bindingCount * sizeof(BindingState); + mapIndices = (ActionMapIndices*)ptr; ptr += mapCount * sizeof(ActionMapIndices); controlMagnitudes = (float*)ptr; ptr += controlCount * sizeof(float); compositeMagnitudes = (float*)ptr; ptr += compositeCount * sizeof(float); controlIndexToBindingIndex = (int*)ptr; ptr += controlCount * sizeof(int); + controlGroupingAndComplexity = (ushort*)ptr; ptr += controlCount * sizeof(ushort) * 2; actionBindingIndicesAndCounts = (ushort*)ptr; ptr += actionCount * sizeof(ushort) * 2; actionBindingIndices = (ushort*)ptr; ptr += bindingCount * sizeof(ushort); enabledControls = (int*)ptr; ptr += (controlCount + 31) / 32 * sizeof(int); @@ -3953,6 +4081,7 @@ public void Dispose() controlMagnitudes = null; compositeMagnitudes = null; controlIndexToBindingIndex = null; + controlGroupingAndComplexity = null; actionBindingIndices = null; actionBindingIndicesAndCounts = null; @@ -3978,6 +4107,7 @@ public void CopyDataFrom(UnmanagedMemory memory) UnsafeUtility.MemCpy(controlMagnitudes, memory.controlMagnitudes, memory.controlCount * sizeof(float)); UnsafeUtility.MemCpy(compositeMagnitudes, memory.compositeMagnitudes, memory.compositeCount * sizeof(float)); UnsafeUtility.MemCpy(controlIndexToBindingIndex, memory.controlIndexToBindingIndex, memory.controlCount * sizeof(int)); + UnsafeUtility.MemCpy(controlGroupingAndComplexity, memory.controlGroupingAndComplexity, memory.controlCount * sizeof(ushort) * 2); UnsafeUtility.MemCpy(actionBindingIndicesAndCounts, memory.actionBindingIndicesAndCounts, memory.actionCount * sizeof(ushort) * 2); UnsafeUtility.MemCpy(actionBindingIndices, memory.actionBindingIndices, memory.bindingCount * sizeof(ushort)); UnsafeUtility.MemCpy(enabledControls, memory.enabledControls, (memory.controlCount + 31) / 32 * sizeof(int)); diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingCompositeContext.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingCompositeContext.cs index cd20ba13db..c3ef444589 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingCompositeContext.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingCompositeContext.cs @@ -322,6 +322,24 @@ public object ReadValueAsObject(int partNumber) return m_State.ReadCompositePartValueAsObject(m_BindingIndex, partNumber); } + /// + /// Return the timestamp (see ) for when the given + /// binding part crossed the button press threshold (see ). + /// + /// Number of the part to read. This is assigned + /// automatically by the input system and should be treated as an opaque + /// identifier. + /// Returns the time at which the given part binding moved into "press" state or 0 if there's + /// current no press. + /// + /// If the given part has more than a single binding and/or more than a single bound control, the earliest + /// press time is returned. + /// + public double GetPressTime(int partNumber) + { + return m_State.GetCompositePartPressTime(m_BindingIndex, partNumber); + } + internal InputActionState m_State; internal int m_BindingIndex; diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputInteractionContext.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputInteractionContext.cs index a2fec85499..60db9dd869 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputInteractionContext.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputInteractionContext.cs @@ -103,7 +103,7 @@ internal set /// public float ComputeMagnitude() { - return m_State.ComputeMagnitude(ref m_TriggerState); + return m_TriggerState.magnitude; } /// @@ -116,7 +116,7 @@ public float ComputeMagnitude() /// public bool ControlIsActuated(float threshold = 0) { - return m_State.IsActuated(ref m_TriggerState, threshold); + return InputActionState.IsActuated(ref m_TriggerState, threshold); } /// diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/ButtonControl.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/ButtonControl.cs index db2b360c1a..b5bb705318 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Controls/ButtonControl.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/ButtonControl.cs @@ -75,7 +75,7 @@ public ButtonControl() /// True if crosses the threshold to be considered pressed. /// /// - public bool IsValueConsideredPressed(float value) + public new bool IsValueConsideredPressed(float value) { return value >= pressPointOrDefault; } diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControl.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControl.cs index 63b8d38b4e..e3a7add93c 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Controls/InputControl.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/InputControl.cs @@ -962,6 +962,13 @@ internal int GetDeviceIndex() return deviceIndex; } + internal bool IsValueConsideredPressed(float value) + { + if (isButton) + return ((ButtonControl)this).IsValueConsideredPressed(value); + return value >= ButtonControl.s_GlobalDefaultButtonPressPoint; + } + internal virtual void AddProcessor(object first) { } diff --git a/Packages/com.unity.inputsystem/InputSystem/Events/InputEventPtr.cs b/Packages/com.unity.inputsystem/InputSystem/Events/InputEventPtr.cs index 64e3c7d842..1ca8a6b043 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Events/InputEventPtr.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Events/InputEventPtr.cs @@ -38,9 +38,18 @@ public InputEventPtr(InputEvent* eventPtr) public bool valid => m_EventPtr != null; /// - /// + /// Whether the event is considered "handled" and should not be processed further. /// - /// + /// + /// This is used in two ways. Setting it from inside will + /// cause the event to not be processed further. If it is a or + /// , the targeted by the event will + /// not receive the state change. + /// + /// Setting this flag from inside a state change monitor (see ) + /// will prevent other monitors on the same not receiving the state change. + /// + /// The event pointer instance is not . public bool handled { get diff --git a/Packages/com.unity.inputsystem/InputSystem/InputFeatureNames.cs b/Packages/com.unity.inputsystem/InputSystem/InputFeatureNames.cs index 3cbfa4f27a..e2b2dd1f22 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputFeatureNames.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputFeatureNames.cs @@ -4,6 +4,7 @@ internal static class InputFeatureNames { public const string kRunPlayerUpdatesInEditMode = "RUN_PLAYER_UPDATES_IN_EDIT_MODE"; public const string kDisableUnityRemoteSupport = "DISABLE_UNITY_REMOTE_SUPPORT"; + public const string kDisableShortcutSupport = "DISABLE_SHORTCUT_SUPPORT"; ////TODO: In v2, kill this. public const string kUseWindowsGamingInputBackend = "USE_WINDOWS_GAMING_INPUT_BACKEND"; } } diff --git a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs old mode 100755 new mode 100644 index dd27b573d8..8795440af5 --- a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs @@ -50,7 +50,7 @@ namespace UnityEngine.InputSystem /// /// Manages devices, layouts, and event processing. /// - internal class InputManager + internal partial class InputManager { public ReadOnlyArray devices => new ReadOnlyArray(m_Devices, 0, m_DevicesCount); @@ -1644,103 +1644,6 @@ public void EnableOrDisableDevice(InputDevice device, bool enable, DeviceDisable DelegateHelpers.InvokeCallbacksSafe(ref m_DeviceChangeListeners, device, deviceChange, "InputSystem.onDeviceChange"); } - ////TODO: support combining monitors for bitfields - public void AddStateChangeMonitor(InputControl control, IInputStateChangeMonitor monitor, long monitorIndex) - { - Debug.Assert(m_DevicesCount > 0); - - var device = control.device; - var deviceIndex = device.m_DeviceIndex; - Debug.Assert(deviceIndex != InputDevice.kInvalidDeviceIndex); - - // Allocate/reallocate monitor arrays, if necessary. - // We lazy-sync it to array of devices. - if (m_StateChangeMonitors == null) - m_StateChangeMonitors = new StateChangeMonitorsForDevice[m_DevicesCount]; - else if (m_StateChangeMonitors.Length <= deviceIndex) - Array.Resize(ref m_StateChangeMonitors, m_DevicesCount); - - // If we have removed monitors - if (!isProcessingEvents && m_StateChangeMonitors[deviceIndex].needToCompactArrays) - m_StateChangeMonitors[deviceIndex].CompactArrays(); - - // Add record. - m_StateChangeMonitors[deviceIndex].Add(control, monitor, monitorIndex); - } - - private void RemoveStateChangeMonitors(InputDevice device) - { - if (m_StateChangeMonitors == null) - return; - - var deviceIndex = device.m_DeviceIndex; - Debug.Assert(deviceIndex != InputDevice.kInvalidDeviceIndex); - - if (deviceIndex >= m_StateChangeMonitors.Length) - return; - - m_StateChangeMonitors[deviceIndex].Clear(); - - // Clear timeouts pending on any control on the device. - for (var i = 0; i < m_StateChangeMonitorTimeouts.length; ++i) - if (m_StateChangeMonitorTimeouts[i].control?.device == device) - m_StateChangeMonitorTimeouts[i] = default; - } - - public void RemoveStateChangeMonitor(InputControl control, IInputStateChangeMonitor monitor, long monitorIndex) - { - if (m_StateChangeMonitors == null) - return; - - var device = control.device; - var deviceIndex = device.m_DeviceIndex; - - // Ignore if device has already been removed. - if (deviceIndex == InputDevice.kInvalidDeviceIndex) - return; - - // Ignore if there are no state monitors set up for the device. - if (deviceIndex >= m_StateChangeMonitors.Length) - return; - - m_StateChangeMonitors[deviceIndex].Remove(monitor, monitorIndex, isProcessingEvents); - - // Remove pending timeouts on the monitor. - for (var i = 0; i < m_StateChangeMonitorTimeouts.length; ++i) - if (m_StateChangeMonitorTimeouts[i].monitor == monitor && - m_StateChangeMonitorTimeouts[i].monitorIndex == monitorIndex) - m_StateChangeMonitorTimeouts[i] = default; - } - - public void AddStateChangeMonitorTimeout(InputControl control, IInputStateChangeMonitor monitor, double time, long monitorIndex, int timerIndex) - { - m_StateChangeMonitorTimeouts.Append( - new StateChangeMonitorTimeout - { - control = control, - time = time, - monitor = monitor, - monitorIndex = monitorIndex, - timerIndex = timerIndex, - }); - } - - public void RemoveStateChangeMonitorTimeout(IInputStateChangeMonitor monitor, long monitorIndex, int timerIndex) - { - var timeoutCount = m_StateChangeMonitorTimeouts.length; - for (var i = 0; i < timeoutCount; ++i) - { - ////REVIEW: can we avoid the repeated array lookups without copying the struct out? - if (ReferenceEquals(m_StateChangeMonitorTimeouts[i].monitor, monitor) - && m_StateChangeMonitorTimeouts[i].monitorIndex == monitorIndex - && m_StateChangeMonitorTimeouts[i].timerIndex == timerIndex) - { - m_StateChangeMonitorTimeouts[i] = default; - break; - } - } - } - private unsafe void QueueEvent(InputEvent* eventPtr) { // If we're currently in OnUpdate(), the m_InputEventStream will be open. In that case, @@ -2089,123 +1992,6 @@ internal struct AvailableDevice internal IInputDiagnostics m_Diagnostics; #endif - // Maps a single control to an action interested in the control. If - // multiple actions are interested in the same control, we will end up - // processing the control repeatedly but we assume this is the exception - // and so optimize for the case where there's only one action going to - // a control. - // - // Split into two structures to keep data needed only when there is an - // actual value change out of the data we need for doing the scanning. - internal struct StateChangeMonitorListener - { - public InputControl control; - public IInputStateChangeMonitor monitor; - public long monitorIndex; - } - internal struct StateChangeMonitorsForDevice - { - public MemoryHelpers.BitRegion[] memoryRegions; - public StateChangeMonitorListener[] listeners; - public DynamicBitfield signalled; - public bool needToCompactArrays; - - public int count => signalled.length; - - public void Add(InputControl control, IInputStateChangeMonitor monitor, long monitorIndex) - { - // NOTE: This method must only *append* to arrays. This way we can safely add data while traversing - // the arrays in FireStateChangeNotifications. Note that appending *may* mean that the arrays - // are switched to larger arrays. - - // Record listener. - var listenerCount = signalled.length; - ArrayHelpers.AppendWithCapacity(ref listeners, ref listenerCount, - new StateChangeMonitorListener {monitor = monitor, monitorIndex = monitorIndex, control = control}); - - // Record memory region. - ref var controlStateBlock = ref control.m_StateBlock; - var memoryRegionCount = signalled.length; - ArrayHelpers.AppendWithCapacity(ref memoryRegions, ref memoryRegionCount, - new MemoryHelpers.BitRegion(controlStateBlock.byteOffset - control.device.stateBlock.byteOffset, - controlStateBlock.bitOffset, controlStateBlock.sizeInBits)); - - signalled.SetLength(signalled.length + 1); - } - - public void Remove(IInputStateChangeMonitor monitor, long monitorIndex, bool deferRemoval) - { - if (listeners == null) - return; - - for (var i = 0; i < signalled.length; ++i) - if (ReferenceEquals(listeners[i].monitor, monitor) && listeners[i].monitorIndex == monitorIndex) - { - if (deferRemoval) - { - listeners[i] = default; - memoryRegions[i] = default; - signalled.ClearBit(i); - needToCompactArrays = true; - } - else - { - RemoveAt(i); - } - break; - } - } - - public void Clear() - { - // We don't actually release memory we've potentially allocated but rather just reset - // our count to zero. - listeners.Clear(count); - signalled.SetLength(0); - - needToCompactArrays = false; - } - - public void CompactArrays() - { - for (var i = count - 1; i >= 0; --i) - { - var memoryRegion = memoryRegions[i]; - if (memoryRegion.sizeInBits != 0) - continue; - - RemoveAt(i); - } - needToCompactArrays = false; - } - - private void RemoveAt(int i) - { - var numListeners = count; - var numMemoryRegions = count; - listeners.EraseAtWithCapacity(ref numListeners, i); - memoryRegions.EraseAtWithCapacity(ref numMemoryRegions, i); - signalled.SetLength(count - 1); - } - } - - // Indices correspond with those in m_Devices. - internal StateChangeMonitorsForDevice[] m_StateChangeMonitors; - - /// - /// Record for a timeout installed on a state change monitor. - /// - private struct StateChangeMonitorTimeout - { - public InputControl control; - public double time; - public IInputStateChangeMonitor monitor; - public long monitorIndex; - public int timerIndex; - } - - private InlinedArray m_StateChangeMonitorTimeouts; - ////REVIEW: Make it so that device names *always* have a number appended? (i.e. Gamepad1, Gamepad2, etc. instead of Gamepad, Gamepad1, etc) private void MakeDeviceNameUnique(InputDevice device) @@ -3523,148 +3309,6 @@ private void InvokeAfterUpdateCallback(InputUpdateType updateType) "InputSystem.onAfterUpdate"); } - // NOTE: 'newState' can be a subset of the full state stored at 'oldState'. In this case, - // 'newStateOffsetInBytes' must give the offset into the full state and 'newStateSizeInBytes' must - // give the size of memory slice to be updated. - private unsafe bool ProcessStateChangeMonitors(int deviceIndex, void* newStateFromEvent, void* oldStateOfDevice, uint newStateSizeInBytes, uint newStateOffsetInBytes) - { - if (m_StateChangeMonitors == null) - return false; - - // We resize the monitor arrays only when someone adds to them so they - // may be out of sync with the size of m_Devices. - if (deviceIndex >= m_StateChangeMonitors.Length) - return false; - - var memoryRegions = m_StateChangeMonitors[deviceIndex].memoryRegions; - if (memoryRegions == null) - return false; // No one cares about state changes on this device. - - var numMonitors = m_StateChangeMonitors[deviceIndex].count; - var signalled = false; - var signals = m_StateChangeMonitors[deviceIndex].signalled; - var haveChangedSignalsBitfield = false; - - // For every memory region that overlaps what we got in the event, compare memory contents - // between the old device state and what's in the event. If the contents different, the - // respective state monitor signals. - var newEventMemoryRegion = new MemoryHelpers.BitRegion(newStateOffsetInBytes, 0, newStateSizeInBytes * 8); - for (var i = 0; i < numMonitors; ++i) - { - var memoryRegion = memoryRegions[i]; - - // Check if the monitor record has been wiped in the meantime. If so, remove it. - if (memoryRegion.sizeInBits == 0) - { - ////REVIEW: Do we really care? It is nice that it's predictable this way but hardly a hard requirement - // NOTE: We're using EraseAtWithCapacity here rather than EraseAtByMovingTail to preserve - // order which makes the order of callbacks somewhat more predictable. - - var listenerCount = numMonitors; - var memoryRegionCount = numMonitors; - m_StateChangeMonitors[deviceIndex].listeners.EraseAtWithCapacity(ref listenerCount, i); - memoryRegions.EraseAtWithCapacity(ref memoryRegionCount, i); - signals.SetLength(numMonitors - 1); - haveChangedSignalsBitfield = true; - --numMonitors; - --i; - continue; - } - - var overlap = newEventMemoryRegion.Overlap(memoryRegion); - if (overlap.isEmpty || MemoryHelpers.Compare(oldStateOfDevice, (byte*)newStateFromEvent - newStateOffsetInBytes, overlap)) - continue; - - signals.SetBit(i); - haveChangedSignalsBitfield = true; - signalled = true; - } - - if (haveChangedSignalsBitfield) - m_StateChangeMonitors[deviceIndex].signalled = signals; - - m_StateChangeMonitors[deviceIndex].needToCompactArrays = false; - - return signalled; - } - - private unsafe void FireStateChangeNotifications(int deviceIndex, double internalTime, InputEvent* eventPtr) - { - Debug.Assert(m_StateChangeMonitors != null); - Debug.Assert(m_StateChangeMonitors.Length > deviceIndex); - - // NOTE: This method must be safe for mutating the state change monitor arrays from *within* - // NotifyControlStateChanged()! This includes all monitors for the device being wiped - // completely or arbitrary additions and removals having occurred. - - ref var signals = ref m_StateChangeMonitors[deviceIndex].signalled; - ref var listeners = ref m_StateChangeMonitors[deviceIndex].listeners; - var time = internalTime - InputRuntime.s_CurrentTimeOffsetToRealtimeSinceStartup; - - // Call IStateChangeMonitor.NotifyControlStateChange for every monitor that is in - // signalled state. - for (var i = 0; i < signals.length; ++i) - { - if (!signals.TestBit(i)) - continue; - - var listener = listeners[i]; - try - { - listener.monitor.NotifyControlStateChanged(listener.control, time, eventPtr, - listener.monitorIndex); - } - catch (Exception exception) - { - Debug.LogError( - $"Exception '{exception.GetType().Name}' thrown from state change monitor '{listener.monitor.GetType().Name}' on '{listener.control}'"); - Debug.LogException(exception); - } - - signals.ClearBit(i); - } - } - - private void ProcessStateChangeMonitorTimeouts() - { - if (m_StateChangeMonitorTimeouts.length == 0) - return; - - // Go through the list and both trigger expired timers and remove any irrelevant - // ones by compacting the array. - // NOTE: We do not actually release any memory we may have allocated. - var currentTime = m_Runtime.currentTime - InputRuntime.s_CurrentTimeOffsetToRealtimeSinceStartup; - var remainingTimeoutCount = 0; - for (var i = 0; i < m_StateChangeMonitorTimeouts.length; ++i) - { - // If we have reset this entry in RemoveStateChangeMonitorTimeouts(), - // skip over it and let compaction get rid of it. - if (m_StateChangeMonitorTimeouts[i].control == null) - continue; - - var timerExpirationTime = m_StateChangeMonitorTimeouts[i].time; - if (timerExpirationTime <= currentTime) - { - var timeout = m_StateChangeMonitorTimeouts[i]; - timeout.monitor.NotifyTimerExpired(timeout.control, - currentTime, timeout.monitorIndex, timeout.timerIndex); - - // Compaction will get rid of the entry. - } - else - { - // Rather than repeatedly calling RemoveAt() and thus potentially - // moving the same data over and over again, we compact the array - // on the fly and move entries in the array down as needed. - if (i != remainingTimeoutCount) - m_StateChangeMonitorTimeouts[remainingTimeoutCount] = m_StateChangeMonitorTimeouts[i]; - ++remainingTimeoutCount; - } - } - - m_StateChangeMonitorTimeouts.SetLength(remainingTimeoutCount); - } - internal unsafe bool UpdateState(InputDevice device, InputEvent* eventPtr, InputUpdateType updateType) { Debug.Assert(eventPtr != null, "Received NULL event ptr"); @@ -3744,6 +3388,10 @@ internal unsafe bool UpdateState(InputDevice device, InputEvent* eventPtr, Input var deviceBuffer = (byte*)InputStateBuffers.GetFrontBufferForDevice(deviceIndex); + // If state monitors need to be re-sorted, do it now. + // NOTE: This must happen with the monitors in non-signalled state! + SortStateChangeMonitorsIfNecessary(deviceIndex); + // Before we update state, let change monitors compare the old and the new state. // We do this instead of first updating the front buffer and then comparing to the // back buffer as that would require a buffer flip for each state change in order diff --git a/Packages/com.unity.inputsystem/InputSystem/InputManagerStateMonitors.cs b/Packages/com.unity.inputsystem/InputSystem/InputManagerStateMonitors.cs new file mode 100644 index 0000000000..fb42f66106 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/InputManagerStateMonitors.cs @@ -0,0 +1,452 @@ +using System; +using Unity.Collections.LowLevel.Unsafe; +using UnityEngine.InputSystem.LowLevel; +using UnityEngine.InputSystem.Utilities; + +namespace UnityEngine.InputSystem +{ + internal partial class InputManager + { + // Indices correspond with those in m_Devices. + internal StateChangeMonitorsForDevice[] m_StateChangeMonitors; + private InlinedArray m_StateChangeMonitorTimeouts; + + ////TODO: support combining monitors for bitfields + public void AddStateChangeMonitor(InputControl control, IInputStateChangeMonitor monitor, long monitorIndex, uint groupIndex) + { + Debug.Assert(m_DevicesCount > 0); + + var device = control.device; + var deviceIndex = device.m_DeviceIndex; + Debug.Assert(deviceIndex != InputDevice.kInvalidDeviceIndex); + + // Allocate/reallocate monitor arrays, if necessary. + // We lazy-sync it to array of devices. + if (m_StateChangeMonitors == null) + m_StateChangeMonitors = new StateChangeMonitorsForDevice[m_DevicesCount]; + else if (m_StateChangeMonitors.Length <= deviceIndex) + Array.Resize(ref m_StateChangeMonitors, m_DevicesCount); + + // If we have removed monitors + if (!isProcessingEvents && m_StateChangeMonitors[deviceIndex].needToCompactArrays) + m_StateChangeMonitors[deviceIndex].CompactArrays(); + + // Add record. + m_StateChangeMonitors[deviceIndex].Add(control, monitor, monitorIndex, groupIndex); + } + + private void RemoveStateChangeMonitors(InputDevice device) + { + if (m_StateChangeMonitors == null) + return; + + var deviceIndex = device.m_DeviceIndex; + Debug.Assert(deviceIndex != InputDevice.kInvalidDeviceIndex); + + if (deviceIndex >= m_StateChangeMonitors.Length) + return; + + m_StateChangeMonitors[deviceIndex].Clear(); + + // Clear timeouts pending on any control on the device. + for (var i = 0; i < m_StateChangeMonitorTimeouts.length; ++i) + if (m_StateChangeMonitorTimeouts[i].control?.device == device) + m_StateChangeMonitorTimeouts[i] = default; + } + + public void RemoveStateChangeMonitor(InputControl control, IInputStateChangeMonitor monitor, long monitorIndex) + { + if (m_StateChangeMonitors == null) + return; + + var device = control.device; + var deviceIndex = device.m_DeviceIndex; + + // Ignore if device has already been removed. + if (deviceIndex == InputDevice.kInvalidDeviceIndex) + return; + + // Ignore if there are no state monitors set up for the device. + if (deviceIndex >= m_StateChangeMonitors.Length) + return; + + m_StateChangeMonitors[deviceIndex].Remove(monitor, monitorIndex, isProcessingEvents); + + // Remove pending timeouts on the monitor. + for (var i = 0; i < m_StateChangeMonitorTimeouts.length; ++i) + if (m_StateChangeMonitorTimeouts[i].monitor == monitor && + m_StateChangeMonitorTimeouts[i].monitorIndex == monitorIndex) + m_StateChangeMonitorTimeouts[i] = default; + } + + public void AddStateChangeMonitorTimeout(InputControl control, IInputStateChangeMonitor monitor, double time, long monitorIndex, int timerIndex) + { + m_StateChangeMonitorTimeouts.Append( + new StateChangeMonitorTimeout + { + control = control, + time = time, + monitor = monitor, + monitorIndex = monitorIndex, + timerIndex = timerIndex, + }); + } + + public void RemoveStateChangeMonitorTimeout(IInputStateChangeMonitor monitor, long monitorIndex, int timerIndex) + { + var timeoutCount = m_StateChangeMonitorTimeouts.length; + for (var i = 0; i < timeoutCount; ++i) + { + ////REVIEW: can we avoid the repeated array lookups without copying the struct out? + if (ReferenceEquals(m_StateChangeMonitorTimeouts[i].monitor, monitor) + && m_StateChangeMonitorTimeouts[i].monitorIndex == monitorIndex + && m_StateChangeMonitorTimeouts[i].timerIndex == timerIndex) + { + m_StateChangeMonitorTimeouts[i] = default; + break; + } + } + } + + private void SortStateChangeMonitorsIfNecessary(int deviceIndex) + { + if (m_StateChangeMonitors != null && deviceIndex < m_StateChangeMonitors.Length && + m_StateChangeMonitors[deviceIndex].needToUpdateOrderingOfMonitors) + m_StateChangeMonitors[deviceIndex].SortMonitorsByIndex(); + } + + public void SignalStateChangeMonitor(InputControl control, IInputStateChangeMonitor monitor) + { + var device = control.device; + var deviceIndex = device.m_DeviceIndex; + + ref var monitorsForDevice = ref m_StateChangeMonitors[deviceIndex]; + for (var i = 0; i < monitorsForDevice.signalled.length; ++i) + { + SortStateChangeMonitorsIfNecessary(i); + + ref var listener = ref monitorsForDevice.listeners[i]; + if (listener.control == control && listener.monitor == monitor) + monitorsForDevice.signalled.SetBit(i); + } + } + + public unsafe void FireStateChangeNotifications() + { + var time = m_Runtime.currentTime; + var count = Math.Min(m_StateChangeMonitors.LengthSafe(), m_DevicesCount); + for (var i = 0; i < count; ++i) + FireStateChangeNotifications(i, time, null); + } + + // Record for a timeout installed on a state change monitor. + private struct StateChangeMonitorTimeout + { + public InputControl control; + public double time; + public IInputStateChangeMonitor monitor; + public long monitorIndex; + public int timerIndex; + } + + // Maps a single control to an action interested in the control. If + // multiple actions are interested in the same control, we will end up + // processing the control repeatedly but we assume this is the exception + // and so optimize for the case where there's only one action going to + // a control. + // + // Split into two structures to keep data needed only when there is an + // actual value change out of the data we need for doing the scanning. + internal struct StateChangeMonitorListener + { + public InputControl control; + public IInputStateChangeMonitor monitor; + public long monitorIndex; + public uint groupIndex; + } + + internal struct StateChangeMonitorsForDevice + { + public MemoryHelpers.BitRegion[] memoryRegions; + public StateChangeMonitorListener[] listeners; + public DynamicBitfield signalled; + public bool needToUpdateOrderingOfMonitors; + public bool needToCompactArrays; + + public int count => signalled.length; + + public void Add(InputControl control, IInputStateChangeMonitor monitor, long monitorIndex, uint groupIndex) + { + // NOTE: This method must only *append* to arrays. This way we can safely add data while traversing + // the arrays in FireStateChangeNotifications. Note that appending *may* mean that the arrays + // are switched to larger arrays. + + // Record listener. + var listenerCount = signalled.length; + ArrayHelpers.AppendWithCapacity(ref listeners, ref listenerCount, + new StateChangeMonitorListener + { monitor = monitor, monitorIndex = monitorIndex, groupIndex = groupIndex, control = control }); + + // Record memory region. + ref var controlStateBlock = ref control.m_StateBlock; + var memoryRegionCount = signalled.length; + ArrayHelpers.AppendWithCapacity(ref memoryRegions, ref memoryRegionCount, + new MemoryHelpers.BitRegion(controlStateBlock.byteOffset - control.device.stateBlock.byteOffset, + controlStateBlock.bitOffset, controlStateBlock.sizeInBits)); + + signalled.SetLength(signalled.length + 1); + + needToUpdateOrderingOfMonitors = true; + } + + public void Remove(IInputStateChangeMonitor monitor, long monitorIndex, bool deferRemoval) + { + if (listeners == null) + return; + + for (var i = 0; i < signalled.length; ++i) + if (ReferenceEquals(listeners[i].monitor, monitor) && listeners[i].monitorIndex == monitorIndex) + { + if (deferRemoval) + { + listeners[i] = default; + memoryRegions[i] = default; + signalled.ClearBit(i); + needToCompactArrays = true; + } + else + { + RemoveAt(i); + } + + break; + } + } + + public void Clear() + { + // We don't actually release memory we've potentially allocated but rather just reset + // our count to zero. + listeners.Clear(count); + signalled.SetLength(0); + + needToCompactArrays = false; + } + + public void CompactArrays() + { + for (var i = count - 1; i >= 0; --i) + { + var memoryRegion = memoryRegions[i]; + if (memoryRegion.sizeInBits != 0) + continue; + + RemoveAt(i); + } + + needToCompactArrays = false; + } + + private void RemoveAt(int i) + { + var numListeners = count; + var numMemoryRegions = count; + listeners.EraseAtWithCapacity(ref numListeners, i); + memoryRegions.EraseAtWithCapacity(ref numMemoryRegions, i); + signalled.SetLength(count - 1); + } + + public void SortMonitorsByIndex() + { + // Insertion sort. + for (var i = 1; i < signalled.length; ++i) + { + for (var j = i; j > 0 && listeners[j - 1].monitorIndex < listeners[j].monitorIndex; --j) + { + listeners.SwapElements(j, j - 1); + memoryRegions.SwapElements(j, j - 1); + + // We can ignore the `signalled` array here as we call this method only + // when all monitors are in non-signalled state. + } + } + + needToUpdateOrderingOfMonitors = false; + } + } + + // NOTE: 'newState' can be a subset of the full state stored at 'oldState'. In this case, + // 'newStateOffsetInBytes' must give the offset into the full state and 'newStateSizeInBytes' must + // give the size of memory slice to be updated. + private unsafe bool ProcessStateChangeMonitors(int deviceIndex, void* newStateFromEvent, void* oldStateOfDevice, uint newStateSizeInBytes, uint newStateOffsetInBytes) + { + if (m_StateChangeMonitors == null) + return false; + + // We resize the monitor arrays only when someone adds to them so they + // may be out of sync with the size of m_Devices. + if (deviceIndex >= m_StateChangeMonitors.Length) + return false; + + var memoryRegions = m_StateChangeMonitors[deviceIndex].memoryRegions; + if (memoryRegions == null) + return false; // No one cares about state changes on this device. + + var numMonitors = m_StateChangeMonitors[deviceIndex].count; + var signalled = false; + var signals = m_StateChangeMonitors[deviceIndex].signalled; + var haveChangedSignalsBitfield = false; + + // For every memory region that overlaps what we got in the event, compare memory contents + // between the old device state and what's in the event. If the contents different, the + // respective state monitor signals. + var newEventMemoryRegion = new MemoryHelpers.BitRegion(newStateOffsetInBytes, 0, newStateSizeInBytes * 8); + for (var i = 0; i < numMonitors; ++i) + { + var memoryRegion = memoryRegions[i]; + + // Check if the monitor record has been wiped in the meantime. If so, remove it. + if (memoryRegion.sizeInBits == 0) + { + ////REVIEW: Do we really care? It is nice that it's predictable this way but hardly a hard requirement + // NOTE: We're using EraseAtWithCapacity here rather than EraseAtByMovingTail to preserve + // order which makes the order of callbacks somewhat more predictable. + + var listenerCount = numMonitors; + var memoryRegionCount = numMonitors; + m_StateChangeMonitors[deviceIndex].listeners.EraseAtWithCapacity(ref listenerCount, i); + memoryRegions.EraseAtWithCapacity(ref memoryRegionCount, i); + signals.SetLength(numMonitors - 1); + haveChangedSignalsBitfield = true; + --numMonitors; + --i; + continue; + } + + var overlap = newEventMemoryRegion.Overlap(memoryRegion); + if (overlap.isEmpty || MemoryHelpers.Compare(oldStateOfDevice, (byte*)newStateFromEvent - newStateOffsetInBytes, overlap)) + continue; + + signals.SetBit(i); + haveChangedSignalsBitfield = true; + signalled = true; + } + + if (haveChangedSignalsBitfield) + m_StateChangeMonitors[deviceIndex].signalled = signals; + + m_StateChangeMonitors[deviceIndex].needToCompactArrays = false; + + return signalled; + } + + internal unsafe void FireStateChangeNotifications(int deviceIndex, double internalTime, InputEvent* eventPtr) + { + Debug.Assert(m_StateChangeMonitors != null); + Debug.Assert(m_StateChangeMonitors.Length > deviceIndex); + + // NOTE: This method must be safe for mutating the state change monitor arrays from *within* + // NotifyControlStateChanged()! This includes all monitors for the device being wiped + // completely or arbitrary additions and removals having occurred. + + ref var signals = ref m_StateChangeMonitors[deviceIndex].signalled; + ref var listeners = ref m_StateChangeMonitors[deviceIndex].listeners; + var time = internalTime - InputRuntime.s_CurrentTimeOffsetToRealtimeSinceStartup; + + // If we don't have an event, gives us as dummy, invalid instance. + // What matters is that InputEventPtr.valid is false for these. + var tempEvent = new InputEvent(new FourCC('F', 'A', 'K', 'E'), InputEvent.kBaseEventSize, -1, internalTime); + if (eventPtr == null) + eventPtr = (InputEvent*)UnsafeUtility.AddressOf(ref tempEvent); + + // Call IStateChangeMonitor.NotifyControlStateChange for every monitor that is in + // signalled state. + eventPtr->handled = false; + for (var i = 0; i < signals.length; ++i) + { + if (!signals.TestBit(i)) + continue; + + var listener = listeners[i]; + try + { + listener.monitor.NotifyControlStateChanged(listener.control, time, eventPtr, + listener.monitorIndex); + } + catch (Exception exception) + { + Debug.LogError( + $"Exception '{exception.GetType().Name}' thrown from state change monitor '{listener.monitor.GetType().Name}' on '{listener.control}'"); + Debug.LogException(exception); + } + + // If the monitor signalled that it has processed the state change, reset all signalled + // state monitors in the same group. This is what causes "SHIFT+B" to prevent "B" from + // also triggering. + if (eventPtr->handled) + { + var groupIndex = listeners[i].groupIndex; + for (var n = i + 1; n < signals.length; ++n) + { + // NOTE: We restrict the preemption logic here to a single monitor. Otherwise, + // we will have to require that group indices are stable *between* + // monitors. Two separate InputActionStates, for example, would have to + // agree on group indices that valid *between* the two states or we end + // up preempting unrelated inputs. + // + // Note that this implies there there is *NO* preemption between singleton + // InputActions. This isn't intuitive. + if (listeners[n].groupIndex == groupIndex && listeners[n].monitor == listener.monitor) + signals.ClearBit(n); + } + + // Need to reset it back to false as we may have more signalled state monitors that + // aren't in the same group (i.e. have independent inputs). + eventPtr->handled = false; + } + + signals.ClearBit(i); + } + } + + private void ProcessStateChangeMonitorTimeouts() + { + if (m_StateChangeMonitorTimeouts.length == 0) + return; + + // Go through the list and both trigger expired timers and remove any irrelevant + // ones by compacting the array. + // NOTE: We do not actually release any memory we may have allocated. + var currentTime = m_Runtime.currentTime - InputRuntime.s_CurrentTimeOffsetToRealtimeSinceStartup; + var remainingTimeoutCount = 0; + for (var i = 0; i < m_StateChangeMonitorTimeouts.length; ++i) + { + // If we have reset this entry in RemoveStateChangeMonitorTimeouts(), + // skip over it and let compaction get rid of it. + if (m_StateChangeMonitorTimeouts[i].control == null) + continue; + + var timerExpirationTime = m_StateChangeMonitorTimeouts[i].time; + if (timerExpirationTime <= currentTime) + { + var timeout = m_StateChangeMonitorTimeouts[i]; + timeout.monitor.NotifyTimerExpired(timeout.control, + currentTime, timeout.monitorIndex, timeout.timerIndex); + + // Compaction will get rid of the entry. + } + else + { + // Rather than repeatedly calling RemoveAt() and thus potentially + // moving the same data over and over again, we compact the array + // on the fly and move entries in the array down as needed. + if (i != remainingTimeoutCount) + m_StateChangeMonitorTimeouts[remainingTimeoutCount] = m_StateChangeMonitorTimeouts[i]; + ++remainingTimeoutCount; + } + } + + m_StateChangeMonitorTimeouts.SetLength(remainingTimeoutCount); + } + } +} diff --git a/Packages/com.unity.inputsystem/InputSystem/InputManagerStateMonitors.cs.meta b/Packages/com.unity.inputsystem/InputSystem/InputManagerStateMonitors.cs.meta new file mode 100644 index 0000000000..3c2dfeb43e --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/InputManagerStateMonitors.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1407189163374c4aa71b9689243809eb +timeCreated: 1647431896 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs index 177dad179e..2754dec550 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs @@ -2293,7 +2293,7 @@ public static int FindControls(string path, ref InputControlList + /// (see /// are usually a more efficient and convenient way to set this up. /// /// Delegate reference is null. diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/EnhancedTouch/EnhancedTouchSupport.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/EnhancedTouch/EnhancedTouchSupport.cs index 60ce36d8cc..92437b307f 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/EnhancedTouch/EnhancedTouchSupport.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/EnhancedTouch/EnhancedTouchSupport.cs @@ -136,7 +136,7 @@ internal static void Reset() private static void SetUpState() { - Touch.s_GlobalState.playerState.updateMask = InputUpdateType.Dynamic | InputUpdateType.Manual; + Touch.s_GlobalState.playerState.updateMask = InputUpdateType.Dynamic | InputUpdateType.Manual | InputUpdateType.Fixed; #if UNITY_EDITOR Touch.s_GlobalState.editorState.updateMask = InputUpdateType.Editor; #endif diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/EnhancedTouch/Finger.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/EnhancedTouch/Finger.cs index e7acda8282..3c9bf82036 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/EnhancedTouch/Finger.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/EnhancedTouch/Finger.cs @@ -136,6 +136,9 @@ private static unsafe bool ShouldRecordTouch(InputControl control, double time, // changes that Touchscreen itself generates. This includes the resetting of deltas. if (!eventPtr.valid) return false; + var eventType = eventPtr.type; + if (eventType != StateEvent.Type && eventType != DeltaStateEvent.Type) + return false; // Direct memory access for speed. var currentTouchState = (TouchState*)((byte*)control.currentStatePtr + control.stateBlock.byteOffset); diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/EnhancedTouch/TouchSimulation.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/EnhancedTouch/TouchSimulation.cs index db0d70bf0c..1ba79016c5 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/EnhancedTouch/TouchSimulation.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/EnhancedTouch/TouchSimulation.cs @@ -111,8 +111,8 @@ protected void RemovePointer(Pointer pointer) // Remove from list. var numPointers = m_NumPointers; - ArrayHelpers.EraseAtWithCapacity(m_Pointers, ref m_NumPointers, pointerIndex); - ArrayHelpers.EraseAtWithCapacity(m_CurrentPositions, ref numPointers, pointerIndex); + m_Pointers.EraseAtWithCapacity(ref m_NumPointers, pointerIndex); + m_CurrentPositions.EraseAtWithCapacity(ref numPointers, pointerIndex); // Re-enable the device (only in case it's still added to the system). if (pointer.added) diff --git a/Packages/com.unity.inputsystem/InputSystem/State/IInputStateChangeMonitor.cs b/Packages/com.unity.inputsystem/InputSystem/State/IInputStateChangeMonitor.cs index a99ed0f7ae..fc7f274d4d 100644 --- a/Packages/com.unity.inputsystem/InputSystem/State/IInputStateChangeMonitor.cs +++ b/Packages/com.unity.inputsystem/InputSystem/State/IInputStateChangeMonitor.cs @@ -4,33 +4,44 @@ namespace UnityEngine.InputSystem.LowLevel { /// - /// Interface used to monitor input system state changes. + /// Interface used to monitor input state changes. /// /// - /// Use to install a state change monitor receiving state change + /// Use to install a state change monitor receiving state change /// callbacks for a specific control. /// - /// + /// public interface IInputStateChangeMonitor { + ////REVIEW: For v2, consider changing the signature of this to put the "was consumed" signal *outside* the eventPtr /// /// Called when the state monitored by a state change monitor has been modified. /// /// Control that is being monitored by the state change monitor and that had its state /// memory changed. - /// - /// If the state change was initiated by a state event, this is the pointer to the event. - /// Otherwise it is null. - /// + /// Time on the timeline at which the control state change was received. + /// If the state change was initiated by a state event (either a + /// or ), this is the pointer to that event. Otherwise it is pointer that is still + /// , but refers a "dummy" event that is not a or . + /// Index of the monitor as passed to . + /// + /// + /// To signal that the state change has been processed by the monitor and that no other pending notifications on the + /// same monitor instance should be sent, set the flag to true on . + /// Note, however, that aside from only silencing change monitors on the same instance, + /// it also only silences change monitors with the same groupIndex value as supplied to + /// . + /// void NotifyControlStateChanged(InputControl control, double time, InputEventPtr eventPtr, long monitorIndex); /// /// Called when a timeout set on a state change monitor has expired. /// - /// - /// - /// - /// + /// Control on which the timeout expired. + /// Input time at which the timer expired. This is the time at which an is being + /// run whose is past the time of expiration. + /// Index of the monitor as given to . + /// Index of the timer as given to . /// void NotifyTimerExpired(InputControl control, double time, long monitorIndex, int timerIndex); } diff --git a/Packages/com.unity.inputsystem/InputSystem/State/InputState.cs b/Packages/com.unity.inputsystem/InputSystem/State/InputState.cs index 2d1138f307..40992e976d 100644 --- a/Packages/com.unity.inputsystem/InputSystem/State/InputState.cs +++ b/Packages/com.unity.inputsystem/InputSystem/State/InputState.cs @@ -144,19 +144,72 @@ public static bool IsIntegerFormat(this FourCC format) format == InputStateBlock.FormatULong; } - ////REVIEW: should these take an InputUpdateType argument? - - public static void AddChangeMonitor(InputControl control, IInputStateChangeMonitor monitor, long monitorIndex = -1) + /// + /// Add a monitor that gets triggered every time the state of changes. + /// + /// A control sitting on an that has been . + /// Instance of the monitor that should be notified when state changes occur. + /// Numeric index of the monitors. Monitors on a device are ordered by decreasing monitor index + /// and invoked in that order. + /// Numeric group of the monitor. See remarks. + /// is null -or- is null. + /// The of has not been . + /// + /// All monitors on an are sorted by their (in decreasing order) and invoked + /// in that order. + /// + /// Every handler gets an opportunity to set to true. When doing so, all remaining pending monitors + /// from the same instance that have the same will be silenced and skipped over. + /// This can be used to establish an order of event "consumption" where one change monitor may prevent another change monitor from triggering. + /// + /// Monitors are invoked after a state change has been written to the device. If, for example, a is + /// received that sets to 0.5, the value is first applied to the control and then any state + /// monitors that may be listening to the change are invoked (thus getting 0.5 if calling ). + /// + /// + /// + /// class InputMonitor : IInputStateChangeMonitor + /// { + /// public InputMonitor() + /// { + /// // Watch the left and right mouse button. + /// // By supplying monitor indices here, we not only receive the indices in NotifyControlStateChanged, + /// // we also create an ordering between the two monitors. The one on RMB will fire *before* the one + /// // on LMB in case there is a single event that changes both buttons. + /// InputState.AddChangeMonitor(Mouse.current.leftButton, this, monitorIndex: 1); + /// InputState.AddChangeMonitor(Mouse.current.rightButton, this, monitorIndex: 2); + /// } + /// + /// public void NotifyControlStateChanged(InputControl control, double time, InputEventPtr eventPtr, long monitorIndex) + /// { + /// Debug.Log($"{control} changed"); + /// + /// // We can add a monitor timeout that will trigger in case the state of the + /// // given control is not changed within the given time. Let's watch the control + /// // for 2 seconds. If nothing happens, we will get a call to NotifyTimerExpired. + /// // If, however, there is a state change, the timeout is automatically removed + /// // and we will see a call to NotifyControlStateChanged instead. + /// InputState.AddChangeMonitorTimeout(control, this, 2); + /// } + /// + /// public void NotifyTimerExpired(InputControl control, double time, long monitorIndex, int timerIndex) + /// { + /// Debug.Log($"{control} was not changed within 2 seconds"); + /// } + /// } + /// + /// + /// + public static void AddChangeMonitor(InputControl control, IInputStateChangeMonitor monitor, long monitorIndex = -1, uint groupIndex = default) { if (control == null) throw new ArgumentNullException(nameof(control)); if (monitor == null) throw new ArgumentNullException(nameof(monitor)); - if (control.device.m_DeviceIndex == InputDevice.kInvalidDeviceIndex) - throw new ArgumentException(string.Format("Device for control '{0}' has not been added to system"), - nameof(control)); + if (!control.device.added) + throw new ArgumentException($"Device for control '{control}' has not been added to system"); - InputSystem.s_Manager.AddStateChangeMonitor(control, monitor, monitorIndex); + InputSystem.s_Manager.AddStateChangeMonitor(control, monitor, monitorIndex, groupIndex); } public static IInputStateChangeMonitor AddChangeMonitor(InputControl control, diff --git a/Packages/com.unity.inputsystem/InputSystem/State/InputStateHistory.cs b/Packages/com.unity.inputsystem/InputSystem/State/InputStateHistory.cs index ae3a00b46b..e98443475f 100644 --- a/Packages/com.unity.inputsystem/InputSystem/State/InputStateHistory.cs +++ b/Packages/com.unity.inputsystem/InputSystem/State/InputStateHistory.cs @@ -405,18 +405,8 @@ protected unsafe object ReadValueAsObject(RecordHeader* data) // Ignore state change if it's in an input update we're not interested in. var currentUpdateType = InputState.currentUpdateType; var updateTypeMask = updateMask; - if ((currentUpdateType & updateTypeMask) == 0 && - // EXCEPTION: When we're recording fixed and/or dynamic updates, do NOT ignore the state change - // if it is from an event. The reason is that the input system concurrently records - // state changes from events into both fixed and dynamic update buffers if both updates - // are enabled concurrently. This means that we will see input data going into - // *dynamic* update state buffers during *fixed* update and vice versa. - !((currentUpdateType & (InputUpdateType.Dynamic | InputUpdateType.Fixed)) != 0 && - (updateTypeMask & (InputUpdateType.Dynamic | InputUpdateType.Fixed)) != 0 && - eventPtr.valid)) - { + if ((currentUpdateType & updateTypeMask) == 0) return; - } // Ignore state change if we have a filter and the state change doesn't pass the check. if (onShouldRecordStateChange != null && !onShouldRecordStateChange(control, time, eventPtr)) From 82f8a7782856a22436a75800c73f9c6a53abeb5d Mon Sep 17 00:00:00 2001 From: Rene Damm Date: Thu, 24 Mar 2022 10:23:09 +0100 Subject: [PATCH 37/53] NEW: Can dynamically get/set parameters on actions (#1516). --- .../CoreTests_Actions_Rebinding.cs | 352 ++++++ Packages/com.unity.inputsystem/CHANGELOG.md | 20 + .../Documentation~/ActionBindings.md | 111 ++ .../InputSystem/Actions/IInputInteraction.cs | 2 + .../InputSystem/Actions/InputActionAsset.cs | 11 + .../InputSystem/Actions/InputActionMap.cs | 9 +- .../Actions/InputActionParameters.cs | 1066 +++++++++++++++++ .../Actions/InputActionParameters.cs.meta | 3 + .../Actions/InputActionRebindingExtensions.cs | 2 +- .../Actions/InputBindingComposite.cs | 3 + .../Actions/InputBindingResolver.cs | 97 +- .../InputSystem/Controls/InputProcessor.cs | 13 + .../Editor/InputParameterEditor.cs | 2 + .../InputSystem/Utilities/PrimitiveValue.cs | 2 + .../InputSystem/Utilities/TypeTable.cs | 2 +- 15 files changed, 1662 insertions(+), 33 deletions(-) create mode 100644 Packages/com.unity.inputsystem/InputSystem/Actions/InputActionParameters.cs create mode 100644 Packages/com.unity.inputsystem/InputSystem/Actions/InputActionParameters.cs.meta diff --git a/Assets/Tests/InputSystem/CoreTests_Actions_Rebinding.cs b/Assets/Tests/InputSystem/CoreTests_Actions_Rebinding.cs index 9edcf76fb5..5bf1c24734 100644 --- a/Assets/Tests/InputSystem/CoreTests_Actions_Rebinding.cs +++ b/Assets/Tests/InputSystem/CoreTests_Actions_Rebinding.cs @@ -1,10 +1,13 @@ +using System; using System.Collections.Generic; using System.Linq; using NUnit.Framework; using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.InputSystem.Controls; +using UnityEngine.InputSystem.Interactions; using UnityEngine.InputSystem.LowLevel; +using UnityEngine.InputSystem.Utilities; using UnityEngine.TestTools.Utils; internal partial class CoreTests @@ -1461,4 +1464,353 @@ public void Actions_InputActionSetupExtensionsChange_ShouldChangeBindingIfFound( secondActionInMap.ChangeBinding(new InputBinding("/e")).WithPath("/f"); Assert.That(actionMap.FindBinding(new InputBinding("/f"), out _), Is.EqualTo(2)); // exact match } + + [Test] + [Category("Actions")] + [TestCase(null, "hold(duration=0.123)", "duration", 0.123f, 0.234f)] + [TestCase(null, "tap(duration=0.123);hold(duration=0.123)", "duration", 0.123f, 0.234f)] + [TestCase(null, "tap(duration=0.234);hold(duration=0.123)", "hold:duration", 0.123f, 0.234f)] + [TestCase("scale(factor=0.123)", null, "factor", 0.123f, 0.234f)] + [TestCase("normalize(min=0.123,max=1),clamp(min=0.123,max=1)", null, "min", 0.123f, 0.234f)] + [TestCase("normalize(min=0.234,max=1),clamp(min=0.123,max=1)", null, "clamp:min", 0.123f, 0.234f)] + public void Actions_CanApplyParameterOverrides(string processors, string interactions, string parameter, object defaultValue, object newValue) + { + var singleAction = new InputAction(processors: processors, interactions: interactions); + singleAction.AddBinding("/buttonSouth"); + singleAction.AddBinding("/buttonNorth"); + + var actionMap = new InputActionMap(); + var actionInMap = actionMap.AddAction("actionInMap", processors: processors, + interactions: interactions); + actionInMap.AddBinding("/buttonSouth"); + actionInMap.AddBinding("/buttonNorth"); + + var actionAsset = ScriptableObject.CreateInstance(); + var actionMapInAsset = actionAsset.AddActionMap("map"); + var actionInAsset = actionMapInAsset.AddAction("actionInAsset", processors: processors, + interactions: interactions); + actionInAsset.AddBinding("/buttonSouth"); + actionInAsset.AddBinding("/buttonNorth"); + + // Querying a non-existing parameter should return nothing. + Assert.That(singleAction.GetParameterValue("DoesNotExist"), Is.Null, + "Expecting getting non-existent parameter on single action to return null"); + Assert.That(actionInMap.GetParameterValue("DoesNotExist"), Is.Null, + "Expecting getting non-existent parameter on action in map to return null"); + Assert.That(actionInAsset.GetParameterValue("DoesNotExist"), Is.Null, + "Expecting getting non-existent parameter on action in asset to return null"); + + // Parameters should be at default values. + Assert.That(singleAction.GetParameterValue(parameter), Is.EqualTo(PrimitiveValue.FromObject(defaultValue)), + () => $"Expecting parameter '{parameter}' to have default value '{defaultValue}' on single action (got '{singleAction.GetParameterValue(parameter)}' instead)"); + Assert.That(actionInMap.GetParameterValue(parameter), Is.EqualTo(PrimitiveValue.FromObject(defaultValue)), + () => $"Expecting parameter '{parameter}' to have default value '{defaultValue}' on action in map (got '{actionInMap.GetParameterValue(parameter)}' instead)"); + Assert.That(actionInAsset.GetParameterValue(parameter), Is.EqualTo(PrimitiveValue.FromObject(defaultValue)), + () => $"Expecting parameter '{parameter}' to have default value '{defaultValue}' on action in asset (got '{actionInAsset.GetParameterValue(parameter)}' instead)"); + + // Apply parameter overrides. + singleAction.ApplyParameterOverride(parameter, PrimitiveValue.FromObject(newValue)); + actionInMap.ApplyParameterOverride(parameter, PrimitiveValue.FromObject(newValue)); + actionInAsset.ApplyParameterOverride(parameter, PrimitiveValue.FromObject(newValue)); + + // Parameters should be at new values. + Assert.That(singleAction.GetParameterValue(parameter), Is.EqualTo(PrimitiveValue.FromObject(newValue)), + () => $"Expecting parameter '{parameter}' to have value '{newValue}' on single action (got '{singleAction.GetParameterValue(parameter)}' instead)"); + Assert.That(actionInMap.GetParameterValue(parameter), Is.EqualTo(PrimitiveValue.FromObject(newValue)), + () => $"Expecting parameter '{parameter}' to have value '{newValue}' on action in map (got '{actionInMap.GetParameterValue(parameter)}' instead)"); + Assert.That(actionInAsset.GetParameterValue(parameter), Is.EqualTo(PrimitiveValue.FromObject(newValue)), + () => $"Expecting parameter '{parameter}' to have value '{newValue}' on action in asset (got '{actionInAsset.GetParameterValue(parameter)}' instead)"); + + // Adding a device should not lead to any of the applied parameter values getting lost. + InputSystem.AddDevice(); + Assert.That(singleAction.GetParameterValue(parameter), Is.EqualTo(PrimitiveValue.FromObject(newValue)), + () => $"Expecting parameter '{parameter}' to have value '{newValue}' on single action (got '{singleAction.GetParameterValue(parameter)}' instead)"); + Assert.That(actionInMap.GetParameterValue(parameter), Is.EqualTo(PrimitiveValue.FromObject(newValue)), + () => $"Expecting parameter '{parameter}' to have value '{newValue}' on action in map (got '{actionInMap.GetParameterValue(parameter)}' instead)"); + Assert.That(actionInAsset.GetParameterValue(parameter), Is.EqualTo(PrimitiveValue.FromObject(newValue)), + () => $"Expecting parameter '{parameter}' to have value '{newValue}' on action in asset (got '{actionInAsset.GetParameterValue(parameter)}' instead)"); + } + + [Test] + [Category("Actions")] + public void Actions_CanApplyParameterOverrides_ToComposites() + { + var action = new InputAction(); + action.AddCompositeBinding("1DAxis(whichSideWins=0)") + .With("Positive", "/a") + .With("Negative", "/s"); + + Assert.That(action.GetParameterValue("whichSideWins"), Is.EqualTo(PrimitiveValue.FromObject(0))); + + action.ApplyParameterOverride("whichSideWins", 1); + + Assert.That(action.GetParameterValue("whichSideWins"), Is.EqualTo(PrimitiveValue.FromObject(1))); + Assert.That(action.GetParameterValue("1DAxis:whichSideWins"), Is.EqualTo(PrimitiveValue.FromObject(1))); + } + + [Test] + [Category("Actions")] + public void Actions_CanApplyParameterOverrides_UsingBindingMask() + { + InputSystem.settings.defaultDeadzoneMin = 0; + InputSystem.settings.defaultDeadzoneMax = 1; + + var mouse = InputSystem.AddDevice(); + var gamepad = InputSystem.AddDevice(); + + var action = new InputAction(type: InputActionType.Value); + action.AddBinding("/delta", groups: "Mouse", processors: "scaleVector2(x=0.25,y=0.25)"); + action.AddBinding("/leftStick", groups: "Gamepad", processors: "scaleVector2(x=4,y=4)"); + + action.Enable(); + + Set(mouse.delta, new Vector2(11, 22)); + + Assert.That(action.ReadValue(), Is.EqualTo(new Vector2(11 * 0.25f, 22 * 0.25f)).Using(Vector2EqualityComparer.Instance)); + + Set(gamepad.leftStick, new Vector2(0.5f, 0.5f)); + + Assert.That(action.ReadValue(), Is.EqualTo(new Vector2(0.5f * 4, 0.5f * 4)).Using(Vector2EqualityComparer.Instance)); + + Set(gamepad.leftStick, default); // Reset so that we relinquish control over the action. + + action.ApplyParameterOverride("x", 0.5f, InputBinding.MaskByGroup("Mouse")); + + Set(mouse.delta, new Vector2(22, 33)); + + Assert.That(action.ReadValue(), Is.EqualTo(new Vector2(22 * 0.5f, 33 * 0.25f)).Using(Vector2EqualityComparer.Instance)); + + Set(gamepad.leftStick, new Vector2(0.6f, 0.6f)); + + Assert.That(action.ReadValue(), Is.EqualTo(new Vector2(0.6f * 4, 0.6f * 4)).Using(Vector2EqualityComparer.Instance)); + } + + [Test] + [Category("Actions")] + public void Actions_CanApplyParameterOverrides_UsingBindingIndex() + { + InputSystem.settings.defaultDeadzoneMin = 0; + InputSystem.settings.defaultDeadzoneMax = 1; + + var mouse = InputSystem.AddDevice(); + var gamepad = InputSystem.AddDevice(); + + var action = new InputAction(type: InputActionType.Value); + action.AddBinding("/delta", processors: "scaleVector2(x=0.25,y=0.25)"); + action.AddBinding("/leftStick", processors: "scaleVector2(x=4,y=4)"); + + action.Enable(); + + Set(mouse.delta, new Vector2(11, 22)); + + Assert.That(action.ReadValue(), Is.EqualTo(new Vector2(11 * 0.25f, 22 * 0.25f)).Using(Vector2EqualityComparer.Instance)); + + Set(gamepad.leftStick, new Vector2(0.5f, 0.5f)); + + Assert.That(action.ReadValue(), Is.EqualTo(new Vector2(0.5f * 4, 0.5f * 4)).Using(Vector2EqualityComparer.Instance)); + + Set(gamepad.leftStick, default); // Reset so that we relinquish control over the action. + + action.ApplyParameterOverride("x", 0.5f, 0); + + Set(mouse.delta, new Vector2(22, 33)); + + Assert.That(action.ReadValue(), Is.EqualTo(new Vector2(22 * 0.5f, 33 * 0.25f)).Using(Vector2EqualityComparer.Instance)); + + Set(gamepad.leftStick, new Vector2(0.6f, 0.6f)); + + Assert.That(action.ReadValue(), Is.EqualTo(new Vector2(0.6f * 4, 0.6f * 4)).Using(Vector2EqualityComparer.Instance)); + } + + [Test] + [Category("Actions")] + public void Actions_CanApplyParameterOverrides_WithOverridesNotGettingLostOnReResolution() + { + var gamepad = InputSystem.AddDevice(); + + var map = new InputActionMap(); + var action = map.AddAction("action", type: InputActionType.Value); + action.AddBinding("/leftTrigger", processors: "scale(factor=0.75)"); + map.Enable(); + + action.ApplyParameterOverride("scale:factor", 0.25f); + + // Add a completely new binding. This will throw lead to a full re-resolve. + // NOTE: We don't add a processor to this one. + action.AddBinding("/rightTrigger"); + + Set(gamepad.leftTrigger, 0.25f); + + Assert.That(action.ReadValue(), Is.EqualTo(0.25f * 0.25f).Within(0.00001)); + + Set(gamepad.rightTrigger, 0.75f); + + Assert.That(action.ReadValue(), Is.EqualTo(0.75f).Within(0.00001)); + } + + [Test] + [Category("Actions")] + public void Actions_CanApplyParameterOverrides_WithOverridesGettingRetroactivelyAppliedToNewBindings() + { + var gamepad = InputSystem.AddDevice(); + + var map = new InputActionMap(); + var action = map.AddAction("action", type: InputActionType.Value); + map.Enable(); + + action.ApplyParameterOverride("scale:factor", 0.25f); + action.AddBinding("/leftTrigger", processors: "scale(factor=0.75)"); + + Assert.That(action.GetParameterValue("scale:factor"), Is.EqualTo(new PrimitiveValue(0.25f))); + + Set(gamepad.leftTrigger, 0.25f); + + Assert.That(action.ReadValue(), Is.EqualTo(0.25f * 0.25f).Within(0.00001)); + } + + [Test] + [Category("Actions")] + public void Actions_CanApplyParameterOverrides_WithMostSpecificOneBeingApplied() + { + var gamepad = InputSystem.AddDevice(); + + var map = new InputActionMap(); + var action1 = map.AddAction("action1", binding: "/leftTrigger", processors: "scale(factor=0.75)"); + var action2 = map.AddAction("action2", binding: "/leftTrigger", processors: "scale(factor=0.25)"); + map.Enable(); + + // Apply one override specifically to action1. + map.ApplyParameterOverride("scale:factor", 0.5f, new InputBinding { action = "action1" }); + + // And another not specifically to any action. + map.ApplyParameterOverride("scale:factor", 0.1f); + + Assert.That(action1.GetParameterValue("scale:factor"), Is.EqualTo(new PrimitiveValue(0.5f))); + Assert.That(action2.GetParameterValue("scale:factor"), Is.EqualTo(new PrimitiveValue(0.1f))); + + Set(gamepad.leftTrigger, 0.5f); + + Assert.That(action1.ReadValue(), Is.EqualTo(0.5f * 0.5f).Within(0.00001)); + Assert.That(action2.ReadValue(), Is.EqualTo(0.5f * 0.1f).Within(0.00001)); + } + + [Test] + [Category("Actions")] + public void Actions_CanApplyParameterOverrides_ThroughMap() + { + var gamepad = InputSystem.AddDevice(); + + var map = new InputActionMap(); + var action1 = map.AddAction("action1", binding: "/leftTrigger", processors: "scale(factor=0.75)"); + var action2 = map.AddAction("action2", binding: "/leftTrigger", processors: "scale(factor=0.25)"); + map.Enable(); + + Set(gamepad.leftTrigger, 0.5f); + + Assert.That(action1.ReadValue(), Is.EqualTo(0.5f * 0.75f).Within(0.0001)); + Assert.That(action2.ReadValue(), Is.EqualTo(0.5f * 0.25f).Within(0.0001)); + + map.ApplyParameterOverride("scale:factor", 0.1f); + + Assert.That(action1.ReadValue(), Is.EqualTo(0.5f * 0.1f).Within(0.0001)); + Assert.That(action2.ReadValue(), Is.EqualTo(0.5f * 0.1f).Within(0.0001)); + + // Put a parameter override directly on action1. Should replace the one + // set on the map. + action1.ApplyParameterOverride("scale:factor", 0.5f); + + Assert.That(action1.ReadValue(), Is.EqualTo(0.5f * 0.5f).Within(0.0001)); + Assert.That(action2.ReadValue(), Is.EqualTo(0.5f * 0.1f).Within(0.0001)); + + // Set a different override on the map. Should not replace the override + // active on action1. + map.ApplyParameterOverride("scale:factor", 0.2f); + + Assert.That(action1.ReadValue(), Is.EqualTo(0.5f * 0.5f).Within(0.0001)); + Assert.That(action2.ReadValue(), Is.EqualTo(0.5f * 0.2f).Within(0.0001)); + } + + [Test] + [Category("Actions")] + public void Actions_CanApplyParameterOverrides_ThroughAsset() + { + var gamepad = InputSystem.AddDevice(); + + var asset = ScriptableObject.CreateInstance(); + var map1 = asset.AddActionMap("map1"); + var map2 = asset.AddActionMap("map2"); + var action1 = map1.AddAction("action1", binding: "/leftTrigger", processors: "scale(factor=0.75)"); + var action2 = map2.AddAction("action2", binding: "/leftTrigger", processors: "scale(factor=0.25)"); + asset.Enable(); + + Set(gamepad.leftTrigger, 0.5f); + + Assert.That(action1.ReadValue(), Is.EqualTo(0.5f * 0.75f).Within(0.0001)); + Assert.That(action2.ReadValue(), Is.EqualTo(0.5f * 0.25f).Within(0.0001)); + + asset.ApplyParameterOverride("scale:factor", 0.1f); + + Assert.That(action1.ReadValue(), Is.EqualTo(0.5f * 0.1f).Within(0.0001)); + Assert.That(action2.ReadValue(), Is.EqualTo(0.5f * 0.1f).Within(0.0001)); + + // Put a parameter override directly on map1. Should replace the one + // set on the asset. + map1.ApplyParameterOverride("scale:factor", 0.5f); + + Assert.That(action1.ReadValue(), Is.EqualTo(0.5f * 0.5f).Within(0.0001)); + Assert.That(action2.ReadValue(), Is.EqualTo(0.5f * 0.1f).Within(0.0001)); + + // Set a different override on the asset. Should not replace the override + // active on action1. + asset.ApplyParameterOverride("scale:factor", 0.2f); + + Assert.That(action1.ReadValue(), Is.EqualTo(0.5f * 0.5f).Within(0.0001)); + Assert.That(action2.ReadValue(), Is.EqualTo(0.5f * 0.2f).Within(0.0001)); + } + + [Test] + [Category("Actions")] + public void Actions_CanApplyParameterOverrides_UsingExpressionSyntax() + { + var asset = ScriptableObject.CreateInstance(); + var map = asset.AddActionMap("map"); + var action = map.AddAction("action"); + action.AddBinding("/buttonSouth", interactions: "tap(duration=0.123)"); + action.AddBinding("/leftButton", interactions: "hold(duration=0.234)"); + + Assert.That(action.GetParameterValue((TapInteraction x) => x.duration), Is.EqualTo(0.123).Within(0.0001)); + Assert.That(action.GetParameterValue((HoldInteraction x) => x.duration), Is.EqualTo(0.234).Within(0.0001)); + + asset.ApplyParameterOverride((TapInteraction x) => x.duration, 0.345f); + asset.ApplyParameterOverride((HoldInteraction x) => x.duration, 0.456); // Note the slight type mismatch here (float and double). + + Assert.That(action.GetParameterValue((TapInteraction x) => x.duration), Is.EqualTo(0.345).Within(0.0001)); + Assert.That(action.GetParameterValue((HoldInteraction x) => x.duration), Is.EqualTo(0.456).Within(0.0001)); + + map.ApplyParameterOverride((TapInteraction x) => x.duration, 0.567f); + map.ApplyParameterOverride((HoldInteraction x) => x.duration, 0.678); // Note the slight type mismatch here (float and double). + + Assert.That(action.GetParameterValue((TapInteraction x) => x.duration), Is.EqualTo(0.567).Within(0.0001)); + Assert.That(action.GetParameterValue((HoldInteraction x) => x.duration), Is.EqualTo(0.678).Within(0.0001)); + + action.ApplyParameterOverride((TapInteraction x) => x.duration, 0.789f); + action.ApplyParameterOverride((HoldInteraction x) => x.duration, 0.987); // Note the slight type mismatch here (float and double). + + Assert.That(action.GetParameterValue((TapInteraction x) => x.duration), Is.EqualTo(0.789).Within(0.0001)); + Assert.That(action.GetParameterValue((HoldInteraction x) => x.duration), Is.EqualTo(0.987).Within(0.0001)); + } + + [Test] + [Category("Actions")] + public void Actions_CanGetParameterValue_ByBindingIndex() + { + var action = new InputAction(); + action.AddBinding("/buttonSouth", interactions: "tap(duration=0.123)"); + action.AddBinding("/buttonSouth", interactions: "tap(duration=0.234)"); + action.AddBinding("/buttonSouth", interactions: "tap(duration=0.345)"); + + Assert.That(action.GetParameterValue("duration", bindingIndex: 0), Is.EqualTo(new PrimitiveValue(0.123f))); + Assert.That(action.GetParameterValue("duration", bindingIndex: 1), Is.EqualTo(new PrimitiveValue(0.234f))); + Assert.That(action.GetParameterValue("duration", bindingIndex: 2), Is.EqualTo(new PrimitiveValue(0.345f))); + } } diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index ca7511fa72..1aa71656dd 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -87,6 +87,26 @@ however, it has to be formatted properly to pass verification tests. ```CSharp InputSystem.settings.SetInternalFeatureFlag("DISABLE_SHORTCUT_SUPPORT", true); ``` +- Added new APIs for getting and setting parameter values on interactions, processors, and composites. + ```CSharp + // Get parameter. + action.GetParameterValue("duration"); // Any "duration" value on any binding. + action.GetParameterValue("tap:duration"); // "duration" on "tap" interaction on any binding. + action.GetParameterValue("tap:duration", // "duration" on "tap" on binding in "Gamepad" group. + InputBinding.MaskByGroup("Gamepad")); + + // Set parameter. + action.ApplyParameterOverride("duration", 0.4f); + action.ApplyParameterOverride("tap:duration", 0.4f); + action.ApplyParameterOverride("tap:duration", 0.4f, + InputBinding.MaskByGroup("Gamepad")); + + // Can also apply parameter overrides at the level of + // InputActionMaps and InputActionAssets with an effect + // on all the bindings contained therein. + asset.ApplyParameterOverride("scaleVector2:x", 0.25f, + new InputBinding("/delta")); + ``` ## [1.3.0] - 2021-12-10 diff --git a/Packages/com.unity.inputsystem/Documentation~/ActionBindings.md b/Packages/com.unity.inputsystem/Documentation~/ActionBindings.md index 513c41340f..78c267afcd 100644 --- a/Packages/com.unity.inputsystem/Documentation~/ActionBindings.md +++ b/Packages/com.unity.inputsystem/Documentation~/ActionBindings.md @@ -13,6 +13,7 @@ * [Applying overrides](#applying-overrides) * [Erasing Bindings](#erasing-bindings) * [Adding Bindings](#adding-bindings) + * [Setting parameters](#setting-parameters) * [Interactive rebinding](#interactive-rebinding) * [Saving and loading rebinds](#saving-and-loading-rebinds) * [Restoring original Bindings](#restoring-original-bindings) @@ -513,6 +514,116 @@ playerInput.actions["move"] .With("Right", "/d"); ``` +### Setting parameters + +A Binding may, either through itself or through its associated Action, lead to [processor](Processors.md), [interaction](Interactions.md), and/or [composite](#composite-bindings) objects being created. These objects can have parameters you can configure through in the [Binding properties view](ActionAssets.md#editing-bindings) of the Action editor or through the API. This configuration will give parameters their default value. + +```CSharp +// Create an action with a "Hold" interaction on it. +// Set the "duration" parameter to 4 seconds. +var action = new InputAction(interactions: "hold(duration=4)"); +``` + +You can query the current value of any such parameter using the [`GetParameterValue`](../api/UnityEngine.InputSystem.InputActionRebindingExtensions.html#UnityEngine_InputSystem_InputActionRebindingExtensions_GetParameterValue_UnityEngine_InputSystem_InputAction_System_String_UnityEngine_InputSystem_InputBinding_) API. + +```CSharp +// This returns a PrimitiveValue?. It will be null if the +// parameter is not found. Otherwise, it is a PrimitiveValue +// which can be converted to a number or boolean. +var p = action.GetParameterValue("duration"); +Debug.Log("'duration' is set to: " + p.Value); +``` + +The above looks for the parameter on any object found on any of the bindings on the action. You can restrict either or both to a more narrow set. + +```CSharp +// Retrieve the value of the "duration" parameter specifically of a +// "Hold" interaction and only look on bindings in the "Gamepad" group. +action.GetParameterValue("hold:duration", InputBinding.MaskByGroup("Gamepad")); +``` + +Alternatively, you can use an expression parameter to encapsulate both the type and the name of the parameter you want to get the value of. This has the advantage of not needing a string parameter but rather references both the type and the name of the parameter in a typesafe way. + +```CSharp +// Retrieve the value of the "duration" parameter of TapInteraction. +// This version returns a float? instead of a PrimitiveValue? as it +// sees the type of "duration" at compile-time. +action.GetParameterValue((TapInteraction x) => x.duration); +``` + +To alter the current value of a parameter, you can use what is referred to as a "parameter override". You can apply these at the level of an individual [`InputAction`](../api/UnityEngine.InputSystem.InputAction.html), or at the level of an entire [`InputActionMap`](../api/UnityEngine.InputSystem.InputActionMap.html), or even at the level of an entire [`InputActionAsset`](../api/UnityEngine.InputSystem.InputActionAsset.html). Such overrides are stored internally and applied automatically even on bindings added later. + +To add an override, use the [`ApplyParameterOverride`](../api/UnityEngine.InputSystem.InputActionRebindingExtensions.html#UnityEngine_InputSystem_InputActionRebindingExtensions_ApplyParameterOverride_UnityEngine_InputSystem_InputAction_System_String_UnityEngine_InputSystem_Utilities_PrimitiveValue_UnityEngine_InputSystem_InputBinding_) API or any of its overloads. + +```CSharp +// Set the "duration" parameter on all bindings of the action to 4. +action.ApplyParameterOverride("duration", 4f); + +// Set the "duration" parameter specifically for "tap" interactions only. +action.ApplyParameterOverride("tap:duration", 0.5f); + +// Set the "duration" parameter on tap interactions but only for bindings +// in the "Gamepad" group. +action.ApplyParameterOverride("tap:duration", 0.5f, InputBinding.MaskByGroup("Gamepad"); + +// Set tap duration for all bindings in an action map. +map.ApplyParameterOverride("tap:duration", 0.5f); + +// Set tap duration for all bindings in an entire asset. +asset.ApplyParameterOverride("tap:duration", 0.5f); + +// Like for GetParameterValue, overloads are available that take +// an expression instead. +action.ApplyParameterOverride((TapInteraction x) => x.duration, 0.4f); +map.ApplyParameterOverride((TapInteraction x) => x.duration, 0.4f); +asset.ApplyParameterOverride((TapInteraction x) => x.duration, 0.4f); +``` + +The new value will be applied immediately and affect all composites, processors, and interactions already in use and targeted by the override. + +Note that if multiple parameter overrides are applied – especially when applying some directly to actions and some to maps or assets –, there may be conflicts between which override to apply. In this case, an attempt is made to chose the "most specific" override to apply. + +```CSharp +// Let's say you have an InputAction `action` that is part of an InputActionAsset asset. +var map = action.actionMap; +var asset = map.asset; + +// And you apply a "tap:duration" override to the action. +action.ApplyParameterOverride("tap:duration", 0.6f); + +// But also apply a "tap:duration" override to the action specifically +// for bindings in the "Gamepad" group. +action.ApplyParameterOverride("tap:duration", 1f, InputBinding.MaskByGroup("Gamepad")); + +// And finally also apply a "tap:duration" override to the entire asset. +asset.ApplyParameterOverride("tap:duration", 0.3f); + +// Now, bindings on `action` in the "Gamepad" group will use a value of 1 for tap durations, +// other bindings on `action` will use 0.6, and every other binding in the asset will use 0.3. +``` + +You can use parameter overrides, for example, to scale mouse delta values on a "Look" action. + +```CSharp +// Set up an example "Look" action. +var look = new InputAction("look", type: InputActionType.Value); +look.AddBinding("/delta", groups: "KeyboardMouse", processors: "scaleVector2"); +look.AddBinding("/rightStick", groups: "Gamepad", processors: "scaleVector2"); + +// Now you can adjust stick sensitivity separately from mouse sensitivity. +look.ApplyParameterOverride("scaleVector2:x", 0.5f, InputBinding.MaskByGroup("KeyboardMouse")); +look.ApplyParameterOverride("scaleVector2:y", 0.5f, InputBinding.MaskByGroup("KeyboardMouse")); + +look.ApplyParameterOverride("scaleVector2:x", 2f, InputBinding.MaskByGroup("Gamepad")); +look.ApplyParameterOverride("scaleVector2:y", 2f, InputBinding.MaskByGroup("Gamepad")); + +// Alternative to using groups, you can also apply overrides directly to specific binding paths. +look.ApplyParameterOverride("scaleVector2:x", 0.5f, new InputBinding("/delta")); +look.ApplyParameterOverride("scaleVector2:y", 0.5f, new InputBinding("/delta")); +``` + +>NOTE: Parameter overrides are *not* persisted along with an asset. + ## Interactive rebinding >__Note:__ To download a sample project which demonstrates how to set up a rebinding user interface with Input System APIs, open the Package Manager, select the Input System Package, and choose the sample project "Rebinding UI" to download. diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/IInputInteraction.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/IInputInteraction.cs index a490fff1d4..a825ead386 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/IInputInteraction.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/IInputInteraction.cs @@ -185,6 +185,8 @@ namespace UnityEngine.InputSystem /// /// /// + /// + /// public interface IInputInteraction { /// diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionAsset.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionAsset.cs index a446152687..4b9b71a2eb 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionAsset.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionAsset.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Linq; using UnityEngine.InputSystem.Utilities; ////TODO: make the FindAction logic available on any IEnumerable and IInputActionCollection via extension methods @@ -893,6 +894,14 @@ private void ReResolveIfNecessary(bool fullResolve) m_ActionMaps[0].LazyResolveBindings(fullResolve); } + internal void ResolveBindingsIfNecessary() + { + if (m_ActionMaps.LengthSafe() > 0) + foreach (var map in m_ActionMaps) + if (map.ResolveBindingsIfNecessary()) + break; + } + private void OnDestroy() { Disable(); @@ -914,6 +923,8 @@ private void OnDestroy() /// [NonSerialized] internal InputActionState m_SharedStateForAllMaps; [NonSerialized] internal InputBinding? m_BindingMask; + [NonSerialized] internal int m_ParameterOverridesCount; + [NonSerialized] internal InputActionRebindingExtensions.ParameterOverride[] m_ParameterOverrides; [NonSerialized] internal InputActionMap.DeviceArray m_Devices; diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionMap.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionMap.cs index da8683c5c3..1847ad04d2 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionMap.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionMap.cs @@ -728,6 +728,8 @@ IEnumerator IEnumerable.GetEnumerator() [NonSerialized] internal InputActionState m_State; [NonSerialized] internal InputBinding? m_BindingMask; [NonSerialized] private Flags m_Flags; + [NonSerialized] internal int m_ParameterOverridesCount; + [NonSerialized] internal InputActionRebindingExtensions.ParameterOverride[] m_ParameterOverrides; [NonSerialized] internal DeviceArray m_Devices; @@ -1197,7 +1199,7 @@ internal bool LazyResolveBindings(bool fullResolve) return true; } - internal void ResolveBindingsIfNecessary() + internal bool ResolveBindingsIfNecessary() { // NOTE: We only check locally for the current map here. When there are multiple maps // in an asset, we may have maps that require re-resolution while others don't. @@ -1209,11 +1211,14 @@ internal void ResolveBindingsIfNecessary() if (m_State != null && m_State.isProcessingControlStateChange) { Debug.Assert(s_DeferBindingResolution > 0, "While processing control state changes, binding resolution should be suppressed"); - return; + return false; } ResolveBindings(); + return true; } + + return false; } // We have three different starting scenarios for binding resolution: diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionParameters.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionParameters.cs new file mode 100644 index 0000000000..bae49a62e6 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionParameters.cs @@ -0,0 +1,1066 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Reflection; +using Unity.Collections.LowLevel.Unsafe; +using UnityEngine.InputSystem.Utilities; + +namespace UnityEngine.InputSystem +{ + partial class InputActionRebindingExtensions + { + /// + /// Return the current value of the given parameter as found on the processors, interactions, or composites + /// of the action's current bindings. + /// + /// Action on whose bindings to look for the value of the given parameter. + /// Name of the parameter to get the value of. Case-insensitive. This can either be just the name of the + /// parameter (like "duration" or expressed as nameof(TapInteraction.duration)) or can be prefixed with the + /// type of object to get the parameter value from. For example, "tap:duration" will specifically get the "duration" + /// parameter from the object registered as "tap" (which will usually be ). + /// Optional mask that determines on which bindings to look for objects with parameters. If used, only + /// bindings that match (see ) the given mask will be taken into account. + /// The current value of the given parameter or null if the parameter could not be found. + /// + /// Parameters are found on interactions (), processors (), and + /// composites (see ) that are applied to bindings. For example, the following binding + /// adds a Hold interaction with a custom duration parameter on top of binding to the gamepad's A button: + /// + /// + /// + /// new InputBinding + /// { + /// path = "<Gamepad>/buttonSouth", + /// interactions = "hold(duration=0.6)" + /// }; + /// + /// + /// + /// In the editor UI, parameters are set graphically from the properties sections in the right-most pane + /// in the action editor when an action or a binding is selected. + /// + /// When the binding above is applied to an action, the duration parameter from the Hold interaction can be + /// queried like so: + /// + /// + /// + /// action.GetParameterValue("duration") // Returns 0.6 + /// + /// + /// + /// Note that if there are multiple objects on the action that use the same parameter name, the value of the first parameter + /// that is encountered is returned. Also note that this method will create GC heap garbage. + /// + /// The type of object to query the parameter from can be include in the parameter. For example, if + /// an action has both a and a on it, the + /// duration parameter can be queried independently like so: + /// + /// + /// + /// // Query "duration" from "hold": + /// action.GetParameterValue("hold:duration"); + /// + /// // Query "duration" from "tap": + /// action.GetParameterValue("tap:duration"); + /// + /// + /// + /// The names used here to identify the object holding the parameter are the same used by , + /// , and . + /// + /// is null -or- is null + /// + /// + /// + public static PrimitiveValue? GetParameterValue(this InputAction action, string name, InputBinding bindingMask = default) + { + if (action == null) + throw new ArgumentNullException(nameof(action)); + if (string.IsNullOrEmpty(name)) + throw new ArgumentNullException(nameof(name)); + + return action.GetParameterValue(new ParameterOverride(name, bindingMask)); + } + + private static PrimitiveValue? GetParameterValue(this InputAction action, ParameterOverride parameterOverride) + { + parameterOverride.bindingMask.action = action.name; + + var actionMap = action.GetOrCreateActionMap(); + actionMap.ResolveBindingsIfNecessary(); + foreach (var parameter in new ParameterEnumerable(actionMap.m_State, parameterOverride, actionMap.m_MapIndexInState)) + { + var value = parameter.field.GetValue(parameter.instance); + return PrimitiveValue.FromObject(value); + } + + return null; + } + + /// + /// Return the current value of the given parameter as found on the processors, interactions, or composites + /// of the action's current bindings. + /// + /// Action on whose bindings to look for the value of the given parameter. + /// Name of the parameter to get the value of. Case-insensitive. This can either be just the name of the + /// parameter (like "duration" or expressed as nameof(TapInteraction.duration)) or can be prefixed with the + /// type of object to get the parameter value from. For example, "tap:duration" will specifically get the "duration" + /// parameter from the object registered as "tap" (which will usually be ). + /// Index of the binding in 's + /// to look for processors, interactions, and composites on. + /// The current value of the given parameter or null if the parameter not could be found. + /// + /// This method is a variation of + /// to specifically target a single binding by index. Otherwise, the method is identical in functionality. + /// + /// is null -or- is null + public static PrimitiveValue? GetParameterValue(this InputAction action, string name, int bindingIndex) + { + if (action == null) + throw new ArgumentNullException(nameof(action)); + if (string.IsNullOrEmpty(name)) + throw new ArgumentNullException(nameof(name)); + if (bindingIndex < 0) + throw new ArgumentOutOfRangeException(nameof(bindingIndex)); + + var indexOnMap = action.BindingIndexOnActionToBindingIndexOnMap(bindingIndex); + var bindingMask = new InputBinding { id = action.GetOrCreateActionMap().bindings[indexOnMap].id }; + + return action.GetParameterValue(name, bindingMask); + } + + /// + /// Return the current value of the given parameter as found on the processors, interactions, or composites + /// of the action's current bindings. + /// + /// Action on whose bindings to look for the value of the given parameter. + /// An expression such as (TapInteraction x) => x.duration that determines the + /// name and type of the parameter being looked for. + /// Optional mask that determines on which bindings to look for objects with parameters. If used, only + /// bindings that match (see ) the given mask will be taken into account. + /// The current value of the given parameter or null if the parameter not could be found. + /// + /// This method is a variation of + /// that encapsulates a reference to the name of the parameter and the type of object it is found on in a way that is + /// type-safe and does not involve strings. + /// + /// + /// + /// // Get the "duration" parameter from a TapInteraction. + /// // This is equivalent to calling GetParameterValue("tap:duration") + /// // but will return a float? instead of a PrimitiveValue?. + /// action.GetParameterValue((TapInteraction x) => x.duration) + /// + /// + /// + /// is null -or- is null + /// + public static unsafe TValue? GetParameterValue(this InputAction action, Expression> expr, InputBinding bindingMask = default) + where TValue : struct + { + if (action == null) + throw new ArgumentNullException(nameof(action)); + if (expr == null) + throw new ArgumentNullException(nameof(expr)); + + var parameterOverride = ExtractParameterOverride(expr, bindingMask); + var value = action.GetParameterValue(parameterOverride); + + if (value == null) + return null; + + // Type is guaranteed to match but just in case, + // make extra sure with a check here. + if (Type.GetTypeCode(typeof(TValue)) == value.Value.type) + { + // Can't just cast here so use UnsafeUtility to work around that. + var v = value.Value; + var result = default(TValue); + UnsafeUtility.MemCpy(UnsafeUtility.AddressOf(ref result), + v.valuePtr, + UnsafeUtility.SizeOf()); + return result; + } + + // Shouldn't get here but just in case, do a conversion using C#'s Convert + // machinery as a fallback. + return (TValue)Convert.ChangeType(value.Value.ToObject(), typeof(TValue)); + } + + /// + /// Set the value of the given parameter on the , , + /// and objects found on the of . + /// + /// An action on whose to look for objects to set + /// the parameter value on. + /// An expression such as (TapInteraction x) => x.duration that determines the + /// name and type of the parameter whose value to set. + /// New value to assign to the parameter. + /// Optional mask that determines on which bindings to look for objects with parameters. If used, only + /// bindings that match (see ) the given mask will have the override applied to them. + /// is null -or- is null + /// or empty. + /// + /// This method is a variation of + /// that encapsulates a reference to the name of the parameter and the type of object it is found on in a way that is + /// type-safe and does not involve strings. + /// + /// + /// + /// // Override the "duration" parameter from a TapInteraction. + /// // This is equivalent to calling ApplyParameterOverride("tap:duration", 0.4f). + /// action.ApplyParameterOverride((TapInteraction x) => x.duration, 0.4f); + /// + /// + /// + /// + public static void ApplyParameterOverride(this InputAction action, Expression> expr, TValue value, + InputBinding bindingMask = default) + where TValue : struct + { + if (action == null) + throw new ArgumentNullException(nameof(action)); + if (expr == null) + throw new ArgumentNullException(nameof(expr)); + + var actionMap = action.GetOrCreateActionMap(); + actionMap.ResolveBindingsIfNecessary(); + bindingMask.action = action.name; + + var parameterOverride = ExtractParameterOverride(expr, bindingMask, PrimitiveValue.From(value)); + + ApplyParameterOverride(actionMap.m_State, actionMap.m_MapIndexInState, + ref actionMap.m_ParameterOverrides, ref actionMap.m_ParameterOverridesCount, + parameterOverride); + } + + /// + /// Set the value of the given parameter on the , , + /// and objects found on the of . + /// + /// An action on whose to look for objects to set + /// the parameter value on. + /// An expression such as (TapInteraction x) => x.duration that determines the + /// name and type of the parameter whose value to set. + /// New value to assign to the parameter. + /// Optional mask that determines on which bindings to look for objects with parameters. If used, only + /// bindings that match (see ) the given mask will have the override applied to them. + /// is null -or- is null + /// or empty. + /// + /// This method is a variation of + /// that encapsulates a reference to the name of the parameter and the type of object it is found on in a way that is + /// type-safe and does not involve strings. + /// + /// + /// + /// // Override the "duration" parameter from a TapInteraction. + /// // This is equivalent to calling mApplyParameterOverride("tap:duration", 0.4f). + /// actionMap.ApplyParameterOverride((TapInteraction x) => x.duration, 0.4f); + /// + /// + /// + /// + public static void ApplyParameterOverride(this InputActionMap actionMap, Expression> expr, TValue value, + InputBinding bindingMask = default) + where TValue : struct + { + if (actionMap == null) + throw new ArgumentNullException(nameof(actionMap)); + if (expr == null) + throw new ArgumentNullException(nameof(expr)); + + actionMap.ResolveBindingsIfNecessary(); + + var parameterOverride = ExtractParameterOverride(expr, bindingMask, PrimitiveValue.From(value)); + + ApplyParameterOverride(actionMap.m_State, actionMap.m_MapIndexInState, + ref actionMap.m_ParameterOverrides, ref actionMap.m_ParameterOverridesCount, + parameterOverride); + } + + /// + /// Set the value of the given parameter on the , , + /// and objects found on the of the + /// in . + /// + /// An asset on whose to look for objects to set + /// the parameter value on. + /// An expression such as (TapInteraction x) => x.duration that determines the + /// name and type of the parameter whose value to set. + /// New value to assign to the parameter. + /// Optional mask that determines on which bindings to look for objects with parameters. If used, only + /// bindings that match (see ) the given mask will have the override applied to them. + /// is null -or- is null + /// or empty. + /// + /// This method is a variation of + /// that encapsulates a reference to the name of the parameter and the type of object it is found on in a way that is + /// type-safe and does not involve strings. + /// + /// + /// + /// // Override the "duration" parameter from a TapInteraction. + /// // This is equivalent to calling mApplyParameterOverride("tap:duration", 0.4f). + /// asset.ApplyParameterOverride((TapInteraction x) => x.duration, 0.4f); + /// + /// + /// + /// + public static void ApplyParameterOverride(this InputActionAsset asset, Expression> expr, TValue value, + InputBinding bindingMask = default) + where TValue : struct + { + if (asset == null) + throw new ArgumentNullException(nameof(asset)); + if (expr == null) + throw new ArgumentNullException(nameof(expr)); + + asset.ResolveBindingsIfNecessary(); + + var parameterOverride = ExtractParameterOverride(expr, bindingMask, PrimitiveValue.From(value)); + + ApplyParameterOverride(asset.m_SharedStateForAllMaps, -1, + ref asset.m_ParameterOverrides, ref asset.m_ParameterOverridesCount, + parameterOverride); + } + + private static ParameterOverride ExtractParameterOverride(Expression> expr, + InputBinding bindingMask = default, PrimitiveValue value = default) + { + if (!(expr is LambdaExpression lambda)) + throw new ArgumentException($"Expression must be a LambdaExpression but was a {expr.GetType().Name} instead", nameof(expr)); + + if (!(lambda.Body is MemberExpression body)) + { + // If the field type in the lambda doesn't match the TValue type being used, + // but there is a coercion, the compiler will automatically insert a Convert(x.name, TValue) + // expression. + if (lambda.Body is UnaryExpression unary && unary.NodeType == ExpressionType.Convert && unary.Operand is MemberExpression b) + { + body = b; + } + else + { + throw new ArgumentException( + $"Body in LambdaExpression must be a MemberExpression (x.name) but was a {expr.GetType().Name} instead", + nameof(expr)); + } + } + + string objectRegistrationName; + if (typeof(InputProcessor).IsAssignableFrom(typeof(TObject))) + objectRegistrationName = InputProcessor.s_Processors.FindNameForType(typeof(TObject)); + else if (typeof(IInputInteraction).IsAssignableFrom(typeof(TObject))) + objectRegistrationName = InputInteraction.s_Interactions.FindNameForType(typeof(TObject)); + else if (typeof(InputBindingComposite).IsAssignableFrom(typeof(TObject))) + objectRegistrationName = InputBindingComposite.s_Composites.FindNameForType(typeof(TObject)); + else + throw new ArgumentException( + $"Given type must be an InputProcessor, IInputInteraction, or InputBindingComposite (was {typeof(TObject).Name})", + nameof(TObject)); + + return new ParameterOverride(objectRegistrationName, body.Member.Name, bindingMask, value); + } + + /// + /// Set the value of the given parameter on the , , + /// and objects found on the of . + /// + /// An action map on whose to look for objects to set + /// the parameter value on. + /// Name of the parameter to get the value of. Case-insensitive. This can either be just the name of the + /// parameter (like "duration" or expressed as nameof(TapInteraction.duration)) or can be prefixed with the + /// type of object to get the parameter value from. For example, "tap:duration" will specifically get the "duration" + /// parameter from the object registered as "tap" (which will usually be ). + /// New value to assign to the parameter. + /// A binding mask that determines which of 's + /// to apply the override to. By default this is empty which leads to the override to be applied to all bindings in the map. + /// + /// This method both directly applies the new value and also stores the override internally. + /// + /// If an override for the same parameter and with the same already exists, + /// its value is simply updated. No new override will be created. + /// + /// You can use this method to set parameters (public fields) on composites, interactions, and processors that are created + /// from bindings. + /// + /// + /// + /// // Create an action map with two actions. + /// var map = new InputActionMap(); + /// var action1 = map.AddAction("action1"); + /// var action2 = map.AddAction("action2"); + /// + /// // Add a binding to each action to which a "ClampProcessor" is applied. + /// // This processor has two parameters: + /// // - "min" (float) + /// // - "max" (float) + /// action1.AddBinding(">Gamepad>/rightTrigger", processors: "clamp(min=0.2,max=0.8)"); + /// action2.AddBinding(">Gamepad>/leftTrigger", processors: "clamp(min=0.2,max=0.8)"); + /// + /// // Apply parameter overrides to set the values differently. + /// // This will apply the setting to *both* the bindings on action1 *and* action2. + /// map.ApplyParameterOverride("min", 0.3f); + /// map.ApplyParameterOverride("max", 0.9f); + /// + /// + /// + /// An override can optionally be directed at a specific type of object. + /// + /// + /// + /// map.ApplyParameterOverride("clamp:min", 0.3f); + /// map.ApplyParameterOverride("clamp:max", 0.9f); + /// + /// + /// + /// By default, the parameter override will apply to all bindings in the map. To limit the override + /// to specific bindings, you can supply a . + /// + /// + /// + /// // Apply a parameter override only to action1. + /// map.ApplyBindingOverride("clamp:min", 0.25f, new InputBinding { action = action1.name }); + /// + /// // Apply a parameter override only to a specific binding path. + /// map.ApplyBindingOverride("clamp:min", 0.4f, new InputBinding { path = "<Gamepad>/leftTrigger" }); + /// + /// + /// + /// If multiple overrides exist for the same parameter, an attempt is made to choose the override that is most specific. + /// Say, that you apply an override for "duration" on an entire using + /// . But then you also apply + /// an override to just an individual inside the asset. In this case, the "duration" + /// override for just that action will be applied to bindings of that action and the override inside the asset will + /// be applied to bindings of all other actions. Note that if multiple overrides exist that could all be considered + /// equally valid, the behavior is undecided. + /// + /// Note that parameter overrides stay in place on the map. Like binding overrides, however, they are not + /// automatically persisted and thus need to be reapplied when actions are loaded from assets. This will, however, be applied + /// automatically to bindings added to the action in the future as well as whenever bindings are resolved to controls. + /// + /// is null -or- is null + /// or empty. + /// + public static void ApplyParameterOverride(this InputActionMap actionMap, string name, PrimitiveValue value, InputBinding bindingMask = default) + { + if (actionMap == null) + throw new ArgumentNullException(nameof(actionMap)); + if (string.IsNullOrEmpty(name)) + throw new ArgumentNullException(nameof(name)); + + actionMap.ResolveBindingsIfNecessary(); + + ApplyParameterOverride(actionMap.m_State, actionMap.m_MapIndexInState, + ref actionMap.m_ParameterOverrides, ref actionMap.m_ParameterOverridesCount, + new ParameterOverride(name, bindingMask, value)); + } + + /// + /// Set the value of the given parameter on the , , + /// and objects found on the of each of the + /// in . + /// + /// An .inputactions asset on whose to look for objects to set + /// the parameter value on. + /// Name of the parameter to get the value of. Case-insensitive. This can either be just the name of the + /// parameter (like "duration" or expressed as nameof(TapInteraction.duration)) or can be prefixed with the + /// type of object to get the parameter value from. For example, "tap:duration" will specifically get the "duration" + /// parameter from the object registered as "tap" (which will usually be ). + /// New value to assign to the parameter. + /// A binding mask that determines which of the + /// to apply the override to. By default this is empty which leads to the override to be applied to all bindings in the asset. + /// + /// This method both directly applies the new value and also stores the override internally. + /// + /// If an override for the same parameter and with the same already exists, + /// its value is simply updated. No new override will be created. + /// + /// You can use this method to set parameters (public fields) on composites, interactions, and processors that are created + /// from bindings. + /// + /// + /// + /// // Create an asset with one action map and two actions. + /// var asset = ScriptableObject.CreateInstance<InputActionAsset>(); + /// var map = asset.AddActionMap("map"); + /// var action1 = map.AddAction("action1"); + /// var action2 = map.AddAction("action2"); + /// + /// // Add a binding to each action to which a "ClampProcessor" is applied. + /// // This processor has two parameters: + /// // - "min" (float) + /// // - "max" (float) + /// action1.AddBinding(">Gamepad>/rightTrigger", processors: "clamp(min=0.2,max=0.8)"); + /// action2.AddBinding(">Gamepad>/leftTrigger", processors: "clamp(min=0.2,max=0.8)"); + /// + /// // Apply parameter overrides to set the values differently. + /// // This will apply the setting to *both* the bindings on action1 *and* action2. + /// asset.ApplyParameterOverride("min", 0.3f); + /// asset.ApplyParameterOverride("max", 0.9f); + /// + /// + /// + /// An override can optionally be directed at a specific type of object. + /// + /// + /// + /// asset.ApplyParameterOverride("clamp:min", 0.3f); + /// asset.ApplyParameterOverride("clamp:max", 0.9f); + /// + /// + /// + /// By default, the parameter override will apply to all bindings in the asset. To limit the override + /// to specific bindings, you can supply a . + /// + /// + /// + /// // Apply a parameter override only to action1. + /// asset.ApplyBindingOverride("clamp:min", 0.25f, new InputBinding { action = action1.name }); + /// + /// // Apply a parameter override only to a specific binding path. + /// asset.ApplyBindingOverride("clamp:min", 0.4f, new InputBinding { path = "<Gamepad>/leftTrigger" }); + /// + /// + /// + /// If multiple overrides exist for the same parameter, an attempt is made to choose the override that is most specific. + /// Say, that you apply an override for "duration" on an entire using + /// . But then you also apply + /// an override to just an individual inside the asset. In this case, the "duration" + /// override for just that action will be applied to bindings of that action and the override inside the asset will + /// be applied to bindings of all other actions. Note that if multiple overrides exist that could all be considered + /// equally valid, the behavior is undecided. + /// + /// Note that parameter overrides stay in place on the map. Like binding overrides, however, they are not + /// automatically persisted and thus need to be reapplied when actions are loaded from assets. This will, however, be applied + /// automatically to bindings added to the action in the future as well as whenever bindings are resolved to controls. + /// + /// is null -or- is null + /// or empty. + /// + public static void ApplyParameterOverride(this InputActionAsset asset, string name, PrimitiveValue value, InputBinding bindingMask = default) + { + if (asset == null) + throw new ArgumentNullException(nameof(asset)); + if (string.IsNullOrEmpty(name)) + throw new ArgumentNullException(nameof(name)); + + asset.ResolveBindingsIfNecessary(); + + ApplyParameterOverride(asset.m_SharedStateForAllMaps, -1, + ref asset.m_ParameterOverrides, ref asset.m_ParameterOverridesCount, + new ParameterOverride(name, bindingMask, value)); + } + + /// + /// Set the value of the given parameter on the , , + /// and objects found on the of . + /// + /// An action on whose to look for objects to set + /// the parameter value on. + /// Name of the parameter to get the value of. Case-insensitive. This can either be just the name of the + /// parameter (like "duration" or expressed as nameof(TapInteraction.duration)) or can be prefixed with the + /// type of object to get the parameter value from. For example, "tap:duration" will specifically get the "duration" + /// parameter from the object registered as "tap" (which will usually be ). + /// New value to assign to the parameter. + /// A binding mask that determines which of 's + /// to apply the override to. By default this is empty which leads to the override to be applied to all bindings of the action. + /// + /// This method both directly applies the new value and also stores the override internally. + /// + /// If an override for the same parameter on the same and with the same + /// already exists, its value is simply updated. No new override will be created. + /// + /// You can use this method to set parameters (public fields) on composites, interactions, and processors that are created + /// from bindings. + /// + /// + /// + /// // Create an action with a binding that has a "ClampProcessor" applied to it. + /// // This processor has two parameters: + /// // - "min" (float) + /// // - "max" (float) + /// var action = new InputAction(binding: ">Gamepad>/rightTrigger", processors: "clamp(min=0.2,max=0.8)"); + /// + /// // Apply parameter overrides to set the values differently. + /// action.ApplyParameterOverride("min", 0.3f); + /// action.ApplyParameterOverride("max", 0.9f); + /// + /// + /// + /// An override can optionally be directed at a specific type of object. + /// + /// + /// + /// // Create an action with both a "tap" and a "hold" interaction. Both have a + /// // "duration" parameter. + /// var action = new InputAction(binding: "<Gamepad>/buttonSouth", interactions: "tap;hold"); + /// + /// // Apply parameter overrides individually to the two. + /// action.ApplyParameterOverride("tap:duration", 0.6f); + /// action.ApplyParameterOverride("hold:duration", 4f); + /// + /// + /// + /// By default, the parameter override will apply to all bindings on the action. To limit the override + /// to specific bindings, you can supply a . + /// + /// + /// + /// // Create a "look" style action with a mouse and a gamepad binding. + /// var lookAction = new InputAction(); + /// lookAction.AddBinding("<Mouse>/delta", processors: "scaleVector2", groups: "Mouse"); + /// lookAction.AddBinding("<Gamepad>/rightStick", processors: "scaleVector2", groups: "Gamepad"); + /// + /// // Override scaling of the mouse delta individually. + /// lookAction.ApplyBindingOverride("scaleVector2:x", 0.25f, InputBinding.MaskByGroup("Mouse")); + /// lookAction.ApplyBindingOverride("scaleVector2:y", 0.25f, InputBinding.MaskByGroup("Mouse")); + /// + /// // Can also do that by path. + /// lookAction.ApplyBindingOverride("scaleVector2:x", 0.25f, new InputBinding("<Mouse>/delta")); + /// lookAction.ApplyBindingOverride("scaleVector2:y", 0.25f, new InputBinding("<Mouse>/delta")); + /// + /// + /// + /// Note that parameter overrides stay in place on the action. Like binding overrides, however, they are not + /// automatically persisted and thus need to be reapplied when actions are loaded from assets. This will, however, be applied + /// automatically to bindings added to the action in the future as well as whenever bindings for the action are resolved. + /// + /// is null -or- is null + /// or empty. + /// + public static void ApplyParameterOverride(this InputAction action, string name, PrimitiveValue value, InputBinding bindingMask = default) + { + if (action == null) + throw new ArgumentNullException(nameof(action)); + if (name == null) + throw new ArgumentNullException(nameof(name)); + + var actionMap = action.GetOrCreateActionMap(); + actionMap.ResolveBindingsIfNecessary(); + bindingMask.action = action.name; + + ApplyParameterOverride(actionMap.m_State, actionMap.m_MapIndexInState, + ref actionMap.m_ParameterOverrides, ref actionMap.m_ParameterOverridesCount, + new ParameterOverride(name, bindingMask, value)); + } + + /// + /// Set the value of the given parameter on the , , + /// and objects found on the of . + /// + /// An action on whose to look for objects to set + /// the parameter value on. + /// Name of the parameter to get the value of. Case-insensitive. This can either be just the name of the + /// parameter (like "duration" or expressed as nameof(TapInteraction.duration)) or can be prefixed with the + /// type of object to get the parameter value from. For example, "tap:duration" will specifically get the "duration" + /// parameter from the object registered as "tap" (which will usually be ). + /// New value to assign to the parameter. + /// Index of the binding in of to which + /// to restrict the parameter override to. + /// is negative or equal or greater than the number of + /// of . + /// is null -or- is null + /// or empty. + /// + /// This method is a variation of which + /// allows specifying a binding by index. It otherwise behaves identically to that method. + /// + public static void ApplyParameterOverride(this InputAction action, string name, PrimitiveValue value, int bindingIndex) + { + if (action == null) + throw new ArgumentNullException(nameof(action)); + if (string.IsNullOrEmpty(name)) + throw new ArgumentNullException(nameof(name)); + if (bindingIndex < 0) + throw new ArgumentOutOfRangeException(nameof(bindingIndex)); + + var indexOnMap = action.BindingIndexOnActionToBindingIndexOnMap(bindingIndex); + var bindingMask = new InputBinding { id = action.GetOrCreateActionMap().bindings[indexOnMap].id }; + + action.ApplyParameterOverride(name, value, bindingMask); + } + + private static void ApplyParameterOverride(InputActionState state, int mapIndex, + ref ParameterOverride[] parameterOverrides, ref int parameterOverridesCount, ParameterOverride parameterOverride) + { + // Update the parameter overrides on the map or asset. + var haveExistingOverride = false; + if (parameterOverrides != null) + { + // Try to find existing override. + for (var i = 0; i < parameterOverridesCount; ++i) + { + ref var p = ref parameterOverrides[i]; + if (string.Equals(p.objectRegistrationName, parameterOverride.objectRegistrationName, StringComparison.OrdinalIgnoreCase) && + string.Equals(p.parameter, parameterOverride.parameter, StringComparison.OrdinalIgnoreCase) && + p.bindingMask == parameterOverride.bindingMask) + { + haveExistingOverride = true; + // Update value on existing override. + p = parameterOverride; + break; + } + } + } + if (!haveExistingOverride) + { + // Add new override. + ArrayHelpers.AppendWithCapacity(ref parameterOverrides, ref parameterOverridesCount, parameterOverride); + } + + // Set value on all current processor and/or interaction instances that use the parameter. + foreach (var parameter in new ParameterEnumerable(state, parameterOverride, mapIndex)) + { + // We cannot just blindly apply the parameter here as the override we have set may be less + // specific than an override we already have applied. So instead, we look up the most specific + // override and set that. + var actionMap = state.GetActionMap(parameter.bindingIndex); + ref var binding = ref state.GetBinding(parameter.bindingIndex); + var overrideToApply = ParameterOverride.Find(actionMap, ref binding, parameterOverride.parameter, + parameterOverride.objectRegistrationName); + if (overrideToApply.HasValue) + { + var fieldTypeCode = Type.GetTypeCode(parameter.field.FieldType); + parameter.field.SetValue(parameter.instance, overrideToApply.Value.value.ConvertTo(fieldTypeCode).ToObject()); + } + } + } + + internal struct Parameter + { + public object instance; + public FieldInfo field; + public int bindingIndex; + } + + // Finds all instances of a parameter in one or more actions. + private struct ParameterEnumerable : IEnumerable + { + private InputActionState m_State; + private ParameterOverride m_Parameter; + private int m_MapIndex; + + public ParameterEnumerable(InputActionState state, ParameterOverride parameter, int mapIndex = -1) + { + m_State = state; + m_Parameter = parameter; + m_MapIndex = mapIndex; + } + + public ParameterEnumerator GetEnumerator() + { + return new ParameterEnumerator(m_State, m_Parameter, m_MapIndex); + } + + IEnumerator IEnumerable.GetEnumerator() + { + return GetEnumerator(); + } + + IEnumerator IEnumerable.GetEnumerator() + { + return GetEnumerator(); + } + } + + private struct ParameterEnumerator : IEnumerator + { + private InputActionState m_State; + private int m_MapIndex; + private int m_BindingCurrentIndex; + private int m_BindingEndIndex; + private int m_InteractionCurrentIndex; + private int m_InteractionEndIndex; + private int m_ProcessorCurrentIndex; + private int m_ProcessorEndIndex; + + private InputBinding m_BindingMask; + private Type m_ObjectType; + private string m_ParameterName; + private bool m_MayBeInteraction; + private bool m_MayBeProcessor; + private bool m_MayBeComposite; + private bool m_CurrentBindingIsComposite; + private object m_CurrentObject; + private FieldInfo m_CurrentParameter; + + public ParameterEnumerator(InputActionState state, ParameterOverride parameter, int mapIndex = -1) + : this() + { + m_State = state; + m_ParameterName = parameter.parameter; + m_MapIndex = mapIndex; + m_ObjectType = parameter.objectType; + m_MayBeComposite = m_ObjectType == null || typeof(InputBindingComposite).IsAssignableFrom(m_ObjectType); + m_MayBeProcessor = m_ObjectType == null || typeof(InputProcessor).IsAssignableFrom(m_ObjectType); + m_MayBeInteraction = m_ObjectType == null || typeof(IInputInteraction).IsAssignableFrom(m_ObjectType); + m_BindingMask = parameter.bindingMask; + Reset(); + } + + private bool MoveToNextBinding() + { + // Find a binding that matches our mask. + while (true) + { + ++m_BindingCurrentIndex; + if (m_BindingCurrentIndex >= m_BindingEndIndex) + return false; // Reached the end. + + ref var binding = ref m_State.GetBinding(m_BindingCurrentIndex); + ref var bindingState = ref m_State.GetBindingState(m_BindingCurrentIndex); + + // Skip any binding that has no associated objects with parameters. + if (bindingState.processorCount == 0 && bindingState.interactionCount == 0 && !binding.isComposite) + continue; + + // If we're only looking for composites, skip any binding that isn't one. + if (m_MayBeComposite && !m_MayBeProcessor && !m_MayBeInteraction && !binding.isComposite) + continue; + + // If we're only looking for processors, skip any that hasn't got any. + if (m_MayBeProcessor && !m_MayBeComposite && !m_MayBeInteraction && bindingState.processorCount == 0) + continue; + + // If we're only looking for interactions, skip any that hasn't got any. + if (m_MayBeInteraction && !m_MayBeComposite && !m_MayBeProcessor && bindingState.interactionCount == 0) + continue; + + if (m_BindingMask.Matches(ref binding)) + { + if (m_MayBeComposite) + m_CurrentBindingIsComposite = binding.isComposite; + + // Reset interaction and processor count. + m_ProcessorCurrentIndex = bindingState.processorStartIndex - 1; // Minus one to account for first MoveNext(). + m_ProcessorEndIndex = bindingState.processorStartIndex + bindingState.processorCount; + m_InteractionCurrentIndex = bindingState.interactionStartIndex - 1; // Minus one to account for first MoveNext(). + m_InteractionEndIndex = bindingState.interactionStartIndex + bindingState.interactionCount; + + return true; + } + } + } + + private bool MoveToNextInteraction() + { + while (m_InteractionCurrentIndex < m_InteractionEndIndex) + { + ++m_InteractionCurrentIndex; + if (m_InteractionCurrentIndex == m_InteractionEndIndex) + break; + var interaction = m_State.interactions[m_InteractionCurrentIndex]; + if (FindParameter(interaction)) + return true; + } + return false; + } + + private bool MoveToNextProcessor() + { + while (m_ProcessorCurrentIndex < m_ProcessorEndIndex) + { + ++m_ProcessorCurrentIndex; + if (m_ProcessorCurrentIndex == m_ProcessorEndIndex) + break; + var processor = m_State.processors[m_ProcessorCurrentIndex]; + if (FindParameter(processor)) + return true; + } + return false; + } + + private bool FindParameter(object instance) + { + if (m_ObjectType != null && !m_ObjectType.IsInstanceOfType(instance)) + return false; + + var field = instance.GetType().GetField(m_ParameterName, + BindingFlags.Instance | BindingFlags.Public | BindingFlags.IgnoreCase); + if (field == null) + return false; + + m_CurrentParameter = field; + m_CurrentObject = instance; + + return true; + } + + public bool MoveNext() + { + while (true) + { + if (m_MayBeInteraction && MoveToNextInteraction()) + return true; + + if (m_MayBeProcessor && MoveToNextProcessor()) + return true; + + if (!MoveToNextBinding()) + return false; + + if (m_MayBeComposite && m_CurrentBindingIsComposite) + { + var compositeIndex = m_State.GetBindingState(m_BindingCurrentIndex).compositeOrCompositeBindingIndex; + var composite = m_State.composites[compositeIndex]; + if (FindParameter(composite)) + return true; + } + } + } + + public unsafe void Reset() + { + m_CurrentObject = default; + m_CurrentParameter = default; + m_InteractionCurrentIndex = default; + m_InteractionEndIndex = default; + m_ProcessorCurrentIndex = default; + m_ProcessorEndIndex = default; + m_CurrentBindingIsComposite = default; + if (m_MapIndex < 0) + { + m_BindingCurrentIndex = -1; // Account for first MoveNext(). + m_BindingEndIndex = m_State.totalBindingCount; + } + else + { + m_BindingCurrentIndex = m_State.mapIndices[m_MapIndex].bindingStartIndex - 1; // Account for first MoveNext(). + m_BindingEndIndex = m_State.mapIndices[m_MapIndex].bindingStartIndex + m_State.mapIndices[m_MapIndex].bindingCount; + } + } + + public Parameter Current => new Parameter + { + instance = m_CurrentObject, + field = m_CurrentParameter, + bindingIndex = m_BindingCurrentIndex, + }; + + object IEnumerator.Current => Current; + + public void Dispose() + { + } + } + + internal struct ParameterOverride + { + public string objectRegistrationName; // Optional. Such as "hold" or "scale". + public string parameter; + public InputBinding bindingMask; + public PrimitiveValue value; + + public Type objectType => + InputProcessor.s_Processors.LookupTypeRegistration(objectRegistrationName) + ?? InputInteraction.s_Interactions.LookupTypeRegistration(objectRegistrationName) + ?? InputBindingComposite.s_Composites.LookupTypeRegistration(objectRegistrationName); + + public ParameterOverride(string parameterName, InputBinding bindingMask, PrimitiveValue value = default) + { + var colonIndex = parameterName.IndexOf(':'); + if (colonIndex < 0) + { + objectRegistrationName = null; + parameter = parameterName; + } + else + { + objectRegistrationName = parameterName.Substring(0, colonIndex); + parameter = parameterName.Substring(colonIndex + 1); + } + this.bindingMask = bindingMask; + this.value = value; + } + + public ParameterOverride(string objectRegistrationName, string parameterName, InputBinding bindingMask, PrimitiveValue value = default) + { + this.objectRegistrationName = objectRegistrationName; + this.parameter = parameterName; + this.bindingMask = bindingMask; + this.value = value; + } + + // Find the *most specific* override to apply to the given parameter. + public static ParameterOverride? Find(InputActionMap actionMap, ref InputBinding binding, string parameterName, string objectRegistrationName) + { + // Look at level of map. + var overrideOnMap = Find(actionMap.m_ParameterOverrides, actionMap.m_ParameterOverridesCount, ref binding, parameterName, + objectRegistrationName); + + // Look at level of asset (if present). + var asset = actionMap.asset; + var overrideOnAsset = asset != null + ? Find(asset.m_ParameterOverrides, asset.m_ParameterOverridesCount, ref binding, parameterName, + objectRegistrationName) + : null; + + return PickMoreSpecificOne(overrideOnMap, overrideOnAsset); + } + + private static ParameterOverride? Find(ParameterOverride[] overrides, int overrideCount, + ref InputBinding binding, string parameterName, string objectRegistrationName) + { + ParameterOverride? result = null; + for (var i = 0; i < overrideCount; ++i) + { + ref var current = ref overrides[i]; + + if (!string.Equals(parameterName, current.parameter, StringComparison.OrdinalIgnoreCase)) + continue; // Different parameter name. + + if (!current.bindingMask.Matches(binding)) + continue; + + if (current.objectRegistrationName != null && !string.Equals(current.objectRegistrationName, objectRegistrationName, + StringComparison.OrdinalIgnoreCase)) + continue; + + if (result == null) + { + // First match. + result = current; + } + else + { + // Already have a match. See which one is more specific. + result = PickMoreSpecificOne(result, current); + } + } + return result; + } + + private static ParameterOverride? PickMoreSpecificOne(ParameterOverride? first, ParameterOverride? second) + { + if (first == null) + return second; + if (second == null) + return first; + + // Having an objectRegistrationName always wins vs not having one. + if (first.Value.objectRegistrationName != null && second.Value.objectRegistrationName == null) + return first; + if (second.Value.objectRegistrationName != null && first.Value.objectRegistrationName == null) + return second; + + // Targeting a specific path always wins vs not doing so. + if (first.Value.bindingMask.effectivePath != null && second.Value.bindingMask.effectivePath == null) + return first; + if (second.Value.bindingMask.effectivePath != null && first.Value.bindingMask.effectivePath == null) + return second; + + // Targeting a specific actions always wins vs not doing so. + if (first.Value.bindingMask.action != null && second.Value.bindingMask.action == null) + return first; + if (second.Value.bindingMask.action != null && first.Value.bindingMask.action == null) + return second; + + // Undecided. First wins by default. + return first; + } + } + } +} diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionParameters.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionParameters.cs.meta new file mode 100644 index 0000000000..59541e458e --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionParameters.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 050df780a05f4754b28e85d32a88da95 +timeCreated: 1647030981 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionRebindingExtensions.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionRebindingExtensions.cs index 4ac5e1668e..1a505c465a 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionRebindingExtensions.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionRebindingExtensions.cs @@ -41,7 +41,7 @@ namespace UnityEngine.InputSystem /// /// /// - public static class InputActionRebindingExtensions + public static partial class InputActionRebindingExtensions { /// /// Get the index of the first binding in on diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingComposite.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingComposite.cs index 40a0960c3a..ec8a7d87ba 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingComposite.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingComposite.cs @@ -26,6 +26,9 @@ namespace UnityEngine.InputSystem /// for more details about composites and for how to define custom composites. /// /// + /// + /// + /// public abstract class InputBindingComposite { /// diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingResolver.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingResolver.cs index d817980f04..f10eb7c974 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingResolver.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingResolver.cs @@ -113,20 +113,20 @@ public void StartWithPreviousResolve(InputActionState state, bool isFullResolve) /// /// Resolve and add all bindings and actions from the given map. /// - /// + /// /// /// This is where all binding resolution happens for actions. The method walks through the binding array - /// in and adds any controls, interactions, processors, and composites as it goes. + /// in and adds any controls, interactions, processors, and composites as it goes. /// [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1809:AvoidExcessiveLocals", Justification = "TODO: Refactor later.")] - public unsafe void AddActionMap(InputActionMap map) + public unsafe void AddActionMap(InputActionMap actionMap) { - Debug.Assert(map != null, "Received null map"); + Debug.Assert(actionMap != null, "Received null map"); InputSystem.EnsureInitialized(); - var actionsInThisMap = map.m_Actions; - var bindingsInThisMap = map.m_Bindings; + var actionsInThisMap = actionMap.m_Actions; + var bindingsInThisMap = actionMap.m_Bindings; var bindingCountInThisMap = bindingsInThisMap?.Length ?? 0; var actionCountInThisMap = actionsInThisMap?.Length ?? 0; var mapIndex = totalMapCount; @@ -161,9 +161,9 @@ public unsafe void AddActionMap(InputActionMap map) var currentCompositePartCount = 0; var currentCompositeActionIndexInMap = InputActionState.kInvalidIndex; InputAction currentCompositeAction = null; - var bindingMaskOnThisMap = map.m_BindingMask; - var devicesForThisMap = map.devices; - var isSingletonAction = map.m_SingletonAction != null; + var bindingMaskOnThisMap = actionMap.m_BindingMask; + var devicesForThisMap = actionMap.devices; + var isSingletonAction = actionMap.m_SingletonAction != null; // Can't use `using` as we need to use it with `ref`. var resolvedControls = new InputControlList(Allocator.Temp); @@ -217,7 +217,7 @@ public unsafe void AddActionMap(InputActionMap map) else if (!string.IsNullOrEmpty(actionName)) { ////REVIEW: should we fail here if we don't manage to find the action - actionIndexInMap = map.FindActionIndex(actionName); + actionIndexInMap = actionMap.FindActionIndex(actionName); } if (actionIndexInMap != InputActionState.kInvalidIndex) @@ -301,14 +301,16 @@ public unsafe void AddActionMap(InputActionMap map) if (!string.IsNullOrEmpty(processorString)) { // Add processors from binding. - firstProcessorIndex = InstantiateWithParameters(InputProcessor.s_Processors, processorString, ref processors, ref totalProcessorCount); + firstProcessorIndex = InstantiateWithParameters(InputProcessor.s_Processors, processorString, + ref processors, ref totalProcessorCount, actionMap, ref unresolvedBinding); if (firstProcessorIndex != InputActionState.kInvalidIndex) numProcessors = totalProcessorCount - firstProcessorIndex; } if (!string.IsNullOrEmpty(action.m_Processors)) { // Add processors from action. - var index = InstantiateWithParameters(InputProcessor.s_Processors, action.m_Processors, ref processors, ref totalProcessorCount); + var index = InstantiateWithParameters(InputProcessor.s_Processors, action.m_Processors, ref processors, + ref totalProcessorCount, actionMap, ref unresolvedBinding); if (index != InputActionState.kInvalidIndex) { if (firstProcessorIndex == InputActionState.kInvalidIndex) @@ -322,14 +324,16 @@ public unsafe void AddActionMap(InputActionMap map) if (!string.IsNullOrEmpty(interactionString)) { // Add interactions from binding. - firstInteractionIndex = InstantiateWithParameters(InputInteraction.s_Interactions, interactionString, ref interactions, ref totalInteractionCount); + firstInteractionIndex = InstantiateWithParameters(InputInteraction.s_Interactions, interactionString, + ref interactions, ref totalInteractionCount, actionMap, ref unresolvedBinding); if (firstInteractionIndex != InputActionState.kInvalidIndex) numInteractions = totalInteractionCount - firstInteractionIndex; } if (!string.IsNullOrEmpty(action.m_Interactions)) { // Add interactions from action. - var index = InstantiateWithParameters(InputInteraction.s_Interactions, action.m_Interactions, ref interactions, ref totalInteractionCount); + var index = InstantiateWithParameters(InputInteraction.s_Interactions, action.m_Interactions, + ref interactions, ref totalInteractionCount, actionMap, ref unresolvedBinding); if (index != InputActionState.kInvalidIndex) { if (firstInteractionIndex == InputActionState.kInvalidIndex) @@ -346,7 +350,7 @@ public unsafe void AddActionMap(InputActionMap map) // subsequent bindings. // Instantiate. For composites, the path is the name of the composite. - var composite = InstantiateBindingComposite(unresolvedBinding.path); + var composite = InstantiateBindingComposite(ref unresolvedBinding, actionMap); currentCompositeIndex = ArrayHelpers.AppendWithCapacity(ref composites, ref totalCompositeCount, composite); @@ -416,7 +420,7 @@ public unsafe void AddActionMap(InputActionMap map) catch (Exception exception) { Debug.LogError( - $"{exception.GetType().Name} while resolving binding '{unresolvedBinding}' in action map '{map}'"); + $"{exception.GetType().Name} while resolving binding '{unresolvedBinding}' in action map '{actionMap}'"); Debug.LogException(exception); // Don't swallow exceptions that indicate something is wrong in the code rather than @@ -571,9 +575,9 @@ public unsafe void AddActionMap(InputActionMap map) compositeStartIndex = compositeStartIndex, compositeCount = totalCompositeCount - compositeStartIndex, }; - map.m_MapIndexInState = mapIndex; + actionMap.m_MapIndexInState = mapIndex; var finalActionMapCount = memory.mapCount; - ArrayHelpers.AppendWithCapacity(ref maps, ref finalActionMapCount, map, capacityIncrement: 4); + ArrayHelpers.AppendWithCapacity(ref maps, ref finalActionMapCount, actionMap, capacityIncrement: 4); Debug.Assert(finalActionMapCount == newMemory.mapCount, "Final action map count should match old action map count plus one"); @@ -594,7 +598,7 @@ public unsafe void AddActionMap(InputActionMap map) } private List m_Parameters; // We retain this to reuse the allocation. - private int InstantiateWithParameters(TypeTable registrations, string namesAndParameters, ref TType[] array, ref int count) + private int InstantiateWithParameters(TypeTable registrations, string namesAndParameters, ref TType[] array, ref int count, InputActionMap actionMap, ref InputBinding binding) { if (!NameAndParameters.ParseMultiple(namesAndParameters, ref m_Parameters)) return InputActionState.kInvalidIndex; @@ -603,20 +607,28 @@ private int InstantiateWithParameters(TypeTable registrations, string nam for (var i = 0; i < m_Parameters.Count; ++i) { // Look up type. - var type = registrations.LookupTypeRegistration(m_Parameters[i].name); + var objectRegistrationName = m_Parameters[i].name; + var type = registrations.LookupTypeRegistration(objectRegistrationName); if (type == null) - throw new InvalidOperationException( - $"No {typeof(TType).Name} with name '{m_Parameters[i].name}' (mentioned in '{namesAndParameters}') has been registered"); + { + Debug.LogError( + $"No {typeof(TType).Name} with name '{objectRegistrationName}' (mentioned in '{namesAndParameters}') has been registered"); + continue; + } if (!m_IsControlOnlyResolve) { // Instantiate it. if (!(Activator.CreateInstance(type) is TType instance)) - throw new InvalidOperationException( - $"Type '{type.Name}' registered '{m_Parameters[i].name}' (mentioned in '{namesAndParameters}') is not an {typeof(TType).Name}"); + { + Debug.LogError( + $"Type '{type.Name}' registered as '{objectRegistrationName}' (mentioned in '{namesAndParameters}') is not an {typeof(TType).Name}"); + continue; + } // Pass parameters to it. - NamedValue.ApplyAllToObject(instance, m_Parameters[i].parameters); + ApplyParameters(m_Parameters[i].parameters, instance, actionMap, ref binding, objectRegistrationName, + namesAndParameters); // Add to list. ArrayHelpers.AppendWithCapacity(ref array, ref count, instance); @@ -631,9 +643,9 @@ private int InstantiateWithParameters(TypeTable registrations, string nam return firstIndex; } - private static InputBindingComposite InstantiateBindingComposite(string nameAndParameters) + private static InputBindingComposite InstantiateBindingComposite(ref InputBinding binding, InputActionMap actionMap) { - var nameAndParametersParsed = NameAndParameters.Parse(nameAndParameters); + var nameAndParametersParsed = NameAndParameters.Parse(binding.effectivePath); // Look up. var type = InputBindingComposite.s_Composites.LookupTypeRegistration(nameAndParametersParsed.name); @@ -647,11 +659,38 @@ private static InputBindingComposite InstantiateBindingComposite(string nameAndP $"Registered type '{type.Name}' used for '{nameAndParametersParsed.name}' is not an InputBindingComposite"); // Set parameters. - NamedValue.ApplyAllToObject(instance, nameAndParametersParsed.parameters); + ApplyParameters(nameAndParametersParsed.parameters, instance, actionMap, ref binding, nameAndParametersParsed.name, + binding.effectivePath); return instance; } + private static void ApplyParameters(ReadOnlyArray parameters, object instance, InputActionMap actionMap, ref InputBinding binding, string objectRegistrationName, string namesAndParameters) + { + foreach (var parameter in parameters) + { + // Find field. + var field = instance.GetType().GetField(parameter.name, + BindingFlags.IgnoreCase | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); + if (field == null) + { + Debug.LogError( + $"Type '{instance.GetType().Name}' registered as '{objectRegistrationName}' (mentioned in '{namesAndParameters}') has no public field called '{parameter.name}'"); + continue; + } + var fieldTypeCode = Type.GetTypeCode(field.FieldType); + + // See if we have a parameter override. + var parameterOverride = + InputActionRebindingExtensions.ParameterOverride.Find(actionMap, ref binding, parameter.name, objectRegistrationName); + var value = parameterOverride != null + ? parameterOverride.Value.value + : parameter.value; + + field.SetValue(instance, value.ConvertTo(fieldTypeCode).ToObject()); + } + } + private static int AssignCompositePartIndex(object composite, string name, ref int currentCompositePartCount) { var type = composite.GetType(); @@ -674,7 +713,7 @@ private static int AssignCompositePartIndex(object composite, string name, ref i throw new InvalidOperationException( $"Field '{name}' used as a parameter of binding composite '{composite}' must be of type 'int' but is of type '{type.Name}' instead"); - ////REVIEW: this create garbage; need a better solution to get to zero garbage during re-resolving + ////REVIEW: this creates garbage; need a better solution to get to zero garbage during re-resolving // See if we've already assigned a part index. This can happen if there are multiple bindings // for the same named slot on the composite (e.g. multiple "Negative" bindings on an axis composite). var partIndex = (int)field.GetValue(composite); diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/InputProcessor.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/InputProcessor.cs index a25e3bdd29..5bb9a42ae8 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Controls/InputProcessor.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/InputProcessor.cs @@ -25,6 +25,8 @@ namespace UnityEngine.InputSystem /// /// /// + /// + /// public abstract class InputProcessor { /// @@ -41,6 +43,17 @@ public abstract class InputProcessor /// public abstract object ProcessAsObject(object value, InputControl control); + /// + /// Process an input value stored in the given memory buffer. + /// + /// Memory buffer containing the input value. Must be at least large enough + /// to hold one full value as indicated by . + /// Size (in bytes) of the value inside . + /// Optional control that the value originated from. Must have the same value type + /// that the processor has. + /// + /// This method allows processing values of arbitrary size without allocating memory on the GC heap. + /// public abstract unsafe void Process(void* buffer, int bufferSize, InputControl control); internal static TypeTable s_Processors; diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/InputParameterEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/InputParameterEditor.cs index 8ae4384622..4cc30e9050 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/InputParameterEditor.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/InputParameterEditor.cs @@ -15,6 +15,8 @@ namespace UnityEngine.InputSystem.Editor /// /// When implementing a custom parameter editor, use instead. /// + /// + /// public abstract class InputParameterEditor { /// diff --git a/Packages/com.unity.inputsystem/InputSystem/Utilities/PrimitiveValue.cs b/Packages/com.unity.inputsystem/InputSystem/Utilities/PrimitiveValue.cs index 3b5798b809..c16f699309 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Utilities/PrimitiveValue.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Utilities/PrimitiveValue.cs @@ -32,6 +32,8 @@ public struct PrimitiveValue : IEquatable, IConvertible [FieldOffset(4)] private float m_FloatValue; [FieldOffset(4)] private double m_DoubleValue; + internal unsafe byte* valuePtr => (byte*)UnsafeUtility.AddressOf(ref this) + 4; + /// /// Type of value stored in the struct. /// if the struct does not hold a value (i.e. has been default-initialized). diff --git a/Packages/com.unity.inputsystem/InputSystem/Utilities/TypeTable.cs b/Packages/com.unity.inputsystem/InputSystem/Utilities/TypeTable.cs index 4ae8b83e52..cbf837a76c 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Utilities/TypeTable.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Utilities/TypeTable.cs @@ -63,7 +63,7 @@ public void AddTypeRegistration(string name, Type type) public Type LookupTypeRegistration(string name) { if (string.IsNullOrEmpty(name)) - throw new ArgumentException("Name cannot be null or empty", nameof(name)); + return null; if (table == null) throw new InvalidOperationException("Input System not yet initialized"); From e033f614af94469a2a590b62247a0ce40a22c70f Mon Sep 17 00:00:00 2001 From: jamesmcgill Date: Thu, 24 Mar 2022 16:14:00 +0100 Subject: [PATCH 38/53] FIX: Ensure BackgroundBehavior.IgnoreFocus is respected even when Application.runInBackground is false --- Assets/Tests/InputSystem/CoreTests_Devices.cs | 63 +++++++++++-------- Packages/com.unity.inputsystem/CHANGELOG.md | 1 + .../InputSystem/InputManager.cs | 10 +-- 3 files changed, 43 insertions(+), 31 deletions(-) diff --git a/Assets/Tests/InputSystem/CoreTests_Devices.cs b/Assets/Tests/InputSystem/CoreTests_Devices.cs index f4165c56c1..662f9b751d 100644 --- a/Assets/Tests/InputSystem/CoreTests_Devices.cs +++ b/Assets/Tests/InputSystem/CoreTests_Devices.cs @@ -4668,8 +4668,8 @@ void DeviceChangeCallback(InputDevice device, InputDeviceChange change) InputDevice trackedDevice2 = null; // If we're set up to process input even when in the background, make sure - // this is intact. - if (appRunInBackground || kIsEditor) + // this is intact. (IgnoreFocus will always allow for running in the background) + if (appRunInBackground || kIsEditor || backgroundBehavior == InputSettings.BackgroundBehavior.IgnoreFocus) { // Queue a change on each device. Set(mouse.position, new Vector2(333, 444), queueEventOnly: true); @@ -4746,27 +4746,14 @@ void DeviceChangeCallback(InputDevice device, InputDeviceChange change) if (!kIsEditor || editorInputBehaviorInPlayMode == InputSettings.EditorInputBehaviorInPlayMode.AllDeviceInputAlwaysGoesToGameView) { - if (appRunInBackground) - { - // All devices should have been affected. - Assert.That(eventCount, Is.EqualTo(5)); - Assert.That(mouse.position.ReadValue(), Is.EqualTo(new Vector2(333, 444))); - Assert.That(keyboard.aKey.isPressed, Is.True); - Assert.That(gamepad.buttonNorth.isPressed, Is.True); - Assert.That(joystick.stick.ReadValue(), - Is.EqualTo(new StickDeadzoneProcessor().Process(new Vector2(0.666f, 0.777f)))); - Assert.That(trackedDevice.devicePosition.ReadValue(), Is.EqualTo(new Vector3(444, 555, 666))); - } - else - { - // All devices should be unaffected. - Assert.That(eventCount, Is.Zero); - Assert.That(mouse.position.ReadValue(), Is.EqualTo(new Vector2(123, 234))); - Assert.That(keyboard.aKey.isPressed, Is.False); - Assert.That(gamepad.buttonNorth.isPressed, Is.False); - Assert.That(joystick.stick.ReadValue(), Is.EqualTo(Vector2.zero)); - Assert.That(trackedDevice.devicePosition.ReadValue(), Is.EqualTo(new Vector3(234, 345, 456))); - } + // All devices should have been affected. + Assert.That(eventCount, Is.EqualTo(5)); + Assert.That(mouse.position.ReadValue(), Is.EqualTo(new Vector2(333, 444))); + Assert.That(keyboard.aKey.isPressed, Is.True); + Assert.That(gamepad.buttonNorth.isPressed, Is.True); + Assert.That(joystick.stick.ReadValue(), + Is.EqualTo(new StickDeadzoneProcessor().Process(new Vector2(0.666f, 0.777f)))); + Assert.That(trackedDevice.devicePosition.ReadValue(), Is.EqualTo(new Vector3(444, 555, 666))); } if (kIsEditor && editorInputBehaviorInPlayMode == InputSettings.EditorInputBehaviorInPlayMode.AllDevicesRespectGameViewFocus) @@ -4937,7 +4924,9 @@ void DeviceChangeCallback(InputDevice device, InputDeviceChange change) Assert.That(sensor.enabled, Is.False); Assert.That(disabledDevice.enabled, Is.False); - if (!appRunInBackground && (!kIsEditor || editorInputBehaviorInPlayMode == InputSettings.EditorInputBehaviorInPlayMode.AllDeviceInputAlwaysGoesToGameView)) + // We were not processing input in the background + if (!appRunInBackground && backgroundBehavior != InputSettings.BackgroundBehavior.IgnoreFocus && + (!kIsEditor || editorInputBehaviorInPlayMode == InputSettings.EditorInputBehaviorInPlayMode.AllDeviceInputAlwaysGoesToGameView)) { // No change on focus gain. @@ -5123,9 +5112,29 @@ void DeviceChangeCallback(InputDevice device, InputDeviceChange change) break; case InputSettings.BackgroundBehavior.IgnoreFocus: - Assert.That(changes, Is.Empty); - Assert.That(commands, Is.Empty); - break; + if (appRunInBackground) + { + Assert.That(changes, Is.Empty); + Assert.That(commands, Is.Empty); + break; + } + else + { + // All enabled devices should have received sync requests. + Assert.That(commands, Is.EquivalentTo(new[] + { + "Sync Gamepad", "Sync Joystick", + "Sync TrackedDevice", "Sync TrackedDevice2", + "Sync Mouse", "Sync Mouse2", "Sync Mouse3", + "Sync Keyboard", "Reset Joystick" + })); + // Enabled devices that don't support syncs get reset. + Assert.That(changes, Is.EquivalentTo(new[] + { + "SoftReset Mouse1", "SoftReset Mouse3", "HardReset Joystick", "SoftReset TrackedDevice2" + })); + break; + } } } diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 1aa71656dd..a78951960e 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -54,6 +54,7 @@ however, it has to be formatted properly to pass verification tests. - Fixed "STAT event with state format TOUC cannot be used with device 'Touchscreen:/Touchscreen'" when more than max supported amount of fingers, currently 10, are present on the screen at a same time (case 1395648). - Fixed missing tooltips in PlayerInputManagerEditor for the Player Limit and Fixed Splitscreen sizes labels ([case 1396945](https://issuetracker.unity3d.com/issues/player-input-manager-pops-up-placeholder-text-when-hovering-over-it)). - Fixed DualShock 4 controllers not working in some scenarios by adding support for extended mode HID reports ([case 1281633](https://issuetracker.unity3d.com/issues/input-system-dualshock4-controller-returns-random-input-values-when-connected-via-bluetooth-while-steam-is-running), case 1409867). +- Fixed `BackgroundBehavior.IgnoreFocus` having no effect when `Application.runInBackground` was false ([case 1400456](https://issuetracker.unity3d.com/issues/xr-head-tracking-lost-when-lost-focus-with-action-based-trackedposedriver-on-android)). #### Actions diff --git a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs index 8795440af5..777625a6c5 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs @@ -256,9 +256,9 @@ public bool runPlayerUpdatesInEditMode private bool gameHasFocus => #if UNITY_EDITOR - m_RunPlayerUpdatesInEditMode || m_HasFocus; + m_RunPlayerUpdatesInEditMode || m_HasFocus || gameShouldGetInputRegardlessOfFocus; #else - m_HasFocus; + m_HasFocus || gameShouldGetInputRegardlessOfFocus; #endif private bool gameShouldGetInputRegardlessOfFocus => @@ -1128,7 +1128,7 @@ public void AddDevice(InputDevice device) #if UNITY_EDITOR isPlaying = m_Runtime.isInPlayMode; #endif - if (isPlaying && !m_HasFocus + if (isPlaying && !gameHasFocus && m_Settings.backgroundBehavior != InputSettings.BackgroundBehavior.IgnoreFocus && m_Runtime.runInBackground && device.QueryEnabledStateFromRuntime() @@ -2630,6 +2630,8 @@ internal void OnFocusChanged(bool focus) var backgroundBehavior = m_Settings.backgroundBehavior; if (backgroundBehavior == InputSettings.BackgroundBehavior.IgnoreFocus && runInBackground) { + // If runInBackground is true, no device changes should happen, even when focus is gained. So early out. + // If runInBackground is false, we still want to sync devices when focus is gained. So we need to continue further. m_HasFocus = focus; return; } @@ -2841,7 +2843,7 @@ private unsafe void OnUpdate(InputUpdateType updateType, ref InputEventBuffer ev (!m_Runtime.runInBackground || m_Settings.backgroundBehavior == InputSettings.BackgroundBehavior.ResetAndDisableAllDevices)) #else - || (!m_HasFocus && !m_Runtime.runInBackground) + || (!gameHasFocus && !m_Runtime.runInBackground) #endif ; var canEarlyOut = From e02e7b209702a95cc8d5d944a07648131ab83531 Mon Sep 17 00:00:00 2001 From: Rene Damm Date: Mon, 28 Mar 2022 17:17:11 +0200 Subject: [PATCH 39/53] FIX: TwoModifiersComposite only accepting buttons (#1514). --- Packages/com.unity.inputsystem/CHANGELOG.md | 3 ++- .../Composites/TwoModifiersComposite.cs | 21 +++++-------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index a78951960e..c128bdfa13 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -52,6 +52,7 @@ however, it has to be formatted properly to pass verification tests. - Fixed no devices being available in `Start` and `Awake` methods if, in the player, any `InputSystem` API was accessed during the `SubsystemRegistration` phase ([case 1392358](https://issuetracker.unity3d.com/issues/inputsystem-does-not-initialize-properly-in-a-build-when-accessed-early)). - Fixed dropdown for "Supported Devices" in settings not showing all device layouts. - Fixed "STAT event with state format TOUC cannot be used with device 'Touchscreen:/Touchscreen'" when more than max supported amount of fingers, currently 10, are present on the screen at a same time (case 1395648). +- Fixed mouse events not being timesliced when input system is switched to process input in fixed updates (case 1386738). - Fixed missing tooltips in PlayerInputManagerEditor for the Player Limit and Fixed Splitscreen sizes labels ([case 1396945](https://issuetracker.unity3d.com/issues/player-input-manager-pops-up-placeholder-text-when-hovering-over-it)). - Fixed DualShock 4 controllers not working in some scenarios by adding support for extended mode HID reports ([case 1281633](https://issuetracker.unity3d.com/issues/input-system-dualshock4-controller-returns-random-input-values-when-connected-via-bluetooth-while-steam-is-running), case 1409867). - Fixed `BackgroundBehavior.IgnoreFocus` having no effect when `Application.runInBackground` was false ([case 1400456](https://issuetracker.unity3d.com/issues/xr-head-tracking-lost-when-lost-focus-with-action-based-trackedposedriver-on-android)). @@ -66,7 +67,7 @@ however, it has to be formatted properly to pass verification tests. * Fix contributed by [Russell Quinn](https://github.com/russellquinn) in [#1483](https://github.com/Unity-Technologies/InputSystem/pull/1483). - Fixed `AxisComposite` not respecting processors applied to `positive` and `negative` bindings (case 1398942). * This was a regression introduced in [1.0.0-pre.6](#axiscomposite-min-max-value-fix). -- Fixed mouse events not being timesliced when input system is switched to process input in fixed updates (case 1386738). +- Fixed `TwoModifiersComposite` inadvertently not allowing controls other than `ButtonControl`s being bound to its `binding` part. ### Added diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/TwoModifiersComposite.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/TwoModifiersComposite.cs index 251681c383..d453f55604 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/TwoModifiersComposite.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/TwoModifiersComposite.cs @@ -3,7 +3,6 @@ using Unity.Collections.LowLevel.Unsafe; using UnityEngine.InputSystem.Layouts; using UnityEngine.InputSystem.Utilities; -using UnityEngine.Scripting; namespace UnityEngine.InputSystem.Composites { @@ -30,26 +29,16 @@ namespace UnityEngine.InputSystem.Composites /// /// /// However, this can also be used to "gate" other types of controls. For example, a "look" - /// action could be bound to mouse such that the and + /// action could be bound to mouse such that the and /// on the keyboard have to be pressed in order for the player to be able to /// look around. /// /// /// - /// lookAction.AddCompositeBinding("OneModifier") - /// .With("Modifier1", "<Keyboard>/alt") + /// var action = new InputAction(); + /// action.AddCompositeBinding("TwoModifiers") + /// .With("Modifier1", "<Keyboard>/ctrl") /// .With("Modifier2", "<Keyboard>/shift") - /// .With("Binding", "<Mouse>/delta") - /// - /// - /// - /// - /// - /// // Create a button action that requires LMB on the mouse - /// // to be held for the mouse delta to come through. - /// var action = new InputAction(type: InputActionType.Button); - /// action.AddCompositeBinding("OneModifier") - /// .With("Modifier", "<Mouse>/leftButton") /// .With("Binding", "<Mouse>/delta"); /// /// @@ -94,7 +83,7 @@ public class TwoModifiersComposite : InputBindingComposite // ReSharper disable once MemberCanBePrivate.Global // ReSharper disable once FieldCanBeMadeReadOnly.Global // ReSharper disable once UnassignedField.Global - [InputControl(layout = "Button")] public int binding; + [InputControl] public int binding; /// /// If set to true, the built-in logic to determine if modifiers need to be pressed first is overridden. From 6221c7bbb93cc2823f56f17d8a95c58199f931f8 Mon Sep 17 00:00:00 2001 From: Rene Damm Date: Mon, 28 Mar 2022 17:19:40 +0200 Subject: [PATCH 40/53] FIX: AddComposite().With() not triggering reresolving correctly (#1510). --- Assets/Tests/InputSystem/CoreTests_Actions.cs | 32 +++++++++++++++++++ Packages/com.unity.inputsystem/CHANGELOG.md | 1 + .../Actions/InputActionSetupExtensions.cs | 23 +++++++------ 3 files changed, 46 insertions(+), 10 deletions(-) diff --git a/Assets/Tests/InputSystem/CoreTests_Actions.cs b/Assets/Tests/InputSystem/CoreTests_Actions.cs index 538a1390a2..1797eb4b23 100644 --- a/Assets/Tests/InputSystem/CoreTests_Actions.cs +++ b/Assets/Tests/InputSystem/CoreTests_Actions.cs @@ -3952,6 +3952,38 @@ public void Actions_CanAddBindingsToActions_AfterActionHasAlreadyResolvedControl Assert.That(action.bindings[0].path, Is.EqualTo("/leftStick")); } + [Test] + [Category("Actions")] + public void Actions_CanAddCompositeBindingsToActions_AfterActionHasAlreadyResolvedControls() + { + var keyboard = InputSystem.AddDevice(); + + var action = new InputAction(); + action.AddCompositeBinding("OneModifier") + .With("Modifier", "/leftCtrl") + .With("Binding", "/space"); + + Assert.That(action.controls, Is.EquivalentTo(new[] { keyboard.spaceKey, keyboard.leftCtrlKey })); + + action.Enable(); + + // Replace the composite binding wholesale. + action.ChangeBinding(0).Erase(); + action.AddCompositeBinding("OneModifier") + .With("Modifier", "/rightCtrl") + .With("Binding", "/a"); + + Assert.That(action.controls, Is.EquivalentTo(new[] { keyboard.aKey, keyboard.rightCtrlKey })); + + Press(keyboard.rightCtrlKey); + + Assert.That(!action.WasPerformedThisFrame()); + + Press(keyboard.aKey); + + Assert.That(action.WasPerformedThisFrame()); + } + [Test] [Category("Actions")] public void Actions_BindingsHaveUniqueIDs() diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index c128bdfa13..5a8479cb62 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -67,6 +67,7 @@ however, it has to be formatted properly to pass verification tests. * Fix contributed by [Russell Quinn](https://github.com/russellquinn) in [#1483](https://github.com/Unity-Technologies/InputSystem/pull/1483). - Fixed `AxisComposite` not respecting processors applied to `positive` and `negative` bindings (case 1398942). * This was a regression introduced in [1.0.0-pre.6](#axiscomposite-min-max-value-fix). +- Fixed calling `action.AddCompositeBinding(...).With(...)` while action is enabled not correctly updating controls for part bindings of the composite. - Fixed `TwoModifiersComposite` inadvertently not allowing controls other than `ButtonControl`s being bound to its `binding` part. ### Added diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionSetupExtensions.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionSetupExtensions.cs index c0df6a41dd..cb539cdd51 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionSetupExtensions.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionSetupExtensions.cs @@ -1535,16 +1535,19 @@ public CompositeSyntax With(string name, string binding, string groups = null, s { ////TODO: check whether non-composite bindings have been added in-between - int bindingIndex; - if (m_Action != null) - bindingIndex = m_Action.AddBinding(path: binding, groups: groups, processors: processors) - .m_BindingIndexInMap; - else - bindingIndex = m_ActionMap.AddBinding(path: binding, groups: groups, processors: processors) - .m_BindingIndexInMap; - - m_ActionMap.m_Bindings[bindingIndex].name = name; - m_ActionMap.m_Bindings[bindingIndex].isPartOfComposite = true; + using (InputActionRebindingExtensions.DeferBindingResolution()) + { + int bindingIndex; + if (m_Action != null) + bindingIndex = m_Action.AddBinding(path: binding, groups: groups, processors: processors) + .m_BindingIndexInMap; + else + bindingIndex = m_ActionMap.AddBinding(path: binding, groups: groups, processors: processors) + .m_BindingIndexInMap; + + m_ActionMap.m_Bindings[bindingIndex].name = name; + m_ActionMap.m_Bindings[bindingIndex].isPartOfComposite = true; + } return this; } From d9674c50838df56add5c29e447f2dd5c3390d76a Mon Sep 17 00:00:00 2001 From: Rene Damm Date: Mon, 28 Mar 2022 18:22:28 +0200 Subject: [PATCH 41/53] DOCS: Add docs for Unity Remote support (#1421). --- Assets/Samples/UnityRemote.meta | 8 + Assets/Samples/UnityRemote/.sample.json | 4 + Assets/Samples/UnityRemote/CubeMaterial.mat | 79 ++ .../Samples/UnityRemote/CubeMaterial.mat.meta | 8 + Assets/Samples/UnityRemote/README.md | 15 + Assets/Samples/UnityRemote/README.md.meta | 7 + .../UnityRemote/UnityRemoteSettings.png | Bin 0 -> 42153 bytes .../UnityRemote/UnityRemoteSettings.png.meta | 98 ++ .../Samples/UnityRemote/UnityRemoteTest.unity | 1223 +++++++++++++++++ .../UnityRemote/UnityRemoteTest.unity.meta | 7 + .../UnityRemote/UnityRemoteTestScript.cs | 173 +++ .../UnityRemote/UnityRemoteTestScript.cs.meta | 11 + Packages/com.unity.inputsystem/CHANGELOG.md | 4 + .../Documentation~/Debugging.md | 31 + .../Documentation~/Sensors.md | 2 + .../Documentation~/Touch.md | 2 + 16 files changed, 1672 insertions(+) create mode 100644 Assets/Samples/UnityRemote.meta create mode 100644 Assets/Samples/UnityRemote/.sample.json create mode 100644 Assets/Samples/UnityRemote/CubeMaterial.mat create mode 100644 Assets/Samples/UnityRemote/CubeMaterial.mat.meta create mode 100644 Assets/Samples/UnityRemote/README.md create mode 100644 Assets/Samples/UnityRemote/README.md.meta create mode 100644 Assets/Samples/UnityRemote/UnityRemoteSettings.png create mode 100644 Assets/Samples/UnityRemote/UnityRemoteSettings.png.meta create mode 100644 Assets/Samples/UnityRemote/UnityRemoteTest.unity create mode 100644 Assets/Samples/UnityRemote/UnityRemoteTest.unity.meta create mode 100644 Assets/Samples/UnityRemote/UnityRemoteTestScript.cs create mode 100644 Assets/Samples/UnityRemote/UnityRemoteTestScript.cs.meta diff --git a/Assets/Samples/UnityRemote.meta b/Assets/Samples/UnityRemote.meta new file mode 100644 index 0000000000..c59e4976ac --- /dev/null +++ b/Assets/Samples/UnityRemote.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c9462485e3d03ca45a47f24ed66f7478 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/UnityRemote/.sample.json b/Assets/Samples/UnityRemote/.sample.json new file mode 100644 index 0000000000..f3dabf7af2 --- /dev/null +++ b/Assets/Samples/UnityRemote/.sample.json @@ -0,0 +1,4 @@ +{ + "displayName": "Unity Remote", + "description": "An example with a simple scene for trying out the Unity Remote app." +} diff --git a/Assets/Samples/UnityRemote/CubeMaterial.mat b/Assets/Samples/UnityRemote/CubeMaterial.mat new file mode 100644 index 0000000000..f63683ad17 --- /dev/null +++ b/Assets/Samples/UnityRemote/CubeMaterial.mat @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CubeMaterial + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.9339623, g: 0.13719928, b: 0.13719928, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Samples/UnityRemote/CubeMaterial.mat.meta b/Assets/Samples/UnityRemote/CubeMaterial.mat.meta new file mode 100644 index 0000000000..65e60dc52c --- /dev/null +++ b/Assets/Samples/UnityRemote/CubeMaterial.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c8809e96fa09da04aa2008b186fdf0fc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/UnityRemote/README.md b/Assets/Samples/UnityRemote/README.md new file mode 100644 index 0000000000..9734845987 --- /dev/null +++ b/Assets/Samples/UnityRemote/README.md @@ -0,0 +1,15 @@ +# Unity Remote Sample + +This sample is just a simple scene that lets you see try out the Unity Remote app. The app is useful for quickly testing your project in the Unity Editor without having to build and deploy to the device. This is supported for iOS and Android. + +More detailed information about the Unity Remote can be found in the [Unity manual](https://docs.unity3d.com/Manual/UnityRemote5.html). + +Instructions: + +1. Install the Unity Remote app on your Android or iOS device. +2. Connect the device to your computer via USB. On Android, make sure you have the Android SDK installed and configured appropriately in Unity. Also, USB debugging needs to be enabled. +3. In Unity, go to `Edit > Project Settings > Editor` and select the device in the `Unity Remote` section. + ![Unity Remote Settings](./UnityRemoteSettings.png) +4. Open the Unity Remote app on the device. +5. Open the [`UnityRemoteTest.unity`](UnityRemoteTest.unity) scene from this sample. +6. Enter play mode. After a short delay, the Unity Remote app on your device should switch to display the scene and you should be able to interact with the scene in the editor using the device. diff --git a/Assets/Samples/UnityRemote/README.md.meta b/Assets/Samples/UnityRemote/README.md.meta new file mode 100644 index 0000000000..293a3bb6e1 --- /dev/null +++ b/Assets/Samples/UnityRemote/README.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 22bf16ad6e7ca7c41bf5234d582dc1f4 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/UnityRemote/UnityRemoteSettings.png b/Assets/Samples/UnityRemote/UnityRemoteSettings.png new file mode 100644 index 0000000000000000000000000000000000000000..85b5d68e0c82c7f40e3e4e9139a8826af454b8e5 GIT binary patch literal 42153 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 literal 0 HcmV?d00001 diff --git a/Assets/Samples/UnityRemote/UnityRemoteSettings.png.meta b/Assets/Samples/UnityRemote/UnityRemoteSettings.png.meta new file mode 100644 index 0000000000..edf7529d66 --- /dev/null +++ b/Assets/Samples/UnityRemote/UnityRemoteSettings.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 2cb428ad990f451498488aab4b461b70 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/UnityRemote/UnityRemoteTest.unity b/Assets/Samples/UnityRemote/UnityRemoteTest.unity new file mode 100644 index 0000000000..218bb4fc11 --- /dev/null +++ b/Assets/Samples/UnityRemote/UnityRemoteTest.unity @@ -0,0 +1,1223 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &139768694 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 139768695} + - component: {fileID: 139768697} + - component: {fileID: 139768696} + m_Layer: 5 + m_Name: TouchInput + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &139768695 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 139768694} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1114015669} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -562.7574, y: -582} + m_SizeDelta: {x: 1034.488, y: 951.28} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &139768696 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 139768694} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Touch +--- !u!222 &139768697 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 139768694} + m_CullTransparentMesh: 1 +--- !u!1 &159226966 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 159226967} + - component: {fileID: 159226969} + - component: {fileID: 159226968} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &159226967 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 159226966} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1040707933} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &159226968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 159226966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 65 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 5 + m_MaxSize: 75 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Reset Cube +--- !u!222 &159226969 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 159226966} + m_CullTransparentMesh: 1 +--- !u!1 &469426655 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 469426656} + - component: {fileID: 469426658} + - component: {fileID: 469426657} + m_Layer: 5 + m_Name: AccelerometerInput + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &469426656 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 469426655} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1114015669} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 493, y: -155} + m_SizeDelta: {x: 916.3427, y: 45.944214} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &469426657 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 469426655} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Accelerometer +--- !u!222 &469426658 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 469426655} + m_CullTransparentMesh: 1 +--- !u!1 &594620413 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 594620417} + - component: {fileID: 594620416} + - component: {fileID: 594620415} + - component: {fileID: 594620414} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &594620414 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 594620413} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &594620415 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 594620413} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: c8809e96fa09da04aa2008b186fdf0fc, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &594620416 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 594620413} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &594620417 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 594620413} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -187} + m_LocalScale: {x: 100, y: 100, z: 100} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1114015669} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &613652736 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 613652738} + - component: {fileID: 613652737} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &613652737 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 613652736} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &613652738 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 613652736} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &741605003 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 741605004} + - component: {fileID: 741605006} + - component: {fileID: 741605005} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &741605004 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741605003} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1114015669} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 481} + m_SizeDelta: {x: 1103.848, y: 64.131} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &741605005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741605003} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 32 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Touch/tap screen to position cube. Rotate device to rotate cube. +--- !u!222 &741605006 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741605003} + m_CullTransparentMesh: 1 +--- !u!1 &759898665 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 759898668} + - component: {fileID: 759898667} + - component: {fileID: 759898666} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &759898666 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 759898665} + m_Enabled: 1 +--- !u!20 &759898667 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 759898665} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &759898668 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 759898665} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1040707932 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1040707933} + - component: {fileID: 1040707936} + - component: {fileID: 1040707935} + - component: {fileID: 1040707934} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1040707933 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1040707932} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 159226967} + m_Father: {fileID: 1114015669} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0.384, y: 0.24800001} + m_AnchoredPosition: {x: 20.130005, y: 19} + m_SizeDelta: {x: -29.406982, y: -36.82202} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1040707934 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1040707932} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1040707935} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1114015670} + m_TargetAssemblyTypeName: UnityRemoteTestScript, Assembly-CSharp + m_MethodName: ResetCube + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1040707935 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1040707932} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1040707936 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1040707932} + m_CullTransparentMesh: 1 +--- !u!1 &1114015665 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1114015669} + - component: {fileID: 1114015668} + - component: {fileID: 1114015667} + - component: {fileID: 1114015666} + - component: {fileID: 1114015670} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1114015666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1114015665} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1114015667 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1114015665} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1114015668 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1114015665} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 759898667} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1114015669 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1114015665} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1628982540} + - {fileID: 469426656} + - {fileID: 139768695} + - {fileID: 2009445575} + - {fileID: 594620417} + - {fileID: 1040707933} + - {fileID: 741605004} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &1114015670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1114015665} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a183b25bd96f6941b6803a60091cd1b, type: 3} + m_Name: + m_EditorClassIdentifier: + camera: {fileID: 759898667} + accelerometerInputText: {fileID: 469426657} + touchInputText: {fileID: 139768696} + gyroInputText: {fileID: 2009445576} + rotatingCube: {fileID: 594620417} +--- !u!1 &1628982539 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1628982540} + - component: {fileID: 1628982542} + - component: {fileID: 1628982541} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1628982540 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1628982539} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1114015669} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1628982541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1628982539} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1628982542 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1628982539} + m_CullTransparentMesh: 1 +--- !u!1 &1680986590 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1680986593} + - component: {fileID: 1680986592} + - component: {fileID: 1680986591} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1680986591 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1680986590} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 +--- !u!114 &1680986592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1680986590} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1680986593 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1680986590} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2009445574 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2009445575} + - component: {fileID: 2009445577} + - component: {fileID: 2009445576} + m_Layer: 5 + m_Name: GyroInput + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2009445575 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2009445574} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1114015669} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 493, y: -391} + m_SizeDelta: {x: 916.343, y: 369.922} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2009445576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2009445574} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Gyro +--- !u!222 &2009445577 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2009445574} + m_CullTransparentMesh: 1 diff --git a/Assets/Samples/UnityRemote/UnityRemoteTest.unity.meta b/Assets/Samples/UnityRemote/UnityRemoteTest.unity.meta new file mode 100644 index 0000000000..58535beaee --- /dev/null +++ b/Assets/Samples/UnityRemote/UnityRemoteTest.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b2d420239a8de8f418c9038894f5349c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/UnityRemote/UnityRemoteTestScript.cs b/Assets/Samples/UnityRemote/UnityRemoteTestScript.cs new file mode 100644 index 0000000000..7505922fa5 --- /dev/null +++ b/Assets/Samples/UnityRemote/UnityRemoteTestScript.cs @@ -0,0 +1,173 @@ +using UnityEngine; +using UnityEngine.InputSystem; +using UnityEngine.InputSystem.EnhancedTouch; +using UnityEngine.UI; +using Gyroscope = UnityEngine.InputSystem.Gyroscope; +using Touch = UnityEngine.InputSystem.EnhancedTouch.Touch; + +public class UnityRemoteTestScript : MonoBehaviour +{ + public Camera camera; + + public Text accelerometerInputText; + public Text touchInputText; + public Text gyroInputText; + + // We rotate this cube based on gyro input. Also, we sync its position on screen + // the position of the primary touch. + public Transform rotatingCube; + + private Vector3 m_Rotation; + private float m_CubeOffsetFromCanvas; + private Vector3 m_CubeStartingPosition; + + public void ResetCube() + { + rotatingCube.SetPositionAndRotation(m_CubeStartingPosition, default); + } + + private void OnEnable() + { + m_CubeOffsetFromCanvas = rotatingCube.position.z - transform.position.z; + m_CubeStartingPosition = rotatingCube.position; + + EnhancedTouchSupport.Enable(); + } + + private void OnDisable() + { + EnhancedTouchSupport.Disable(); + } + + private void Update() + { + UpdateTouch(); + UpdateAccelerometer(); + UpdateGyro(); + } + + private void UpdateTouch() + { + var touchscreen = GetRemoteDevice(); + if (touchscreen == null) + { + touchInputText.text = "No remote touchscreen found."; + return; + } + + // Dump active touches. + string activeTouches = null; + foreach (var touch in Touch.activeTouches) + { + // Skip any touch not from our remote touchscreen. + if (touch.screen != touchscreen) + continue; + + if (activeTouches == null) + activeTouches = "Active Touches:\n"; + + activeTouches += $"\nid={touch.touchId} phase={touch.phase} position={touch.screenPosition} pressure={touch.pressure}\n"; + } + if (activeTouches == null) + activeTouches = "No active touches."; + touchInputText.text = activeTouches; + + // Find world-space position of current primary touch (if any). + if (touchscreen.primaryTouch.isInProgress) + { + var touchPosition = touchscreen.primaryTouch.position.ReadValue(); + var worldSpacePosition = + camera.ScreenToWorldPoint(new Vector3(touchPosition.x, touchPosition.y, transform.position.z + m_CubeOffsetFromCanvas)); + rotatingCube.position = worldSpacePosition; + } + } + + private void UpdateAccelerometer() + { + var accelerometer = GetRemoteDevice(); + if (accelerometer == null) + { + accelerometerInputText.text = "No remote accelerometer found."; + return; + } + + var value = accelerometer.acceleration.ReadValue(); + accelerometerInputText.text = $"Accelerometer: x={value.x} y={value.y} z={value.z}"; + } + + private void UpdateGyro() + { + var gyro = GetRemoteDevice(); + var attitude = GetRemoteDevice(); + var gravity = GetRemoteDevice(); + var acceleration = GetRemoteDevice(); + + // Enable gyro from remote, if needed. + EnableDeviceIfNeeded(gyro); + EnableDeviceIfNeeded(attitude); + EnableDeviceIfNeeded(gravity); + EnableDeviceIfNeeded(acceleration); + + string text; + if (gyro == null && attitude == null && gravity == null && acceleration == null) + { + text = "No remote gyro found."; + } + else + { + string gyroText = null; + string attitudeText = null; + string gravityText = null; + string accelerationText = null; + + if (gyro != null) + { + var rotation = gyro.angularVelocity.ReadValue(); + gyroText = $"Rotation: x={rotation.x} y={rotation.y} z={rotation.z}"; + + // Update rotation of cube. + m_Rotation += rotation; + rotatingCube.localEulerAngles = m_Rotation; + } + + if (attitude != null) + { + var attitudeValue = attitude.attitude.ReadValue(); + attitudeText = $"Attitude: x={attitudeValue.x} y={attitudeValue.y} z={attitudeValue.z} w={attitudeValue.w}"; + } + + if (gravity != null) + { + var gravityValue = gravity.gravity.ReadValue(); + gravityText = $"Gravity: x={gravityValue.x} y={gravityValue.y} z={gravityValue.z}"; + } + + if (acceleration != null) + { + var accelerationValue = acceleration.acceleration.ReadValue(); + accelerationText = $"Acceleration: x={accelerationValue.x} y={accelerationValue.y} z={accelerationValue.z}"; + } + + text = string.Join("\n", gyroText, attitudeText, gravityText, accelerationText); + } + + gyroInputText.text = text; + } + + private static void EnableDeviceIfNeeded(InputDevice device) + { + if (device != null && !device.enabled) + InputSystem.EnableDevice(device); + } + + // Make sure we're not thrown off track by locally having sensors on the device. Instead + // explicitly grab the remote ones. + private static TDevice GetRemoteDevice() + where TDevice : InputDevice + { + foreach (var device in InputSystem.devices) + if (device.remote && device is TDevice deviceOfType) + return deviceOfType; + return default; + } +} diff --git a/Assets/Samples/UnityRemote/UnityRemoteTestScript.cs.meta b/Assets/Samples/UnityRemote/UnityRemoteTestScript.cs.meta new file mode 100644 index 0000000000..a2abebcff4 --- /dev/null +++ b/Assets/Samples/UnityRemote/UnityRemoteTestScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5a183b25bd96f6941b6803a60091cd1b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 5a8479cb62..3d69541e0a 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -76,6 +76,8 @@ however, it has to be formatted properly to pass verification tests. - Added support for SteelSeries Nimbus+ gamepad on Mac (addition contributed by [Mollyjameson](https://github.com/MollyJameson)). - Added a new `DeltaControl` control type that is now used for delta-style controls such as `Mouse.delta` and `Mouse.scroll`. * Like `StickControl`, this control has individual `up`, `down`, `left`, and `right` controls (as well as `x` and `y` that it inherits from `Vector2Control`). This means it is now possible to directly bind to individual scroll directions (such as `/scroll/up`). +- Added support for using the Unity Remote app with the input system. + * Requires Unity 2021.2.18 or later. #### Actions @@ -191,6 +193,8 @@ however, it has to be formatted properly to pass verification tests. - Added support for PS5 DualSense controllers on Mac and Windows. - Improved the user experience when creating single vs multi-touch touchscreen bindings in the Input Action Asset editor by making both options visible in the input action dropdown menu. Now it's not neccessary to be aware of the touch\*/press path binding syntax ([case 1357664](https://issuetracker.unity3d.com/issues/inputsystem-touchscreens-multi-touch-doesnt-work-when-using-a-custom-inputactionasset)). +- Added support for the Unity Remote app. + * __NOTE__: This unfortunately requires a change in the Unity native runtime. We are in the process of rolling out the change to Unity versions. A public build that receives the change will automatically enable the functionality in the Input System package. ## [1.1.1] - 2021-09-03 diff --git a/Packages/com.unity.inputsystem/Documentation~/Debugging.md b/Packages/com.unity.inputsystem/Documentation~/Debugging.md index 1835f9a1a0..2ecd0e4397 100644 --- a/Packages/com.unity.inputsystem/Documentation~/Debugging.md +++ b/Packages/com.unity.inputsystem/Documentation~/Debugging.md @@ -7,6 +7,7 @@ * [Debugging layouts](#debugging-layouts) * [Debugging Remotely](#debugging-remotely) * [Device Simulator](#device-simulator) +* [Unity Remote](#unity-remote) When something isn't working as expected, the quickest way to troubleshoot what's wrong is the Input Debugger in the Unity Editor. The Input Debugger provides access to the activity of the Input System in both the Editor and the connected Players. @@ -94,3 +95,33 @@ Visualizes the current state of a single Action in real time. You can have multi When Device Simulator window is in use, mouse and pen inputs on the simulated device screen are turned into touchscreen inputs. Device Simulator uses its own touchscreen device, which it creates and destroys together with the Device Simulator window. To prevent conflicts between simulated touchscreen inputs and native mouse and pen inputs, Device Simulator disables all native mouse and pen devices. + +## Unity Remote (iOS, Android) + +>__Note__: Joysticks/gamepads are not yet supported over the Unity Remote. No joystick/gamepad input from the mobile device will come through in the editor. + +>__Note__: This requires Unity 2021.2.18 or later. + +The Unity Remote is an app available for iOS and Android which allows using a mobile device for input while running in the Unity Editor. You can find details about the app and how to install it in the [Unity manual](https://docs.unity3d.com/Manual/UnityRemote5.html). + +If you would like to try out the Unity Remote app, you can [install](Installation.md#installing-samples) the "Unity Remote" sample that is provided with the Input System package. + +When in play mode in the Editor and connected to the Unity Remote app, you will see a number of Devices have been added with the [`InputDevice.remote`](../api/UnityEngine.InputSystem.InputDevice.html#UnityEngine_InputSystem_InputDevice_remote) flag set to true: + +- [`Touchscreen`](../api/UnityEngine.InputSystem.Touchscreen.html) +- [`Accelerometer`](../api/UnityEngine.InputSystem.Accelerometer.html) + +If a gyro is present on the mobile device: + +- [`Gyroscope`](../api/UnityEngine.InputSystem.Gyroscope.html) +- [`AttitudeSensor`](../api/UnityEngine.InputSystem.AttitudeSensor.html) +- [`LinearAccelerationSensor`](../api/UnityEngine.InputSystem.LinearAccelerationSensor.html) +- [`GravitySensor`](../api/UnityEngine.InputSystem.GravitySensor.html) + +These Devices can be used just like local Devices. They will receive input from the connected mobile device which in turn will receive the rendered output of the game running in the editor. + +The [`Accelerometer`](../api/UnityEngine.InputSystem.Accelerometer.html) device will automatically be enabled and will not need you to call [`InputSystem.EnableDevice`](../api/UnityEngine.InputSystem.InputSystem.html#UnityEngine_InputSystem_InputSystem_EnableDevice_UnityEngine_InputSystem_InputDevice_) explicitly. Setting the sampling frequency on the accelerometer from the Unity Remote using [`Sensor.samplingFrequency`](../api/UnityEngine.InputSystem.Sensor.html#UnityEngine_InputSystem_Sensor_samplingFrequency) has no effect. + +The remaining sensors listed above will need to be explicitly enabled via [`InputSystem.EnableDevice`](../api/UnityEngine.InputSystem.InputSystem.html#UnityEngine_InputSystem_InputSystem_EnableDevice_UnityEngine_InputSystem_InputDevice_) just like local sensors. Setting the sampling frequency on these sensors from the Unity Remote using [`Sensor.samplingFrequency`](../api/UnityEngine.InputSystem.Sensor.html#UnityEngine_InputSystem_Sensor_samplingFrequency) will be relayed to the device but note that setting the frequency on one of them will set it for all of them. + +Touch coordinates from the device will be translated to the screen coordinates of the Game View inside the Editor. diff --git a/Packages/com.unity.inputsystem/Documentation~/Sensors.md b/Packages/com.unity.inputsystem/Documentation~/Sensors.md index 6b1630aaf3..b103ca242c 100644 --- a/Packages/com.unity.inputsystem/Documentation~/Sensors.md +++ b/Packages/com.unity.inputsystem/Documentation~/Sensors.md @@ -16,6 +16,8 @@ Sensors are [`InputDevices`](Devices.md) that measure environmental characteristics of the device that the content is running on. Unity currently supports sensors on iOS and Android. Android supports a wider range of sensors than iOS. +>__Note__: To test your app on iOS or Android in the editor with sensor input from your mobile device, you can use the Unity Remote as described [here](Debugging.md#unity-remote). This currently supports [`Accelerometer`](#accelerometer), [`Gyroscope`](#gyroscope), [`GravitySensor`](#gravitysensor), [`AttitudeSensor`](#attitudesensor), and [`LinearAccelerationSensor`](#linearaccelerationsensor). + To determine whether a particular sensor is present, you can use its `.current` getter. ```CSharp diff --git a/Packages/com.unity.inputsystem/Documentation~/Touch.md b/Packages/com.unity.inputsystem/Documentation~/Touch.md index c2f0fbd598..f003a7bd66 100644 --- a/Packages/com.unity.inputsystem/Documentation~/Touch.md +++ b/Packages/com.unity.inputsystem/Documentation~/Touch.md @@ -13,6 +13,8 @@ Touch support is divided into: Touch input is supported on Android, iOS, Windows, and the Universal Windows Platform (UWP). +>__Note__: To test your app on iOS or Android in the editor with touch input from your mobile device, you can use the Unity Remote as described [here](Debugging.md#unity-remote). + ## `Touchscreen` Device At the lowest level, a touch screen is represented by an [`InputSystem.Touchscreen`](../api/UnityEngine.InputSystem.Touchscreen.html) Device which captures the touch screen's raw state. Touch screens are based on the [`Pointer`](Pointers.md) layout. From 880c959bcfb2c67d06adbccbd9420382ae8fa3bd Mon Sep 17 00:00:00 2001 From: Chris Massie <67029035+chris-massie@users.noreply.github.com> Date: Wed, 30 Mar 2022 02:29:58 -0700 Subject: [PATCH 42/53] NEW: Game Core now supported with XR classes (#1525). --- .../_SharedScripts/Handedness.cs | 2 +- Assets/QA/Tests/XRHaptics/XRHaptics.cs | 2 +- .../Tests/InputSystem/CoreTests_Controls.cs | 9 ++++++++- Assets/Tests/InputSystem/Plugins/XRTests.cs | 12 ++++++------ Packages/com.unity.inputsystem/CHANGELOG.md | 3 ++- .../InputSystem/InputSystem.cs | 3 +-- .../Plugins/XR/Controls/PoseControl.cs | 5 ++--- .../Plugins/XR/Devices/GoogleVR.cs | 5 +++-- .../InputSystem/Plugins/XR/Devices/Oculus.cs | 7 ++++--- .../InputSystem/Plugins/XR/Devices/OpenVR.cs | 5 +++-- .../Plugins/XR/Devices/WindowsMR.cs | 7 ++++--- .../InputSystem/Plugins/XR/GenericXRDevice.cs | 4 ++-- .../Plugins/XR/Haptics/BufferedRumble.cs | 5 +++-- .../Haptics/GetCurrentHapticStateCommand.cs | 7 ++++--- .../Haptics/GetHapticCapabilitiesCommand.cs | 7 ++++--- .../XR/Haptics/SendBufferedHapticsCommand.cs | 7 ++++--- .../XR/Haptics/SendHapticImpulseCommand.cs | 11 ++++++----- .../InputSystem/Plugins/XR/XRLayoutBuilder.cs | 5 +++-- .../InputSystem/Plugins/XR/XRSupport.cs | 19 +++++++++++-------- .../InputSystem/Unity.InputSystem.asmdef | 2 +- 20 files changed, 73 insertions(+), 54 deletions(-) diff --git a/Assets/QA/Tests/XRDeviceActions/_SharedScripts/Handedness.cs b/Assets/QA/Tests/XRDeviceActions/_SharedScripts/Handedness.cs index d205937af1..ff30762c36 100644 --- a/Assets/QA/Tests/XRDeviceActions/_SharedScripts/Handedness.cs +++ b/Assets/QA/Tests/XRDeviceActions/_SharedScripts/Handedness.cs @@ -1,4 +1,4 @@ -#if ENABLE_VR || ENABLE_AR +#if ENABLE_VR || UNITY_GAMECORE using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.UI; diff --git a/Assets/QA/Tests/XRHaptics/XRHaptics.cs b/Assets/QA/Tests/XRHaptics/XRHaptics.cs index 8d5dfa977b..c67cb5c231 100644 --- a/Assets/QA/Tests/XRHaptics/XRHaptics.cs +++ b/Assets/QA/Tests/XRHaptics/XRHaptics.cs @@ -1,4 +1,4 @@ -#if ENABLE_VR || ENABLE_AR +#if ENABLE_VR || UNITY_GAMECORE using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.InputSystem.XR; diff --git a/Assets/Tests/InputSystem/CoreTests_Controls.cs b/Assets/Tests/InputSystem/CoreTests_Controls.cs index f99b5c8b7f..1bfcf91cc0 100644 --- a/Assets/Tests/InputSystem/CoreTests_Controls.cs +++ b/Assets/Tests/InputSystem/CoreTests_Controls.cs @@ -1167,12 +1167,19 @@ public void Controls_CanTurnControlPathIntoHumanReadableText() Assert.That(InputControlPath.ToHumanReadableString("*/{PrimaryAction}"), Is.EqualTo("PrimaryAction [Any]")); Assert.That(InputControlPath.ToHumanReadableString("/leftStick"), Is.EqualTo("Left Stick [Gamepad]")); Assert.That(InputControlPath.ToHumanReadableString("/leftStick/x"), Is.EqualTo("Left Stick/X [Gamepad]")); - Assert.That(InputControlPath.ToHumanReadableString("{LeftHand}/position"), Is.EqualTo("position [LeftHand XR Controller]")); Assert.That(InputControlPath.ToHumanReadableString("*/leftStick"), Is.EqualTo("leftStick [Any]")); Assert.That(InputControlPath.ToHumanReadableString("*/{PrimaryMotion}/x"), Is.EqualTo("PrimaryMotion/x [Any]")); Assert.That(InputControlPath.ToHumanReadableString("/buttonSouth"), Is.EqualTo("Button South [Gamepad]")); Assert.That(InputControlPath.ToHumanReadableString("/buttonSouth"), Is.EqualTo("A [Xbox Controller]")); Assert.That(InputControlPath.ToHumanReadableString("/touch4/tap"), Is.EqualTo("Touch #4/Tap [Touchscreen]")); + Assert.That(InputControlPath.ToHumanReadableString("{LeftHand}/position"), +#if ENABLE_VR || UNITY_GAMECORE + // The layout settings for the display name to change from XRController to XR Controller + // is defined on the XRController class in GenericXRDevice.cs, so must match the preprocessor guard here. + Is.EqualTo("position [LeftHand XR Controller]")); +#else + Is.EqualTo("position [LeftHand XRController]")); +#endif // OmitDevice. Assert.That( diff --git a/Assets/Tests/InputSystem/Plugins/XRTests.cs b/Assets/Tests/InputSystem/Plugins/XRTests.cs index 2e1270aadc..31c77759dd 100644 --- a/Assets/Tests/InputSystem/Plugins/XRTests.cs +++ b/Assets/Tests/InputSystem/Plugins/XRTests.cs @@ -1,16 +1,16 @@ -#if ENABLE_VR || ENABLE_AR +// ENABLE_VR is not defined on Game Core but the assembly is available with limited features when the XR module is enabled. +#if ENABLE_VR || UNITY_GAMECORE using System; -using NUnit.Framework; using System.Collections.Generic; using System.Runtime.InteropServices; +using NUnit.Framework; using UnityEngine; -using UnityEngine.Scripting; using UnityEngine.InputSystem; -using UnityEngine.InputSystem.Utilities; -using UnityEngine.InputSystem.XR; using UnityEngine.InputSystem.Controls; using UnityEngine.InputSystem.Layouts; using UnityEngine.InputSystem.LowLevel; +using UnityEngine.InputSystem.Utilities; +using UnityEngine.InputSystem.XR; using UnityEngine.XR; using Usages = UnityEngine.InputSystem.CommonUsages; @@ -893,4 +893,4 @@ public void Controls_XRAxisControls_AreClampedToOneMagnitude() Assert.That((device["Vector2/y"] as AxisControl).EvaluateMagnitude(), Is.EqualTo(1f).Within(0.0001f)); } } -#endif //ENABLE_VR || ENABLE_AR +#endif diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 3d69541e0a..88ca44d75a 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -74,6 +74,7 @@ however, it has to be formatted properly to pass verification tests. - Added support for "Hori Co HORIPAD for Nintendo Switch", "HORI Pokken Tournament DX Pro Pad", "HORI Wireless Switch Pad", "HORI Real Arcade Pro V Hayabusa in Switch Mode", "PowerA NSW Fusion Wired FightPad", "PowerA NSW Fusion Pro Controller (USB only)", "PDP Wired Fight Pad Pro: Mario", "PDP Faceoff Wired Pro Controller for Nintendo Switch", "PDP Faceoff Wired Pro Controller for Nintendo Switch", "PDP Afterglow Wireless Switch Controller", "PDP Rockcandy Wired Controller". - Added support for SteelSeries Nimbus+ gamepad on Mac (addition contributed by [Mollyjameson](https://github.com/MollyJameson)). +- Added support for Game Core platforms to XR layouts, devices, and input controls. These classes were previously only enabled on platforms where `ENABLE_VR` is defined. - Added a new `DeltaControl` control type that is now used for delta-style controls such as `Mouse.delta` and `Mouse.scroll`. * Like `StickControl`, this control has individual `up`, `down`, `left`, and `right` controls (as well as `x` and `y` that it inherits from `Vector2Control`). This means it is now possible to directly bind to individual scroll directions (such as `/scroll/up`). - Added support for using the Unity Remote app with the input system. @@ -180,7 +181,7 @@ however, it has to be formatted properly to pass verification tests. - Fixed a problem where explicitly switching to the already active control scheme and device set for PlayerInput would cancel event callbacks for no reason when the control scheme switch would have no practical effect. This fix detects and skips device unpairing and re-pairing if the switch is detected to not be a change to scheme or devices. (case 1342297) - Any unhandled exception in `InputManager.OnUpdate` failing latter updates with `InvalidOperationException: Already have an event buffer set! Was OnUpdate() called recursively?`. Instead the system will try to handle the exception and recover into a working state. - Fixed an issue that broke the `VirtualMouseInput` component in the editor ([case 1367553](https://issuetracker.unity3d.com/issues/vitrualmouseinput-stickaction-doesnt-work)). -- Fixed a problem where only using runtimes that are not XR supported causes a compile error.This fix adds back in ENABLE_VR checks to prevent this case (case 1368300) +- Fixed a problem where only using runtimes that are not XR supported causes a compile error. This fix adds back in `ENABLE_VR` checks to prevent this case (case 1368300) - Fixed input action for Android gamepad's right stick will be correctly invoked when only y axis is changing ([case 1308637](https://issuetracker.unity3d.com/issues/android-input-system-right-analog-stick-tracking-is-erratic-when-using-a-gamepad-connected-to-an-android-device)). - Generic gamepad short display button names were incorrectly mapped on Switch (`A` instead of `B`, etc). - Fixed an issue where resetting an action via `InputAction.Reset()` while being in disabled state would prevent the action from being enabled again. ([case 1370732](https://issuetracker.unity3d.com/product/unity/issues/guid/1370732/)). diff --git a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs index 2754dec550..4219580a49 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs @@ -1,4 +1,3 @@ -// Grouping up the XR defines since it's a pretty heavy sequence using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; @@ -3447,7 +3446,7 @@ private static void PerformDefaultPluginInitialization() Switch.SwitchSupportHID.Initialize(); #endif - #if (UNITY_XR_AVAILABLE && !UNITY_FORCE_INPUTSYSTEM_XR_OFF) && ENABLE_VR + #if UNITY_INPUT_SYSTEM_ENABLE_XR && (ENABLE_VR || UNITY_GAMECORE) && !UNITY_FORCE_INPUTSYSTEM_XR_OFF XR.XRSupport.Initialize(); #endif diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Controls/PoseControl.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Controls/PoseControl.cs index e1ae35b449..4ee78e4f22 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Controls/PoseControl.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Controls/PoseControl.cs @@ -1,8 +1,7 @@ -#if (UNITY_XR_AVAILABLE && !UNITY_FORCE_INPUTSYSTEM_XR_OFF) && ENABLE_VR || PACKAGE_DOCS_GENERATION +// ENABLE_VR is not defined on Game Core but the assembly is available with limited features when the XR module is enabled. +#if UNITY_INPUT_SYSTEM_ENABLE_XR && (ENABLE_VR || UNITY_GAMECORE) && !UNITY_FORCE_INPUTSYSTEM_XR_OFF || PACKAGE_DOCS_GENERATION using System.Runtime.InteropServices; using Unity.Collections.LowLevel.Unsafe; -using UnityEngine; -using UnityEngine.InputSystem; using UnityEngine.InputSystem.Controls; using UnityEngine.InputSystem.Layouts; using UnityEngine.InputSystem.LowLevel; diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/GoogleVR.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/GoogleVR.cs index 28144ed117..a3c0b8b4c4 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/GoogleVR.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/GoogleVR.cs @@ -1,8 +1,9 @@ -#if UNITY_XR_AVAILABLE && ENABLE_VR && !DISABLE_BUILTIN_INPUT_SYSTEM_GOOGLEVR && !PACKAGE_DOCS_GENERATION && !UNITY_FORCE_INPUTSYSTEM_XR_OFF +// ENABLE_VR is not defined on Game Core but the assembly is available with limited features when the XR module is enabled. +// Docs generation is skipped because these are intended to be replaced with the com.unity.xr.googlevr package. +#if UNITY_INPUT_SYSTEM_ENABLE_XR && (ENABLE_VR || UNITY_GAMECORE) && !DISABLE_BUILTIN_INPUT_SYSTEM_GOOGLEVR && !UNITY_FORCE_INPUTSYSTEM_XR_OFF && !PACKAGE_DOCS_GENERATION using UnityEngine.InputSystem.Controls; using UnityEngine.InputSystem.Layouts; using UnityEngine.InputSystem.XR; -using UnityEngine.Scripting; namespace Unity.XR.GoogleVr { diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/Oculus.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/Oculus.cs index ce614b0746..318145042f 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/Oculus.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/Oculus.cs @@ -1,9 +1,10 @@ -#if UNITY_XR_AVAILABLE && ENABLE_VR && !DISABLE_BUILTIN_INPUT_SYSTEM_OCULUS && !PACKAGE_DOCS_GENERATION && !UNITY_FORCE_INPUTSYSTEM_XR_OFF +// ENABLE_VR is not defined on Game Core but the assembly is available with limited features when the XR module is enabled. +// Docs generation is skipped because these are intended to be replaced with the com.unity.xr.oculus package. +#if UNITY_INPUT_SYSTEM_ENABLE_XR && (ENABLE_VR || UNITY_GAMECORE) && !DISABLE_BUILTIN_INPUT_SYSTEM_OCULUS && !UNITY_FORCE_INPUTSYSTEM_XR_OFF && !PACKAGE_DOCS_GENERATION using UnityEngine.InputSystem; -using UnityEngine.Scripting; -using UnityEngine.InputSystem.XR; using UnityEngine.InputSystem.Controls; using UnityEngine.InputSystem.Layouts; +using UnityEngine.InputSystem.XR; namespace Unity.XR.Oculus.Input { diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/OpenVR.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/OpenVR.cs index 38106f8915..d1d058f481 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/OpenVR.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/OpenVR.cs @@ -1,9 +1,10 @@ -#if UNITY_XR_AVAILABLE && ENABLE_VR && !DISABLE_BUILTIN_INPUT_SYSTEM_OPENVR && !PACKAGE_DOCS_GENERATION && !UNITY_FORCE_INPUTSYSTEM_XR_OFF +// ENABLE_VR is not defined on Game Core but the assembly is available with limited features when the XR module is enabled. +// Docs generation is skipped because these are intended to be replaced with the com.unity.xr.openvr package. +#if UNITY_INPUT_SYSTEM_ENABLE_XR && (ENABLE_VR || UNITY_GAMECORE) && !DISABLE_BUILTIN_INPUT_SYSTEM_OPENVR && !UNITY_FORCE_INPUTSYSTEM_XR_OFF && !PACKAGE_DOCS_GENERATION using UnityEngine.InputSystem; using UnityEngine.InputSystem.Controls; using UnityEngine.InputSystem.Layouts; using UnityEngine.InputSystem.XR; -using UnityEngine.Scripting; namespace Unity.XR.OpenVR { diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/WindowsMR.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/WindowsMR.cs index b6108452d6..e411ed395d 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/WindowsMR.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/WindowsMR.cs @@ -1,8 +1,9 @@ -#if UNITY_XR_AVAILABLE && ENABLE_VR && !DISABLE_BUILTIN_INPUT_SYSTEM_WINDOWSMR && !PACKAGE_DOCS_GENERATION && !UNITY_FORCE_INPUTSYSTEM_XR_OFF -using UnityEngine.InputSystem.XR; +// ENABLE_VR is not defined on Game Core but the assembly is available with limited features when the XR module is enabled. +// Docs generation is skipped because these are intended to be replaced with the com.unity.xr.windowsmr package. +#if UNITY_INPUT_SYSTEM_ENABLE_XR && (ENABLE_VR || UNITY_GAMECORE) && !DISABLE_BUILTIN_INPUT_SYSTEM_WINDOWSMR && !UNITY_FORCE_INPUTSYSTEM_XR_OFF && !PACKAGE_DOCS_GENERATION using UnityEngine.InputSystem.Controls; using UnityEngine.InputSystem.Layouts; -using UnityEngine.Scripting; +using UnityEngine.InputSystem.XR; namespace UnityEngine.XR.WindowsMR.Input { diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/GenericXRDevice.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/GenericXRDevice.cs index 78e4e4d5eb..057500fbca 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/GenericXRDevice.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/GenericXRDevice.cs @@ -1,8 +1,8 @@ -#if UNITY_XR_AVAILABLE && ENABLE_VR || PACKAGE_DOCS_GENERATION +// ENABLE_VR is not defined on Game Core but the assembly is available with limited features when the XR module is enabled. +#if UNITY_INPUT_SYSTEM_ENABLE_XR && (ENABLE_VR || UNITY_GAMECORE) && !UNITY_FORCE_INPUTSYSTEM_XR_OFF || PACKAGE_DOCS_GENERATION using UnityEngine.InputSystem.Controls; using UnityEngine.InputSystem.XR.Haptics; using UnityEngine.InputSystem.Layouts; -using UnityEngine.Scripting; using UnityEngine.XR; namespace UnityEngine.InputSystem.XR diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/BufferedRumble.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/BufferedRumble.cs index 554f614b4a..20bd60c591 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/BufferedRumble.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/BufferedRumble.cs @@ -1,4 +1,5 @@ -#if UNITY_XR_AVAILABLE && ENABLE_VR || PACKAGE_DOCS_GENERATION +// ENABLE_VR is not defined on Game Core but the assembly is available with limited features when the XR module is enabled. +#if UNITY_INPUT_SYSTEM_ENABLE_XR && (ENABLE_VR || UNITY_GAMECORE) || PACKAGE_DOCS_GENERATION namespace UnityEngine.InputSystem.XR.Haptics { public struct BufferedRumble @@ -25,4 +26,4 @@ public void EnqueueRumble(byte[] samples) } } } -#endif // UNITY_XR_AVAILABLE || PACKAGE_DOCS_GENERA +#endif diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/GetCurrentHapticStateCommand.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/GetCurrentHapticStateCommand.cs index 872ae91abc..c246037db7 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/GetCurrentHapticStateCommand.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/GetCurrentHapticStateCommand.cs @@ -1,7 +1,8 @@ -#if UNITY_XR_AVAILABLE && ENABLE_VR || PACKAGE_DOCS_GENERATION +// ENABLE_VR is not defined on Game Core but the assembly is available with limited features when the XR module is enabled. +#if UNITY_INPUT_SYSTEM_ENABLE_XR && (ENABLE_VR || UNITY_GAMECORE) || PACKAGE_DOCS_GENERATION using System.Runtime.InteropServices; -using UnityEngine.InputSystem.Utilities; using UnityEngine.InputSystem.LowLevel; +using UnityEngine.InputSystem.Utilities; namespace UnityEngine.InputSystem.XR.Haptics { @@ -46,4 +47,4 @@ public static GetCurrentHapticStateCommand Create() } } } -#endif // UNITY_XR_AVAILABLE || PACKAGE_DOCS_GENERATION +#endif diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/GetHapticCapabilitiesCommand.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/GetHapticCapabilitiesCommand.cs index f1b27e196d..081aa58c7d 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/GetHapticCapabilitiesCommand.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/GetHapticCapabilitiesCommand.cs @@ -1,7 +1,8 @@ -#if UNITY_XR_AVAILABLE && ENABLE_VR || PACKAGE_DOCS_GENERATION +// ENABLE_VR is not defined on Game Core but the assembly is available with limited features when the XR module is enabled. +#if UNITY_INPUT_SYSTEM_ENABLE_XR && (ENABLE_VR || UNITY_GAMECORE) || PACKAGE_DOCS_GENERATION using System.Runtime.InteropServices; -using UnityEngine.InputSystem.Utilities; using UnityEngine.InputSystem.LowLevel; +using UnityEngine.InputSystem.Utilities; namespace UnityEngine.InputSystem.XR.Haptics { @@ -51,4 +52,4 @@ public static GetHapticCapabilitiesCommand Create() } } } -#endif // UNITY_XR_AVAILABLE || PACKAGE_DOCS_GENERATION +#endif diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/SendBufferedHapticsCommand.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/SendBufferedHapticsCommand.cs index d1d5ec3b38..577d38bbaf 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/SendBufferedHapticsCommand.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/SendBufferedHapticsCommand.cs @@ -1,7 +1,8 @@ -#if UNITY_XR_AVAILABLE && ENABLE_VR || PACKAGE_DOCS_GENERATION +// ENABLE_VR is not defined on Game Core but the assembly is available with limited features when the XR module is enabled. +#if UNITY_INPUT_SYSTEM_ENABLE_XR && (ENABLE_VR || UNITY_GAMECORE) || PACKAGE_DOCS_GENERATION using System.Runtime.InteropServices; -using UnityEngine.InputSystem.Utilities; using UnityEngine.InputSystem.LowLevel; +using UnityEngine.InputSystem.Utilities; namespace UnityEngine.InputSystem.XR.Haptics { @@ -52,4 +53,4 @@ public static SendBufferedHapticCommand Create(byte[] rumbleBuffer) } } } -#endif // UNITY_XR_AVAILABLE || PACKAGE_DOCS_GENERATION +#endif diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/SendHapticImpulseCommand.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/SendHapticImpulseCommand.cs index d38d138aba..e9985d9eca 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/SendHapticImpulseCommand.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/SendHapticImpulseCommand.cs @@ -1,14 +1,15 @@ -#if UNITY_XR_AVAILABLE && ENABLE_VR || PACKAGE_DOCS_GENERATION && !UNITY_FORCE_INPUTSYSTEM_XR_OFF +// ENABLE_VR is not defined on Game Core but the assembly is available with limited features when the XR module is enabled. +#if UNITY_INPUT_SYSTEM_ENABLE_XR && (ENABLE_VR || UNITY_GAMECORE) || PACKAGE_DOCS_GENERATION using System.Runtime.InteropServices; -using UnityEngine.InputSystem.Utilities; using UnityEngine.InputSystem.LowLevel; +using UnityEngine.InputSystem.Utilities; namespace UnityEngine.InputSystem.XR.Haptics { /// /// A device command sent to a device to set it's motor rumble amplitude for a set duration. /// - /// This is directly used by the SimpleXRRumble class. For clearer details of using this command, see that class. + /// This is directly used by the class. For clearer details of using this command, see that class. [StructLayout(LayoutKind.Explicit, Size = kSize)] public struct SendHapticImpulseCommand : IInputDeviceCommandInfo { @@ -36,7 +37,7 @@ public struct SendHapticImpulseCommand : IInputDeviceCommandInfo /// The desired motor you want to rumble /// The desired motor amplitude that should be within a [0-1] range. /// The desired duration of the impulse in seconds. - /// The command that should be sent to the device via InputDevice.ExecuteCommand(InputDeviceCommand). See XRHaptics for more details. + /// The command that should be sent to the device via InputDevice.ExecuteCommand. public static SendHapticImpulseCommand Create(int motorChannel, float motorAmplitude, float motorDuration) { return new SendHapticImpulseCommand @@ -49,4 +50,4 @@ public static SendHapticImpulseCommand Create(int motorChannel, float motorAmpli } } } -#endif // UNITY_XR_AVAILABLE || PACKAGE_DOCS_GENERATION +#endif diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/XRLayoutBuilder.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/XRLayoutBuilder.cs index 82c192c44e..e1da9dfb66 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/XRLayoutBuilder.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/XRLayoutBuilder.cs @@ -1,4 +1,5 @@ -#if UNITY_XR_AVAILABLE && ENABLE_VR && !UNITY_FORCE_INPUTSYSTEM_XR_OFF +// ENABLE_VR is not defined on Game Core but the assembly is available with limited features when the XR module is enabled. +#if UNITY_INPUT_SYSTEM_ENABLE_XR && (ENABLE_VR || UNITY_GAMECORE) && !UNITY_FORCE_INPUTSYSTEM_XR_OFF using System; using System.Collections.Generic; using UnityEngine.InputSystem.LowLevel; @@ -340,4 +341,4 @@ private InputControlLayout Build() } } } -#endif // UNITY_XR_AVAILABLE && && !UNITY_FORCE_INPUTSYSTEM_XR_OFF +#endif diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/XRSupport.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/XRSupport.cs index f88b314cba..df67fabb5e 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/XRSupport.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/XRSupport.cs @@ -1,10 +1,10 @@ -#if UNITY_XR_AVAILABLE && ENABLE_VR || PACKAGE_DOCS_GENERATION +// ENABLE_VR is not defined on Game Core but the assembly is available with limited features when the XR module is enabled. +#if UNITY_INPUT_SYSTEM_ENABLE_XR && (ENABLE_VR || UNITY_GAMECORE) || PACKAGE_DOCS_GENERATION using System; using System.Collections.Generic; -using UnityEngine.XR; using UnityEngine.InputSystem.Layouts; using UnityEngine.InputSystem.Controls; -using UnityEngine.Scripting; +using UnityEngine.XR; namespace UnityEngine.InputSystem.XR { @@ -31,7 +31,7 @@ public static class XRUtilities // Sync to UnityXRInputFeatureType in IUnityXRInput.h /// - /// The type of data a exposes. + /// The type of data a exposes. /// public enum FeatureType { @@ -77,7 +77,7 @@ public struct XRFeatureDescriptor ///
public FeatureType featureType; /// - /// The overall size of the feature. This is only filled in when the is . + /// The overall size of the feature. This is only filled in when the is . /// public uint customSize; } @@ -305,7 +305,8 @@ public static void Initialize() InputSystem.RegisterLayout(); InputSystem.onFindLayoutForDevice += XRLayoutBuilder.OnFindLayoutForDevice; -#if ENABLE_VR + + // Built-in layouts replaced by the com.unity.xr.windowsmr package. #if !DISABLE_BUILTIN_INPUT_SYSTEM_WINDOWSMR InputSystem.RegisterLayout( matches: new InputDeviceMatcher() @@ -324,6 +325,7 @@ public static void Initialize() ); #endif + // Built-in layouts replaced by the com.unity.xr.oculus package. #if !DISABLE_BUILTIN_INPUT_SYSTEM_OCULUS InputSystem.RegisterLayout( matches: new InputDeviceMatcher() @@ -353,6 +355,7 @@ public static void Initialize() .WithProduct("^(Oculus Tracked Remote)")); #endif + // Built-in layouts replaced by the com.unity.xr.googlevr package. #if !DISABLE_BUILTIN_INPUT_SYSTEM_GOOGLEVR InputSystem.RegisterLayout( matches: new InputDeviceMatcher() @@ -364,6 +367,7 @@ public static void Initialize() .WithProduct("^(Daydream Controller)")); #endif + // Built-in layouts replaced by the com.unity.xr.openvr package. #if !DISABLE_BUILTIN_INPUT_SYSTEM_OPENVR InputSystem.RegisterLayout( matches: new InputDeviceMatcher() @@ -406,9 +410,8 @@ public static void Initialize() .WithProduct(@"^(HTC V2-XD/XE)") ); #endif -#endif #endif } } } -#endif // UNITY_XR_AVAILABLE || PACKAGE_DOCS_GENERATION +#endif diff --git a/Packages/com.unity.inputsystem/InputSystem/Unity.InputSystem.asmdef b/Packages/com.unity.inputsystem/InputSystem/Unity.InputSystem.asmdef index 57ff8fca2e..43757faee3 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Unity.InputSystem.asmdef +++ b/Packages/com.unity.inputsystem/InputSystem/Unity.InputSystem.asmdef @@ -39,7 +39,7 @@ { "name": "com.unity.modules.xr", "expression": "1.0.0", - "define": "UNITY_XR_AVAILABLE" + "define": "UNITY_INPUT_SYSTEM_ENABLE_XR" }, { "name": "com.unity.modules.physics", From 352b6c5b32e320c5439899f029975f7c3f8adf73 Mon Sep 17 00:00:00 2001 From: andrew-oc <78356434+andrew-oc@users.noreply.github.com> Date: Thu, 31 Mar 2022 08:56:50 +0200 Subject: [PATCH 43/53] NEW: Added CursorLockBehavior to InputSystemUIInputModule to enable pointer events when the cursor is locked. (#1518) --- Assets/Tests/InputSystem/Plugins/UITests.cs | 33 +++++++++++++ Packages/com.unity.inputsystem/CHANGELOG.md | 1 + .../Images/InputSystemUIInputModule.png | Bin 65298 -> 45237 bytes .../Documentation~/UISupport.md | 3 +- .../Plugins/UI/InputSystemUIInputModule.cs | 46 ++++++++++++++++-- .../UI/InputSystemUIInputModuleEditor.cs | 9 ++++ 6 files changed, 88 insertions(+), 4 deletions(-) diff --git a/Assets/Tests/InputSystem/Plugins/UITests.cs b/Assets/Tests/InputSystem/Plugins/UITests.cs index 2f14a49133..5dfb0ecf04 100644 --- a/Assets/Tests/InputSystem/Plugins/UITests.cs +++ b/Assets/Tests/InputSystem/Plugins/UITests.cs @@ -24,6 +24,7 @@ using Is = UnityEngine.TestTools.Constraints.Is; using MouseButton = UnityEngine.InputSystem.LowLevel.MouseButton; using UnityEngine.Scripting; +using Cursor = UnityEngine.Cursor; #if UNITY_EDITOR using UnityEditor; @@ -3667,6 +3668,38 @@ public void Setup() Assert.That(clicked, Is.EqualTo(canRunInBackground)); } + [UnityTest] + [Category("UI")] + public IEnumerator UI_WhenCursorIsLockedToScreenCenter_PointerEnterAndExitEventsFire() + { + var eventSystem = new GameObject("EventSystem", typeof(TestEventSystem), typeof(InputSystemUIInputModule)); + var inputModule = eventSystem.GetComponent(); + inputModule.m_CursorLockBehavior = InputSystemUIInputModule.CursorLockBehavior.ScreenCenter; + inputModule.actionsAsset.Enable(); + + new GameObject("Raycaster", typeof(PhysicsRaycaster)) + { + transform = { position = new Vector3(0, 0, -1) } + }; + var cube = GameObject.CreatePrimitive(PrimitiveType.Cube); + var callbackReceiver = cube.AddComponent(); + + Cursor.lockState = CursorLockMode.Locked; + var mouse = InputSystem.AddDevice(); + + // first yield is to enable the input system ui input module + yield return null; + Press(mouse.leftButton); + + // second yield is to actually process events in the module + yield return null; + Assert.That(callbackReceiver.events.Any(e => e.type == EventType.PointerEnter), Is.True); + + cube.transform.position = new Vector3(1000, 0, 0); + yield return null; + Assert.That(callbackReceiver.events.Any(e => e.type == EventType.PointerExit), Is.True); + } + public class MyButton : UnityEngine.UI.Button { public bool receivedPointerDown; diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 88ca44d75a..8015a46b5a 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -37,6 +37,7 @@ however, it has to be formatted properly to pass verification tests. * If, for example, an action was bound to `/buttonSouth` and was enabled, adding a second `Gamepad` would lead to the action being temporarily disabled, then updated, and finally re-enabled. * This was especially noticeable if the action was currently in progress as it would get cancelled and then subsequently resumed. * Now, an in-progress action will get cancelled if the device of its active control is removed. If its active control is not affected, however, the action will keep going regardless of whether controls are added or removed from its `InputAction.controls` list. +- Added the 'Cursor Lock Behavior' setting to InputSystemUIInputModule to control the origin point of UI raycasts when the cursor is locked. This enables the use of PhysicsRaycaster when the cursor is locked to the center of the screen ([case 1395281](https://issuetracker.unity3d.com/product/unity/issues/guid/1395281/)). ### Fixed diff --git a/Packages/com.unity.inputsystem/Documentation~/Images/InputSystemUIInputModule.png b/Packages/com.unity.inputsystem/Documentation~/Images/InputSystemUIInputModule.png index f27104fd7dbc9c16a81041397ce53655fb8e236b..021170f2100d815fc2096088141050cb0a831188 100644 GIT binary patch literal 45237 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

Lb%U`L%k-xg?ZnP=+xMY zvSwV9kG3qm{u#h}^`b%E_gi=_a*VRD9GgH%gg}g{Y-K&K$)9eg>Ul%C=FAO^D7EjQ zBWrJqq;+K<8#x9T)#+B)H-qfU>@CFeLp5qNQS|iQ8WDPP>TX&X(=FXkF97Ecc20H> z=CeUuN?nrX#%u-5LEHyASqF&>y?qU2zvQvW6t8@s^RNaSZv6qG9Cy=hX9jmnw*pPU zhnaEe8FrkvPx68;9ansv^G{b_ck3+TC3nJQUHizL8|p;fKe(hoI%upaH*0?mB5Tt? zJ$h}%V6Jcf3;T?nR3$)e68X}0U-$bR$RiIB#2R)XwFPbrqA+)LuY zh86tQSl<0U%q_-yRkD&RhvddNVdAKGa|%g0WDZJ@!?kHVxi2{t!)V{xV0!n3SU7|) zer|7>34W8#x_)j@1o7B9{hE~{?TnX>F5-w|g!nKoCa#{`&IE^kz?=R2&jYIOO-E?d zj;B64Mh7hx9THA!lPbx{fn~F&r?$FPvl%{-HBNrUjhUj;Fih|rnL46lf%)~T_Hyz? z;ZguECj%RvKS|L5!0*!*PO$o7*vk7_95+VZZ%#MdbV?*TxZb_fqVXg0f85S22$X!B zkLJdpEHHYGkxs&Pv*AU|6IkYKBnjDD|w%d^7e3LSj1b_4#$A zT`cEkejPYbR^iXD?qpFPP=;-Hs?dAhr&^pc^K{Uk#t`!35L3la(Voj|qPNEr45FNL zW$Z;YoDokky1gsRmud2@dIDm#TWD6~xwOV0Tdo#Wh)^33Wf=t$L~aZnR9;vmn(f@7 zg7?qG#ZS3SCK)74njaP2Qg`~eZq8;0ZC;uJl4At*5jFi-Z{9=YKpq1>w$m9bEw_Ln zW0BChXUTGvkm(h<;sW{y5FFze;t1Y|}ow(``(MxkZ|CBr)&!Wl{U# zBACd>SG03Kyxh(mL%o;ZjE8IKHIq5vF`ee=tDoY)&V8J~y7;{HR^BKG0p9oRuI{ut zH~yxl>YV*HP%Y{Dd7sRwrE$XC*@ZQ7xYBbxFwR^LJBIY?Oxo}0`~za>0-W}!($Ugi zR5x^_NiE6Bl51UiU=N(zv5Vzde=lH#_~{b&M&jY>N}Ny2Ue|*+DC(*lVPeJwwgsfr zxy>Z1Yf$;E>il6YyM{qJA)zG=mcPOnXTQUu|FiskX@*SQML52%5! zSXafPSkwj;Hs0jhbbR%D3H*D63hN zUYEoJ2RRQ&HMvxI9`L1HYPh%mbvqgclw9TaHnmV7(Q{-OXB$n&&dmY0qKa^#Py{_p z#Uo;2L;0#d)*Y6BeXw?jUx_EyPYd|%ycDl=0LR`aQ05I>45?9?o{Rjv81(-4isRdy z<1Gogf{>>S9KvuIArh#UJzcu`)^Na0Pgk1QUV3$JvevjrYZ{<5^oKnr+`k=zv?`g6 zH{jkw7oS)i-<}CuId9Pt5xSziIO_!D6gPln-KgfnK#l^AnnYO?+B%4R0|!_)vnxXj zNGpnWzlbV=*}!jgi|E(59HwDofx42z%q^uGv@Bvj57_zbGDC7;cyfMLBQQ>n_!1mMyP-VB^yBvdHQ z6g{62NDn_DQCR>oh}qIqbwg~Fs&0q@yuW^W@Np!lNbfK@JzTQdTF;q>ugD*vG$0Nu*SbKRi^^7azS!`JJ(A9esxth;y=Vh5@;N`o=TK5EZ(GM;K$ zfV6tG|Kc@8$JQeOKy0R8Arh8=7*-XOZ?>@S`R$FGFh+f2UOte5=0wLRzUUsK1^Ncf<3*m-~d_HTg(Gt=Q{HSu#)+zMxrD-7P z@gfdUVH%sQwCV2wZ`z}#0aiB;I5$kqH&S{uBccxh4%hAGJpPX|`S;eTeiw^=Dwi@M z>9EdO$6(WPPW!V=#P-6~yfi|lf9Y=`&Dk5Oa3*zZKw>wydB0y3Cl_xQ*Kj;oL=(_o z9e>det$050OoSqKcnPn89A5&KEAEGlj}id1?(Kw?dd77`f7baDfcZcwH*Mc>iL z$-CO|YkdE9S)#ECFa&*?1E310t{#wd^&kh9EF8&8Ic3bO;9WSk@P%eH!)g zoq#Bf{+7W45Do<6CWroO+(coxbXif<{_@MYQ-9?mm#6PoS3zDYS6?`^Q@9#6tQ(&_ z(M|B3W0usVi#E~-E>mmya_vUyCLPRH!sJ4}L`B@GNC>3at5cFzB z_=--&a^(i+1dh@WgJtW@RzuEqdt7ZCmw! zkDVE=%b&M`d5O~z=@DPc`h9iYNsno5x^b+_xREpMbzxXv*G@^n_02Yme=h>N+TC3;9-l$59py}LQwhE1*^Ha@~d)19o35hBiKi%7LBv1V6!O~V*QkajfH=xh0lu<-s+F#Ab zCiKS1;}7nVs6B|Zj3skCwO9aBm9Lk(X-_o1P~)Cz9%HeQNb<9#P9 z-glM`DzSnjkrM8%AKiPog$l6iJTsrZ4tS55V{9YxoiL~LI{M)wUygR2I*wtj1Nd!- znBb_0&P8Hg&Asn^s-e%^pJm@aF&j*Sp`OzDtrZ2 zBbZiN@%+Q4H@c;%+Zu)xFQSdkF7sM7>V(g+jw{m7$&E8wUf+T7Z&@*He-O}^h$>7| zkLRxOvpJ0xeRFvrwC7~}fzfz-;p@|cD+|KOLJ?#QiIj4;y5S~LxNV@rSIsO-t+LZE|?b;Wm*<}7nimn2prv8CV#UB zE)0LGCb-&v$%g*VU;-wjRlpUI-S|(4z(>dD#XlCwG5@BrEh_ztr2kjI0ElLDVm5!1 zpg*rZs-p^x`SKg`|1H`{q&j=!sQ)AsE*m%^cfMP>flw_DtW`jIJ}OWR1{i5G_ER&3 ze6Wk(11Uq}mat|2tvNk#@)kWi&%>dydEXi+#b0(ixlMCGgBawlj5oktcR|yQ`%`5f z@37rfkKk1d*E!x8&(*2=>cuujk&hxx4WK|&!p*mazk-*Rl7rLz*LNbtHgN zkT>jG>p3cq0=+0K6W7f_$q!g6 z2*LHkBKJSm&pr^KT0T#QZ%#D<8cnrm-9QP&0l0&swqF5xK?&drrmVCMr51pRf|pM~ zKGP0?KZ9(=LnJ#niwfIvRRi2A;rY}O3c~RqO^PfcQrIXFz2ps`01Vl)2LArm8+Cf% zm7GIMeno`T=~ar;{!so6&~ssYVLk* zPZm_YaO=m?>Ui}J3(l&~%m0R8H~B~{{_6l2PDaBlf5cz?2crFZR(LT8RsexLsqhw}ZVK@h5PtX- z?x3tezLM$`iRE$7l!I&vwONmOPvh954OW#g+~#b@`=w2A?m@8|Xy>`k#B|QK`FM1v>NPDY*28Xh`ut-nH+l^tx>%c&2niaPP9 zb~CXkHl7B>-(9-S!NE$EGKNH(W}^5F2pbu{1<8~Y;-1dV+@G~cW#SRDZxoJlVTwo{ z7K@}b4~85r_#6Q9X+jNsxaPw>u{BG9jkRe$6Uuh@f=xkhfK0#(teJu10jeBZ&_RKL z&}S&MH7^`?OVUrq((H>;qrXPP{E0s+EarT`sR`{1^e7wx2luI0T#wHUv!A-yL*CqE z$Vk%<0|@c!77z^K(^RdG1Trqxlb~H>^*;84v;K--u-A6SDGfyB;Rzzp>5fl~*ZI8& zCC&X6+FI|1?;z`v+L9up%kb@Sh%_BmFhi^#yDwmp!bmYb_OhNgJp zD@3kOzqTBc=-e@}b)+q3BYEeb=Ap>Pi#dKyz*P*+4Fj^tZrkJ&*H=kcA*j?Y)x`1R zEP7)dEG+MMpNG?kh!`jsWIRd$+i?-3f8tAyCNz6gLcxCEnYP0qhitAo2jHhoN7C{jFDU&Yu0l5a}?d^T~wv%NR?`ZP0QIu9$(482<3ge5i z4Vm(b=gDZX%9#h4mmJ6y>IQaN@MbgUiFucDb&lEw8l()zIO2(I$3yhFD2$bBkCF3Q}S9c6&s{jI>SU|qkv z#lnTu*QD%2zDHgQGS;!(K+!>kFG@vZRqqMS5Bl4m1&@(flIQ*K&Yd$I8!3F=6RtE} z0=S9A5I}Z}z5qkom{aQALNmzfn@>dFKln3h`rh$iyI;;r7#%8oHvhi!b_F1I3!${_ z_L~X&OTjAIpF1?ij3~X`{a4W=YvOZ>cw#7fm#!c~J{ss>HxUo|{89jeC>KHlfykv> zmJU*5d1$ax>+33%{{n#FU=7#xOPlovxxdN2wq^+iYRDqXrG!ZmKJNEtX6AwCWaQ7N z`A~x9N76~+qu0gW`L3nozn z@o&^|6rfiRuKH<@4K&}ecV%BX+Vg~q2FxO9)CX#A``2FK#b}u0Me?Pu7XAp0`CJpQ zWO5L@Xct|sVOoQD6&c;T^%up9i$`&NB;CJy01;#ImiE3%3p-bs>Jk6SNw=bU?~4_K z34ssxB*3R>ZNske|2AX)KzR}YOip9nI zX6^NQelL5%Q`2()g>jQ_)HH~F+2};>(o1~6QJW$2xIMVFGrdK)1Wn#_7HhUo=qwRt zPjQ(iS4@T6q_wNlDT{i!Z$k`iRlVgTLHbFJdd;%sv)X7AUIP<%2rKV5H+A05}??*^>IyB@kJLBYtJCn`KJIq+qUNiZ|T)aA*;2l2T z*t*c6**Z^OE*Q&Mcrn#_q`hPK1JlT4yD+m$3Q}9XgCAhlua7f=`u&NW z7W+UMDqCs&z>QW(SY1T=Y-IlZ%blFwG0*hs9P#vm9J{h5n6|V05V)<#S{(@lF205l z^6%3%C91G-R-&LUC-p~|9J>r)MOFD32ge)SwaRUKvdTnC$tM9SA8w;VOnTLh6Y(+Y zrfM{e�$SXN5R7P2(Gi$eZkQwr9R&yU++|r^ri5(B`Oby$Qft98MF%8#j+JzU{P< zsSNFBvk$aCdEfnM=m_&_OgaCC+E@=(X`Djq7ugYefMT9M*SlM$0?Nf9CznXO=0upn zP-|Ky!qq|LfvyW6KnVyWVZnPY;GKgGeT0m0_ zT@bJLzH)=K_aSt&*;FTi1UN;g(R0$St*}@Imam)aQgBUB)Qsp=ogL$RCzoFiSSr!6 zh^69!iweC7bbZ9N7;ay|dB4Ttd`9?4%l*rN7Z}7O3>0trv3E&~vCnhddH6+P##g)X z-9Fctk=7zYfHtq6WmJDR<|o2&RopmNSThX67nq%jRTSCpI%FNcz9at48;CodsRpx&IA7q9hCUc z4$O7DNR9}vSms5cS(tJjedH|P@${BfDXGckwOBrviB|Rbkz?eK=8yPN2u~Je7^I@^ z$9au0!|yak_zh$<%T*qoHCdI4ebz9+Zb#Thkd&1Yp(p@G8@byq?tIua}T z+DKNBq3G_X$Yqhd+syO6yVS{SPhylNmzOuakVh7|EG0O^BU@tDg-~=-Cl)EOZ{uro z!*yYtuNUI?j~~Z06{F%W!Z?Vq81XmH&;lGKD3?u2di+U^eXvHiZU?}&bQF0<_1TTw?@M4%uqbkphJq9Rc{<;0>a#gy> z&$NqVSNSc6CssLNVd9nxCFQfY$8WX$ns2RBYM$uwby

Lzb*pdCA)nvN>2&rk^X)- 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 RhMNa}9Jg$z6p^W?{t1&9Z=nDH literal 65298 zcmb5WbySq!*FH>0Nuz{xs~{oL9TI{{D4|1l%n;HY(hW*Tr-0-TLk->CGB9)_-3`AR zKcDCO`#x*E>wVYz$B4|jGNP|Y$Xe*8MTn^KZkwI%!oW2j$-!XUjuWbA_w z#X%u?QdK_%qPDs~N1bKe$%fK-ue~{U@3Y#Q=N?IaUOBqenI-Mgo?jn$IZl31p6F3O z5h8t`Rz2sY)Vx*N#97*S`OD*YME_N_4=#hv;7=rt&A=?3k)4tEYehNkk_Go+ z2iZU0`nRKyf=-mkqAyu^p27a-QnGx+FHO@gh=gHS zb@&6m(po|w%jom}zO61(Th&6Xjwpzj1b8R#VucsO2L6+AFP=q&+7JHcr4L9!j<`8* zQp3Nm5QBmUXkuHwk-w>qu{T}}jd)M@&z;zBG(LhSx)T^RbDxGFrptEnAA22WVdDpR zZ5*@wHOap{YPByxsZitW&Da_ww`W#a>BNdIdRjpA1-`YXG$p^cVu{s3C2#G~liJ%| zvz#fhq2A&%$2bYGVVzy;`479EISHcUnbmNFQO!02+V$fu*FUtF&GkdBqIj33{{b0j zW90B5$7)MYP^v{1>V?f5{8MKH)zh1+vxG*^D>*#Y>UYWf@A$!ph5qFGIrfiM`caI8 zDV@=lb{BiQNq!c)_7g>#WrZh|zy8?>RWs$#Vy_@C`6d*`-%S-J&^uGj-^BqG; zpeJh;WZcsWIn?lR4VzRN5;rp0I&Bz)toWm25j=Q3L-48IskjJKJy?08<26!dzy3a( zu6eFuWTzsu_^_Zrje!HFoh*=`&Y$er&EZS4By&WaV<8@m@JCES8V2;hCe|Ac-f+FA zZE{LCmnW;!R;7GdTMI2;2O)pQP4wk?x#8+(3nviBVl1;%6ls(6*3JG~%H@*##oCqL zDxJg)-QjX+Q(tM*P5L3S=`P_q{ch_n_U>BmE(-XZ-LV6otEN@&JMX*nYj4KGqtd1x z_BONLpF3A6$Zk#|4I(Wq)H1u}&e2MX57}1Qjb0g^O*Zr5ObD3GymdRWJBDdB^@nRvGsTg!gh z)BS@g7rBq&JCDzEeNyE+@5tkN@cvWft!lwSK`}*Q26) z1=g_nO-pq1JG$$4{GR8t7xRS2XJ}MnaAErZ;!pG}EV8uj+b_*-|8WKFUoW(dk`|u!7uSa11MkZ}bLiV>!#9MH~)oy+HmsQ0vizTdMTw!U`p)?L67GTvyyZAw@+Kj-8m*fCTmHACYPaSXlUScJOb>pgs#%>>++njgEDKF9_u}$5m&26 zO&%;dm+wOr!3NLt&UR-#efOnY#a$1LH%D`oU>(1IzDqVFSnIV6K@P zY|y(^8ZuP+gcg%xHGSEyIyy@`RaTmVU%buLE;oL&iGXImvdM_6#!c`pkDk40*HWKZ zz^CMmW|R$8u(bU3nC+v2fZI5-js`?O?~bKgf<58xpOVzFi1ONRFUM5@O4t;GxcBJ3-q_oUyIH|MR#po7q#sA zgWFy%YP)#;ozIr6>Rjt(5#y=BDC6_~h*8H4k56@5k6f+RKYjAvcqMdp!gaVQAkmlk zO|LKIMBZe3NruN`PWK6~d!DF(2ee{4G1qzZHveM%x>iv9~i;?!K1=-K-vR-0A(aY2FucZ z@--l?i;((?8PLwsca-|5d|H{hqH|gM?^g3K*FR7zctiv`67ZtGd0HAjh`!eC$3fTk z`>g3ZI-Muem9huNRg^ae)_V`8An{v%`kKhT4cWckZj7Ln3(bUHc%1vncAj4MD^J!3 z?Ha~PO-*NW?s6NVmmArQq9@}Y@fOxl`{iu2AJcdj&l$2k69oI0iE~^ z9{B^V#`CNYnW5jyQ4*YAu?XXTyfW*BL69kaePkedHfTU~T4}>+(g&^DV7X6da6TG7 z%kQ7?+ey=DK7u(A7Xb!~C0r{5JL$cCD7bgnRPH{+6#{Q!mRR1&hA)17XKlf9BR9mo zspE;o~&USCcf~X1f|=8@d|fCpGEf zepp5I{B#yi*z>y8i3f|2J_gOomqyq2IrquarN<1GhKFf^4Ja6T&5Isvpq<>rvMBYR zHPHvt*JbI@qdTGnJ`g|bW-`qeax1m2-{F744^Hf%qLD*sec1N6Y7$p`Na7Cugn{@y z*kq-LiU{PI{Rq@eMAcOzmrzqKrF(U@=e)Lz#pdFG>?lY32<3A|n(^2m*HOj45s2x= z?Y5axCG$8=sMhYT#mgCIGM1>Geg09-n6V%~GzdkMFWVaIHr;tW|L`+>r7uAlI4_Jj zGdxSc-VT~en9o$R{B!d1l5;oml+$;Un;>Ul6%gI+O5HNg6B(I)Dng{XrjE(2%uOLz zAj_1Opl(E)pjOrLKIc)oQ^eCc*%n;>5*?nz5|s>_j&eVE6?$ItZL#G;!n zpE zu{s^tN5(m5@*%4>??zHK=VG}yRX{vx9n=!~j>ynu?&Y>h5ViPG|0^lFfk*mNGeNX& z-Pp9jG&b;`2h-UNdvJsoMSPai$9N}d09EzB_+0+hQpY_ZTo10PO97Rnb+=HDu#SH?^fL$w|d)d zh^rqbiFbe-RKlE?nmZ5m7tx>u&o_Fifcb3ZX2ykv8S5fy?bnlpKX#A>ax&u4P0kb( zLE}hr5oj^T)&}{Ql=&sci;~%^h9SjM$wL_DA8EauqF08VJqrkpk50=b>n-xZuiWF| z7E~@&fX0q`o{Jjo39!Ko`>cl%ui2iV#AgSEI$soWXs1Aq4D(LZGNl7D^Z+yyf#Q0x znlM21U~j;baIz&Cvr486d9fi%1@fsKJ}wc&IB-F?TaD8cUS`N?i1;8f=Lq3;W?^Dt z`bLA#FG44=%{$UAOF|cEYq3)^;~{~DB*$Qh#5zN9Galv+qKA5JSDK&8z!3-h!C#{; zW%eb5Yds+2^Cr0D>*c=YdlnMgX@wz=o|=Y6tzBRuxI~djone<#{5$Gu@PnjID`(=} z#v{Y^u%le3lt&_w0J1kFYif}GqwO6P?q;7L`pP`Aa*JP%mD5|flhadAj)UO3(Nl}R z;i{He?5rW>d>hNvs4c{2SeUtOZI>{(n3M;yXgXDK7cF`+x{===j|<0^ZFn$%wok`} z{&K>iJDTCAW^YM-n=g5vP16m`BJ6Zyqz#WNNdN13>+tIhVjqS;Em3qXvdj;cCtGH( zlLluG*9r~Uz0<~h5WQ=odx$b6DpLNS(4l9tv!Qc*g) zefvYi;=>|pcL$!S8JQVQl+U_AJ3)uhEELyvE_!wLp?XArhBzrxs)$fXc)>pnV~AD5 zXb7nfp%~1OlY?D^BI)K!j3I>bHI+`<){S(&sRTy(2Uj!pLqA%{?(95ZQK@7NB9>jz zC@ENvQ(TO4o$9f$m)j;HNfi%%;+_cwvj3vVZ~E(w=p%DuUfOILE1c;;J+4^yCSVR*>;qN#h9J!?bWcH!T9MTUK`ByK$ z5HcB7o;}Rg9gat-!xJUzmIR@n(2Qmn;oKeI>dRcIcW5kDete!3|8)UFk~s7%JQ z+Q_ei);$K}^{BsBPcs~rA68R267hVx2nsu@FvHj-=H=Zv<~J`ZEENk^dYWyNm^Qut zTif#`wbIV{{4aI(u^O4lvdd?Gu;6x1;+(@uCRa#1%dh+0z1DiAwl#+#%$%|3w*E?6 zu{o;HtG?R8Z0$Iyf=|;< z+jcWg+@FvQ96{10+)Gl(MLc;Ayqub@2+nh%Ezm;coOQq#InCllzHN({BpbK99spb(Re5pJKOxh&)%S_GV^U+l@zk1ykB90Od~R3>@}n$nscD zt9`0z?A=2pI2vrI77_h7iuAK&gY46fjlCYkC3W1YU#dLYw5CTb_)y)pu#~dwX9C}C!nyquh zg>vat^Q~Ng@B^uFLkNRHi|yFO32YTRIqtOT2=pEkY5fRl`p&7Re))FJ*yDSej9!zu zAujn8>3TV8Jv54em(zPM!n8})FzRvtiErKH1$h$rZ6P70tS|%J(c9tR4z5=7$IB4E z%cTL-$Tvr-(X?Xk{$OppAPKZxU7$BcCTB8HbO4TULszTwK!qdNV5;Ov^aKMzBD${b3U43c|DnsN#gLjEVv_nE4!159~=$j zkcq1Ji86THlo+^L^zU!BPfY|>1hRL&(muyydHoc1&CAF{MrW5spBZb3{&2W3Q1!F< zSk~EAAeA+@m@a}aytCCSAHf#GC9C*zJ;MxF$3{>PWNz??646=(W?6a+SkeJ#&v0r6DdthbNq+zvk&2=tOU_LO7ZP z6YwQv3u$Eb$0K#ItK6TS6w=m)tC zXl$^yF=-neO|J@Q5Kj7eVL3q)T&3naUi$MBboc&%je{hC5a`;{@YmJFd1$zaH7xlc>`{%PI-f;H<*hA{ zI&~4B7-rE7{{(1icK0o7^iIz{H6AE28uc7kb9LKCbG2OXxH!rPI7BFoEFG)iK1c%&acWI9o3*?iJ)krht#5vtB3CfjSeA_+##7XT}CkgZME zT$6-^7B7aqH_nnt|D*;#zS!&KtvS$rBDg;LR(uxoy;446wC7f9jbt{#(t9c7so$*= z)5A88{rD#`t+o(gis&-T-t5%uI+cde?RT)5s~o!6`|Rl7ZFg|M?VoXbD=$AjwsxiS zx19L(!yOx61lyIm^wNk_5-Bj#Xk;Q5(KZkj_#=(*xP3az5#aOf?f_F7f2Y}} zeP3r;F%n-8V%*N(^;?ZL%)301u=pi<+~53@)C?`i~Omk|BJAG~vM6RJlu)pQe^qwS{Y_1^SvwATTK1}2ZU17 z7LgK_hy?lEI@J~FE>m}j$Hd!4te95BB)m2+h@j(u; zg*NVLpCts|Pm2mjO^b@??s{9pMaLmoqUWs-ENF-{i|fO2xcT?J!)H#;={IMLYQo(h zDWb!!lI@0lC#uUYjXEi~(G=Zbx5s%B7(0K~X*@{?XcVzq0usVER{f&=yqa4rP_h*> z1oowg4Hc!tf}`k`SC>m@Ryj7=aVgjw7=C?m z)o7#-Um~1W@HPe3Z&2tkH$~RbH$|?3;XKQ!&EEcTK4Q&2Q&_oo(V8YRHFkq=U!6>M zy95BhAD z(vB}ptM(9tD?xTJgz~w$*Bt4@_Dyey76V8GJIQZxiiQHd0IayN7uJPEe z^!ks_y%VH^(@P8ar%^QUpA#l;trC-UN^%jrPMEuL$zGe5yI;l57cVcFo=?ky0yNcTA>^uaYI=KOi_m59iPGK`H z^70oSkO{eq5alnrHzm`CaG8c7)W&UV{&tn-)g=Ft)c?W~A%R$U!@!7Sw8tZJu{Nl-4geYsn& z+u(+AG)}69!{G04c2*+Bvs?9Mw91OEc6m-h>4u6f=Cax`+REDdb4mS?kcE?tKyAT* z(ibJ<+!v(G&5Cjqeq6mUoXuJ6;XOi|HnBo7N4=~j3wxPB^)n#i?y$kfx9>mZ@K zo1yux$s#C9Jo{<)Y64#SWn&w3DKUm_P>Q$hEx@^aS!=#U_vNv7lw|M!-XbH{+t+~A zS4RBEcp(EiT6k7C+OW>;dOhU1GIuJra(Y$YR}69Mes^~A{pT6{*@?BAmUaCW!{+#= z#Va!*k$~7MAlvx6Qi)(c(uC#)pv>M3t|>X7`;)L!?_rK6}VgH5$mfp?<}Y>Kqw=jBMuPW z<(O^jFzY$CEsfH+YO+Qad(-~7+Z)}uuJk|8o#*Cdts4uowcU~5)bgg7zL=yUb1rC# zBZgbccVamE(x_}hco6E~xVHmLETd>A@3a0>4AXuH0Hjob4s6a)j(>|#A*gJyU!?5M zG}jz9o&WugVO)bvOiJA}Z4KIXoV0yVq6z8I_%&;<%;psccS_D}wX zVMNkP_>Fu)U!14PP1cM;?)my2ajjb#$6vooOMq)1bZEq&jr#n(kg#z!Xh?CxS?Io8 z5$n1Cj&r;qUyq?t+tCKD0##?y`!!DZ&*(y4<>NW+&R8@?M;*rBzk6!^=4@WT(UK>m z_*cPmwR)8Gdnh^s?f4CFtcf8FSOh&vxRJeKHnefitt4zO@9$X=m5-!;BMem+Ql>44 zkAFbN$Lb&5hYteNh`I6l6H17(&CZLGwdU}3@mvr~bBYg%Ulp~GlH&-yQ^pPnH+~G7 zQ2UVkMG>vBBEa>bQCDPKg09<}I)_cehnav2^_(9po1FZa804K=-ONkpuUTSb$lJtW zXqOd)@@*HNy$a!2IKd6#--p+DJd)M8s&qfI{=sVzd%QU&pXPn*>be*}o}<^~1#s&h zrz$PJy?XaTA>KZ2!pmiuZ<}TG+?c-5bM%~;NzOP_rk=6zc#0v} z2(Vy>z3ip!+K82pFIIWQ82oFnpTas{4AmmkVrw(Wt>;x19e1WDf(s+41bP?Sf>wt! zWy(D+zHH7n-N}mmG!`=Zv=gM~;WWmA9m^(ER0D%^7a=9HnCd$<*PAtvy z?E|#RaZBTefKA$njATMg*WEq9*E`SP{E}M@Y%dl**T>^ez56}tUlr#RIa$7vbZ}=44)~hxrIIg^La5!xwTb@!;blS!x zUcVXZt8hjm20D+7oIdDuUFnYb^mB+nXyC|j`w;{4DCyZ zfw~sXWj_5h)F?k&ew#d?P$b+W9v}p#@{n$eHv)$2bdBPupc82=MJt5CCpdz^38S%>NnE)06 zwRvRQsufb(3BO)aG!Sp8$yx83f?MC`K(E?bXE<=~C88|dvTZ*)Qzj^h+|m60!lUBvN7#x# zeVe%8J_kvT(DQgd#6matj&7i@jqeM-}zpm^pd>=o&| zYK00d=b^<6GJzCOzuvBidXukTr80x0AKH`=1uC>PX8EW|kV<~V#E<2(`kjb2PL*eX z4D5Yk-=3jjXW(|a{XA8~nP7@b6F851o_`7{)>^dOm~#5w;i4K4irL1j--gSX!1elJ zulz@IBn}7DiJoy zs*4K}X@&Q}ufYumom4+4Ye$wWucw?|Boy+0&n(L%{&QFbLE$RY529B~PA}~PrbmU` z+=jF{`L5+F7FDJ{CL84dtV!cL#YF}`WcU}?Efd%IFT!S_vZ0E3ugpk)&&AdNhEseh zehLvc*72XNh;{PiYXh0D(-}rIQX%ymT zGzRGeW&f$F3SwoO6TJa@IhArGT?G@72nmsb%=eJECkDr;!UkZ8^976yh&@mS`;~>U z`s=mFI0Y##0j3R&YW_mRw@}KD`4pIF67T{)$kpl2kHfN&%9zfJi{+J;NC92Tqazmo z=oF$5gda)`!mtmPIpaK~!=Hg~hgYcbkHLi*BT>4Kj<5C4Y24oN;{U969g2=z58CMVSqpBxpeuIfU)x=NQP}jzHmW(&#UI*)Ewh63YEI5e9~j!LlC`HJmS*fC1I6?g zmbV-^zYHXfS9%w7Sb(E-Ig8;$Ev87sFZ`OwlEmP#g06S6tzS3k`g+t(bL0i+U#p_S z4f}u%U5IbjZ=?E;F;oQbqA`}nkt35Xsl=AZUbXc-ecpi1>~ML)?l7)KiWz>l`e9rn zfpWh0Z4cdYcn1kjP68{8x?CME&`8ZsYc;i9r_MX%jn0l55NG~0QIJhr$(@L!pIsYI z{1*%PGp<6cC%QWJk7J(h&D(5GR|L4x z8Kh_;0h=lzQ$j!gH3{IsWp#=)nc%+^>c-jPiS?iXG$$YYwS*qFVzT2ggc~qn8)1h` zl4BIz5^jzv@udlBYk@YoT&W^tL=(ps#Sg$ z4%jp~m+mmzfElPnti`j9Aqgs)~MLwkh4H4Cu2{iT7$72-c*hY!8a&#MIHYe)7 zKA9Bx@+y&Ay?%2ZRU^d5F3@x_7%Vu^6m_kJ@&Gn{d|9uoUZoTA)j zH@;4pMQC2bGViywCP;J-XF<_uIijmds$o|rg2(_tOej&wVLP9ZM|5ZBoe|-8;aLKa zvwy1#;yoi~VE$sr0NZ~d6SOepuhA05bS+=ImDIP2m1eO~;3j+Yrh(D!c94t}nnfgQ z5blS6RL%`nQP1YA&X+uw+{n;xudbkPR5`D03^K{XCC}q`Ak88f^KcZ>N0JB7KlGjz zKP7F15i+pz{^5)%{stg2oS{El9M3|qm$HHFrj$xSc9USEy7F8Z$qb9+%hTv z-~YK=f7zZJUj7kW2@-_lYR_EiD3hU1UqdGj8X-;!+HwIVuEDRD){*rT{XWI6@Z=-p z8tJqWOwoZHz@PfCM?|pGMsR}ZuJX9l?Y#4c)rOn>hFkbmhm0f`j&)ptDdPm?{Lhpb z2841PgD1FR1zgv_9k>Z7O#aa>OHW~@14*QeIgIyK8b%aC6N@&u`P~ihNZh}SiAiDC ziYh2V1Ja76EgpmXiAZd&+sW8)zjtt|uA((67_AdqeNk$oWS7rOpr2`_VCKK4o?{~b zP|o-2P+{QuO(mrPJOjb#&rB%+jSF9i53J(E84AGS6bGIbZOrtfLt|FDK&^Da1W_T2 z%@EQ_1~MB;i+g1@*u6QH2V}lPBrN&z$|-^|4u*wqezcC(7)#x!MIi$DcxC0ptP|N^ zY%lJU2xcplD8pw$f5weTK$G#$=p&YHQt#8J^$xOl`YuJ6`-CS1zlRw{nZU*@pso7- zKGXRt$1?N{EvD)v`2641IKqV;l|nKSl9Ua zoUm?(Mq8|Gj#td}KQp^Fn95$LSsKp)f^`G<=-&8PrDkUyXco74R@CJTsH+fB2m7d6 zpeIOopDngiJsvzCBx}SyTnwVSS2{8$*aBLYscM__7dmykMTlQI-0v)Zu4e*PMZ0`$ zb)78HIlR5v>+AXU^q+?ddR^DR0pSObIvkc67Ft@;hH}KhS9%`R2%*<3VfXChBZR-K z1g8i)hTcz0t^cE^?_V>+egTq^Sw9@D2o$V1NxS4vq#qHLBR9h07=b&tIKZfx-kF%2YF)vT@eGbz`|45{se##kbR_@+6=Bo zYkW=EMm3o`38bg?n;omlz!F7w2Ll>R&P28d#m5RM2%uzIup69VkV7j_-Q_cMDX$u7$X`$PUF z!Agl$1+3$Jb23^Cs?MOnKc=#-VW67z@Doimv%Ui3`0R@Qw3=QL%1YeB@3wFA^^N$w6uYXb}c z!fs&(U4730o6pfT0d)m%IxDvu7V3wNvwu$#ga!m+Quc?Dal``B);9o}H3776EiNZP z!+tevpUQKH-&0s)FZ${}LhNJ)Z#&)w6eWI{Kh=p&C`xpUS_eUr;Vh0y@iG#~WDpGw)(&$AA8YOV3L)sc&KEQA?+n_o zHo$t)B)&@E%kRbgnDJ-w2Q&>9_%Q!l*hxO>hBspHA#E5q_2B1dkZsd8yY3SouiQVM8T&57_Dv z4S3Y93iYY4#y1!~w zd*Zx#zzGc?C#Xq>78U8_8}V>%Z{WaoVtib6pGE!pSYUYAoUo_kb-#5(!WDq9hPFBS zOi~&s;XdDok;&8#FPwIw_g_dMc3aRAA3YEmMLOYi_|~*4x|nNa%jW}IvgN$oq)+(h z$g1WFRgcT%RfH=DrpJpM^8icu=u#v4;@HhvM^=RF*WSKbAwhc_rm?_LZ6(5aKlnVc zxH<_TG4dE%T=S{&TzhMP_u3!4Q z0#ASyz(mcQD3iQx59N4aU(|*QjZGDxm3+alotp5Kd)qt%;got7Fh`%7_sXz6SRc-B z-fFPE9yF=xz5vKfbBUVFVe9zpZbjx`25O5m;S>T!taS{%Iyv;AQ&nx40(Js{0K*b@ z(8I-)lrZy141EgL?G54%KlJk`h9CDM1UAbix3tHL5zcW(3I<)#sZ;Z2^1T@O_YbJ< zeS(o32K2S^ z_q8AY43P`IFI~1?>AW`w$n)>#&ftJ-1_&bC(hWBAjh&HtNLu`7$QZ0%8BNi@)5oL+ zohWlLu=rT1e;CFQOm-ZcF%qthJ;I(x>RkJIb?hoYUH(f~LWC=r?pV+eVH)s|v>(oiz2eH*)gOmi0lXpV? zJM=?pEx%IcndD)ufX6GEDJY1gFbz%dLWawWS6Jc|Kd|o?t5nN!}8u_leqq`<`>J4qEWohdnN!)0dO}k z8rFP7U8VzVZNZDbR;2=G`~BRlkTm}Vl(pbrmHFSL{-RdQdGD?HrY1aUL6tzfC%{Gi z(b}y*gN8}759(;1GTr)_Hdk;lZ*8%M_&*?AtHB(g)=e+Y8r;wRL7?|dAyYMW*`L$} zXDt1zzxQ$f6{Dm`Ey4k&S;%ES!{dB0=ze59EY#v2S^)A(SapW&mZ-kpEmn{Dr%>^5 z9q^-`tGycC}w4+a{6lz*4%(N!9iKcW0no0|#QdrB#N&+8{!*YzNTop)1uB&K?H zU7IM@8S1a36|AK?$a<&8@|39}X~oz8J?l5MT*V)6s=Fd-zOg99C)xtD`%cTV4Ydh~ zqi+De@*9fni~8#v=*5pifOOz>ATQ?+9}J$#!=~HItz1yGwbWIH)Ylb2aD&~6w1_31 z^fGjOiBSChjM#7pA3(+bG4a2F=+*xPqH~7G-5_xZeol$|$$YI0gcj8U2aAs{P?egj zR--UqM^N(lIpMKW^Mkdx=iYy%Edx30fgENWsRCs`@7qlPK^vnUn2J$G6B`S-wdzIeDBCV0_4{~yW2VGc*ve3}W4JRFhE1b>`Rnc7$oe0rtqXIiqLF=mX3%tNyJ}p=^6FEz$MP*fA7Z6 zsF~_d>1#+>Vf%Cq0#Rb8iO1VhA3j%E#yzL4w4R;zf7!1B$?(3r?Tn=5s>;k`=i{3= zeo#;hl*&2-tJ|<808u(C4Xi+1|Ic_q=PoI>S2Ov7gxif7&JoG3_htcrsBNFVwihbGf=n+r`d#v z1TINx8~6#jwG1^T`(+)X=zr;pC0!$UZWhq`^){TFLikEE*RZ1A9QuTzmJ6e z%xM6OtqAQ{iSK23#11R#hZ115D>}`&pg{f0#7eQ~@kA(}!F1L=GX>1A&kxq_fX)!V zgXs*Mpwx6aUA-M&_s!e{>FcbiG=ZWGXcjcUHplh!&qUvKkV1=VOG3#=bA{()0EEFe zuLosboc=S8WfG8ZI1!yvC9WflTrjyZOpN5X*7lzS)D1YpCUsR6N}m5%NaGkT(GhV4 zM(ep;Wri#E$r9aavV_mcW{7Of(*Vb{AH6k&{@6)BG8({x8z<#svSH2=(1;{HD@rLJ zTIwqK3Nf3s(30IeF;L7}h&{RlHWhOB@4U=8c&#&#U6B-8$tz^pg>c|~?YN0x7;?%i z8IsVj1r{x1DE7bn2gIxMhpZ>r1-jZnRVv1Uj){kTFeU^FuHIPy>YXpc6!mwb#qw|~ zA;{l3GRk3)D6%~-G!LU+3Neg7tKWAR@FMM3ams42wh1M!%W&kAp8B(1(@ReLWXEu; z&NjrBIRv|F)Es{K>()j8y7lGprqQm=cZgHwT(ym!QCBG>>Ol^AiQs>tm7Lr!pl9@f z7)Td>U|y6hkB;wLBps}a4-kt^Hc{lwqkG*usWB(hc%MZ9$5jn@wr(OAAFozMStnO9E*#$rm_Q7L zXgz>hiRf+#QlsLtT$ynudape1H_c7^z2EVVm476G#e!&-OK9{}$parD0 zY}u&8$)I#75^_Wm0?>{C>VK*RlwLWa#@V8A-C!t`V;e2f+35B)`(fPMuyntPYi@yj zfKd6Naf)ufojnp2KuK@Ry@KEHTg2W(0_5y%zTRHqM_{FyR<{SHmXRz3Z0J`8L{7bw= z&%6O{F--edkQDDD1Tc_aYO@V-!*o5acB&5t1m@erOPg+m7d=iUG=ZrLu80g4D5>MA z<Sjt{4LHr-FZJOBF#Q$9LCvE8mn?wx=qHm)-ivY~H7fzXN=Ig+i0&k&U)vF3_tc>h`=5?nvSLKWKDMnU&`kjX$T?4ZDJGxq{0Nq@V&xl#hU zN0>~3js+gbG%r90eSKwfe;YF2BQ@jyuO8URl)c_K_P$V3_7o)jy}=$hp~YF7UyKU; zfITuzkA88u`VHt^?cH4n zJ;JT@?p+)}uJ-@{!WdYcwQ8U?-x=wmS(jqC$F=qY==aePcG@-vSI;_uSnsrAW{(^S zh<9A?`!9@*jT31J`?01Q+^cI%0Sb@L4;SCz#Br5o=k)vb&w6cDXw_PSjd3wn)#9Y- z;B=c>p421zG&>rr@qB|`RL#E)xgip4FiNuCXevdrcSVTuPu13`o4J3P&c20+sHf!h zBZ;Zk48MlIsaKf3n*vxS1!_tV&=V43^=}+QgXNK&} zHRJ+3of@!aOv3wNx(P8%@^YyOR&-47!VDZ~gdMOi4bC+H8h!;xwRjJbs&Pf=xFFM& zFU7S2`bneaq}u1b?{1`$*TS~KG6NB2ct|+FO=MBt=3O9QCtH(LRBlX=D~{?J!$1nM zXDalF`q6?9d2emzD}(6Grj zRAn{UJL^2p0nm)RNO|hWO+Y?|J15hPwLV+Flx)>>y=@t`Lb%maC?usZIY;NvM6HD)N)B2{6$IqOfKQV@mW{c^f#XTeXu!R;jruN z#rnIt-^HM0fh%(lqX5o+j4_C868ZkFQI5rkmYmUJ#%w^_#2Q{HSZbblxk`sa#H|2G z!70r|BdHGJ*wi0RJBU!2)&RU&#e9^+Z4FfHeBmp@W?SZkIfeb!u!tXKWi>R2bd>dN zB0Zp&i39lBA41X!SIy{z4?N4=)3{e2xBavow4>2)b2^^JqZLK0eBB|S;HLlJmI2!; zsUOr9I6iJB$i#^GI_C#;BX$Gr+9p8H{LgAqr*`+FVOzoa>GC>E!MsGh0DH8>@a1OL z79qRUEv!Lyj{^YqHq;!RP8+&5bYuL#H#A}S&9EXSTJ0#wR)G3(`jfQZz znt=D`FCoSEnYiFFKmBz#Q&eKv8OP0d!G{PMF(vG5;$Ut{9~j-5zr|PnQ8-GgWLwP7 z4j9ocFs;Gq&CYd8j=u{8>$ zd|x&ya=P3;t!x1u7UYg@sNgw_M5EIz4N0A|I!cqrc0@2ZfJHRIzS4;4T8@c=B_#eD z&!(ue{`zQtTF2am_H{n{To}7eDM$Qdm^R>UGm!KiI3ykG{H^e@i+UYlG6dW^t}ee? zmkgqe2{-~}?^f}cbYP8oAA|p@37LCTppKrKhNJoBXz^avRK~i)OaX$BL?Ge%?Z2ao zu>fhdA|z`R`r3I2MC4ZkR-wFHKHS5$z;1DoqiA>w`)hFYBdEz$=2I+w-WjmFApAlf zq&2epGufKQ>DbA9rvJyQfnkwj7yXe(q^(Yu=0lIxG7Shw+S^XMqFy{Fr8WmC%uzUW{J z7v5GLv0Cm`x;M}3%Ab215jlN*XgkGpg75qu_>b=v;k*_BQ~2r$Be@Ec4>J4o@Q>eD zwW1Z^xJgtkD|4U{*VA=_6y&Um-TfcZ-ZCu8w{7=UkdP1r=`KN#M!H*&5J_ne0U4yb zrMp3C5D=w7(gBo|ZW+3}n<3XZ_#gHdQ`Gf-V}@pLD&JNRmF|IDEFWbU8W|EySI(JDz8{4CcE zY9q+dMp~T3!3QeD{o|ZP^Nu~aQ@e0EVEq1L@={nZ#eNA27o^G7S?uysBP44K+xY03 z8sgJ&-*s5dBV(uGbjBzJuv@s_$Y=0w>9g!wo)8I>KH_wtYtkzGpA)q_CXp(=ZGvF!ua6I{tSY|!Qq^s$c-_M{4%V8*X=>fLXkCC)%g}dbAYB=TC(tKjhAs z+V;%i@2;KT%p0iNVMGJqLOhO`Pe3>2FE}^i|H9{$yV|K7oNdW0&*6j7OzM1;@iS=m zxusy6GF2a{dXI@Q_GF1eHEt;{g{C>C@RUypRG&9l-|)eljNf+f;!$@Ciu?Dn*VL__ z6@5*_DpPz`s@e|RV=)V0q%{kRcfP!tI*88O+>^QM=j0uWpE|T$sF2y28WBC@u(tWH z8@f3m`E{s3Jd08#7bYo1E`mlU8xaE}l8*wSKy}49fB#RbLK?lc-CXtz9rH*Oa8*X0 zJ}GuH83zO9FR3!TxTQ$XwYtN3*n3q@Ia9u)f2N5_+#itd_-4IkIUEFC`En6tR!_HG zh0IUr2_{;n(Ay+DL0qiV2a^({FxwrYR1uHrhuPY!IEVgaHV!L2oZ(5X!^p|lMw!&A9R28p zxD!BUk8(W@td*n0C9Or({)9J1pR(NW|}BpL>THJu3wtxOD@3p3Vc$;hIg3S+=?@^17d}MY2;Lm4FjE{(1t)}J=X4EK#ErY+xMa3As~TTDq={K65PsQg-cpia$9O=DTu$2JL+_|=_Rz7*63K0k0$m;oTj zaRt#$#k7L1N2gQ0?l{a5xCt&K`k8|Ij9tls@=f?@f}C^YIz|`e?*^Uau7~g4N*sk7no_}4=38yq?w$t-b;hPD=BYwr zr*MKQjT@LNj-EmNzV~oT8#AFUx5tAoE;A^yQI4i-8kXSJaaUn&aww>mt4eOhN3W6zkm9P zt+$&n_g_DZ@R;Nef&3Hb=3Z`1*7PSdXg5=I*MY|wq@2-do?~rn0$=$@jewWYKQ>$l zbXl1R6NQ)w{)*oINbcjbY`PNY)@U)&x@fTd z9SXb!)@d%wA$ouXFpL;Lyrkt#e0}Y&&i!0RX5$%Ec#rE4_Lotpr||z(N)5$6 z2|9hd1a{Yh-PxP%mR)*@%M3+33d~N5+7d>Zr3F9tKgU-1=V|X6JZEr@`8M`J18e?m zQ3G=IRgJTb`%c>*2I&l8H!L9Q$RGGVuXd#iYMy9ol2==(*9`qxWwSKY>U4FVMqt&j z>8cw}hF$PqNA9A@M&n|jBYbV5h;sLLrdSh5Mv1paQ|%u0hNXptr{(wGueW9}Z1hz7 zkH%3a+pTVajW=|Pm!=M^KsT4inWC2|wtK=qwp!brwoM|fek`fgi+vU%91}TEfgcmy z)TY^b&raEe((9add-clO$HVKlrz_?9GDJ4Z3k~PoE*AM{%M(K~ScR$Y-0)dX(DO~% z`rkL5G?*&X^RIrSGeS}!m^Sf;u;lMA81 z58wP#?D6tM;LF-G+j3CP*PU+^GKh%i18NY>E2PA&XtB$=qsV*YO&^3)d99fvw z*@0c;MaI3C_P?UIs7}&WsMu|10G8(U`q8TL!LL}Hr5{aR=H5c0qc1ncN^KVO*DIPu zy_d?Jx-~8BJTO1;xfp~P7M0grMDO0vnD?h8{_;mvjNEu8c}dGKv`M^q@oSUH+MOM7 zJMHVOLzck=s5|v=CIOhZ1idO0c`gY19X|fvlwl+Aw!O}oX}cQDk->x?O$oq(XUJhD z$X%GFd^ATgwl%yM0UG0&+4^b?+)ehgUZ>ANP=o;xtJLyekO1Kz5&|ouSwn`pjq{S@ zE2{%uN3QGsf<4en0~FT zb5UDXlQ&mu+_FD$VsXk)Xo`jyr;t=@XNlkK{QaB54G|k0K1JF?C2|AWn21FSnG>v} ze&bt~QcbZj?zU6J2{~SzuEe}Bm{!0qTzqQIc5v8WdzU$!kV(Bcc=^pPtWoOq%(NPU z>T>YY;dH+fm?e zkNSXX8B026Vo)ex*}eg8$}bCiEIp#?r3U)>O6i1nyT>l$DjC90qD2o159o%iuCwHARAY}rr=hKz{ogkIk!v%&Zw>=NG8ShQ& zIxv@0YKYFL150E;F1AY_q^Zg4g6~lB&DO_q8fQt`MbBxE^N}YGne*4pBJe+P44*u= z3`Z7$0$Ettb?=@QUI=T*odCrICgWy{tj{l_&?q9^v9cv3f?Z(`caxK?TVf(WHJow@ z-tKm$9(%vg(m~?INS+Eq6aAsO^KWFE+3#glGEpmb(@tX~LKqlA>|)T#nQH6Q@9#zx z)YQ}@+4P)G7~)Jj$aJRYK@k{o6413-J94hC;Re!y2!mw}X$2*#m`VAS~np1sc&Lpdo& z;+tn@>~Yx37g=_3G^`?ZAm?3!DRpy5^}b+WwgVQUe(P462*$2d-wql9*1 zdQ*A34Vx~lLQ07|ng|lSn5g!}3cX~`C*L>prhQiF_hP0>KVx!DAMFTi&<~;9&TGN= zib7gAQ#^f3v=D8 zHY$v-P~n%A{k`lvTF2deRrhL}0DqDc%hc?(E^&FEheHk)nUHJQs=QRCaGQD2|C63^`z5&dP)((GMAeGnY zn;VVq1?HR#(dA1*SkvlN)3aj-{_^89?5aHLtFTZa-8D`LVw+dE?PSsc`(|&C?=p!S z$*F`+Al@+%Vp?SGYDQ8FD;v-AXs@T-PW3hTI$OD`3FaSo^&GUvB!4R z*az?N@nrd^>F_XvsW;UW>zpN2Hc5YdYLm5grUUtte{7vgOuw(j#7tpenA7Dno-;o! z)GXoYXERWn3+!Ba9{)x*tLU1EItwBuELL*UwQt&y3%rQGI9g$weidUUcfH{}4|seZ zpmY&nn_jH>4VGaliBa$MeEzatDeg}yMHP%if`^Br8pWyuSU7>S?M~M6XV*JC>m!K zdV%U7pyG9DHxP7j4~g*bW`ywhb!@_Yorj%n=x8SbtgNiWQA=s_qVD@`M9U2>v%O1F zzuO*z6<|5)@xj?~6__+?qLSi$Bn}U{04ho(cH;eo?F^i<_tS!=ax^)-LZ!C6P}TtK z2HEQAWlYtFKX<0llBxH*=~$ra)I56x8@D!t{iKH{X*=Pw<%^!CA$O!7VOU|++2x@X zsM|&kTm;n^GGS?uv&?)KXow2X>&mi~{e0ftL=%~l$U-LEp`=I8(_{te)bLg~$oa^wXB>b0JSynGt{7CEXMJist^Y{-{IP zO5;Vunrta)2E!y@p+gXj;q(tD?$d}OuYf}ZlS6wi_;fh>2K4vn`}_I5>rV7bYN&ySAH`{| z+RQW2esO$K6+JZT+Ztbik8&WcJlSNF0RCEW`J$hpC@!)^h$X-9>M7OwG3@+!+p1YA z80-GT)|m+y#MwX4SLK}BteLEJdA|7lRY>!h0avk{Fs#5Ru%C0f?Ygn*c@031v3wzvQ`sm4{ z$^KpM0T1+>LDPrshVa?UnTy`OVXMQI+pAC5c)oTP3LXQS$@vqi$->upVf%J|{L_p9 z4eJfgQ#MpSj$HJVXL(K!JDnkAXE-au3vfZ#Ip4JFGxZP~&DE{>lkL1|sqLlX^->|P z-)-}f6p3DX@OJz$Q9tljMiCMa-_>##x_WfGEOyruEQh9&(t8tU6Ky|~zzMPL(DsH^ z4p%OlpB|2SiL*!X^@ST!>dYrAw}r3~;~{Q^-GhfgzcE(77(K*?9yfck^=wPpkgm9o zi~jpTXeX<5Fc;%AI(xxX=4BG}AVbtikXVx=8ZCb6S;T6`@oamwY3&5?sY)&&ZpEWY z^WFzRbib5+Xa|fo_DygENGy8l7Ro1Pr}$P-Tkbd{aTpl1$RI}=ytu6K@=cFU2FTu2 zl)F4>>5FS)HJP7m7Q!xuGq33pWAmVv?eOFx&&mm{rX!u@O`>Q5_EP9Uml6NaVI(Ri z;p;MMwk=1UX`EPyP~6qtdBESxE-j>q`F)X~34}*{dOo+}%4w1RoMPN!yq1d-TcI>5 z#}J|nm_%bAq?D7r#uD(}at-M{>D@@nE)EmO)h<}68Y~sKl4p9os)tb<#jeKFuvz0J z-nw`#=~iognqicJ>2w%q=qL%YLoTCrYJ$8rah@iMtLIrrmD_@2X#4LRmX|Bw;~I`e z@)_1PlhwuLpV59-|FB&qyYIcuAwb~F6NDSp*66w|2*;sSu(n7z%R|#1#BHz!H66w$ zn>^Ryl_Nns`zN5+2|W7b8-s+a9yalFDKtKJ{aDGY`Rx8dU$#pR+3_fgR%b7;_9ty> z-YyNi)fC+}d=S{c3x2WlU%?gjaE!W}=)?}a>-fjYJiw^%mg}PIUDee77oiXPY?mie z<%{M}QK@h0C6I%TYaun4rQm#op{%DwWxCwz;I=EBZuS<}akI**8Rvo#Z=JnYTPcrUu>8`}7mDK`2h%MV$J4&UsdG&Z4N*AqwkB0yDUlUIGt#R-^t=ZS!puE<#upsyPwo2lbrQ`5U3i_FtS`p- ziVSU5UVo-p3q#YsgUp^VPiA?oO+#>4`|@#?wO{=VdvUl$G;#|X%^pV_T0bFaiNUOV z|M*2PPO8@qQ13&ohFWzEW7Y;7T<1?cDLm(ERCZ@pP`cfyE}+5JIg~hz)$a&9S)O6! z(r3buEJ8l7B1hWyT>WBic1EW7dlQ2PT>o)%kC*tJ z*5Tfyfu@BZ3Z|-fh>;BS(fjd6foY;ritf(EmS790@fmV;=(6?IkUuE@KiL(1Yz@1a zan+hg)02~AGgIYn5^Q4ExeTEcBGT zlhRW&{=Oc5vi`3s$z8UUCswe{&sm65D0!l*zLE4hqzR$LbyGa*15zE2RFrDg4*}y2^q%?T1p=CtWY#lPvenOJu^u50u=Cp&iK zFL%-y1W9(LTcaz5r!M;Pw#P2iYQ@b}01pinoBYi^BKKoXb+@IESmmZS%}yoqmv;K8 ziUec(fS<8pa|AI~h(>5xPBQN(za}IF|8=9Tm;)=Q>Yq|wa|{SV30$Jwqv-HMM*a9V zlJ$)kS65>QkHZ`U%Gg}?^nU;zLpQKs_9*yjJA2&Bcp(J9=O(I#rP|ecK#7BF*!`3K ziag@6RL#Y`JzBD-T>gnN`x4Tgly^-VZ>Qy#Su?U%kv1Lmgpq()QYr3Tm+$%zAt^q8 zbk;r#RN)sSP{5Wz91=ZeLFr2ykETH@hir3}Oua-g_FFL=@o%k2fOC&QlrVvE`08J7 zm8YuZqu;!(>vmJz|1EH0sza)*hEyqSoGEUPDfPds!n6oU&wQGU9VnnWpL4z!yiU5k zG?CsTu7F0wW!ClR_QLo+kAM70P-9a|>+ff^zQj$v^1uCP-&CE08BjDT>=tFmf4H#U zN|tvt(WKME&IuN}HBQ?x33N~YFwvckK9%}wMo#<%LQ>0M3>6Pl#uWS0796nzz{ltW zb62zBe5HqXXTgHny}#I@grKqfUj7Xp9HsP>7bcs26I#EKs}vBYD-Q+ikq#;!NSD56 zpf~K}eJ;mK9uiJVS!t|P4yB+bUbc@2)0MrzhvcZv$JIMU9}RcvD*m}Ax{!1MhxRhN z;m7MDkc1;LAq`X|R}os&d!83qBu{|*0e!`xTq5t}@~~eKIQ!|JJ<|w#^km^E90i1@ zIBOSvFSh}+5ipy{ysn0$5PcHQGp!;z@ zu&rxGQ3$OZg%Z@?=!`?{4D=d9X@|T>Mcf?+POHWY9L}XBYqtZ#6(4gztAW&{_En96 zTm5&`u<4%31$~PA>AG6OO1WT(Hr|df;Zu=$qufUQ3EY<@d z?=O8;KAFD(4Deg>N!2$^$(U=K!VdbH<9v5Dr1D>M&qyRn0 z2IA>j{V7Q#y1a7$_yY%^1R0N5iO>yF+>5@IagmH7!bB=4#3U zT~0g9H&0)G|2@?T7!6pW0pUdK&gX9fML9}pr=*|uKYv=M-p5YU8Sn~Htiv*Wj+L;A zhLuc&7R@DTHBkE%P%3&mxf&e^!H9~|BGcwqKlgFjKjdYCjj3QZyUNn?8&I|a()Auc>YRlInTYaY3*=CDE z-gtEOfEAsAl~t)Lncc>KwANFci^`n-?^#nK&YFDQphYCu1Lrgg+;1X4hFGg}pYuao z0@ir0LKIWVV_**M@j)*Jl6LQz5j_~^lM(1zZ|Xn6`BR!eTz)*~kCT#0ZZ(es{2-Sd zsVt>bNp@QU+5YM!dgECBPhNj705?r8!}H)deko2krqE0uJ`Vh!$YTL*b`->3l9Av=I$k`j}aE~Tg?;o zTl9+MXFDdwml;NDGJZ%XFGN311`5h}Z3#m_>u5Dx7H+!^b$*KD3HaBkrmcGjg!eb_{y8B~+V5}VGY;bruS$V@kw3xyYOQ}VFDo-yu&f4+l_%6Z#Rh|v~zD+Lx zXfn+M?pQ>vYtdk9i#K7xvc78{`oUM9tIgwO`RKv73VWMkd*JW;;j+t%?SamyPez4b zbW1ZVlWI$kjWuq(7r6)0AHAZIwqG+vsY$E%+q3PE?KHst0}eEM)kru`Fff6@sWb`p z>d>jR&3>rOL~Z2Hp(e)j*vM+SzKSHt-}ED|_3JVhg{$U=>jI%~bYsuvgcpJ&{4HQ* z#w)N}7ZlS^FcND4xRFK1>iUxn#{Lr$TI3GpBmu>w?wrKUH*06>Lk_-s11)&`fJBi=x}?4GEy>a{cZhz_xMRPQ-h z+rorQJ_ht}rG|i-X;;(TMG$l4R?e*_r?i?iorTvqXnjH>Q6{~%141~(BW{QICNrOJd;;bBBDx);S$oZb$X8r_2^bHGayq*r;iLHymHmq`~!-7|v9iB5JeV&cxwc+OMu z*o=7jYJ$*yx@ch&PY{45S>Q&*S>v)Rlfi`iAReuXWZ zl&;9YaId;(;=5A&y?cKSuY$Vf%3r*CY)T%o48W9_E(hBs&?UL=_>bqMfmjp_wqjdos zzS!8tRd;h8o((h@jVk8WkX^Ak`dn^7S9WT{?RpdCqgmoS=}jiQ4d-9?f8?aIXi-FgzA3+&Tco(ZD%qx4_bHU5Eyx%SZnI{q@1kM(CRKdekJbmDu*8gQXKqkUl0qIw2f zub>@r!0W80-IvHlr`mNB$06FX@coKyY;^HZ(mp5?wlP#$<4DCX`Bq%ddg`&wQyn%_ zLm#QfeLB>NV~~U~B$Lg$MyWS*AD;tbne_URnwVR)TxmfY;S2_yav<)?W9lvIf%<## zhK)>>dvWMeDP`!vjc5Dk=Xud1V`hg7tBVz;Pds3%C6mrg!g~uC&LMXI6RCd7yAh+0 zYJpQ-(fT|GXZgp(z~&vYnS;V!nc8i)#qTr6Gib!tcZI6I^4h$f6HJ~sv;~p8R8)~2 z4^Q6_WugZS(F448Z7d~M`;~_&h9N(Q$MiyvYH91_X!k>91l~F_BKF(PM@O0*Hd?Wxg``Qh|^>?#4qa(tB& zP|K^WHD&2&lKS>%58^vg!2}~u_1<9G?Y9>v>eb@qz|~<87)y6BRBM*%(Dg&lDul<2 zlaI(Rzr9G|He7jX@Yu_cf>Gaqgvm=b;u$Su0M^N6{70CC)6QKSa-7H}V$gNM(G1cq zDYo=xAM%fb?iy_U3~GN6w424%Jas?0w0p%odSs=opON%OW-0Ga4ntXM??$#Cne0Df z7$Z-STWaPCk4a8C{vNpU;SmOz$lEE#cZd1Mm74_^SPaAbBhS|ux)gXodayQAZ$HfC z$9VY#{2=AWa8RY3gI??uUF_M?ck;sz4oFmC#ZwZ>t%O7KX2!q)>;EcQon=mJ;~AD& zV6@9LDiL#ahJ~J@;Ir^bSUq?%_C{LaM80xlqR>Q=AYKf7*hmcG$(REt{({!4GqOErtPh4O!%L zfAZK=I&Ydt%Ay+hk~PB-*DZ&AK_G&|1vn&~$~Eacx9T^B$}Nk}LRq(X9swf^Flo{JRA=$^2rHyqF4OB}#{Jw-S%@(|52@-}VDla+%#o5&Q}X!S!)`ge0)^LO zNGRy6)>Gr-yl??Fwq~+T?NR+Mo8Ed()dhS*AxcH$Sbc!7mlM7%=Kh`|fXr2F3e%`^ zv5MTKI3Z{hcH~ogxI8U(L=K*RYO6)!LywUarA>1={|Od(M{Od)4;9;Nj(!mcs2fSC zYfUNz_~Mq<2^D9GOe}^iQHHiMrr1B75>QiB22AEGmJCo^KGanx5_>n5ZHK)Mt9^ah zn#496mO-v1{1b^_PlAZjJ##M!X}Shi%C#^sgOuP!iYz9T=EepH!*EzdK*xB=cmrc-ibyF7(4Vr>-K%QXttEQ&b1tg!sR&i$gSSo z(5?0m^WX?mq~eh-uIL_M2j-}MQ}68g+I(2j2>U|%?A=FWHDKZErWiqCBHFW4xsb|r zZp29H48mr&rLMJwXj^nFhs)wam^?Vt?=MH6Gi@k?^f2yYNposh{)9 zzwgp`dtEm4M}lkR=A#V*jB7l^5U;hf=+P^VH!OkE(m64;o`&5|bbN=lm zJZ!cq^D`db>@?geUXm02E&v(AI?M9!1uT?v_kMl3wPM2MT&V}0qRVSt&t87a{*`69 z$1$&qzUSxqQz{4v$?i910lPRd@&{};<03Bahe6XP4tY-F*^Yx%A)aN?YxkSO_yAA^ z>-j3}#O<0kO_j#yX^JL=`O>zKJ>c~h<#fr*OVCfzd(722hZcXy*nVs+Bus}RJPJBH zCr@5#r~y_;k?7ETU~;bhmy-7D)spGvFjn7+2Z#KePZ~hP@ss8e67F;MrppSq@el0` zUH70@GRSC|394ef!^+{8dkvCM^^V`xaG@rty7mCHzjfnxSvd6L+B)q8&0|y|Ce{_hTvUj;cm!3=Hr* z%BVm7qpRfKuDpuYDh;eWb*M8L*jbZ@3z0R$XXB&oRvDF6l-qVP_R-SrR5Gul0)^!6 zoRaR`o${zf8&!@=)($Dw1_om(afpc1cH(|I0?X9OS`8AJjL|MT%&b)2TqZkiM^DxV zmfe(W8?o?qXI z@~O-Huy>b`@W(iH8UP-s?@arrm9jYS!Sw>IqK`l&E*@a25MAkZ=~snY$qCS>Zq7Qy zmUew^eq3(b_|PHDZV6eGSHNr)rwn<<8mqEXpq}l%kqy?n$@=w6T;?qE70|Zt;VnXTZtnB zLYtN{z1_WXhK(r`NB@>~6-O7y7#GH~z zPjyT-?6j`Dfg0F!`4w{a@5N`zGVl3FgMfH~JrHjJ3PeCSo#G^$YLIeK`R5xu(0h+V!~=CR;C6vKp@eO!rM&7(qUzoYzhScdluc8+bgQnaI_7bu~MZqhi}IRZek;|1swoll=&5**y_TYhbmq_`Foxp--Pp-Fcs-vhSM{Y zSS6zCUC6R2>5XOL#yMOcPd24B4f?v1|FtbTy&C^8w9sV&I#rjEtYL8`Gravtoa5cV>%ID>t7$1v0bJE}c78%35XZ#$# zn(2RefL4vY98XbQzWDtq=4vUqfW0)Z>&-_XI~#yFCSuFVSL?N&S0Qi2pl=wJiUzG> zQtc>+o*U?m#l*B8{*R1yg~sKMmfAcvCT)b;|6#NX1bpbb80L?b#IE;DwN*vywtkWk z^^Ls+q?3c@Lw5c}-}HVyLmxU_&?6Jp)WojUO`e+ z#6{T~pa;@wvJo0T=_93ND7+ZhTSbo~K}xo_i8sO05BJFB}_V zb$_wFvu4)w5N$SSPw6MBs_428`%JBEW7k)4nGY4m-Rw<{?Z{f9KwjopX21Td2Xc$w z0PjZ=h;od8mk^6c5SOkOB2H!2eY5y6GXUs=*3D;JmFIV!7NZNfLq}G?4WbZs<*<;7CWcr%t@X49q#`|tD*xx0 z>+{0W<_`y*W@xu(^WAbdcl+v8Xz@|+YGKp0Mqh>iT{zML!o14m+(T??12nj&z^g-# z?YRdenv=%blg+boQ?(*(ARyCUAkxJ2m^xv_N0(~cB6Q^@R>0e+2H?uiL8=mLHAqSp z^o@E30HuJ_mD?GMRXsIbi=S+!t2rqy4$s5|5O#mJp$2ldb|?G5hgu9J#oR}?{fdfn)*H1ArIF?O6P5GL)yg> zK6k(#Z18iRD?_1Y7$IxQ6Py5==DuJtKDRZy@f&NXvzVB@Th^)P34i8HBB*Yv*AA2L z|81Fg4#)^fUiaLah9=j)+#VxyZoWcW!bmF)-BHeMXSV&3>W+uAd-WygyTJs66HI3L z-mdm}n*iUL4o;aDEl5Zv%U}|rv~&SWE6*&`cWb8Zt+M2{aKi56F~i-6%1-7?K(*Ff zY2@T<tE1HmDdgF}=& z@A*0$G)(vo8NXd629!zNJtW*q(^9*?f&b;rpPotKa`ez z#V5Yoedg|atVh{ZX513-v$^d3k`Q8|?J9)RbO}AFK|aQ9tO*h3oEnS*wMLHXCMF(* z`vdmNj8cF0%air#NvNvuu4(4!z+dNRG16DHFXDJbvTH~mFhsO*wLZ248U{2-Vd{hJ z{dOxB$qW%%u6lv01h|6cjmOLSm+L7i7O1x&(V0wi!U z|MC@LoU8L8JC5FEp+2MT?pQf49_x;M8oki0|kkPu%oi<9S!(E<=3Yza%uwXE7e zd@v3j$m-@@2A+?~!5gUWdF^dwNU3TFD#PZUSxJ$dZ?hVZ(Wg4ENfW^4kO*8UD#}p= z33t!XE`SN#ma=R}$9&)86>R||#~>$Rgh?mtwnXa%+YtBi2_hz3V%KM%L3aBl_U8Ju z>Gn66Tr;W~-T;U0TN%lb#e)6@#JwTSD~-85Dm))BQ)2)WrZ_`ycpEzSk|5v&=uBg! zR3UO#B4Cf>SAWAN&$<&5-!Ysa=&hkbzzZJ_BH3MF_r=Em5i~1$sf^dUTlZ+JJZ8#o z(;ZKejk3U8zlk@y|LdRb)hkt>&y>5fO+NVuxT-%(X@a0x_liNe)7;Oy>my&|!KQ=C zYOh}9fo)-xo5Ce-6DGA5p=JgFF;jORk1s?LV^|U0&^`~{e9eF~))=dZKX%L*u$1O= zb;7=C!;|%|Qdg_^8&An=hHDcR&4nDmUU{7PCBt0-!3+Xw!VPFPo+E&LUA}lq|7H&? z4a!krlfn*Xhwvh-hRlY=&==$NHnPXBwfWL9i> zOw79yPdAcTD}n5tdT#>&YAkm>&IB2f09a+}4d7&f?KoSO!Zl>6=Mdo%F!Fl#fdveq z*EawCt1@@SgEj!8Y|F^R9Rhb2vreYCD&bjTYgP{zf!1_uz((%LViYiL}3NO&W ze=1_LR{mh2J_zt~4Dmv&d`x=TeT03^J?7mm0cbYw`C>bl-GVe6&RF&1>Sc5=zAiS4 z0gX~2gVDN+HE!)f4h=}+zF4SZS*TrV|1QwO3o`LH%iaGh&j?FBhx~8Vc*rG-|p^CXpgHVY+ zMZ65a62-elw0;7qhz|nQYN*KHYE|q1P_1qxGc#d#KYA`&4s!i$h;6XfjXz{Ds~5!Z zSPr$SA8mYggPn~NC~f9|fm-_)fGX~DWiJud=RK--S{tBoeM+39{Y9C=?VyvfC0{Cf zVpPk}+I_g*WtS2UXq#7Awi!UYxxD((r0aQ#Mg(CZ+bWCXV@oT=b}#r-qO%!+{8=tK zsrt0WseK$adHCLAX38zUs0FheJUX2PT5$zSpto&u+0 z*N9F*AqL@7CL30rxXzAi8H9ILgC&Mmi{OP4;O@n~L{M&3vwRWzN`xdLsHnO#P`C6C z-5}*k`G6uW#0Ja|8)~cPtE>UzW+|MKyGS^QBMN7gI1;zXk&N#>kCdk^lppOKV}PDu zmMx{&`!vssUOt~aYxLQBkUM7n*QX1Sn5%_p80z%IcxNCiCb%d8CbS5vMjt_Dxj3SWYx?)J zLgvHy%Foh;3kt=-+X?yP(5d3eW9CMedz%R?J8@#sBfsUJvy~qsa{K%?IQU7L0Td#7 z?+&{=`YEF>;fJX_Ak*N~?qO%$VueUYDAj_Zmd4v)%hAFSff6fN2Sf5V2Mhsvq`(YK zb9Jm`7>Hu#-~9k;H}9DUk~hyMFLqtppSX?(X5*LKo{7&<8mqx~CgSRsP5q)*>IRN>xoR?S{oc&>M7#1fvaSvjE>^#dD8Ya#bqqu>ekR1hsWu`Pg208BIY zOt=-9f$k?RvlqmNzaV1lDeplu@wQJp6p!Hzp#CWvO8(Bfi?Ld6+Wz~$%GmL_zh!I} zn1_S?-0Kz|g%qpwW!!#aDsPC`HD4&BZal=E1POPZdY8?|=E|AQx7+N58g;Mq4*hVk z8D2*=AQKTZ>eu6Axm|dJ%)%5FD;VMcP;)J<{UW<@##Zyh7NJ|_hAwk7BWl?`g`bx7 zVE6ZrhERg`59DnB9N7O}$l9OukQ~mge8y*tV5+cY5(CwuL#C$*K&J`0kC2p(lxnH` zDc0YNs4TBBzv<{M#P3iEAWubV3I?1#XPm0|u`f+KM>NTd?)~P`hwJ*Fh&SmD6lA`r zJ&0s1@j^=Fv&L|~^qna^az1}@d+6=U3JUQR4Do=AW{zeDVseh{lV{8LY(8QW)z(%+ zM_{{NlHIl{>{9GV(g3>c@p?eJ_P5-D9xC5P+khf)@vpL1Tty8SfB&=UO#pnC0GO&X z%$Pl#h&5@mv}uOKe7Mv`tnM_!Bi-)oQP6b_IF(Yv(#CNy#6>^u24U+6*4N@2L@Y6SCW;*J3Q!uuvwGFLWVT2v*Av_m+mUDgJ& zv#4m6hVBM(W2|$3Q6^K?Ex>+3EG7Yb9PHfYJuxmg4RjsRl<_)<_GtlPm_X(XQ|$O6 zs4)A}S>KKqCOZvKD%ogMaoC%GQumUSQu8()^p#2z&&PouAeu@@8JK36yOY?sE%zrc zt5-fi~)K3 z9MIWyt0A0;JOTZ{DuHNcIa~ICp^FiC44-vp7nT}|GQ+Z7(5=(F+S?|95GfGa*p%NB zxkr}d)H=C5GBT1?YBgy{=yi@@ z!B`$pNx$U(-9eLv^+ATU#B$&#)-zNlw3o8uqOYUwOuqLYeaUA%wH9$`e+lCx0p2SR zG!r?a#c0@F`>I9dp*yp!jFpgjMl9S)qN(MT?_mCA7Gcp`{8fN7sSIRM92+l*9I5{K zz}Z8my}(&fu&IsNZ2tvpRpjVaFK{w!Da_NjngD!fHryt#vDErRRiO?gMd5)lC6Rk! z89AqVJ|7h}i~LP1zKT3>kiDS0JL~4RwtrqH-jC;=3;Y4*Ly|`TbvNwEf+_j@N^jD6 zyv)-c6c;^>bNmBFbs#gu-bmkMSY<2JBN_l>VHATzsz7I;`lXZXyfx6gt0w;cV~ zT3hR**9@3YLpF`L(+s+C|NeJeepU+=EVY_cl<=QDHh;>-Q)PfVj(ix9}lo!I%4DXrx}aUCapWb^)Vx zXY0d-*8hX;G9~_&pkJd}572GCyTG>xei8uw-pu{QTS01Og0%xd%SA)s8JwnX6j zb2afb%56M)XRh*rwlx8jG&$J2iRAFMU06ap=H1u@1%RN~Fkp|#%7%?#i6gGYeWc7} zV9f}8;$Ke6eA^)qjf@r4w0QMvwP_w7J^GpLIL&gSk!Gt@c!L^RDPL*+y}!Ga=b!&im|f3AH5}w6@!1bv$ z-B@%gXT;_K>zDT81Y4b_-83D&o2@=~+|--K_a3KPv6bfi?pqtDATAy~Th#i8!1Aja zjUmzsBpd0Lcm~uJv~5JN`vVFl>Y~0SB$Z0wIP$R<573?s0Bb)Nl=W{3;z2C98}xH# zz&t5yo0pq=&&#yVa9l|az0MU-g42pKeXa$5v-=oL?rlvNlL;wj9@<`afw4d?xNCj< zzQTxCHe#qDx%ClO52QI?Ojdd6NpIqZHenMI|LTeYgjsI(a==!5(wp*(`}otjbV`!} z@*OduG+o>OTXp%(yRZc1`y;&oyD?_y)8M%Iht;A3FAUg^qyQ=wAA2y@1r9E{8sOJk z2WWm(%XkEZ`FjuUaQ{{&1y5aFAXQq^fE3dW=fuvi!|GD75wzEh3=u>xbX5pTz=+`}4_wCE zch=Y@*5n7VYa=L2r1fOIQz1#576@YxD{7YL30MNDC(28|8aV%+1NfX$>7yYcX7%4& z?95<39}VtUs<6k&)_TM#-n#cTtXxXaaSeBh9ZRw3)t4w?_)@&_aJJkw(1CaxEWs_t z38f3r^Hk+m`N$!0eLX$P+IZoQ$t(QB8P<-_;ZYkzt;UL++V3uLTg*{^)h^F@$o@|5 zlb`+MOq5HiQ1vbc+zRIvP|>HAAo_`^ z)@z=3Bl5Bhf?eyUH8wYo)32wVw?~nXnJ@zFU{c_pb^`hK@)R>Da=~Fux3yM|n_8}G z#=WO8e#m!lIo7syzFWjXCcZyMguR3QSb~cbR0F(=DgrelO17gmAj&@mVcd*Sjd-FVXWY4S`D-L$SUQX_F_4Nc2 zx%p*TE-M5OyYoQ>^;#4-aAUS%H=K{40GY`J{BqoXuE5rg6~NG3;I(xFp3$UKn?{`( zuT%ZS$vj1(S9R-dREe#`^ME5j=LMDP(-LIyhp_Hg5RUad%VK zu!@-V%JjGGgM~}@pG|v#oYkLR-ssQiPp+O%Njvv}$oe}$b=7NR=#u{poNKOm*X_op z_j?xjo{5V?2&4_bb8_ahn(oqN8ZGkH-P4gconlu3xh(5m^9hGE17joGB*GHcJY(?W z=_&dTt85&0VBzI!{M*m$@A!A0Ae^)y;|c-I4AY$TvypRvgx~^Y^8%PFJsL9fIo8nL z+p51E=4gH5wNCloaN}*BmIKFHn>Fl8Vr9uhxu*%{fo}jel4gJA1_7>tih8+o6iIKI z-q?6fJK3+z{W3ZO1$~b#1bdNzILOTc1{BG`mTHiDHG;`r*??N%T2O=@ zm07!Fn^=KKCg`VUyllrg=<$rl?8YtX5fp4$g@5-$@}A=J!eD#=KVUa>KT||^b#CBo z1CNMS-EQN>3!TldS3H^AUsO_OiV16G*|hF;rB<5v1+;qHEHd;@E;-+3)by{UO%%Yl6V|3%tc z2UM}B>%)RlBB6*VDJ>u+lF}%l2nqrsEl8J?G!lX+4H5!^QqtWi-5?>|T}pR+@8I6& z?0xP%_n!Ox{zVt8H8X4Gecq?g%DC*Usy-E)Dn3G18Fr}8TY6Mr>HqX9s;>*C7j$gu zzI&B`VqjoEw|t3}cg=c$ZCJ*{xqm?ofl|A57FV^3rgFYpAr%Ofw!!Z=egf#M#kkzA zjrwMjD8`BWTur~|p7ePgovVTFCtULruANyXwiPSCF;p!Hn_%Eh}t)Yq4cNe<|uEV2P=F{Spnb=W4iC z9g3VB40ayfv2)sAlA*YCXY*4B`R5%{h-CTPp&|p;Jz3R*b6jSFmzQ-=$~6{NHs#^7 z5~?I8&q>AiqdqN~JT0MkHIRi5L29XHzfa^mj_6fO9OFv;&N`kyqQAhGjN?o9PsGLM zC|}1+NplR3tluun*jIFy`vn8R;nDKt&3iYknKnDKkDr|ia5@UewsUO1KhHg%#?)Tl zK6h96?WS$Egz(*HfOaRDkk)Q@kY4!vJPP@}+)f*S59{o7&{V!NyyR1($GKUlag1-o z6GmL%O0g)~N@&!ZqcCn?KD!C@+pybT$cWy1D_Ns8pGF+q3|M;Fh@7(}<)3E1!6mWs zqj_d*_p;8xB%IBc4YzCi4%DakIlA^GiY7xb5T*0?*W}D;SLO>h?|9&O?&$Lb9hE?= zq;!A&$LoqRJtsDN7igcXd9O^6eg*BSGb|M%tY&)*Y7DURU9qO9uHx`H5LyqgV)wr}=MQIyEI*bY(BPbr<$kmAZ`*oSpXoy0tsX z8$(hC9kX-f*bn~TF>mdLw(4u{=oc;w!WcTO{wLqzQ?dk$(kSp|FU09E6rgUsrR08> zjsU9(r>`E_DTG%(gXWEv&Ghdbk`@5PM@HZvTvOnG^E_lm$}q5}Vku&eibKtG&IJOMx_0bWSyJZi;5 zA$gXhr*sgDat)?{(5ph$>r>Y$yv%Q5Udb;?6gkTgj~m-6a_#xSyd|!2DUKrR$e+wf zmEX?(^Eda>JU5M*L#}07116Y?fi>E(0H4O`Z7WV)e`+zj2GrO=d`>*zW*K}KJMf7 zP-AIauX)2X`T{{=7a6{)W*Z+ub%&`Rby5WjNof2pKz#<+HQl&tNv>>H<!7hHXK?N4ym zSoc?OhdGNMI6YCF|J~@r%~j{(CsLyhemZ!9sZHlHyjwEHpJ`2_&2s<4ad$o;F=A$H ziUlCkv<3Vcs7;swpZ7!8pR@fhusk;chrO5VXVFy~pdGiU+FuEw4648cBbWU-Ez z4%Hqjri9(R_nS0GJ@{Pa^eg(+jQfti&Lrl`Nj@c-O#dMfT8&bR>gdzM*QHO(_jIy)I7IWE5h5$J??-jr^t zu)uwnYm4VM+mfoB&}?Bj^BeV;tq!228Nb7$g1pfxpS{!k)OB}zlC2%k;z!3kmdmyl zt9xhB{o%tYgnT@{fp<#IuqiT~0;6@eePTd@W=iF_K)O_>h`&B1GEQOJC4`45`VxOT zz53HBm4Pglv7kXDVJ6VhjTw{PFRnthw%#kKcQw6n!_jwyVpj$~sO%T+2;{+r- z)0HPjr$)P=@Dr?_KB1${VC6vke;g}uVIYB2e|LkoeSI9K(-kkZ4(fxep8@Maj@ucO znfocvMfx25m@MX#d(VN`&EH3pwEL7oq~k}B2PnPZxvY-nG_ z2sU05zwjpiy-Q$xt#$e(SEI4U1n;GN0#S?hO6P;H4Q}E`{&5JCM^vk*UVMw06T-gk zp-M_g1p<<4Mna?^X=ih5Yml1u<0kLGj}(Q}c$m^HK%02qUbyZG^Rp+0y(zTN?xo-O zRHlzBr*vdFk=lcX{LkPo`zF`*<`@370|Vmi+bw^@fBmn7%m-*8M;%-`o#|G`MW~;c zmMqX|FM)X?)6C{Aos&%=r}LpL*_h!<5+NPX9rF8x8q zHi=2uboTrl z76D!3Smi-!-76RKZ=QO?xI?GhRV=su%E$b6p7FN1Vfs1gJ;R~beP(lh(H2v_+#l7G zfM;zH!xNwZffUZ#ShkZ_URh}Zn9BM?>LA}b&|lV>baD!9`wwu3esuWA<(CVa*-w6X zzvm~QGNy@BC!5(k7%FrLmT~z>qutx#Nq9GM92nhUr~E0=|GMkm1@+_$^Q~P#mscw zGXQ<883rhXazSu&6On-K)9edcr1Tj$#OIwCxJ-xjJ<&hEP!x%_H0;K!CrZ?l42`7`T*EN6Gebw zylbNwT&O@s9eh+Z-5s%n+rwYjC^C+(ME}A@IRP7G_$a5ShxHjx_H%53XV_P6vROu& zoA3Ub!|oh%&r0p9UoskEdSYb%=bIU1ssnyh154ezjvF4ykBtpGF2t8 z|336KNZYVF4>6JBThX7jj`TDc_xel?0Y1Ti_wG2sBTIGPc%V$#e&?r2B8KZ}h!00! z+xgSIP7PUGf?b=TH-$L#9~cohpSH8S?jsVL#<%e%$;?FBzvoE&Kr|R}JDXJet(`um z9_{#TwLq$St*oQNqLL+0+K7CHKN&B#36sx`bZED3O)p1q%vQEZ(92v!c|P%>F0y0ZhyZRO!#;^<_FtdKR?^7?{D@+3rl#ondgF$>$~R*SLCenV-C6mp6hLXotVlfu&?#p8|r{Q*StHK7lg zEmGZa5_o!LVUh*!>+!1tw~e(b+!K)^P%%&GOQJypm)mW%ZGJA(qi+s+pbpW?fkyZB zxbo!-OlIv4^2E3GL9ljB)2sZZdfwBF%42)IC|_<0O#IdezKi%w1tZ(3YNZ8s3px#F zhZ@XI%4{&HZ+_Gog5VtwU7KmIL3O#>^yyeX`1>y^5U(;>8IDv)}T_xvt347 zS1T&!%SEng)AS}5ty{yVeJX&>`OW~7iK3++$<%lP zy8*^e3r9T)jR$Y4#Vi@tM(ppIm>u@NO!PAS_ux&{Uf*fyXr#b8@;fzjAp{XL_}_5~ z0TMc4^NE3CzMREd=GXpbwaEz?pOJ~qZPhI*Ue)#L-DeZRDu0fIHm6=KIXy;$576$F zTF$ix6q%1la^kB#sc2r1nDnotDed;nA`g#v(P@%4>Cpd~J4L5qESc zSXjHW7I)_QKR&alJvY<#>Upem{c~x6Z^i$FZ|&^jH~Vcs5RY57h31Vb;6>!z(f5tW z`C#*>NvM<1Kb3Mn2pR0An>X{OFRGjo;C@?EsDy8`_uPW}?gd7bx7e8Jz~+(&IhNLK zTPN(~F71?p7DRKszVK-o)0KVKPqdqoS}1rUthcXZ*;4_2D=t{d(ej=GiED(Di2GUJ zcd%O=aO7uJ<%_~t=3YkZQ<9{VGF!2WMFcVqw5+{v+3K51_xa>=%4e_8_FAy=>J&c6ftMF;h7(C%plYV~;v zT*1Rpt${Lw+`RyPaq1$+8dojn|5=jvF1;EpLHs*av8*wub2=`J)U5J3CSliLu}_~B zxPSHj+_FL6Qt9M7 zrq&{d*0JhGm3Mv?iCtk)o!>-0kM@r=vszHeWbGjq#!Ra5>qh5*PGpLq2Y z0Je{BT==c#`|ruX!poOcpx&DD=#uhvcNjaVccp7jQ&@Zy9-h9XvfpC9(lYp^GY_E_ zbp7vvD@Ah3$r_1Q|3(oO_7%$!E8Ubr-t{SBM8tf#jCBbw->9By;EFH*Cyb!Ak#CTN zQ{Aah@RHdhVXzR_+&mIA9X`#yo~C-_B6g?vT-dvG@fRBpYHpnxXC~YK&uYGX+O7nd z?`6N$kN+VpnEzf!G9T68_iJF^M=zfw^I^>S;2~r_S32!R)4UzCWXRB_EI!+}MdP8$ z|EQzH*+eu(K0U1C;PbJ#z$jQjPGz2q3kz}#z5*(qNDom?j+*pjxj^Jy)5w69i_$rD zBbr@X+G*UJ3p6st^w2$cv3;6wx>tT$fS73~%)oi~~&sAVL z@(jQW%>qhYSYRL}2+o2rC>%Sbuf9qs?k}npzm1B_m-Vlp;fQiuN!_llADDOI=MCrS zvXmfiLLZ9ovgrbc=%y|1*8LE2IZDE-R4<6VX>rtnmEBCwL6kADXVTxtrdU+)fJH-f z2UCh%waD#q_gwmQ4e9$&n{xrDJ zgaATq{uU!$V`<=JvdrV;S+mCktUmipI+M&mv1QUQ1jJa>5h_W7}V+t}*5eGOA zK0-ehlvHjHz2`(?yThpe5exmzav|renJSM)BqHp^?x-C1Ir|m+dLD8k7;`-GJ%y61 zRU)}PCO~~e89euPBHcbA7qHji)9X%p$j!P6_noWH8?NrdRLp+WZ*zFs!`2wS@seq~ z-}c_~;m`2$N&f|B%D@!Dc;yDwi;ae2J#4eCAMr8#Q7>BD1=GPa#ZeH=I@F zQr&b8+}L4WhuJia_Lj2Z4e1CU$_eQH40@dDcgyB4(aN~Z6c63Ch^~&jzIE-zY+iD= z+slstu9ia6Er!wy(Q3|!b!j*+yg+=`V$1zu5a)gI`zQ9E zmmfUv2k*W)AE_|V$IEFsUK`Wskr@(w$yw| zT4kAhQjWlX#w1iitmaySnJ;V;4 zQ*t?Kjw%I_oh0H0$&C6WJAL-E=Zd5KPkC^;NX*{5TpPRJ8X+KITCt}K3dWu3)&-7r z<1oD!lOEm|8?;IGPr9ZKol^QHEoy%$)6%T<@6i7vTUg}nI_Y>F@nJ_83Jg~VE=G&Z z2(fuTMQ2*dJF_2Y9KA?ukIxfpzqJ@q7z_e0ob!ZdTv1|RK7TVkac^VY`P((SYQMe5 z1!Of3Gz+~B4amVJbH$JTlWq0x6h9SG@fYb-bpjHN2y)uP1}frJ2asjB8@QU{J(o6_ zcXh{^d}QL!zy3CRYk7b}|LjxeOEx1i@y=&Xb1aZ6+&6Y_F*R$v*y{J@$*nlY=mtJb^jBaZ&il?PRLnkCQd!Hjep9$Dg^y=2J@q7ZAgrj%=oIsSFW<`H*F58^Tlpts9eNCui3JWFe!=ffPQT7 z355MYf>))->$xr?c|`Y0Sf*2rO{5gn21%JZe})2geMLfn!yIRQu8G7N==A|00(aSmMyfJ+Y>KUwNdYT@YM*FKJuz&Xe;cx~izyk18{ zX|sH`TAj+b@C24pO-_Hpc0R@`qc{nS<%lI+v@P4G*@XI)a}Th32-mKtu(0*qRr*e5UAyWcRVB(j(5DddXZr~#P!(mfUmrEqvkAgS+}zp>fT-XFeTytrXSxEvpXyL zMg9{m2hoMg5LKCB17X9V}J4hjPw?A*q4^%t31kH0Tvi5DzeiFOjM(0 zBs8}WCU&m76rqH#IE`AkF^$pjp!ZRU6T%@ zzNu=`+d~}>;+?BXalj&n_J(6LJo?Uo_e5~6o;bV|<+J6x{;bTVRYBCh+;a&sgtu$9A0KYdK)%d}VzXA9Y%P|{%`!Mc25Ni5 zW3$e7*$3|}AO_yE->i7%%7!@P=Y~?+j28+Okj+^FdrP^-rCfJl0*}`qv~)`rG}Q(o zhL59LNW-4|Ck?xq4>|u(%Z`0_wda43O?Vx?H#I_s#3xVF@i3A^&!w(X4nyFYbVYc7 z+R4P(W!qTG0`v=4@t^l;Ir7DvFM{t$4k`t!IPvX(faOgnArylQahQPV&JgcU+7ux0)3!HXd>}jf=RuJ5M$EabU~eR4HlQ9seWc zwc;OcwAFvO(L^Ip-DomP%@_pX?C&%i$0;edKZ|*Wk5;_YuJ`PB9XsydmLj147^c(D zZP}Wt*h1z~LOp3)X#zZxl;EHIZL4y<6}``>`5q#>MYWT=@RCsFtB?5^eA<3G&rvN* z$_nl`<75YHshwWs>wCB{RnRUEO55V_Uqw+QLl= zavEK>kpSU3vj(ku!oD@;a5d?xDsD5Y6ojMW-W@_>&pdBD*QfErc<+OhCO+Q#^GjBL zYavO-ne<#sfX28E{!PP|58csquaZ>d-T_}PK82H~t4ZOv#f(TUQ>%KrfpVj;;qH_V z%5-E*)sy!wR?tswMe=C5DQ{v@Ut0YyB@xI$GW{HT%Q){quqs7h{N%r?sR&_(m+)Uem_ zpYXaAm!T#(=woQu|6>dT{9QR(=Icejw<-UzNEa@k`}g0)&q#S!_BRL9`+r7KWGA2H z>0k8O0aJcsg4>@yx&K4-LIV1xwBY>5yWZ)5;G1CW;JzJw=hgjhZl}8Muzz7#L*AS+ ztQH)9WmvBxD$axY;^hI#P&)?RHu+2u(|T)F8oQTjVxpHiSg~sJg|cVEggyx!m9O$U zpB(LU#lO@>B7Y7Kg9k^BPeqf5u6)VD_fhM9z<|$+useg<9+Tiy!}lrdM&xDZ{u#P( z<+o1nFQE%(){zn-<#NM(j&`F5bU{uhaM96VpVFPu0{vg!z$71a2)~NgObpTP6JlYe zi@KIwqASQ!r5ephA*(s>g+p=${!}c+GN5XhOCCG`*H?mc#I3Hxha^xFE%ugTU2G7x zoERqZiPG!^sTn1V`a}6fVOGoij}hc*-w#;~It4L3P-tE+u0aVSX&@W8Q&*Wy}V?3pq&2dXt_}# zgBRy=o6#TS=Y4zo5{4xT`*}+F(ILT!0MAAC%eA_LSylg5NYfl3E<)J`LA8OmZSfjY9P-b7)j(r44OVlE||=3Q^9~sJmE3n zd6ioE%Uvw(LNBT>Nf!)2>4l#+A!H1STgYL^0M`>F2$Ua6 zGrDs1WDQ^mmT23FkYx32V)-aH^G{k1NI#2(9!t=)aO770M9*!e*ipc2-(Nx=-?sd6leDj$DjMCWA_% zPtZ`m4IC3wQ?S>i>RM|GqnB~(`p|bQM{=%CO}M3d(q4)e@uuP>0e-Li6K)Yma;5EG zYho?HMSgJW_3i2KeZA(bl1%ndw2xp>-ABy(8h8$k)motv(3FhBH+}EDEnIn!2>zw-%uA0?v4d)S1Y>I4-Uk6`FqT}8U(A4VJa{77Ph4R z>JN;gv>#HJ2UBonn?b}hO-1L}-V*iH9WXy+&yNkod{Z#J`7)Z|X{oNS(2cW~#_n4U z8jLs8ps6sogoVt$csFO9g=X*2z6zz&eW1rId*kDEjBZ@d{z1FoB>L30x9a4pInVCA zSd><2HGP_=|M)GrPJRV!1e-6i>T|p(lHrik^=Jf5p6=a)sIu3oPT#+5ltOPRmg57s z40`Bf`D8uK+IgO9(yM0meld2VYH(*JQOWEx#v#6aqgEz!z-=_d{gZ&heb~>%gAs_* zsN~G2E~+tLpRQ2>fAZ9|{aW-UZV^v6LJ$el>@B}(g4 zu<61PJKG8tB~7Ww9RL2vcg7o?ns@2kYXtjyzF4O!8p6Vmg41-k2%luc3{~FLjZ@x8 zG1F#ITJ;6#_93bprM%aIBbZ|3Rr0kTyy78KQZGx5N8;e73sw&8Hm0GmG5AYgb4|5& zp3+iWvYG2#3n*{m6W?n$$A{v{+?SJO`2K6^8Ls_YH1bJ<9I}qknuzy_bxFIO%F zd3!ISsFnEIjfnZ5en$&FJdpBAc`+r_kBaHR=Jsa%yit+)-9bWqS9lzy@`l+$W=sLO zJWe(-}0ZI=Y`uV6avaJkz!_aohm`v}d08dSn~;`NhmB@xxNH!UJ}`hEF<4oH_QI!0c#NO0(WO?E-jxiX7UlvFUA7=JoP z)!zBGBQw_b`e13#Y)dU`&zep1$4Ne81u21;p$(3mb1qIk_PF zCRV;b8W|KJ+@>p5q&a3tP#r@ho$+#5dp_eWL>T!L>b-TZ!Tb&7^G{dG3SVqo8OSz4 zLS95CukJ3@y%+pIDdu@Y2-n5*z?RHdYiNfhpNZr2mF~U{Sp43WQt{CAH4V-XA$wWYq$p~YUEtUuYn0ax4tzMd48 zLhiH%O(>YKaDy9mY6TJNJyIU?Sj&qnr|$}5cL^L{DO)P5Q!FPL?&-5LEs}G5qzDcS zcgM8{A&}wH4&>LLnkb1-PJH{D2+bEXQ)NW844xHSc1NN%II)RXp8T4JyHlWQvBfpIBl3UOeOy2@Lu|n*r zd^8FLC1mO9xy{uvm@6M24{xvOW+{{l3!)>y$7s~~z$60chy}svdd%1{L6sSe*DiC| zq#@D~`x821>rsT3_&$0Z%j9dw6uO^yQXoc|TYGSd@{^xQ4fZvPsZ`Fj%-!=NXCVWb zHo;S!_w>)_A@lA2_acINWc^Y}ZzNP2nX}=v0PVkR>7>R>GSl zf@hvp9;%UrTN}5+++`(zL&-*%N z{oFjB+IpG$(&!8B4Ev_G_e*y~Co%d2sMj9O9u$}?De}IY^q}pt5o(d`^9yuKN2h%+ zh0Qwt&LE2uS~D3`i?YsVBtDF!gY@7~n2?)644DA31{cOh-qx{GDXc%{gfW|1+E0945~ft;Pu2)pK1=oO{PgtUh)K9!Nv51Pf3Gp$NAG$tu%zL>eJG zV=iL`6nAgWSqk*e=qd^9lTYiau28MLUn0L0w4vH2qB<8mqFTOv(B0rOHUyhzIY} z+oh8?j=Iuf@BY)yn4;;bA8&Fwk*`|W`Z|*g*=tte*nIf96G~IeB%udsi*R)XDHSb4$#!+pFeDmSKoMr~^3ubu7pFI*(vO^>cS!pDO|lfy zp0fA8hO$t;Ev_uI?~VD!0Ob}@KY+)}_Y0@V;1gy|%K>MIcj$t+CTsQa_B+2q;LxN* z--954)I^?826=Jtrci=M&LUJRNiBR2lk!~jMy)r&%-Gn`(0HklPGhG_xB-C*QTva0 z=${NK;qOg83(Lw6z@P9~(}`?FSU9Q|X@1T#>XY#efT2|y{9U0<D0|hK4y{!XLq`&kQ^x#G)5SLe3g3 zFE4LxBK#nwL(t{8jE0t03Mk_lhM8iN_8R1;{yce-H1Vj{EJ^r-A*}n(uF6Ad(H5e*yy57uuBfg#wh^1G9#So zZ4y`Xi6&aE)~j5`;TCC$9tyee|5Cb<`{2`Xn) za^6)r?Q^$mQ@k%yOAn=jF8lJ0N5Z@h_+K8)$N4*|G`@}yk|ftjb*Gia=(!cf+|Cq5 zD*NnVamx={kfZz^5*&H|0SVIH*X0?8wNKZsO~IHfJMG)2p@dgM+>@CpeiWP}yJOn|W|WQ@2I0f-}7qdEFyjRZe!We;BK4Eg+v{d9B>24bAgnl7Brc6mNqdcE9XJEe`o ziZ~K~WvG<37Cn4!f-ebAX!nt6=?a(7N{%;8?$#=a1TF08G$LOM=vFa)wrs#gV^tTzSe_g z1w)fF$Kk@dLm&5Y8DBMJX;bRFedq3WUlj9?5gtM>bpAQQr?8&wr*eV{DoU;rA=Jd- zb9Ztxl*8TExOKrBTz1=UG+!c3bYmaa1qx6r27{49oy)i%|GEEb ztRZwGJwN6tA{N!Jq|9t4f%P${KAICv45W8Z@7%=XmZ;B5j}}U`2)i&uEVR`l50VdS z1s6~u-&%PtiAgyhwMNds&-q|3prel_qw(KQ_HQDtJ{?QzF7QQn=3j19Ja&|8r#Ag@ zI@Y7|>G_mt?}NmZ+kl%kyg(9IfdgO#^4|ocP5x|YK?IuHCx3_j1>As9{MnRV@0Mg+#ab z?-wtRma8ClZ}qo4`kmJ~=T86J8XnBzuOJTlk3W}Gl0W@p-}>q)EO8}MB4Slf+aCw5 z`ss-5=UVAGhPxx9MrLen)FoNclU#>=+T@W&38!Jz-+%a3QQ_ybsmJee z9zRH6UNiM!-TAK1_X&}iH;BM^tU_(8+?HVyHh$6XPq~3hLRA|6q`Y$JV{R0$_Flnk z%c7w^sCc8}^kC!g&BJ0gHGQnXp8|`FguDMFX5Rz;deQL>a?$9SQ8Bs9VQ5tQb|#Gj6!rexwHQ#lRF<^ z@r=B@)W;uwpUuKCXO%>mXvWIJ_4kK!g(v4$Nt!5~TM~)}MJ+Hg4x})PUsiRL_|bi? zlwS$!UKy{PXc&V6T4@BE<-a2g^n7vuR{uW7bW51*L>B-<{Qtx7-aOYquW)|0BSO;% z>g13-t7OQOzsw+a_kI`)Gtwpx_fft%!Fnd-a_Do%EpR?wm^Q+!BQQs?%TD%Mg@yW>69h0FS=@w8A@*rcyIW#7Nj2cZv0h=hmkenT_fDTkrSXfwc zr8Xw{kquyY)qy?qEl^exn$L8^j76}LYXMvtzm9x>VlQ@2pDh*6hYz4(*40yDi}~pe0}%Pc%cVy3H$c+oX;0|KFhg*vUXmp#IkY z6wF1O&jWSxby)4S#gBokkAJo5Y{c~1yJO3#(}O%8^*vCd*pc?;yoRcU=2G>*M<0j^ zSGU_EOu}{C$@~=$H|X`&?vBQGvO6=A+(a*c!wL!tqADD=c+Vj#gKy#hU%-G?RU7h) zc;71jn`zyPuQ1Hv87EBZy-BhZy|0l{q2$8iqwS#t(27E^FT2a_G{|g<*v^xPII~h! z#{jCn5M~uc2-IbO!Tfyoz5NKiPmf;^!mj?I7Gz5#BMoX5Z7@(Lz$2pqr+Eol!uE5u zLKBuaU%<@(%c`A#UM9rFWyj3@S4JSE*va$6hsc;m;PWVfMb>(;Dx6(AzAvskiZ2rF zMD;pQfFYB0?^Dm<;I-!A&gB|R(Jj1m!DCR)iC+w+u$#WfYq2XSc?~?-a!zdGod6w} z;>O5UmOSw&Sislz0SKX%it+=|^?O6=$hgJ7P_Y9cz0Ghusxpr(j}N7}W-lTL%GxaQ zN>`j(Bs}>s)jQ9WsnjPFBBO|5Bh-88z*5QZA=)bg(Sr z0HE%lL+Kio>d|LWxtGyBZzr;S88P3^5-EYYAI2*8I0iSvlXqRlpLJKKpe}l8tt?`VF>>fPQzP@1mI+Uu5aek_THI zpd(Z?G3?8T&aBxRe%U~_$b0~G2|*y$O7?n+C%7AHmJ0=wy@eU7#d7UYym5X=K15er zIJ;Ph%?cy3^Mr88CT!NS*h3VnBHbHf6{geTfzEAPPNmnd_R|4xhL6ck(v=u-nJhlx ztU^6OU5&-tUT_kwXCFCM$tPt5s97vRwxC)mW9*&|x3837FH4&RYS$`^y_b~I#T7R| z=ehnORWV&I2dp`Jx6Y{tlt^j&Ih2a~;vxfni&ynKhp}*iEF# zj7{=J4?)e~ai|PSe3g z`IeGGE{#@!=Yg{9#7iXe-_?)X|a`sWJ35+Z6qh5WqQ=% zr*$Y;KRk5MR?JqWJhw>VVP$BzvjHR>pUG`ldW90UJn$m!eNJMGQZ|K#LPRCbPg~a` zoaR-{B5(UnB~}>a1sFMZ81(owtIiObw?%SyjQL#*e^H{tvIp3wr-WI$5(b7>J*FPv zs2iPPczZUmevogcnA`1oz}f^`i{3o3X);&~bAsx4WQs_r7{mFdrK%`KlMzjdasD)yep-kUz1ra@801YKej(6appJ9nn8P(emaaUU*og-x@flJ zTp>|$_}qnVn}9yU=-zYxrO{~x)fG^{?wa`+Yk3DEJLKLXD=fJG()`{bGcYg&g@n*B zDWyFk<3dJl3q0FH5NR0DJG3`wI|Z0J3)9n!Fd& z45p-zKliWXhT~EhwVyn*XBv~buN`DF=Xea^K6Xvd2txU%22N){MMm-_*gvBJVL8y&_ z1z*Z5D`=dRgaMsoifrkTSwHz*53_>j?^z!# z<}K4r!841!sf?WnS0UN{`b@L+1yuXpUtmpwCY6g6QWeDi!{VVtOl+N|(Zlek#a}^Kl1pzZ`K9ZH$@g({Q#X&qe(QE0HZs znH>0t-{xB=E)Ug2vqRilg=pn;i6M7nM-GF8PPGS?%+PX`wKI$IZ9Y*+9jmOZ4Ot2NH_dKEmFt3^1(>U| zN$of3F_kKo$HhOGgc=o`#mh1Lk;Z^j58nj-d|^wV5%-bTgHH;rmMp+kSS|KQ$=JJ~ zsuliU+Gw7h(=O7&e0#x=(hq*AgT~5s4F! zaWi09+BQ+0%YwdfgMplc>5do;b%zyB+MzPL+|8xF4%XDW-j}*Qi(yDfNntgWIv?3D zjFc8aQkT?#Li#fWFfGia(UTS&0pNQ=EX$d14D}=Ht2KBJpz|mJTsA4~66AJwVd*zB z^t!h8E<_>tnt4q{zZy+ek54gK-nSZj(?WjNL6DEN!g7~t>KXhV1m`6Gj4*g0sgCw9 z)WfO@dp8|2txJWmsL@#4rO4|MJfWM0WWNAp4}awOeav9Q&4mT2c}a05iCc%@$O}#H zucJ7z@8<%fXr6y1!Bni)S6Oiswt4dF_?GE1j|LYgD|<5`173Z5WrXNC9+$~*{GeA( zOBieB{`K79*zG7m>t~=^NZhxQC(o!rvbcUQs~l~HwyDHx)p$A&W-xsnxvnaZVJUMb zfDST=R=dNS*&zYCO^F-XVz!J&hKH@zsl;( zP`fj8IG&cD0m_S%m#2%w<^AoIRAXd+IEF5Qhf2*uxV-=7w%d(7ympzPfw?UEEkn+7 z^!Bsuc(<{o49x^&W#h0<0l&YbrI!ar_{z z>8^?HLO1Gi;Bb!hAuP2O6S>&k9Y+oy)=tYL& zSkApllKBM2bJ?#(n}-`62ll0Yt=68S6q_So3GnX9M)T3aMYprm!s%bHhFDyEqioL-8SNS=rudVuvs83a% zAkflR(0FvXn39WFZT1?gg^^IU(9(#7?`z5}J9Q{SB4=>rE$UTH1SPBxWiv!`I zb#!YcUUw~Mjm)^%s;Q~TkP%hT1t7sGWC>qUEGJN!g}Pv^AlA3&q|lOf8QVo|f0?(-er#r%>TC6_LyshAeu zLlfQLpDTh5K>&YM8f(<)*XGO})++gDjcnH4Ap}86B6B`MEkx}aSv(Y|&O`;$+OU)| zTpd4)_fD0MNaO{2)5RP7lfABFPuQD1uAwBFDF5=`*6L^ox4WHHbJ?#?-AMsWuz=i7 zOFM4M_ED(KxUeL-=3sb?i65z8nj3Sp-;=T8T)hOil{20Zef@UeGC=5!twfU|8;KN& zr0+tLhiv!JViLA6)t7T#Qas9#>G;Sizjw=r?|3D@Pv@SY;oEZM7$%dJFUj2s=o$VG z-~g^wL6uDJI?08s*E{t-Yts=j3U3_?5;gjx< z>C=?DXS6U__+2^OMbo<%t}6$y3~r#3%JVID_N<%ww*#kDZibTR>?{O?dPLrodesP<39F0y1?U`9lABCM za8xVBGXe0okg^rEbO^2O7ks&@!b!DE#N4RseV4#R9i#NH-Hq)!N^PZOCw%h#avHDbFTFrT|}I*^a{Sj@$zg`B8&*ejsoz?UB85|c3> zJ5bA-`bKu9+YYYX(L>LbOB6X5j9NGxaaAFs`yTssxADtL?Xt7?!;q_(=)R|_p=uMD z=mRUr8+cB6Hzv%6m|$UI^$b4v#N1`2lKCtZsMS=oxTLsDNEctgyMIuI?`f3b90e6E zoGmUX#fQ#45s0uO=8nE5+dMTc*5XyalA`MINg#J{6@5 z-p!$VACCN(%SGpoh{{;u(A7<$@%~hdu&>5+j{RO8s3Lgew@^Jes2i{ypfHKCo!PT~ zb33Wbp-GLqJY_O9^J)tifhxXKSlNeu(+J--wq!Zf&m!X5UzP(iPJf*ri5-cXk?nAo zCF7>`^1NLVwgI}Be_3@=(ptmgfh(Q}`F_&0YCBR!`~&28IEO&4_k%u6Ej!bCiP8)+ zN;=J9h7GoWoCgavlc(gufKOnMl&R6(j4lo#?S(-Xfy;mr&}(AQt3bwq{|nZAtR8a= z_wGQPVpn*gb5%4x3uCCLb-?W3G=?|H;f=-0IbaAXAby88^ za|i91^Fp|@_IF*rcv)yCh2r1p=n|qKPOnf?y!Vl-F9fnKuE|*qB0PT~T1mUP+TUOo z2v#?MWOAt}RP$%Yc!BQlIE;{m!3LC1eQn=4=^GJq?BR&l{88dIZUoJFkr^_Gj>+GF z+tcjSjbDt~)vN;t3aNG~Ng$JoyAj0` z*b&~%)qHFNhzT}01C?Y$KZbH}&?a`UG0nFGC#EqUi6M!}Y*@WU`42p0)8=i$RmarB zhmUJ=<-_k7n}Dhgu}7b7>0YT-t-{QCpsY+)mT@fO@ECq2IrSJXQ$hqIrt^yr;pe?! z6=)90TL@CO&E!*@g}ptbULgOyF3XVvC?Nl0(yC}*s+2AE`%Y8k4I9qU=cB~CMqk@@ zl)e;B=hv`3x#!+UUI}wyhcJG9u}kV~>0S9ZnSoL8ab_E0O9DqQE9J;J3V19$#>b${ zq>YL|wzj7UL9M+&|qQ^22nFhzxLl>y9 zUm7>M%ct~AF8bN|+mF2UL-Nto0WX>V8=6@nX2uLbUXvNSPF=Rk+JXL%g2s`}bzv$T zkV4Q+uPWlcuTtdq$k@FCFpXo4vSs%qF3{}S$wL>i{e!o59M|7CCad&s9CNXuIa@XK z@eXcx^MH(W0)&_LM@n}sum}P|3^TMwC4|9B!{$A9en*NJE9RBiFbHGgd;aHYK2QB( z{7wBW%%Y#^Jyu;qhZ@En>M7E&$ZDdhLt|7`Nm~5oU!fbqHrxJ z5PbXcdS}f78TH~SwY$aJzcbPSmd2;jk$?E zRcN4wX>dCl)gIeX!~R6NpB# z!N-voO}E06Bmo@=#h32!Be{1UjTx}qm8qd;lw^3*yh$ui^pE4ts{ zEq7bes94zFWt&0$ZcS)_I1q{}AIn%;P%B}<8eD%Glz+nJLnEdXiFc*Ml-ni6Eqa;; zx)Ef-H@c^V)&goLf)WJ`Z^4TEl18d#Bu>i|E$qGzMg59;dpczSOguB21khh1YM6W+ zVXmyfj@|QCkx+I&9MN403x72b>LLL-a74ts2EA07__h=TUM{iMOJzp-xMW4T+1hBX z-+c@Do?dD<3xaqn)tJ5dVGDIsr+4Gmz8yG|+8(TLpU8Dr%F^2{t6i}}VfZQ_{;4y5 zsY3(GfT5N%_)A3joRIW72~3dmpsEv8`+B7Dmx^Q%SOaT&*AyQ9rqC)~RH<#;AmAQY z&Adt3w;%eSv73f{5bXZtN&6D+NYBZ(`DdW)n5sN1Pf}ziYl8yv9+IETOMS-#p}t zNMtOr!buD0X7cl%jgI)kzTZ;p9}D{eX!8VEs3(9b6Jn)%2CgMqpdXI|DS-~q0GDe+ z1#Sb$8|$_SN3N=YHU<%(H;eiX7F)`I?06z@>W1cszFa}VEc3girizVoFCgIH#UE@F)dBd@`=&5(8 z8!1XqRxi3CMeYNmig4^coaWl})6MIdT2&iXk+X!a6k$Ek3fOP_1tzTIFaEYgW43u@ z`>FrNi>AJGu;j`Q6dLp;_Bo1T2%0cWAT>YPVPE?ZSuv{6)$aA5@XZ}e!27a*xzhLk0!%7v=VO3tPJ%cxU3Gw_XJB7< zTLZ%CCT17R=ZsiuEJp^Mfw^^Y%71lks6niUz8!p>Y@pE<=rF0bhGVYgnd_e6eEfz- zUjwxP(B7jexs47f(xYDW-nmQHoAtazd+ml zTXxc@sUn6}T=usV{iNYw07K-9XQ{t92~9DG>8L_Stf~RPmbQ>!KX3#7krh z$rj8+1to6Rywq!-MH=XWCrDc`VLp&(Gx;FlQZas`0aR=oQGPXVhqaQXkff&7F6AEv zuO&I}1_pe0BDt~Cr#JA@dE1$C{h)vfYyB{I4Vd;aGd>R7fX6b_>Ju0gPXV0p6*&Sm zzwP^Q=;FW1KZf6L&?sGTLwMSpg=scYsqn|hN4a1vzXMq?5 zoddVGHOH-W%3>(TR(Z?WLAR-Bx*~&oy+D{=z-|W4^6zL+-cvVb|EC%>)^Ff7BHvDk_IU8|(P+=TzFY&6f zL=MlJjFX3g1@$2non4R+qAKz@AXaY8nN+(`Lf)-&E(%rH@&lW}C^VeYr{v4W>fOiW zkq;3+Vtl;HZ}wk`mJ{VX>C%A-3fm|0|EfQnJtBmUK&Z%2_A@FlE|vx@bjI|D?DW$S zx4Q<@u;WCbd|?z0c-3JOz315Lb<)4vhqjwcEFIo*Ww7Gx?>? zi)a`&D+t`x-)MFJ9VQ>w&V#y7hE6-t!iL-rcoS16wI++KW~m&n2NPQ|LnRoCTtR8Y zzJGKoJCuPZ8fZU}H0@`RE_cB3xAwCi!*6}%>A_q4&m4KPBe5z)b>kDN*xt|boCaZ9 zyy$wblMlRarevIsPmdM&D}o8tmVr!09neBv3Hr7)#1sTy(j0g^UhDiD$T%e8K5b5w zDZt?7TGR7)r$cJ%8dgA@TAezxB21_ct}mS5;Lz@t6Wp+U#&VE){>4r&oEnQJ~0kx<&2E7`$^dA}rvvCg06Kl9z?Jj;> z&(6V!aVI)|4)}t}!40v~b{Hn+S^Ca8MK{h89RDt}yxG!8>6Mi#km))@iaozT6v6GB znVbeiTEaF0^D2;d=4rI@$#`3$^%KNIoCdbJjkUTL1a5Y?@slIR4z%hNkREzYb&~L@ zG4=tkC^l(w{z)IoKb)0Ge$&D%ZO%#6CVyiga(JF##;%b*Co7gw&pCo@#S+f%#@`g6 z5^vTtd4k7l%G00l#eRCn&vn(}y1J{jV5gS6Hx-?;iKw`eD@_ENq{>a=@Ag- z5Cfy>mjAe@BXimA(Crt{OD;qHf>tf3C=z_#zai|xzPr1WdaLDSsc5Ppj}WIOm{IeQ zJQ<^2bNIZN8LbiyMn%<+zHd;LsV^wsBX`ohSzSR$%69`j^m@}%$w%a}Ui_m3HW;2~)K=alw6K{4L#o+P++06q z-`^AO_T+Z}Rl{IbGD@IW5n%!>r?MSNrK?m8^ z@8ezu!AINPkbB1*z1O-rv8`#wgIL>`8u+{P^I%B`1&N1>a zT->53R0W0#!dEI_l$>r$1HWg3Si6kFxo7nPdLPp-ide0cSbOwA(#wy3By+Ue6ScS9 z06J`LmN6PE)2Nr0KBn6pHE|%X{$gx82!&kybq66K`eTSuog zdRL>nGdUWO&VP2kd#r>*vBF`bAR(2)yeJ@a`W7l8nj+0e4bxtrg=s@}ACo~ooW8M} zu4MH9N7Pt^^Dua7xdaf}{@pCX!er9=RKh3h=Jio{{{ZNW8%f#=g0n$&y+PxtY|9&J z@*LhiZ;3t6Ey%5raKdrkOobzi_zR0}KW-FvD|YmP<22^AUj?($DqcCv)pv{YvWmQ( zUZ29f%;5QwXXpFTdia(ic_c759Xd?L$gXcTMcm=Zd<@r4{TfZ^#x_0nOouuz)(a_k z*hIjIp5o%J*Eb>Y3M&eoXL2{kqP~uDarHB1q6L1|gzs3CF0%$n-wdTDimV{RiMagn zdj5m=nt$jM4iDJIO#AyxaX&G6j%$Is{T7fGLOI}zr}KSQhwKyBR2f2;&$u6N*6=-e zkLnjc@c&Tfa}&4%o^N@os<1_vLrb6|yp8H1hp(b!zVm)^HMJKgn z+}yPsI><@yYV_mU6~3P8xqVke@3hpvQ)u4jC=X^1fjh|EPYyjwjmk6Tq`u=B=iw&9 z=f8wU`DHB_*1cKKvXBUD^qkljb5(fqM#a5Np~^T}D7fM|%w^btb~Brw?Th6xY@b3= zC85(&-_tcgYrCVR&=sMYwDPq5+NxsJT!ZA!y#Vz_8oB@aD*l{#RUJd6IWizBKcUySdbUKh&?o#b5pk_`1;ozD5aB$oHxJw50GW zV9Lj3XN!~eqtFDZO4FwD3VAuVpEJ!o3Td)RaoLf>;uWO+5Y@o#pw%@qog1(LvZ5UoX3{V*J>gVWJ z*FveP%ESSmyiWigHiSkEDpQ3c@jz-!z`LHyC=0}s6$-SHU=@FnK;E(YoDCm=Ft06j zPtueoYM3`QNk+=$r2$P0`*Y*WfuqNxFY(y_y=-^`OAHUG&K#KB#kaGCGyVi1 zl6=?YK4xpTbv6xvq=#+KQ`KeA6G|hiz^jmtMINf1?QgJCa0Fc^RGo_UZf)#9yuzB= zI-2Di$^)&hzp1CZeb@I`cRZN<+ou2@t>)bW
By default, this references a built-in Asset named *DefaultInputActions*, which contains common default Actions for driving UI. If you want to set up your own Actions, [create a custom Input Action Asset](ActionAssets.md#creating-input-action-assets) and assign it here. When you assign a new Asset reference to this field in the Inspector, the Editor attempts to automatically map Actions to UI inputs based on common naming conventions.| |[Deselect on Background Click](../api/UnityEngine.InputSystem.UI.InputSystemUIInputModule.html#UnityEngine_InputSystem_UI_InputSystemUIInputModule_deselectOnBackgroundClick)|By default, when the pointer is clicked and does not hit any `GameObject`, the current selection is cleared. This, however, can get in the way of keyboard and gamepad navigation which will want to work off the currently selected object. To prevent automatic deselection, set this property to false.| |[Pointer Behavior](../api/UnityEngine.InputSystem.UI.InputSystemUIInputModule.html#UnityEngine_InputSystem_UI_InputSystemUIInputModule_pointerBehavior)|How to deal with multiple pointers feeding input into the UI. See [pointer-type input](#pointer-type-input).| +|[Cursor Lock Behavior](../api/UnityEngine.InputSystem.UI.InputSystemUIInputModule.html#UnityEngine_InputSystem_UI_InputSystemUIInputModule_cursorLockBehavior)|Controls the origin point of UI raycasts when the cursor is locked. | You can use the following properties to map Actions from the chosen [__Actions Asset__](../api/UnityEngine.InputSystem.UI.InputSystemUIInputModule.html#UnityEngine_InputSystem_UI_InputSystemUIInputModule_actionsAsset) to UI input Actions. In the Inspector, these appear as foldout lists that contain all the Actions in the Asset: @@ -63,7 +64,7 @@ For each of these types of input, input is sourced and combined from a specific To the UI, a pointer is a position from which clicks and scrolls can be triggered to interact with UI elements at the pointer's position. Pointer-type input is sourced from [point](../api/UnityEngine.InputSystem.UI.InputSystemUIInputModule.html#UnityEngine_InputSystem_UI_InputSystemUIInputModule_point), [leftClick](../api/UnityEngine.InputSystem.UI.InputSystemUIInputModule.html#UnityEngine_InputSystem_UI_InputSystemUIInputModule_leftClick), [rightClick](../api/UnityEngine.InputSystem.UI.InputSystemUIInputModule.html#UnityEngine_InputSystem_UI_InputSystemUIInputModule_rightClick), [middleClick](../api/UnityEngine.InputSystem.UI.InputSystemUIInputModule.html#UnityEngine_InputSystem_UI_InputSystemUIInputModule_middleClick), and [scrollWheel](../api/UnityEngine.InputSystem.UI.InputSystemUIInputModule.html#UnityEngine_InputSystem_UI_InputSystemUIInputModule_scrollWheel). >[!NOTE] ->The UI input module does not have an association between pointers and cursors. In general, the UI is oblivious to whether a cursor exists for a particular pointer. However, for mouse and pen input, the UI input module will respect [Cusor.lockState](https://docs.unity3d.com/ScriptReference/Cursor-lockState.html) and pin the pointer position at `(-1,-1)` whenever the cursor is locked. +>The UI input module does not have an association between pointers and cursors. In general, the UI is oblivious to whether a cursor exists for a particular pointer. However, for mouse and pen input, the UI input module will respect [Cusor.lockState](https://docs.unity3d.com/ScriptReference/Cursor-lockState.html) and pin the pointer position at `(-1,-1)` whenever the cursor is locked. This behavior can be changed through the [Cursor Lock Behavior](../api/UnityEngine.InputSystem.UI.InputSystemUIInputModule.html#UnityEngine_InputSystem_UI_InputSystemUIInputModule_cursorLockBehavior) property of the [InputSystemUIInputModule](../api/UnityEngine.InputSystem.UI.InputSystemUIInputModule.html). Multiple pointer Devices may feed input into a single UI input module. Also, in the case of [Touchscreen](../api/UnityEngine.InputSystem.Touchscreen.html), a single Device can have the ability to have multiple concurrent pointers (each finger contact is one pointer). diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs index 2d88ec11ea..9349b1fd8b 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs @@ -82,6 +82,24 @@ public UIPointerBehavior pointerBehavior set => m_PointerBehavior = value; } + ///

+ /// Where to position the pointer when the cursor is locked. + /// + /// + /// By default, the pointer is positioned at -1, -1 in screen space when the cursor is locked. This has implications + /// for using ray casters like because the raycasts will be sent from the pointer + /// position. By setting the value of to , + /// the raycasts will be sent from the center of the screen. This is useful when trying to interact with world space UI + /// using the and interfaces when the cursor + /// is locked. + /// + /// + public CursorLockBehavior cursorLockBehavior + { + get => m_CursorLockBehavior; + set => m_CursorLockBehavior = value; + } + /// /// Called by EventSystem when the input module is made current. /// @@ -249,7 +267,9 @@ private void ProcessPointer(ref PointerModel state) var pointerType = eventData.pointerType; if (pointerType == UIPointerType.MouseOrPen && Cursor.lockState == CursorLockMode.Locked) { - eventData.position = new Vector2(-1, -1); + eventData.position = m_CursorLockBehavior == CursorLockBehavior.OutsideScreen ? + new Vector2(-1, -1) : + new Vector2(Screen.width / 2f, Screen.height / 2f); ////REVIEW: This is consistent with StandaloneInputModule but having no deltas in locked mode seems wrong eventData.delta = default; } @@ -341,8 +361,7 @@ private void ProcessPointerMovement(ref PointerModel pointer, ExtendedPointerEve var currentPointerTarget = // If the pointer is a touch that was released the *previous* frame, we generate pointer-exit events // and then later remove the pointer. - (eventData.pointerType == UIPointerType.Touch && !pointer.leftButton.isPressed && !pointer.leftButton.wasReleasedThisFrame) || - (eventData.pointerType == UIPointerType.MouseOrPen && Cursor.lockState == CursorLockMode.Locked) + eventData.pointerType == UIPointerType.Touch && !pointer.leftButton.isPressed && !pointer.leftButton.wasReleasedThisFrame ? null : eventData.pointerCurrentRaycast.gameObject; @@ -2193,6 +2212,7 @@ public InputActionAsset actionsAsset [SerializeField] private bool m_DeselectOnBackgroundClick = true; [SerializeField] private UIPointerBehavior m_PointerBehavior = UIPointerBehavior.SingleMouseOrPenButMultiTouchAndTrack; + [SerializeField, HideInInspector] internal CursorLockBehavior m_CursorLockBehavior = CursorLockBehavior.OutsideScreen; private static Dictionary s_InputActionReferenceCounts = new Dictionary(); @@ -2225,6 +2245,26 @@ private struct InputActionReferenceState // Navigation-type input. private NavigationModel m_NavigationState; + + /// + /// Controls the origin point of raycasts when the cursor is locked. + /// + public enum CursorLockBehavior + { + /// + /// The internal pointer position will be set to -1, -1. This short-circuits the raycasting + /// logic so no objects will be intersected. This is the default setting. + /// + OutsideScreen, + + /// + /// Raycasts will originate from the center of the screen. This mode can be useful for + /// example to check in pointer-driven FPS games if the player is looking at some world-space + /// object that implements the and + /// interfaces. + /// + ScreenCenter + } } } #endif diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModuleEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModuleEditor.cs index 7015ce1741..415ea83d67 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModuleEditor.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModuleEditor.cs @@ -68,6 +68,7 @@ private static InputActionReference[] GetAllAssetReferencesFromAssetDatabase(Inp private SerializedProperty m_ActionsAsset; private InputActionReference[] m_AvailableActionReferencesInAssetDatabase; private string[] m_AvailableActionsInAssetNames; + private bool m_AdvancedFoldoutState; private string MakeActionReferenceNameUsableInGenericMenu(string name) { @@ -167,6 +168,14 @@ public override void OnInspectorGUI() EditorGUI.EndDisabledGroup(); } + m_AdvancedFoldoutState = EditorGUILayout.Foldout(m_AdvancedFoldoutState, new GUIContent("Advanced"), true); + if (m_AdvancedFoldoutState) + EditorGUILayout.PropertyField(serializedObject.FindProperty("m_CursorLockBehavior"), + EditorGUIUtility.TrTextContent("Cursor Lock Behavior", + $"Controls the origin point of UI raycasts when the cursor is locked. {InputSystemUIInputModule.CursorLockBehavior.OutsideScreen} " + + $"is the default behavior and will force the raycast to miss all objects. {InputSystemUIInputModule.CursorLockBehavior.ScreenCenter} " + + $"will cast the ray from the center of the screen.")); + if (GUI.changed) serializedObject.ApplyModifiedProperties(); } From 9154ade0dfcb627b486d723b6062906f90e0d82c Mon Sep 17 00:00:00 2001 From: Emad Date: Thu, 31 Mar 2022 23:03:23 +1100 Subject: [PATCH 44/53] DOCS: Fix typo in AddAction method summary (#1517). --- .../InputSystem/Actions/InputActionSetupExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionSetupExtensions.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionSetupExtensions.cs index cb539cdd51..f42c295957 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionSetupExtensions.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionSetupExtensions.cs @@ -135,7 +135,7 @@ public static void RemoveActionMap(this InputActionAsset asset, string nameOrId) ////TODO: add method to add an existing InputAction to a map /// - /// Ad a new to the given . + /// Add a new to the given . /// /// Action map to add the action to. The action will be appended to /// of the map. The map must be disabled (see From d6950e66224c39c2d11aba04d13c985ba67e4847 Mon Sep 17 00:00:00 2001 From: turboj Date: Thu, 31 Mar 2022 14:14:48 +0200 Subject: [PATCH 45/53] FIX: Exceptions in Path.Combine() in editor (#1497). --- .../InputSystem/Editor/Internal/GUIHelpers.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/GUIHelpers.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/GUIHelpers.cs index 5f216e5c25..72df0e66a6 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/GUIHelpers.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/GUIHelpers.cs @@ -45,6 +45,8 @@ public static Texture2D LoadIcon(string name) var skinPrefix = EditorGUIUtility.isProSkin ? "d_" : ""; var scale = Mathf.Clamp((int)EditorGUIUtility.pixelsPerPoint, 0, 4); var scalePostFix = scale > 1 ? $"@{scale}x" : ""; + if (name.IndexOfAny(Path.GetInvalidFileNameChars())>-1) + name = string.Join("_", name.Split(Path.GetInvalidFileNameChars())); var path = Path.Combine(kIconPath, skinPrefix + name + scalePostFix + ".png"); return AssetDatabase.LoadAssetAtPath(path); } From e9f3ac5a6032de783197d5545d15f7213f135749 Mon Sep 17 00:00:00 2001 From: Rene Damm Date: Mon, 4 Apr 2022 12:17:12 +0200 Subject: [PATCH 46/53] CHANGE: Make 'Both' the default 'Active Input Handling' (#1527). --- Packages/com.unity.inputsystem/CHANGELOG.md | 5 ++++- .../InputSystem/Editor/Internal/GUIHelpers.cs | 2 +- Packages/com.unity.inputsystem/InputSystem/InputSystem.cs | 3 +-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 8015a46b5a..d782af5e9a 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -37,7 +37,9 @@ however, it has to be formatted properly to pass verification tests. * If, for example, an action was bound to `/buttonSouth` and was enabled, adding a second `Gamepad` would lead to the action being temporarily disabled, then updated, and finally re-enabled. * This was especially noticeable if the action was currently in progress as it would get cancelled and then subsequently resumed. * Now, an in-progress action will get cancelled if the device of its active control is removed. If its active control is not affected, however, the action will keep going regardless of whether controls are added or removed from its `InputAction.controls` list. -- Added the 'Cursor Lock Behavior' setting to InputSystemUIInputModule to control the origin point of UI raycasts when the cursor is locked. This enables the use of PhysicsRaycaster when the cursor is locked to the center of the screen ([case 1395281](https://issuetracker.unity3d.com/product/unity/issues/guid/1395281/)). +- Installing the package for the first time will now set `"Active Input Handling"` to `"Both"` rather than `"Input System Package"`. + * This means, that by default, both the old and the new input system will run side by side where supported. + * This can be manually switched by going to `Edit >> Project Settings >> Player >> Active Input Handling`. ### Fixed @@ -78,6 +80,7 @@ however, it has to be formatted properly to pass verification tests. - Added support for Game Core platforms to XR layouts, devices, and input controls. These classes were previously only enabled on platforms where `ENABLE_VR` is defined. - Added a new `DeltaControl` control type that is now used for delta-style controls such as `Mouse.delta` and `Mouse.scroll`. * Like `StickControl`, this control has individual `up`, `down`, `left`, and `right` controls (as well as `x` and `y` that it inherits from `Vector2Control`). This means it is now possible to directly bind to individual scroll directions (such as `/scroll/up`). +- Added the 'Cursor Lock Behavior' setting to InputSystemUIInputModule to control the origin point of UI raycasts when the cursor is locked. This enables the use of PhysicsRaycaster when the cursor is locked to the center of the screen ([case 1395281](https://issuetracker.unity3d.com/product/unity/issues/guid/1395281/)). - Added support for using the Unity Remote app with the input system. * Requires Unity 2021.2.18 or later. diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/GUIHelpers.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/GUIHelpers.cs index 72df0e66a6..18bd7a5055 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/GUIHelpers.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/GUIHelpers.cs @@ -45,7 +45,7 @@ public static Texture2D LoadIcon(string name) var skinPrefix = EditorGUIUtility.isProSkin ? "d_" : ""; var scale = Mathf.Clamp((int)EditorGUIUtility.pixelsPerPoint, 0, 4); var scalePostFix = scale > 1 ? $"@{scale}x" : ""; - if (name.IndexOfAny(Path.GetInvalidFileNameChars())>-1) + if (name.IndexOfAny(Path.GetInvalidFileNameChars()) > -1) name = string.Join("_", name.Split(Path.GetInvalidFileNameChars())); var path = Path.Combine(kIconPath, skinPrefix + name + scalePostFix + ".png"); return AssetDatabase.LoadAssetAtPath(path); diff --git a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs index 4219580a49..1a15c5d2f8 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs @@ -3254,12 +3254,11 @@ internal static void InitializeInEditor(IInputRuntime runtime = null) { const string dialogText = "This project is using the new input system package but the native platform backends for the new input system are not enabled in the player settings. " + "This means that no input from native devices will come through." + - "\n\nDo you want to enable the backends? Doing so will *RESTART* the editor and will *DISABLE* the old UnityEngine.Input APIs."; + "\n\nDo you want to enable the backends? Doing so will *RESTART* the editor."; if (EditorUtility.DisplayDialog("Warning", dialogText, "Yes", "No")) { EditorPlayerSettingHelpers.newSystemBackendsEnabled = true; - EditorPlayerSettingHelpers.oldSystemBackendsEnabled = false; EditorHelpers.RestartEditorAndRecompileScripts(); } } From aec7000b448a41183e56206492226e637b848590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kan=20Sidenvall?= Date: Mon, 4 Apr 2022 13:56:31 +0200 Subject: [PATCH 47/53] FIX: Formatting fix for CI formatting check From 0217c2d5569c8017410e78d8de01b867a9bd4ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kan=20Sidenvall?= Date: Tue, 5 Apr 2022 07:09:07 +0200 Subject: [PATCH 48/53] Added Third Party Notices.md doc (#1519) NEW: Added "Third Party Notices.md" document with license for Rebinding UI sample. --- Assets/Samples/RebindingUI/README.md | 3 +- Third Party Notices.md | 134 +++++++++++++++++++++++++++ 2 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 Third Party Notices.md diff --git a/Assets/Samples/RebindingUI/README.md b/Assets/Samples/RebindingUI/README.md index 1baba2d532..dd71f2185b 100644 --- a/Assets/Samples/RebindingUI/README.md +++ b/Assets/Samples/RebindingUI/README.md @@ -4,4 +4,5 @@ This sample demonstrates how to use the Input System APIs to set up a rebinding Finally, the [RebindSaveLoad](./RebindSaveLoad.cs) script demonstrates how to persist user rebinds in `PlayerPrefs` and how to restore them from there. - The icons used in the sample are taken from [Free Prompts Pack](https://opengameart.org/content/free-keyboard-and-controllers-prompts-pack) made by Nicolae Berbece. + The icons used in the sample are taken from [Free Prompts Pack v4.0](https://opengameart.org/content/free-keyboard-and-controllers-prompts-pack) created by, and made available to public domain by Nicolae Berbece. + Icons are licensed under [Creative Commons CC0](https://creativecommons.org/publicdomain/zero/1.0/). diff --git a/Third Party Notices.md b/Third Party Notices.md new file mode 100644 index 0000000000..4d08c89b1f --- /dev/null +++ b/Third Party Notices.md @@ -0,0 +1,134 @@ +# This package contains third-party software components governed by the license(s) indicated below + +--- + +
+Component Name: Assets/Samples/RebindingUI/Icons/*.png (RebindingUI sample icon assets)
+Source URL:     https://opengameart.org/content/free-keyboard-and-controllers-prompts-pack
+Version:        4.0
+License:        Creative Commons CC0
+License URL:    https://creativecommons.org/publicdomain/zero/1.0/
+
+
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.
+
From 22f79a0d6b125054a646e5ef4942764f7a738853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kan=20Sidenvall?= Date: Tue, 5 Apr 2022 22:19:37 +0200 Subject: [PATCH 49/53] Star complaince docs - batch 1 (#1523) * DOCS: Added missing API docs for PrimitiveValue, InputActionTrace, InputExtensions, CommonUsages, ReadOnlyArray. Co-authored-by: James McGill --- .../InputSystem/Actions/InputActionTrace.cs | 138 ++++++++++++++++++ .../InputSystem/Controls/CommonUsages.cs | 76 +++++++++- .../InputSystem/InputExtensions.cs | 6 +- .../InputSystem/InputSettings.cs | 53 ++++++- .../InputSystem/Utilities/PrimitiveValue.cs | 72 +++++++++ .../InputSystem/Utilities/ReadOnlyArray.cs | 48 ++++++ 6 files changed, 385 insertions(+), 8 deletions(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionTrace.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionTrace.cs index 3d3dd42aeb..3f73921855 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionTrace.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionTrace.cs @@ -98,12 +98,31 @@ public sealed class InputActionTrace : IEnumerable public InputEventBuffer buffer => m_EventBuffer; + /// + /// Returns the number of events in the associated event buffer. + /// public int count => m_EventBuffer.eventCount; + /// + /// Constructs a new default initialized InputActionTrace. + /// + /// + /// When you use this constructor, the new InputActionTrace object does not start recording any actions. + /// To record actions, you must explicitly set them up after creating the object. + /// Alternatively, you can use one of the other constructor overloads which begin recording actions immediately. + /// + /// + /// + /// public InputActionTrace() { } + /// + /// Constructs a new InputActionTrace that records . + /// + /// The action to be recorded. + /// Thrown if is null. public InputActionTrace(InputAction action) { if (action == null) @@ -111,6 +130,11 @@ public InputActionTrace(InputAction action) SubscribeTo(action); } + /// + /// Constructs a new InputActionTrace that records all actions in . + /// + /// The action-map containing actions to be recorded. + /// Thrown if is null. public InputActionTrace(InputActionMap actionMap) { if (actionMap == null) @@ -126,6 +150,8 @@ public InputActionTrace(InputActionMap actionMap) /// Instead, the trace will listen to and automatically record /// every triggered action. /// + /// + /// public void SubscribeToAll() { if (m_SubscribedToAll) @@ -141,6 +167,11 @@ public void SubscribeToAll() UnsubscribeFrom(m_SubscribedActionMaps[m_SubscribedActionMaps.length - 1]); } + /// + /// Unsubscribes from all actions currently being recorded. + /// + /// + /// public void UnsubscribeFromAll() { // Only unhook from OnActionChange if we don't have any recorded actions. If we do have @@ -156,6 +187,17 @@ public void UnsubscribeFromAll() UnsubscribeFrom(m_SubscribedActionMaps[m_SubscribedActionMaps.length - 1]); } + /// + /// Subscribes to . + /// + /// The action to be recorded. + /// + /// **Note:** This method does not prevent you from subscribing to the same action multiple times. + /// If you subscribe to the same action multiple times, your event buffer will contain duplicate entries. + /// + /// If is null. + /// + /// public void SubscribeTo(InputAction action) { if (action == null) @@ -171,6 +213,17 @@ public void SubscribeTo(InputAction action) m_SubscribedActions.AppendWithCapacity(action); } + /// + /// Subscribes to all actions contained within . + /// + /// The action-map containing all actions to be recorded. + /// + /// **Note:** This method does not prevent you from subscribing to the same action multiple times. + /// If you subscribe to the same action multiple times, your event buffer will contain duplicate entries. + /// + /// Thrown if is null. + /// + /// public void SubscribeTo(InputActionMap actionMap) { if (actionMap == null) @@ -184,6 +237,16 @@ public void SubscribeTo(InputActionMap actionMap) m_SubscribedActionMaps.AppendWithCapacity(actionMap); } + /// + /// Unsubscribes from an action, if that action was previously subscribed to. + /// + /// The action to unsubscribe from. + /// + /// **Note:** This method has no side effects if you attempt to unsubscribe from an action that you have not previously subscribed to. + /// + /// Thrown if is null. + /// + /// public void UnsubscribeFrom(InputAction action) { if (action == null) @@ -201,6 +264,16 @@ public void UnsubscribeFrom(InputAction action) m_SubscribedActions.RemoveAtWithCapacity(index); } + /// + /// Unsubscribes from all actions included in . + /// + /// The action-map containing actions to unsubscribe from. + /// + /// **Note:** This method has no side effects if you attempt to unsubscribe from an action-map that you have not previously subscribed to. + /// + /// Thrown if is null. + /// + /// public void UnsubscribeFrom(InputActionMap actionMap) { if (actionMap == null) @@ -258,6 +331,12 @@ public unsafe void RecordAction(InputAction.CallbackContext context) context.ReadValue(valueBuffer, valueSizeInBytes); } + /// + /// Clears all recorded data. + /// + /// + /// **Note:** This method does not unsubscribe any actions that the instance is listening to, so after clearing the recorded data, new input on those subscribed actions will continue to be recorded. + /// public void Clear() { m_EventBuffer.Reset(); @@ -269,6 +348,7 @@ public void Clear() DisposeInternal(); } + /// public override string ToString() { if (count == 0) @@ -288,6 +368,7 @@ public override string ToString() return str.ToString(); } + /// public void Dispose() { UnsubscribeFromAll(); @@ -311,6 +392,11 @@ private void DisposeInternal() } } + /// + /// Returns an enumerator that enumerates all action events recorded for this instance. + /// + /// Enumerator instance, never null. + /// public IEnumerator GetEnumerator() { return new Enumerator(this); @@ -428,12 +514,26 @@ public unsafe struct ActionEventPtr internal InputActionState m_State; internal ActionEvent* m_Ptr; + /// + /// The associated with this action event. + /// public InputAction action => m_State.GetActionOrNull(m_Ptr->bindingIndex); + /// + /// The associated with this action event. + /// + /// + /// public InputActionPhase phase => m_Ptr->phase; + /// + /// The instance associated with this action event. + /// public InputControl control => m_State.controls[m_Ptr->controlIndex]; + /// + /// The instance associated with this action event if applicable, or null if the action event is not associated with an input interaction. + /// public IInputInteraction interaction { get @@ -446,14 +546,36 @@ public IInputInteraction interaction } } + /// + /// The time, in seconds since your game or app started, that the event occurred. + /// + /// + /// Times are in seconds and progress linearly in real-time. The timeline is the same as for . + /// public double time => m_Ptr->baseEvent.time; + /// + /// The time, in seconds since your game or app started, that the transitioned into . + /// public double startTime => m_Ptr->startTime; + /// + /// The duration, in seconds, that has elapsed between when this event was generated and when the + /// action transitioned to and has remained active. + /// public double duration => time - startTime; + /// + /// The size, in bytes, of the value associated with this action event. + /// public int valueSizeInBytes => m_Ptr->valueSizeInBytes; + /// + /// Reads the value associated with this event as an object. + /// + /// object representing the value of this action event. + /// + /// public object ReadValueAsObject() { if (m_Ptr == null) @@ -488,6 +610,15 @@ public object ReadValueAsObject() return control.ReadValueFromBufferAsObject(valuePtr, valueSizeInBytes); } + /// + /// Reads the value associated with this event into the contiguous memory buffer defined by [buffer, buffer + bufferSize). + /// + /// Pointer to the contiguous memory buffer to write value data to. + /// The size, in bytes, of the contiguous buffer pointed to by . + /// If is null. + /// If the given is less than the number of bytes required to write the event value to . + /// + /// public void ReadValue(void* buffer, int bufferSize) { var valueSizeInBytes = m_Ptr->valueSizeInBytes; @@ -501,6 +632,12 @@ public void ReadValue(void* buffer, int bufferSize) UnsafeUtility.MemCpy(buffer, m_Ptr->valueData, valueSizeInBytes); } + /// + /// Reads the value associated with this event as an object of type . + /// + /// The event value type to be used. + /// Object of type . + /// In case the size of does not match the size of the value associated with this event. public TValue ReadValue() where TValue : struct { @@ -518,6 +655,7 @@ public TValue ReadValue() return result; } + /// public override string ToString() { if (m_Ptr == null) diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/CommonUsages.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/CommonUsages.cs index 70b4d52b23..90681e9623 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Controls/CommonUsages.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/CommonUsages.cs @@ -11,7 +11,7 @@ public static class CommonUsages /// Primary 2D motion control. /// /// - /// Example: left stick on gamepad. + /// Example: Left stick on a gamepad. /// public static readonly InternedString Primary2DMotion = new InternedString("Primary2DMotion"); @@ -19,17 +19,74 @@ public static class CommonUsages /// Secondary 2D motion control. /// /// - /// Example: right stick on gamepad. + /// Example: Right stick on a gamepad. /// public static readonly InternedString Secondary2DMotion = new InternedString("Secondary2DMotion"); + /// + /// The primary action control on any input device, such as a gamepad, mouse, or keyboard. + /// + /// + /// Example: Primary mouse button (left button on right-handed configuration, right button on left-handed configuration), + /// south-button on a gamepad. + /// public static readonly InternedString PrimaryAction = new InternedString("PrimaryAction"); + + /// + /// Secondary action control on any input device, such as a gamepad, mouse, or keyboard. + /// + /// + /// Example: Secondary mouse button (right button on right-handed configuration, left button on left-handed configuration), + /// east-button on a gamepad. + /// public static readonly InternedString SecondaryAction = new InternedString("SecondaryAction"); + + /// + /// The primary trigger control on input devices with triggers. + /// + /// + /// Example: Right trigger-button on a gamepad. + /// public static readonly InternedString PrimaryTrigger = new InternedString("PrimaryTrigger"); + + /// + /// The secondary trigger control on input devices with triggers. + /// + /// + /// Example: Left trigger-button on a gamepad. + /// public static readonly InternedString SecondaryTrigger = new InternedString("SecondaryTrigger"); - public static readonly InternedString Modifier = new InternedString("Modifier"); // Stuff like CTRL + + /// + /// A modifier action control that modifies usage of other controls. + /// + /// + /// Example: Keyboard modifier keys like CTRL, SHIFT, ALT, OPTION, etc. + /// + public static readonly InternedString Modifier = new InternedString("Modifier"); + + /// + /// The spatial position control on input devices with spatial tracking. + /// + /// + /// Example: User head position in tracking-space using e.g. a head-tracking system. This could for example be a VR tracking system or another user-facing tracking sensor. + /// public static readonly InternedString Position = new InternedString("Position"); + + /// + /// The spatial orientation control on input devices with spatial tracking. + /// + /// + /// Example: User head-orientation in tracking-space using e.g. a head-tracking system. This could for example be a VR tracking system or another user-facing tracking sensor. + /// public static readonly InternedString Orientation = new InternedString("Orientation"); + + /// + /// The primary hat-switch control on input devices with hat-switches such as joysticks or gamepads. + /// + /// + /// Example: Joystick or gamepad hat-switch. + /// public static readonly InternedString Hatswitch = new InternedString("Hatswitch"); /// @@ -108,9 +165,22 @@ public static class CommonUsages /// public static readonly InternedString ScrollVertical = new InternedString("ScrollVertical"); + /// + /// A screen-space point. + /// + /// + /// Example: Touch contact point. + /// public static readonly InternedString Point = new InternedString("Point"); + /// + /// Low-frequency haptic motor for force-feedback. + /// public static readonly InternedString LowFreqMotor = new InternedString("LowFreqMotor"); + + /// + /// High-frequency haptic motor for force-feedback. + /// public static readonly InternedString HighFreqMotor = new InternedString("HighFreqMotor"); /// diff --git a/Packages/com.unity.inputsystem/InputSystem/InputExtensions.cs b/Packages/com.unity.inputsystem/InputSystem/InputExtensions.cs index d0084633ee..d0765b5db4 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputExtensions.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputExtensions.cs @@ -53,8 +53,8 @@ public static bool IsActive(this TouchPhase phase) /// Check if a enum value represents a modifier key. /// /// The key enum value you want to check. + /// true if represents a modifier key, else false. /// - /// Returns true if this key is a modifier key, false otherwise. /// Modifier keys are any keys you can hold down to modify the output of other keys pressed simultaneously, /// such as the "shift" or "control" keys. /// @@ -80,9 +80,7 @@ public static bool IsModifierKey(this Key key) /// Check if a enum value represents key generating text input. /// /// The key enum value you want to check. - /// - /// Returns true if this key is a key generating non-whitespace character input, false otherwise. - /// + /// true if represents a key generating non-whitespace text input, else false. public static bool IsTextInputKey(this Key key) { switch (key) diff --git a/Packages/com.unity.inputsystem/InputSystem/InputSettings.cs b/Packages/com.unity.inputsystem/InputSystem/InputSettings.cs index 6854b4b869..8fc6f4dbec 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputSettings.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputSettings.cs @@ -44,7 +44,7 @@ namespace UnityEngine.InputSystem public partial class InputSettings : ScriptableObject { /// - /// Determine how the input system updates, i.e. processes pending input events. + /// Allows you to control how the input system handles updates. In other words, how and when pending input events are processed. /// /// When to run input updates. /// @@ -361,6 +361,18 @@ public float defaultTapTime } } + /// + /// Allows you to specify the default minimum duration required of a press-and-release interaction to evaluate to a slow-tap-interaction. + /// + /// The default minimum duration that the button-like input control must remain in pressed state for the interaction to evaluate to a slow-tap-interaction. + /// + /// A slow-tap-interaction is considered as a press-and-release sequence on a button-like input control. + /// This property determines the lower bound of the duration that must elapse between the button being pressed and released again. + /// If the delay between press and release is less than this duration, the input does not qualify as a slow-tap-interaction. + /// + /// The default slow-tap time is 0.5 seconds. + /// + /// public float defaultSlowTapTime { get => m_DefaultSlowTapTime; @@ -374,6 +386,18 @@ public float defaultSlowTapTime } } + /// + /// Allows you to specify the default minimum duration required of a press-and-release interaction to evaluate to a hold-interaction. + /// + /// The default minimum duration that the button-like input control must remain in pressed state for the interaction to evaluate to a hold-interaction. + /// + /// A hold-interaction is considered as a press-and-release sequence on a button-like input control. + /// This property determines the lower bound of the duration that must elapse between the button being pressed and released again. + /// If the delay between press and release is less than this duration, the input does not qualify as a hold-interaction. + /// + /// The default hold time is 0.4 seconds. + /// + /// public float defaultHoldTime { get => m_DefaultHoldTime; @@ -387,6 +411,20 @@ public float defaultHoldTime } } + /// + /// Allows you to specify the default maximum radius that a touch contact may be moved from its origin to evaluate to a tap-interaction. + /// + /// The default maximum radius (in pixels) that a touch contact may be moved from its origin to evaluate to a tap-interaction. + /// + /// A tap-interaction or slow-tap-interaction is considered as a press-and-release sequence. + /// If the associated touch contact is moved a distance equal or greater to the value of this setting, + /// the input sequence do not qualify as a tap-interaction. + /// + /// The default tap-radius is 5 pixels. + /// + /// + /// + /// public float tapRadius { get => m_TapRadius; @@ -400,6 +438,19 @@ public float tapRadius } } + /// + /// Allows you to specify the maximum duration that may pass between taps in order to evaluate to a multi-tap-interaction. + /// + /// The default maximum duration (in seconds) that may pass between taps in order to evaluate to a multi-tap-interaction. + /// + /// A multi-tap interaction is considered as multiple press-and-release sequences. + /// This property defines the maximum duration that may pass between these press-and-release sequences. + /// If consecutive taps (press-and-release sequences) occur with a inter-sequence duration exceeding + /// this property, the interaction do not qualify as a multi-tap-interaction. + /// + /// The default multi-tap delay time is 0.75 seconds. + /// + /// public float multiTapDelayTime { get => m_MultiTapDelayTime; diff --git a/Packages/com.unity.inputsystem/InputSystem/Utilities/PrimitiveValue.cs b/Packages/com.unity.inputsystem/InputSystem/Utilities/PrimitiveValue.cs index c16f699309..960b6664d6 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Utilities/PrimitiveValue.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Utilities/PrimitiveValue.cs @@ -848,6 +848,7 @@ public static PrimitiveValue FromObject(object value) /// Create a PrimitiveValue holding a bool. /// /// A boolean value. + /// A PrimitiveValue set to public static implicit operator PrimitiveValue(bool value) { return new PrimitiveValue(value); @@ -857,6 +858,7 @@ public static PrimitiveValue FromObject(object value) /// Create a PrimitiveValue holding a character. /// /// A character. + /// A PrimitiveValue set to public static implicit operator PrimitiveValue(char value) { return new PrimitiveValue(value); @@ -866,6 +868,7 @@ public static PrimitiveValue FromObject(object value) /// Create a PrimitiveValue holding a byte. /// /// A byte value. + /// A PrimitiveValue set to public static implicit operator PrimitiveValue(byte value) { return new PrimitiveValue(value); @@ -875,6 +878,7 @@ public static PrimitiveValue FromObject(object value) /// Create a PrimitiveValue holding a signed byte. /// /// A signed byte value. + /// A PrimitiveValue set to public static implicit operator PrimitiveValue(sbyte value) { return new PrimitiveValue(value); @@ -884,6 +888,7 @@ public static PrimitiveValue FromObject(object value) /// Create a PrimitiveValue holding a short. /// /// A short value. + /// A PrimitiveValue set to public static implicit operator PrimitiveValue(short value) { return new PrimitiveValue(value); @@ -893,6 +898,7 @@ public static PrimitiveValue FromObject(object value) /// Create a PrimitiveValue holding an unsigned short. /// /// An unsigned short value. + /// A PrimitiveValue set to public static implicit operator PrimitiveValue(ushort value) { return new PrimitiveValue(value); @@ -902,6 +908,7 @@ public static PrimitiveValue FromObject(object value) /// Create a PrimitiveValue holding an int. /// /// An int value. + /// A PrimitiveValue set to public static implicit operator PrimitiveValue(int value) { return new PrimitiveValue(value); @@ -911,6 +918,7 @@ public static PrimitiveValue FromObject(object value) /// Create a PrimitiveValue holding an unsigned int. /// /// An unsigned int value. + /// A PrimitiveValue set to public static implicit operator PrimitiveValue(uint value) { return new PrimitiveValue(value); @@ -920,6 +928,7 @@ public static PrimitiveValue FromObject(object value) /// Create a PrimitiveValue holding a long. /// /// A long value. + /// A PrimitiveValue set to public static implicit operator PrimitiveValue(long value) { return new PrimitiveValue(value); @@ -929,6 +938,7 @@ public static PrimitiveValue FromObject(object value) /// Create a PrimitiveValue holding a ulong. /// /// An unsigned long value. + /// A PrimitiveValue set to public static implicit operator PrimitiveValue(ulong value) { return new PrimitiveValue(value); @@ -938,6 +948,7 @@ public static PrimitiveValue FromObject(object value) /// Create a PrimitiveValue holding a float. /// /// A float value. + /// A PrimitiveValue set to public static implicit operator PrimitiveValue(float value) { return new PrimitiveValue(value); @@ -947,6 +958,7 @@ public static PrimitiveValue FromObject(object value) /// Create a PrimitiveValue holding a double. /// /// A double value. + /// A PrimitiveValue set to public static implicit operator PrimitiveValue(double value) { return new PrimitiveValue(value); @@ -954,61 +966,121 @@ public static PrimitiveValue FromObject(object value) // The following methods exist only to make the annoying Microsoft code analyzer happy. + /// + /// Constructs a PrimitiveValue from . + /// + /// The value to be stored in the returned PrimitiveValue. + /// A PrimitiveValue set to public static PrimitiveValue FromBoolean(bool value) { return new PrimitiveValue(value); } + /// + /// Constructs a PrimitiveValue from . + /// + /// The value to be stored in the returned PrimitiveValue. + /// A PrimitiveValue set to public static PrimitiveValue FromChar(char value) { return new PrimitiveValue(value); } + /// + /// Constructs a PrimitiveValue from . + /// + /// The value to be stored in the returned PrimitiveValue. + /// A PrimitiveValue set to public static PrimitiveValue FromByte(byte value) { return new PrimitiveValue(value); } + /// + /// Constructs a PrimitiveValue from . + /// + /// The value to be stored in the returned PrimitiveValue. + /// A PrimitiveValue set to public static PrimitiveValue FromSByte(sbyte value) { return new PrimitiveValue(value); } + /// + /// Constructs a PrimitiveValue from . + /// + /// The value to be stored in the returned PrimitiveValue. + /// A PrimitiveValue set to public static PrimitiveValue FromInt16(short value) { return new PrimitiveValue(value); } + /// + /// Constructs a PrimitiveValue from . + /// + /// The value to be stored in the returned PrimitiveValue. + /// A PrimitiveValue set to public static PrimitiveValue FromUInt16(ushort value) { return new PrimitiveValue(value); } + /// + /// Constructs a PrimitiveValue from . + /// + /// The value to be stored in the returned PrimitiveValue. + /// A PrimitiveValue set to public static PrimitiveValue FromInt32(int value) { return new PrimitiveValue(value); } + /// + /// Constructs a PrimitiveValue from . + /// + /// The value to be stored in the returned PrimitiveValue. + /// A PrimitiveValue set to public static PrimitiveValue FromUInt32(uint value) { return new PrimitiveValue(value); } + /// + /// Constructs a PrimitiveValue from . + /// + /// The value to be stored in the returned PrimitiveValue. + /// A PrimitiveValue set to public static PrimitiveValue FromInt64(long value) { return new PrimitiveValue(value); } + /// + /// Constructs a PrimitiveValue from . + /// + /// The value to be stored in the returned PrimitiveValue. + /// A PrimitiveValue set to public static PrimitiveValue FromUInt64(ulong value) { return new PrimitiveValue(value); } + /// + /// Constructs a PrimitiveValue from . + /// + /// The value to be stored in the returned PrimitiveValue. + /// A PrimitiveValue set to public static PrimitiveValue FromSingle(float value) { return new PrimitiveValue(value); } + /// + /// Constructs a PrimitiveValue from . + /// + /// The value to be stored in the returned PrimitiveValue. + /// A PrimitiveValue set to public static PrimitiveValue FromDouble(double value) { return new PrimitiveValue(value); diff --git a/Packages/com.unity.inputsystem/InputSystem/Utilities/ReadOnlyArray.cs b/Packages/com.unity.inputsystem/InputSystem/Utilities/ReadOnlyArray.cs index c761172e62..cb43d947c6 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Utilities/ReadOnlyArray.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Utilities/ReadOnlyArray.cs @@ -69,6 +69,19 @@ public TValue[] ToArray() return result; } + /// + /// Searches for the first element in the array for which the given is true and returns the index of that element. + /// + /// The predicate to be evaluated for each element which defines the condition for the search. + /// Index of the first element for which is truex or -1 if no such element exists. + /// If predicate is null. + /// + /// + /// // Searches for the first element in an integer array that is greater or equal to 5. + /// var haystack = new ReadOnlyArray<int>(new[] { 1, 2, 3, 4, 5, 6, 7 }); + /// var index = haystack.IndexOf((value) => value >= 5); // index == 4 + /// + /// public int IndexOf(Predicate predicate) { if (predicate == null) @@ -93,16 +106,22 @@ public Enumerator GetEnumerator() return new Enumerator(m_Array, m_StartIndex, m_Length); } + /// IEnumerator IEnumerable.GetEnumerator() { return GetEnumerator(); } + /// IEnumerator IEnumerable.GetEnumerator() { return GetEnumerator(); } + /// + /// Constructs a read-only array containing elements . + /// + /// An existing array containing elements to be wrapped as a read-only array. [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2225:OperatorOverloadsHaveNamedAlternates", Justification = "`ToXXX` message only really makes sense as static, which is not recommended for generic types.")] public static implicit operator ReadOnlyArray(TValue[] array) { @@ -192,6 +211,13 @@ public TValue Current /// public static class ReadOnlyArrayExtensions { + /// + /// Evaluates whether contains an element that compares equal to . + /// + /// The array element type. + /// Reference to the read-only array to be searched. + /// The value to be searched for in . + /// true if contains , else false. public static bool Contains(this ReadOnlyArray array, TValue value) where TValue : IComparable { @@ -201,12 +227,26 @@ public static bool Contains(this ReadOnlyArray array, TValue val return false; } + /// + /// Evaluates whether contains a reference to . + /// + /// The array element type. + /// Reference to the read-only array to be searched. + /// The reference to be searched for in . + /// true if contains a reference to , else false. public static bool ContainsReference(this ReadOnlyArray array, TValue value) where TValue : class { return IndexOfReference(array, value) != -1; } + /// + /// Retrieves the index of in . + /// + /// The array element type. + /// Reference to the read-only array to be searched. + /// The reference to be searched for in . + /// The zero-based index of element in if such a reference could be found and -1 if it do not exist. public static int IndexOfReference(this ReadOnlyArray array, TValue value) where TValue : class { @@ -216,6 +256,14 @@ public static int IndexOfReference(this ReadOnlyArray array, TVa return -1; } + /// + /// Evaluates whether whether and contain the same sequence of references. + /// + /// The array element type. + /// The first array to be evaluated. + /// The second array to be evaluated. + /// The maximum number of elements to be compared. + /// true if the first elements of and contain the same references, else false. internal static bool HaveEqualReferences(this ReadOnlyArray array1, IReadOnlyList array2, int count = int.MaxValue) { var length1 = Math.Min(array1.Count, count); From e0b76e2f8065e3e7f8d15d0dd16688c473ddbb69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kan=20Sidenvall?= Date: Wed, 6 Apr 2022 15:40:11 +0200 Subject: [PATCH 50/53] FIX: Workaround for System.CodeDom test failures relating to Unity 2022 and .NET Standard (#1529) * FIX: Improved error message detail for codedom compilation errors and added workaround for compiling on Unity 2022 or with netstandard API profile. --- Assets/Tests/InputSystem/CoreTests_Editor.cs | 28 +++++++++++++------ .../Unity.InputSystem.Tests.asmdef | 5 ---- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Assets/Tests/InputSystem/CoreTests_Editor.cs b/Assets/Tests/InputSystem/CoreTests_Editor.cs index 9404016ff5..f7a6229878 100644 --- a/Assets/Tests/InputSystem/CoreTests_Editor.cs +++ b/Assets/Tests/InputSystem/CoreTests_Editor.cs @@ -2181,9 +2181,9 @@ public void Editor_ActionTree_CompositesAreShownWithNiceNames() Assert.That(tree["map/action"].children[0].displayName, Is.EqualTo("1D Axis")); } - #if UNITY_STANDALONE // CodeDom API not available in most players. We only build and run this in the editor but we're - // still affected by the current platform. -#if !TEMP_DISABLE_EDITOR_TESTS_ON_TRUNK // Temporary: Disables tests while net-profile passed from UTR to trunk is overridden to netstandard (missing CodeDom) +#if UNITY_STANDALONE // CodeDom API not available in most players. We only build and run this in the editor but we're + // still affected by the current platform. +#if !NET_STANDARD_2_0 // Not possible to run when using .NET standard at the moment. [Test] [Category("Editor")] [TestCase("MyControls (2)", "MyNamespace", "", "MyNamespace.MyControls2")] @@ -2223,9 +2223,8 @@ public void Editor_CanGenerateCodeWrapperForInputAsset(string assetName, string Assert.That(set1map.ToJson(), Is.EqualTo(map1.ToJson())); } +#endif // !NET_STANDARD_2_0 #endif -#endif - // Can take any given registered layout and generate a cross-platform C# struct for it // that collects all the control values from both proper and optional controls (based on // all derived layouts). @@ -2881,7 +2880,7 @@ private void AssertAssetIsUnmodifiedAfterExitingPlayMode(Action, System.IFormattable + // causing compilation failure for 2022 versions. This is a workaround for running these tests. + var netstandard = Assembly.Load("netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51"); + cp.ReferencedAssemblies.Add(netstandard.Location); +#endif var cr = codeProvider.CompileAssemblyFromSource(cp, code); var assembly = cr.CompiledAssembly; @@ -3070,7 +3075,12 @@ internal static Type Compile(string code, string typeName, string options = null if (cr.Errors.HasErrors) { if (!Encoding.UTF8.GetBytes(cr.Errors[0].ErrorText).SequenceEqual(Encoding.UTF8.GetPreamble())) - Assert.Fail($"Compilation failed: {cr.Errors}"); + { + var sb = new StringBuilder("Compilation of generated code failed:"); + for (var i = 0; i < cr.Errors.Count; ++i) + sb.Append("\n").Append(cr.Errors[i].ErrorText); + Assert.Fail(sb.ToString()); + } foreach (var tempFile in cr.TempFiles) { @@ -3088,8 +3098,8 @@ internal static Type Compile(string code, string typeName, string options = null return type; } -#endif -#endif +#endif // !NET_STANDARD_2_0 +#endif // UNITY_STANDALONE [Test] [Category("Editor")] diff --git a/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef b/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef index 0752cc681a..c774d89566 100644 --- a/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef +++ b/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef @@ -30,11 +30,6 @@ "expression": "1.0", "define": "HAVE_DOCTOOLS_INSTALLED" }, - { - "name": "Unity", - "expression": "[2022.2.0a1,2022.2.0a10)", - "define": "TEMP_DISABLE_EDITOR_TESTS_ON_TRUNK" - }, { "name": "Unity", "expression": "[2021.2,2021.3)", From 524455d9114e12f12b6e18069050c91a0719f94e Mon Sep 17 00:00:00 2001 From: unity-cwells <47453839+unity-cwells@users.noreply.github.com> Date: Fri, 8 Apr 2022 10:20:22 +0100 Subject: [PATCH 51/53] FIX: Input devices sometimes marked as disabled on reconnect (#1524). --- Assets/Tests/InputSystem/CoreTests_Devices.cs | 46 +++++++++++++++++++ Packages/com.unity.inputsystem/CHANGELOG.md | 1 + .../InputSystem/InputManager.cs | 1 + 3 files changed, 48 insertions(+) diff --git a/Assets/Tests/InputSystem/CoreTests_Devices.cs b/Assets/Tests/InputSystem/CoreTests_Devices.cs index 662f9b751d..96c5f2b366 100644 --- a/Assets/Tests/InputSystem/CoreTests_Devices.cs +++ b/Assets/Tests/InputSystem/CoreTests_Devices.cs @@ -1501,6 +1501,52 @@ public void Devices_WhenRetainedOnDisconnectedList_CanBeReconnected(string devic Assert.That(InputSystem.disconnectedDevices, Is.Empty); } + // https://fogbugz.unity3d.com/f/cases/1404320 + [Test] + [Category("Devices")] + public void Devices_CanReconnectDevice_WhenDisconnectedWhileAppIsOutOfFocus() + { + runtime.runInBackground = true; + + var deviceDesc = new InputDeviceDescription + { + deviceClass = "Gamepad", + product = "TestDevice", + serial = "1234" + }; + + var deviceId = runtime.ReportNewInputDevice(deviceDesc); + InputSystem.Update(); + + var device = InputSystem.GetDeviceById(deviceId); + Assert.That(device, Is.Not.Null); + + // Loose focus. + runtime.PlayerFocusLost(); + InputSystem.Update(); + + // Disconnect. + var inputEvent = DeviceRemoveEvent.Create(deviceId, runtime.currentTime); + InputSystem.QueueEvent(ref inputEvent); + InputSystem.Update(); + + Assert.That(InputSystem.disconnectedDevices, Is.EquivalentTo(new[] { device })); + Assert.That(InputSystem.devices, Is.Empty); + + // Regain focus. + runtime.PlayerFocusGained(); + InputSystem.Update(); + + var newDeviceId = runtime.ReportNewInputDevice(deviceDesc); + InputSystem.Update(); + + var newDevice = InputSystem.GetDeviceById(newDeviceId); + Assert.That(newDevice, Is.SameAs(device)); + + Assert.That(device.added, Is.True); + Assert.That(device.enabled, Is.True); + } + [Test] [Category("Devices")] public void Devices_WhenRemoved_DoNotEmergeOnUnsupportedList() diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index d782af5e9a..920f78a834 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -59,6 +59,7 @@ however, it has to be formatted properly to pass verification tests. - Fixed missing tooltips in PlayerInputManagerEditor for the Player Limit and Fixed Splitscreen sizes labels ([case 1396945](https://issuetracker.unity3d.com/issues/player-input-manager-pops-up-placeholder-text-when-hovering-over-it)). - Fixed DualShock 4 controllers not working in some scenarios by adding support for extended mode HID reports ([case 1281633](https://issuetracker.unity3d.com/issues/input-system-dualshock4-controller-returns-random-input-values-when-connected-via-bluetooth-while-steam-is-running), case 1409867). - Fixed `BackgroundBehavior.IgnoreFocus` having no effect when `Application.runInBackground` was false ([case 1400456](https://issuetracker.unity3d.com/issues/xr-head-tracking-lost-when-lost-focus-with-action-based-trackedposedriver-on-android)). +- Fixed an issue where a device was left disabled when it was disconnected while an application was out-of-focus and then re-connected when in-focus (case 1404320). #### Actions diff --git a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs index 777625a6c5..d3f06ce21e 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs @@ -2248,6 +2248,7 @@ private void OnNativeDeviceDiscovered(int deviceId, string deviceDescriptor) device.m_DeviceId = deviceId; device.m_DeviceFlags |= InputDevice.DeviceFlags.Native; device.m_DeviceFlags &= ~InputDevice.DeviceFlags.DisabledInFrontend; + device.m_DeviceFlags &= ~InputDevice.DeviceFlags.DisabledWhileInBackground; device.m_DeviceFlags &= ~InputDevice.DeviceFlags.DisabledStateHasBeenQueriedFromRuntime; AddDevice(device); From 224aa412600b2f6a0918f6af9a4c8afaf11841e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kan=20Sidenvall?= Date: Fri, 8 Apr 2022 17:00:59 +0200 Subject: [PATCH 52/53] CI workaround via extended ignore ranges for UIToolkit and IL2CPP mac issue relating to XBox controller (#1532) * FIX: Extended disabled ranges for currently failing trunk tests to make CI green while investigating further. --- Assets/Tests/InputSystem/Plugins/UITests.cs | 12 ++++++++---- .../Tests/InputSystem/Unity.InputSystem.Tests.asmdef | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Assets/Tests/InputSystem/Plugins/UITests.cs b/Assets/Tests/InputSystem/Plugins/UITests.cs index 5dfb0ecf04..13214a8474 100644 --- a/Assets/Tests/InputSystem/Plugins/UITests.cs +++ b/Assets/Tests/InputSystem/Plugins/UITests.cs @@ -3417,15 +3417,19 @@ public void UI_CanDriveVirtualMouseCursorFromGamepad() #if UNITY_2021_2_OR_NEWER [UnityTest] [Category("UI")] - [TestCase(UIPointerBehavior.AllPointersAsIs, ExpectedResult = 1)] + [TestCase(UIPointerBehavior.AllPointersAsIs, ExpectedResult = 1 +#if TEMP_DISABLE_UITOOLKIT_TEST && (UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN) + , Ignore = "Currently fails on MacOS, MacOS standalone, MacOS standalone IL2CPP player on Unity version 2022.2 CI" +#endif + )] [TestCase(UIPointerBehavior.SingleMouseOrPenButMultiTouchAndTrack, ExpectedResult = 1 - #if UNITY_STANDALONE_OSX && TEMP_DISABLE_UITOOLKIT_TEST +#if TEMP_DISABLE_UITOOLKIT_TEST && (UNITY_STANDALONE_OSX) // temporarily disable this test case on OSX player for 2021.2. It only intermittently works and I don't know why! , Ignore = "Currently fails on OSX IL2CPP player on Unity version 2021.2" - #endif +#endif )] [TestCase(UIPointerBehavior.SingleUnifiedPointer, ExpectedResult = 1)] -#if UNITY_ANDROID || UNITY_IOS || UNITY_TVOS +#if (UNITY_ANDROID || UNITY_IOS || UNITY_TVOS) || (TEMP_DISABLE_UITOOLKIT_TEST && (UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN)) [Ignore("Currently fails on the farm but succeeds locally on Note 10+; needs looking into.")] #endif [PrebuildSetup(typeof(UI_CanOperateUIToolkitInterface_UsingInputSystemUIInputModule_Setup))] diff --git a/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef b/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef index c774d89566..0240f6980c 100644 --- a/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef +++ b/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef @@ -32,17 +32,17 @@ }, { "name": "Unity", - "expression": "[2021.2,2021.3)", + "expression": "[2021.1,2021.2)", "define": "TEMP_DISABLE_UITOOLKIT_TEST" }, { "name": "Unity", - "expression": "[2022.1,2022.2)", + "expression": "[2022.2.0a1,2022.2.0b16)", "define": "TEMP_DISABLE_UITOOLKIT_TEST" }, { "name": "Unity", - "expression": "[2022.2.0a1,2022.2.0a10)", + "expression": "[2022.2.0a1,2022.2.0a12)", "define": "TEMP_DISABLE_STANDALONE_OSX_XINPUT_TEST" } ], From 27c54538a2ee7f55884cbb1ebaf6e8cf42737948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kan=20Sidenvall?= Date: Sun, 10 Apr 2022 20:03:51 +0200 Subject: [PATCH 53/53] RELEASE: 1.4.0 --- Packages/com.unity.inputsystem/CHANGELOG.md | 29 +++++++++------------ 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 920f78a834..530f5d7468 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -8,11 +8,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. Due to package verification, the latest version below is the unpublished version and the date is meaningless. however, it has to be formatted properly to pass verification tests. -## [Unreleased] +## [1.4.0] - 2022-04-10 ### Changed -- `Button` type `InputAction`s now go to `started` when a button goes from a press to below the release threshold but not yet to 0 ([case ] +- `Button` type `InputAction`s now go to `started` when a button goes from a press to below the release threshold but not yet to 0. ```CSharp // Before: Set(Gamepad.current.rightTrigger, 0.7f); // Performed (pressed) @@ -73,20 +73,6 @@ however, it has to be formatted properly to pass verification tests. * This was a regression introduced in [1.0.0-pre.6](#axiscomposite-min-max-value-fix). - Fixed calling `action.AddCompositeBinding(...).With(...)` while action is enabled not correctly updating controls for part bindings of the composite. - Fixed `TwoModifiersComposite` inadvertently not allowing controls other than `ButtonControl`s being bound to its `binding` part. - -### Added - -- Added support for "Hori Co HORIPAD for Nintendo Switch", "HORI Pokken Tournament DX Pro Pad", "HORI Wireless Switch Pad", "HORI Real Arcade Pro V Hayabusa in Switch Mode", "PowerA NSW Fusion Wired FightPad", "PowerA NSW Fusion Pro Controller (USB only)", "PDP Wired Fight Pad Pro: Mario", "PDP Faceoff Wired Pro Controller for Nintendo Switch", "PDP Faceoff Wired Pro Controller for Nintendo Switch", "PDP Afterglow Wireless Switch Controller", "PDP Rockcandy Wired Controller". -- Added support for SteelSeries Nimbus+ gamepad on Mac (addition contributed by [Mollyjameson](https://github.com/MollyJameson)). -- Added support for Game Core platforms to XR layouts, devices, and input controls. These classes were previously only enabled on platforms where `ENABLE_VR` is defined. -- Added a new `DeltaControl` control type that is now used for delta-style controls such as `Mouse.delta` and `Mouse.scroll`. - * Like `StickControl`, this control has individual `up`, `down`, `left`, and `right` controls (as well as `x` and `y` that it inherits from `Vector2Control`). This means it is now possible to directly bind to individual scroll directions (such as `/scroll/up`). -- Added the 'Cursor Lock Behavior' setting to InputSystemUIInputModule to control the origin point of UI raycasts when the cursor is locked. This enables the use of PhysicsRaycaster when the cursor is locked to the center of the screen ([case 1395281](https://issuetracker.unity3d.com/product/unity/issues/guid/1395281/)). -- Added support for using the Unity Remote app with the input system. - * Requires Unity 2021.2.18 or later. - -#### Actions - - Added support for keyboard shortcuts and mutually exclusive use of modifiers. * In short, this means that a "Shift+B" binding can now prevent a "B" binding from triggering. * `OneModifierComposite`, `TwoModifiersComposite`, as well as the legacy `ButtonWithOneModifierComposite` and `ButtonWithTwoModifiersComposite` now require their modifiers to be pressed __before__ (or at least simultaneously with) pressing the target button. @@ -119,6 +105,17 @@ however, it has to be formatted properly to pass verification tests. new InputBinding("/delta")); ``` +### Added + +- Added support for "Hori Co HORIPAD for Nintendo Switch", "HORI Pokken Tournament DX Pro Pad", "HORI Wireless Switch Pad", "HORI Real Arcade Pro V Hayabusa in Switch Mode", "PowerA NSW Fusion Wired FightPad", "PowerA NSW Fusion Pro Controller (USB only)", "PDP Wired Fight Pad Pro: Mario", "PDP Faceoff Wired Pro Controller for Nintendo Switch", "PDP Faceoff Wired Pro Controller for Nintendo Switch", "PDP Afterglow Wireless Switch Controller", "PDP Rockcandy Wired Controller". +- Added support for SteelSeries Nimbus+ gamepad on Mac (addition contributed by [Mollyjameson](https://github.com/MollyJameson)). +- Added support for Game Core platforms to XR layouts, devices, and input controls. These classes were previously only enabled on platforms where `ENABLE_VR` is defined. +- Added a new `DeltaControl` control type that is now used for delta-style controls such as `Mouse.delta` and `Mouse.scroll`. + * Like `StickControl`, this control has individual `up`, `down`, `left`, and `right` controls (as well as `x` and `y` that it inherits from `Vector2Control`). This means it is now possible to directly bind to individual scroll directions (such as `/scroll/up`). +- Added the 'Cursor Lock Behavior' setting to InputSystemUIInputModule to control the origin point of UI raycasts when the cursor is locked. This enables the use of PhysicsRaycaster when the cursor is locked to the center of the screen ([case 1395281](https://issuetracker.unity3d.com/product/unity/issues/guid/1395281/)). +- Added support for using the Unity Remote app with the Input System. + * Requires Unity 2021.2.18 or later. + ## [1.3.0] - 2021-12-10 ### Changed