RELEASE: Merge develop.

Author: douglas-piconi

.yamato/upm-ci.yml

@@ -43,6 +43,8 @@ platforms:
     image: {{ platform.image }}
     flavor: {{ platform.flavor}}
   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 pack --package-path ./Packages/com.unity.inputsystem/
     - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }}

Assets/Demo/DemoControls.cs

@@ -256,9 +256,9 @@ public DemoControls()
                 },
                 {
                     ""name"": ""submit"",
-                    ""type"": ""Value"",
+                    ""type"": ""Button"",
                     ""id"": ""f6c0c6e8-e423-42cc-9071-06396825f4e2"",
-                    ""expectedControlType"": """",
+                    ""expectedControlType"": ""Button"",
                     ""processors"": """",
                     ""interactions"": """"
                 },

Assets/Demo/DemoControls.inputactions

@@ -244,9 +244,9 @@
                 },
                 {
                     "name": "submit",
-                    "type": "Value",
+                    "type": "Button",
                     "id": "f6c0c6e8-e423-42cc-9071-06396825f4e2",
-                    "expectedControlType": "",
+                    "expectedControlType": "Button",
                     "processors": "",
                     "interactions": ""
                 },

Assets/Demo/SimpleDemo/SimpleController_UsingActionEventQueue.cs

@@ -16,9 +16,9 @@ public class SimpleController_UsingEvents : MonoBehaviour
     public void OnEnable()
     {
         InputSystem.onEvent +=
-            eventPtr =>
+            (eventPtr, device) =>
         {
-            var gamepad = InputSystem.GetDeviceById(eventPtr.deviceId) as Gamepad;
+            var gamepad = device as Gamepad;
             if (gamepad == null)
                 return;
 

Assets/Demo/SimpleDemo/SimpleController_UsingEvents.cs

@@ -4,6 +4,7 @@
 using UnityEngine.InputSystem.Utilities;
 using UnityEngine;
 using UnityEngine.InputSystem.Layouts;
+using UnityEngine.InputSystem.LowLevel;
 
 public struct MyDeviceState : IInputStateTypeInfo
 {
@@ -13,36 +14,29 @@ public struct MyDeviceState : IInputStateTypeInfo
     [InputControl(layout = "Axis")]
     public float axis1;
 
-    public FourCC format
-    {
-        get { return new FourCC('M', 'Y', 'D', 'V'); }
-    }
+    public FourCC format => new FourCC('M', 'Y', 'D', 'V');
 }
 
 [InputControlLayout(stateType = typeof(MyDeviceState))]
-//[InputPlugin]
 public class MyDevice : InputDevice, IInputUpdateCallbackReceiver
 {
     public ButtonControl button1 { get; private set; }
     public AxisControl axis1 { get; private set; }
 
-    protected override void FinishSetup(InputDeviceBuilder builder)
+    protected override void FinishSetup()
     {
-        button1 = builder.GetControl<ButtonControl>(this, "button1");
-        axis1 = builder.GetControl<AxisControl>(this, "axis1");
-        base.FinishSetup(builder);
+        button1 = GetChildControl<ButtonControl>("button1");
+        axis1 = GetChildControl<AxisControl>("axis1");
+        base.FinishSetup();
     }
 
-    public void OnUpdate(InputUpdateType updateType)
+    public void OnUpdate()
     {
-        if (updateType == InputUpdateType.Dynamic)
-        {
-            var isButton1Pressed = Time.frameCount % 100 == 0;
-            if (isButton1Pressed)
-                InputSystem.QueueStateEvent(this, new MyDeviceState {buttons = 1});
-            else
-                InputSystem.QueueStateEvent(this, new MyDeviceState());
-        }
+        var isButton1Pressed = Time.frameCount % 100 == 0;
+        if (isButton1Pressed)
+            InputSystem.QueueStateEvent(this, new MyDeviceState {buttons = 1});
+        else
+            InputSystem.QueueStateEvent(this, new MyDeviceState());
     }
 
     public static void Initialize()

Assets/Demo/SimpleDevice.cs

@@ -4,6 +4,7 @@
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.Controls;
 using UnityEngine.InputSystem.Layouts;
+using UnityEngine.InputSystem.LowLevel;
 using UnityEngine.InputSystem.Utilities;
 using UnityEngine.InputSystem.Steam;
 #if UNITY_EDITOR
@@ -45,18 +46,18 @@ private static void RuntimeInitializeOnLoad()
     public ButtonControl click { get; protected set; }
     public ButtonControl steamExitMenu { get; protected set; }
 
-    protected override void FinishSetup(InputDeviceBuilder builder)
+    protected override void FinishSetup()
     {
-        base.FinishSetup(builder);
-        move = builder.GetControl<StickControl>("move");
-        look = builder.GetControl<Vector2Control>("look");
-        fire = builder.GetControl<ButtonControl>("fire");
-        jump = builder.GetControl<ButtonControl>("jump");
-        menu = builder.GetControl<ButtonControl>("menu");
-        steamEnterMenu = builder.GetControl<ButtonControl>("steamEnterMenu");
-        navigate = builder.GetControl<Vector2Control>("navigate");
-        click = builder.GetControl<ButtonControl>("click");
-        steamExitMenu = builder.GetControl<ButtonControl>("steamExitMenu");
+        base.FinishSetup();
+        move = GetChildControl<StickControl>("move");
+        look = GetChildControl<Vector2Control>("look");
+        fire = GetChildControl<ButtonControl>("fire");
+        jump = GetChildControl<ButtonControl>("jump");
+        menu = GetChildControl<ButtonControl>("menu");
+        steamEnterMenu = GetChildControl<ButtonControl>("steamEnterMenu");
+        navigate = GetChildControl<Vector2Control>("navigate");
+        click = GetChildControl<ButtonControl>("click");
+        steamExitMenu = GetChildControl<ButtonControl>("steamExitMenu");
     }
 
     protected override void ResolveSteamActions(ISteamControllerAPI api)

Assets/Demo/SteamController/SteamDemoController.cs

@@ -1,5 +1,6 @@
 using UnityEngine;
 using UnityEngine.InputSystem;
+using UnityEngine.InputSystem.LowLevel;
 using UnityEngine.UI;
 
 ////FIXME: will not work properly when there are multiple keyboards