Refactor input for Rendering Debugger, remove DebugUpdater GameObject when using InputSystem

Author: arttu-peltonen

Packages/com.unity.render-pipelines.core/Runtime/Camera/FreeCamera.cs

@@ -99,6 +99,7 @@ void RegisterInputs()
 #endif
 
 #if UNITY_EDITOR && !USE_INPUT_SYSTEM
+#pragma warning disable CS0618 // Type or member is obsolete
             List<InputManagerEntry> inputEntries = new List<InputManagerEntry>();
 
             // Add new bindings
@@ -112,6 +113,7 @@ void RegisterInputs()
             inputEntries.Add(new InputManagerEntry { name = kSpeedAxis, kind = InputManagerEntry.Kind.Axis, axis = InputManagerEntry.Axis.Seventh, gravity = 1000.0f, deadZone = 0.001f, sensitivity = 1000.0f });
 
             InputRegistering.RegisterInputs(inputEntries);
+#pragma warning restore CS0618 // Type or member is obsolete
 #endif
         }
 

Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugManager.Input.cs

@@ -0,0 +1,116 @@
+#if ENABLE_UIELEMENTS_MODULE && (UNITY_EDITOR || DEVELOPMENT_BUILD)
+#define ENABLE_RENDERING_DEBUGGER_UI
+#endif
+#if ENABLE_INPUT_SYSTEM && ENABLE_INPUT_SYSTEM_PACKAGE
+#define USE_INPUT_SYSTEM
+using UnityEngine.InputSystem;
+#endif
+
+// Input support for Rendering Debugger using Input System Package
+
+namespace UnityEngine.Rendering
+{
+    public sealed partial class DebugManager
+    {
+        const string k_EnableDebug = "Enable Debug";
+        const string k_ResetBtn = "Debug Reset";
+        const string k_DebugPreviousBtn = "Debug Previous";
+        const string k_DebugNextBtn = "Debug Next";
+        const string k_PersistentBtn = "Debug Persistent";
+        const string k_DPadHorizontal = "Debug Horizontal";
+        const string k_MultiplierBtn = "Debug Multiplier";
+
+#if USE_INPUT_SYSTEM
+        const string k_AnyTouch = "Any Touch";
+
+        readonly InputActionMap m_DebugActionMap = new InputActionMap("Debug Menu");
+        InputAction m_MultiplierAction;
+
+        internal void EnableInputCallbacks()
+        {
+            m_DebugActionMap.Enable();
+        }
+
+        internal void DisableInputCallbacks()
+        {
+            m_DebugActionMap.Disable();
+        }
+
+        void ToggleRuntimeUI() => displayRuntimeUI = !displayRuntimeUI;
+
+        void RegisterDebugInputs()
+        {
+            var enableAction = m_DebugActionMap.AddAction(k_EnableDebug, type: InputActionType.Button);
+            enableAction.AddCompositeBinding("ButtonWithOneModifier")
+                .With("Modifier", "<Gamepad>/rightStickPress")
+                .With("Button", "<Gamepad>/leftStickPress")
+                .With("Modifier", "<Keyboard>/leftCtrl")
+                .With("Button", "<Keyboard>/backspace");
+            enableAction.performed += _ => ToggleRuntimeUI();
+
+            var anyTouchAction = m_DebugActionMap.AddAction(k_AnyTouch, type: InputActionType.Button);
+            anyTouchAction.AddBinding("<Touchscreen>/touch2/tap"); // touch2 means "third finger"
+            anyTouchAction.performed += ctx =>
+            {
+                // We want a three-finger double-tap to toggle the debug UI. However, it's a bit tricky to perform a
+                // three-finger tap consistently. Therefore, to be slightly error-tolerant, we actually check for a
+                // "double-tap action on the third tracked finger".
+                var pressControl = ctx.control as InputSystem.Controls.ButtonControl;
+                var touchControl = pressControl?.parent as InputSystem.Controls.TouchControl;
+                int tapCount = touchControl?.tapCount?.ReadValue() ?? 0;
+                if (tapCount == 2)
+                    ToggleRuntimeUI();
+            };
+
+#if ENABLE_RENDERING_DEBUGGER_UI
+            var resetAction = m_DebugActionMap.AddAction(k_ResetBtn, type: InputActionType.Button);
+            resetAction.AddCompositeBinding("ButtonWithOneModifier")
+                .With("Modifier", "<Gamepad>/rightStickPress")
+                .With("Button", "<Gamepad>/b")
+                .With("Modifier", "<Keyboard>/leftAlt")
+                .With("Button", "<Keyboard>/backspace");
+            resetAction.performed += _ => { Reset(); };
+
+            var next = m_DebugActionMap.AddAction(k_DebugNextBtn, type: InputActionType.Button);
+            next.AddBinding("<Keyboard>/pageDown");
+            next.AddBinding("<Gamepad>/rightShoulder");
+            next.performed += _ => { m_RuntimeDebugWindow.SelectNextPanel(); };
+
+            var previous = m_DebugActionMap.AddAction(k_DebugPreviousBtn, type: InputActionType.Button);
+            previous.AddBinding("<Keyboard>/pageUp");
+            previous.AddBinding("<Gamepad>/leftShoulder");
+            previous.performed += _ => { m_RuntimeDebugWindow.SelectPreviousPanel(); };
+
+            var persistentAction = m_DebugActionMap.AddAction(k_PersistentBtn, type: InputActionType.Button);
+            persistentAction.AddBinding("<Keyboard>/rightShift");
+            persistentAction.AddBinding("<Gamepad>/x");
+            persistentAction.performed += _ => { TogglePersistent(); };
+
+            m_MultiplierAction = m_DebugActionMap.AddAction(k_MultiplierBtn, type: InputActionType.Value);
+            m_MultiplierAction.AddBinding("<Keyboard>/leftShift");
+            m_MultiplierAction.AddBinding("<Gamepad>/y");
+
+            var moveHorizontalAction = m_DebugActionMap.AddAction(k_DPadHorizontal);
+            moveHorizontalAction.AddCompositeBinding("1DAxis")
+                .With("Positive", "<Gamepad>/dpad/right")
+                .With("Negative", "<Gamepad>/dpad/left")
+                .With("Positive", "<Keyboard>/rightArrow")
+                .With("Negative", "<Keyboard>/leftArrow");
+            moveHorizontalAction.performed += ctx =>
+            {
+                bool multiplierPressed = m_MultiplierAction.IsPressed();
+                bool increment = ctx.ReadValue<float>() > 0.0f;
+                if (increment)
+                {
+                    selectedWidget.OnIncrement(multiplierPressed);
+                }
+                else
+                {
+                    selectedWidget.OnDecrement(multiplierPressed);
+                }
+            };
+#endif
+        }
+#endif
+    }
+}