Merge Upstream-Develop

Author: StayTalm

.yamato/promotion.yml

@@ -6,50 +6,6 @@ test_platforms:
     image: package-ci/win10:stable
     flavor: b1.large
 ---
-{% for editor in test_editors %}
-{% for platform in test_platforms %}
-promotion_test_{{ platform.name }}_{{ editor.version }}:
-  name : Promotion Test {{ editor.version }} on {{ platform.name }}
-  agent:
-    type: {{ platform.type }}
-    image: {{ platform.image }}
-    flavor: {{ platform.flavor}}
-  variables:
-    UPMCI_PROMOTION: 1
-  commands:
-    - mv ./Assets/Samples ./Packages/com.unity.inputsystem
-    - mv ./Assets/Samples.meta ./Packages/com.unity.inputsystem
-    - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
-    - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }}
-  artifacts:
-    logs:
-      paths:
-        - "upm-ci~/test-results/**/*"
-  dependencies:
-    - .yamato/upm-ci.yml#pack
-{% endfor %}
-{% endfor %}
-
-promotion_test_trigger:
-  name: Promotion Tests Trigger
-  agent:
-    type: Unity::VM
-    image: package-ci/win10:stable
-    flavor: b1.large
-  artifacts:
-    logs:
-      paths:
-        - "upm-ci~/test-results/**/*"
-    packages:
-      paths:
-        - "upm-ci~/packages/**/*"
-  dependencies:
-{% for editor in test_editors %}
-{% for platform in test_platforms %}
-    - .yamato/promotion.yml#promotion_test_{{platform.name}}_{{editor.version}}
-{% endfor %}
-{% endfor %}
-
 promote:
   name: Promote to Production
   agent:
@@ -71,10 +27,4 @@ promote:
   artifacts:
     artifacts:
       paths:
-        - "upm-ci~/packages/*.tgz"
-  dependencies:
-{% for editor in test_editors %}
-{% for platform in test_platforms %}
-    - .yamato/promotion.yml#promotion_test_{{ platform.name }}_{{ editor.version }}
-{% endfor %}
-{% endfor %}
+        - "upm-ci~/packages/*.tgz"

Assets/Demo/DemoGame.cs

@@ -3,6 +3,7 @@
 using UnityEngine.EventSystems;
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.Controls;
+using UnityEngine.InputSystem.LowLevel;
 using UnityEngine.InputSystem.UI;
 using UnityEngine.InputSystem.Users;
 using UnityEngine.InputSystem.Utilities;
@@ -311,7 +312,7 @@ public void OnStartGameButton()
     /// switch from one or the other. In that case, while we will stay on the Gamepad control scheme,
     /// we will still unassign the previously used gamepad from the player and assign the newly used one.
     /// </remarks>
-    private void OnUnpairedInputDeviceUsed(InputControl control)
+    private void OnUnpairedInputDeviceUsed(InputControl control, InputEventPtr eventPtr)
     {
         // We should only listen for unpaired device activity when we're either in the lobby
         // or in single-player mode. In a multi-player game, we turn it off and simply ignore whatever

Assets/Demo/DemoPlayerController.cs

@@ -317,7 +317,7 @@ public void OnMenu(InputAction.CallbackContext context)
         {
             // Leave menu.
 
-            user.ResumeHaptics();
+            //user.ResumeHaptics();
 
             controls.gameplay.Enable();
             controls.menu.Disable();///REVIEW: this should likely be left to the UI input module
@@ -328,7 +328,7 @@ public void OnMenu(InputAction.CallbackContext context)
         {
             // Enter menu.
 
-            user.PauseHaptics();
+            //user.PauseHaptics();
 
             controls.gameplay.Disable();
             controls.menu.Enable();///REVIEW: this should likely be left to the UI input module

Assets/Demo/SteamController/SteamDemoController.cs

@@ -36,14 +36,23 @@ private static void RuntimeInitializeOnLoad()
         InputSystem.RegisterLayout<SteamDemoController>(matches: deviceMatcher);
     }
 
+    [InputControl]
     public StickControl move { get; protected set; }
+    [InputControl]
     public Vector2Control look { get; protected set; }
+    [InputControl]
     public ButtonControl fire { get; protected set; }
+    [InputControl]
     public ButtonControl jump { get; protected set; }
+    [InputControl]
     public ButtonControl menu { get; protected set; }
+    [InputControl]
     public ButtonControl steamEnterMenu { get; protected set; }
+    [InputControl]
     public Vector2Control navigate { get; protected set; }
+    [InputControl]
     public ButtonControl click { get; protected set; }
+    [InputControl]
     public ButtonControl steamExitMenu { get; protected set; }
 
     protected override void FinishSetup()
@@ -86,6 +95,7 @@ protected override void ResolveSteamActions(ISteamControllerAPI api)
     public SteamHandle<InputAction> navigateHandle { get; private set; }
     public SteamHandle<InputAction> clickHandle { get; private set; }
     public SteamHandle<InputAction> steamExitMenuHandle { get; private set; }
+
     private SteamActionSetInfo[] m_ActionSets;
     public override ReadOnlyArray<SteamActionSetInfo> steamActionSets
     {
@@ -126,7 +136,10 @@ public unsafe struct SteamDemoControllerState : IInputStateTypeInfo
 {
     public FourCC format
     {
-        get { return new FourCC('S', 't', 'e', 'a'); }
+        get
+        {
+            return new FourCC('S', 't', 'e', 'a');
+        }
     }
 
     [InputControl(name = "fire", layout = "Button", bit = 0)]

Assets/QA/Input_Test/Scenes.meta

@@ -0,0 +1,4 @@
+{
+  "displayName": "InputDeviceTester",
+  "description": "A scene containing UI to visualize the controls on various supported input devices."
+}