RELEASE: Merge dvelop.

Author: douglas-piconi

Assets/Samples/SimpleDemo/README.md

@@ -113,7 +113,7 @@ public class SimpleController : MonoBehaviour
 }
 ```
 
-but then we would have to look up all the actions manually in the action map. A simple approach is to put all our actions in a separate asset and generate a C# wrapper class that automatically performs the lookup for us.
+but then we would have to look up all the actions manually in the action map. A simpler approach is to put all our actions in a separate asset and generate a C# wrapper class that automatically performs the lookup for us.
 
 To create such an `.inputactions` asset, right-click in the Project Browser and click `Create >> Input Actions`. To edit the actions, double-click the `.inputactions` asset and a separate window will come up. The asset we use in this example is [SimpleControls.inputactions](SimpleControls.inputactions).
 
@@ -153,6 +153,8 @@ public class SimpleController_UsingActionAsset
         // Same here, we can just look the actions up by name.
         var look = m_Controls.gameplay.look.ReadValue<Vector2>();
         var move = m_Controls.gameplay.move.ReadValue<Vector2>();
+
+        //...
     }
 }
 ```

Assets/Samples/SimpleDemo/SimpleControls.cs

@@ -1,4 +1,4 @@
-// GENERATED AUTOMATICALLY FROM 'Assets/Demo/SimpleDemo/SimpleControls.inputactions'
+// GENERATED AUTOMATICALLY FROM 'Assets/Samples/SimpleDemo/SimpleControls.inputactions'
 
 using System.Collections;
 using System.Collections.Generic;

Assets/Samples/SimpleDemo/SimpleControls.inputactions.meta

@@ -0,0 +1,15 @@
+{
+    "name": "InputSystem.Samples.Visualizers",
+    "references": [
+        "GUID:75469ad4d38634e559750d17036d5f7c"
+    ],
+    "optionalUnityReferences": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": true,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": []
+}

Assets/Samples/Visualizers/Unity.InputSystem.Visualizers.asmdef

@@ -5,7 +5,6 @@
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.Controls;
 using UnityEngine.InputSystem.DualShock;
-using UnityEngine.InputSystem.Steam;
 using UnityEngine.InputSystem.XInput;
 using UnityEngine.InputSystem.XR;
 using UnityEngine.SceneManagement;

Assets/Samples/Visualizers/Unity.InputSystem.Visualizers.asmdef.meta

@@ -183,8 +183,6 @@ public void Actions_CanDetermineIfMapIsUsableWithGivenDevice()
     [Category("Actions")]
     public void Actions_WhenDisabled_CancelAllStartedInteractions()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
         var action1 = new InputAction("action1", InputActionType.Button, binding: "<Gamepad>/buttonSouth", interactions: "Hold");
@@ -828,8 +826,6 @@ public void Actions_CanCreateActionsWithoutAnActionMap()
     [Category("Actions")]
     public void Actions_CanCreateActionAssetWithMultipleActionMaps()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
         var asset = ScriptableObject.CreateInstance<InputActionAsset>();
@@ -1172,8 +1168,6 @@ public void Actions_CanByPassControlActuationChecks_UsingPasshtroughAction()
     [Category("Actions")]
     public void Actions_WithMultipleBoundControls_DriveInteractionsFromControlWithGreatestActuation()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
         // We go through several permutations of the same behavior all in one test. Makes the
@@ -1502,8 +1496,6 @@ public void Actions_WithMultipleBoundControls_CanHandleInteractionsThatTriggerOn
     [Ignore("TODO")]
     public void TODO_Actions_WithMultipleActuationsFromSameState_()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var mouse = InputSystem.AddDevice<Mouse>();
         var action = new InputAction(binding: "<Mouse>/*button");
         action.Enable();
@@ -1669,8 +1661,6 @@ public void Actions_WhenTriggered_TriggerGlobalNotification()
     [Category("Actions")]
     public void Actions_CanRecordActions()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var action = new InputAction();
         action.AddBinding("<Gamepad>/leftStick");
         action.AddBinding("<Gamepad>/rightStick");
@@ -2588,8 +2578,6 @@ public void Actions_ChangingBindingMaskWhileEnabled_CancelsOngoingActions()
     [Category("Actions")]
     public void Actions_CanAddInteractionsToActions()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
         InputSystem.RegisterProcessor<ConstantVector2TestProcessor>();
@@ -2980,7 +2968,6 @@ public void Actions_WithoutInteraction_TriggerInResponseToMagnitude()
     [Category("Actions")]
     public void Actions_CanPerformHoldOnTrigger()
     {
-        InputSystem.settings.timesliceEvents = false;
         InputSystem.settings.defaultButtonPressPoint = 0.1f;
 
         var gamepad = InputSystem.AddDevice<Gamepad>();
@@ -3025,8 +3012,6 @@ public void Actions_CanPerformHoldOnTrigger()
     [Category("Actions")]
     public void Actions_CanDistinguishTapAndSlowTapOnSameAction()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         // Bindings can have more than one interaction. Depending on the interaction happening on the bound
         // controls one of the interactions may initiate a phase shift and which interaction initiated the
         // shift is visible on the callback.
@@ -3399,8 +3384,6 @@ public void TODO_Actions_ButtonTriggersActionOnlyAfterCrossingPressThreshold()
     [Category("Actions")]
     public void Actions_CanQueryStartAndPerformTime()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var gamepad = InputSystem.AddDevice("Gamepad");
 
         var action = new InputAction(binding: "/gamepad/leftTrigger", interactions: "slowTap");
@@ -5056,6 +5039,125 @@ public void Actions_CanGetSourceControlWhenReadingValueFromCompositePart()
         LogAssert.NoUnexpectedReceived();
     }
 
+    [Test]
+    [Category("Actions")]
+    public void Actions_CanCreateButtonWithOneModifierComposite()
+    {
+        InputSystem.settings.defaultButtonPressPoint = 0.1f;
+
+        // Using gamepad so we can use the triggers and make sure
+        // that the composite preserves the full button value instead
+        // of just going 0 and 1.
+        var gamepad = InputSystem.AddDevice<Gamepad>();
+
+        var action = new InputAction(type: InputActionType.Button);
+        action.AddCompositeBinding("ButtonWithOneModifier")
+            .With("Modifier", "<Gamepad>/leftTrigger")
+            .With("Modifier", "<Gamepad>/dpad/up")
+            .With("Button", "<Gamepad>/rightTrigger");
+
+        action.Enable();
+
+        using (var trace = new InputActionTrace(action))
+        {
+            Set(gamepad.leftTrigger, 0.5f);
+            Assert.That(trace, Is.Empty);
+
+            Set(gamepad.rightTrigger, 0.75f);
+            Assert.That(trace,
+                Started(action, value: 0.75f, control: gamepad.rightTrigger)
+                    .AndThen(Performed(action, value: 0.75f, control: gamepad.rightTrigger)));
+
+            trace.Clear();
+
+            Set(gamepad.leftTrigger, 0);
+            Assert.That(trace,
+                Canceled(action, value: 0f, control: gamepad.leftTrigger));
+
+            trace.Clear();
+
+            Press(gamepad.dpad.up);
+            Assert.That(trace,
+                Started(action, value: 0.75f, control: gamepad.dpad.up)
+                    .AndThen(Performed(action, value: 0.75f, control: gamepad.dpad.up)));
+
+            trace.Clear();
+
+            Set(gamepad.rightTrigger, 0);
+            Assert.That(trace,
+                Canceled(action, value: 0f, control: gamepad.rightTrigger));
+
+            trace.Clear();
+
+            Release(gamepad.dpad.up);
+            Set(gamepad.rightTrigger, 0.456f);
+
+            Assert.That(trace, Is.Empty);
+        }
+    }
+
+    [Test]
+    [Category("Actions")]
+    public void Actions_CanCreateButtonWithTwoModifiersComposite()
+    {
+        InputSystem.settings.defaultButtonPressPoint = 0.1f;
+
+        // Using gamepad so we can use the triggers and make sure
+        // that the composite preserves the full button value instead
+        // of just going 0 and 1.
+        var gamepad = InputSystem.AddDevice<Gamepad>();
+
+        var action = new InputAction(type: InputActionType.Button);
+        action.AddCompositeBinding("ButtonWithTwoModifiers")
+            .With("Modifier1", "<Gamepad>/leftTrigger")
+            .With("Modifier1", "<Gamepad>/dpad/up")
+            .With("Modifier2", "<Gamepad>/rightTrigger")
+            .With("Modifier2", "<Gamepad>/dpad/down")
+            .With("Button", "<Gamepad>/leftStick/up");
+
+        action.Enable();
+
+        using (var trace = new InputActionTrace(action))
+        {
+            Set(gamepad.leftTrigger, 0.345f);
+            Assert.That(trace, Is.Empty);
+
+            Set(gamepad.rightTrigger, 0.456f);
+            Assert.That(trace, Is.Empty);
+
+            Set(gamepad.leftStick, new Vector2(0, 0.75f));
+            Assert.That(trace,
+                Started(action,
+                    value: 0.75f,
+                    control: gamepad.leftStick.up)
+                    .AndThen(Performed(action,
+                    value: 0.75f,
+                    control: gamepad.leftStick.up)));
+
+            trace.Clear();
+
+            Press(gamepad.dpad.up);
+            Set(gamepad.leftTrigger, 0);
+
+            // Bit counter-intuitive but the composite yields a value every time
+            // one of the constituents change.
+            Assert.That(trace,
+                Performed(action,
+                    value: 0.75f,
+                    control: gamepad.dpad.up)
+                    .AndThen(Performed(action,
+                    value: 0.75f,
+                    control: gamepad.leftTrigger)));
+
+            trace.Clear();
+
+            Set(gamepad.rightTrigger, 0);
+
+            Assert.That(trace,
+                Canceled(action, value: 0f, control: gamepad.rightTrigger));
+        }
+    }
+
     [Test]
     [Category("Actions")]
     public void Actions_CanSerializeAndDeserializeActionMapsWithCompositeBindings()
@@ -5827,8 +5929,6 @@ public void Actions_CanIterateOverActionsInMap()
     [Category("Actions")]
     public void Actions_CanUseTouchWithActions()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var touchscreen = InputSystem.AddDevice<Touchscreen>();
 
         var primaryTouchAction = new InputAction("PrimaryTouch" , binding: "<Touchscreen>/primaryTouch/position");
@@ -5899,8 +5999,6 @@ public void Actions_CanUseTouchWithActions()
     [Category("Actions")]
     public void Actions_CanDrivePointerInputFromTouchPenAndMouse()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         // Give us known parameters for tap detection.
         InputSystem.settings.defaultTapTime = 0.5f;
         InputSystem.settings.tapRadius = 5;

Assets/Tests/DemoGameTestFixture.cs

@@ -143,8 +143,6 @@ public void Actions_CanPerformPressInteraction()
     [Category("Actions")]
     public void Actions_CanPerformHoldInteraction()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         const int timeOffset = 123;
         runtime.currentTimeOffsetToRealtimeSinceStartup = timeOffset;
         runtime.currentTime = 10 + timeOffset;
@@ -256,8 +254,6 @@ public void Actions_CanPerformHoldInteraction()
     [Category("Actions")]
     public void Actions_CanPerformTapInteraction()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
         var performedReceivedCalls = 0;
@@ -315,8 +311,6 @@ public void Actions_CanPerformTapInteraction()
     [Category("Actions")]
     public void Actions_CanPerformDoubleTapInteraction()
     {
-        InputSystem.settings.timesliceEvents = false;
-
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
         runtime.advanceTimeEachDynamicUpdate = 0;

Assets/Tests/InputSystem/CoreTests_Actions.cs

@@ -574,14 +574,15 @@ public void Controls_CanQueueValueChange()
     [Category("Controls")]
     public void Controls_CanQueueValueChange_InFuture()
     {
+        InputSystem.settings.updateMode = InputSettings.UpdateMode.ProcessEventsInFixedUpdate;
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
         gamepad.leftTrigger.QueueValueChange(0.123f, 0.5);
 
         InputSystem.Update();
         Assert.That(gamepad.leftTrigger.ReadValue(), Is.EqualTo(0).Within(0.00001));
 
-        runtime.currentTime = 1;
+        runtime.currentTimeForFixedUpdate = 1;
         InputSystem.Update();
         Assert.That(gamepad.leftTrigger.ReadValue(), Is.EqualTo(0.123).Within(0.00001));
     }