Merge branch 'develop' into stable

Author: stefanunity

.buginfo

@@ -2,4 +2,4 @@ system: jira
 server: jira.unity3d.com
 project: ISXB
 issuetype: Bug
-
+package: Input System

.yamato/upm-ci.yml

@@ -12,9 +12,10 @@
   commands:
     - {{ utr_install_win }}
     - {{ upm_ci_install }}
-    # Get latest version of doctools package. Automatically makes the documentation tests in APIVerification go live.
+    # Get version 2.3.0-preview of doctools package (it currently fails for 3.0.0-preview).
+    # Automatically makes the documentation tests in APIVerification go live.
     - '%GSUDO% choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes'
-    - git clone git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
+    - git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
     # We keep the samples in Assets/ as they otherwise won't get imported and you can't
     # really work with them. Move them into the package for when we run upm-ci here.
     - move /Y .\Assets\Samples .\Packages\com.unity.inputsystem
@@ -47,8 +48,9 @@
   commands:
     - {{ utr_install_nix }}
     - {{ upm_ci_install }}
-    # Get latest version of doctools package. Automatically makes the documentation tests in APIVerification go live.
-    - git clone git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
+    # Get version 2.3.0-preview of doctools package (it currently fails for 3.0.0-preview).
+    # Automatically makes the documentation tests in APIVerification go live.
+    - git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
     # We keep the samples in Assets/ as they otherwise won't get imported and you can't
     # really work with them. Move them into the package for when we run upm-ci here.
     - mv ./Assets/Samples ./Packages/com.unity.inputsystem

Assets/Samples/InGameHints/InGameHintsActions.cs

@@ -14,6 +14,7 @@
 using System.Collections.Generic;
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.Utilities;
+using UnityEngine;
 
 namespace UnityEngine.InputSystem.Samples.InGameHints
 {
@@ -272,6 +273,11 @@ public @InGameHintsActions()
             m_Gameplay_Throw = m_Gameplay.FindAction("Throw", throwIfNotFound: true);
         }
 
+        ~@InGameHintsActions()
+        {
+            Debug.Assert(!m_Gameplay.enabled, "This will cause a leak and performance issues, InGameHintsActions.Gameplay.Disable() has not been called.");
+        }
+
         public void Dispose()
         {
             UnityEngine.Object.Destroy(asset);

Assets/Samples/ProjectWideActionsTest.meta renamed to Assets/Samples/ProjectWideActions.meta

@@ -1,5 +1,5 @@
 {
-    "name": "ProjectWideActionsTest",
+    "name": "ProjectWideActions",
     "rootNamespace": "",
     "references": [
         "GUID:75469ad4d38634e559750d17036d5f7c"

Assets/Samples/ProjectWideActionsTest/ProjectWideActionsTest.asmdef renamed to Assets/Samples/ProjectWideActions/ProjectWideActions.asmdef

@@ -0,0 +1,48 @@
+#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
+
+namespace UnityEngine.InputSystem.Samples.ProjectWideActions
+{
+    public class ProjectWideActionsExample : MonoBehaviour
+    {
+        [SerializeField] public GameObject cube;
+
+        InputAction move;
+        InputAction look;
+        InputAction attack;
+        InputAction jump;
+        InputAction interact;
+        InputAction next;
+        InputAction previous;
+        InputAction sprint;
+        InputAction crouch;
+
+        // Start is called before the first frame update
+        void Start()
+        {
+            // Project-Wide Actions
+            move = InputSystem.actions.FindAction("Player/Move");
+            look = InputSystem.actions.FindAction("Player/Look");
+            attack = InputSystem.actions.FindAction("Player/Attack");
+            jump = InputSystem.actions.FindAction("Player/Jump");
+            interact = InputSystem.actions.FindAction("Player/Interact");
+            next = InputSystem.actions.FindAction("Player/Next");
+            previous = InputSystem.actions.FindAction("Player/Previous");
+            sprint = InputSystem.actions.FindAction("Player/Sprint");
+            crouch = InputSystem.actions.FindAction("Player/Crouch");
+
+            // Handle input by responding to callbacks
+            attack.performed += ctx => cube.GetComponent<Renderer>().material.color = Color.red;
+            attack.canceled += ctx => cube.GetComponent<Renderer>().material.color = Color.green;
+        }
+
+        // Update is called once per frame
+        void Update()
+        {
+            // Handle input by polling each frame
+            var moveVal = move.ReadValue<Vector2>() * 10.0f * Time.deltaTime;
+            cube.transform.Translate(new Vector3(moveVal.x, moveVal.y, 0));
+        }
+    } // class ProjectWideActionsExample
+} // namespace UnityEngine.InputSystem.Samples.ProjectWideActions
+
+#endif