From a868f5f6e2314a3be8cc4fe302e80e8725d9da77 Mon Sep 17 00:00:00 2001 From: leonardo Date: Fri, 9 May 2025 13:12:53 +0200 Subject: [PATCH 01/12] WIP: moving editor related things into its own assembly --- .../Actions/Composites/AxisComposite.cs | 44 +---------- .../Actions/Composites/Vector2Composite.cs | 41 ---------- .../Actions/Composites/Vector3Composite.cs | 41 ---------- .../Actions/Interactions/HoldInteraction.cs | 45 +---------- .../Interactions/MultiTapInteraction.cs | 72 +----------------- .../Actions/Interactions/PressInteraction.cs | 67 +---------------- .../Interactions/SlowTapInteraction.cs | 45 +---------- .../Actions/Interactions/TapInteraction.cs | 45 +---------- .../Processors/AxisDeadzoneProcessor.cs | 44 ----------- .../Processors/StickDeadzoneProcessor.cs | 44 ----------- .../InputSystem/Editor/Actions.meta | 8 ++ .../Editor/Actions/AxisCompositeEditor.cs | 45 +++++++++++ .../Actions/AxisCompositeEditor.cs.meta | 2 + .../Editor/Actions/Interactions.meta | 8 ++ .../Interactions/HoldInteractionEditor.cs | 48 ++++++++++++ .../HoldInteractionEditor.cs.meta | 2 + .../Interactions/MultiTapInteractionEditor.cs | 75 +++++++++++++++++++ .../MultiTapInteractionEditor.cs.meta | 2 + .../Interactions/PressInteractionEditor.cs | 70 +++++++++++++++++ .../PressInteractionEditor.cs.meta | 2 + .../Interactions/SlowTapInteractionEditor.cs | 47 ++++++++++++ .../SlowTapInteractionEditor.cs.meta | 2 + .../Interactions/TapInteractionEditor.cs | 47 ++++++++++++ .../Interactions/TapInteractionEditor.cs.meta | 2 + .../Editor/Actions/Vector2CompositeEditor.cs | 44 +++++++++++ .../Actions/Vector2CompositeEditor.cs.meta | 2 + .../Editor/Actions/Vector3CompositeEditor.cs | 45 +++++++++++ .../Actions/Vector3CompositeEditor.cs.meta | 2 + .../InputSystem/Editor/Controls.meta | 8 ++ .../Editor/Controls/Processors.meta | 8 ++ .../Processors/AxisDeadzoneProcessorEditor.cs | 48 ++++++++++++ .../AxisDeadzoneProcessorEditor.cs.meta | 2 + .../StickDeadzoneProcessorEditor.cs | 49 ++++++++++++ .../StickDeadzoneProcessorEditor.cs.meta | 2 + .../InputSystem/Editor/Plugins.meta | 8 ++ .../Editor/Plugins/EnhancedTouch.meta | 8 ++ .../EnhancedTouch/TouchSimulationEditor.cs | 49 ++++++++++++ .../TouchSimulationEditor.cs.meta | 2 + .../InputSystem/Editor/Plugins/HID.meta | 8 ++ .../Plugins/HID/HIDDescriptorWindow.cs | 0 .../Plugins/HID/HIDDescriptorWindow.cs.meta | 0 .../Plugins}/InputSettingsiOSProvider.cs | 2 +- .../Plugins}/InputSettingsiOSProvider.cs.meta | 0 .../Editor/Plugins/PlayerInput.meta | 8 ++ .../PlayerInput/PlayerInputManagerEditor.cs | 2 +- .../PlayerInputManagerEditor.cs.meta | 0 .../Plugins}/PlayerInputEditor.cs | 2 +- .../Plugins}/PlayerInputEditor.cs.meta | 0 .../Editor/UnityEditor.InputSystem.asmdef | 18 +++++ .../UnityEditor.InputSystem.asmdef.meta | 7 ++ .../Plugins/EnhancedTouch/TouchSimulation.cs | 46 ------------ 51 files changed, 688 insertions(+), 530 deletions(-) create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/AxisCompositeEditor.cs create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/AxisCompositeEditor.cs.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/HoldInteractionEditor.cs create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/HoldInteractionEditor.cs.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/PressInteractionEditor.cs create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/PressInteractionEditor.cs.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/TapInteractionEditor.cs create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/TapInteractionEditor.cs.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector2CompositeEditor.cs create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector2CompositeEditor.cs.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector3CompositeEditor.cs create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector3CompositeEditor.cs.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Controls.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Plugins.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/HID.meta rename Packages/com.unity.inputsystem/InputSystem/{ => Editor}/Plugins/HID/HIDDescriptorWindow.cs (100%) rename Packages/com.unity.inputsystem/InputSystem/{ => Editor}/Plugins/HID/HIDDescriptorWindow.cs.meta (100%) rename Packages/com.unity.inputsystem/InputSystem/{Plugins/iOS => Editor/Plugins}/InputSettingsiOSProvider.cs (97%) rename Packages/com.unity.inputsystem/InputSystem/{Plugins/iOS => Editor/Plugins}/InputSettingsiOSProvider.cs.meta (100%) create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInput.meta rename Packages/com.unity.inputsystem/InputSystem/{ => Editor}/Plugins/PlayerInput/PlayerInputManagerEditor.cs (99%) rename Packages/com.unity.inputsystem/InputSystem/{ => Editor}/Plugins/PlayerInput/PlayerInputManagerEditor.cs.meta (100%) rename Packages/com.unity.inputsystem/InputSystem/{Plugins/PlayerInput => Editor/Plugins}/PlayerInputEditor.cs (99%) rename Packages/com.unity.inputsystem/InputSystem/{Plugins/PlayerInput => Editor/Plugins}/PlayerInputEditor.cs.meta (100%) create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/UnityEditor.InputSystem.asmdef create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/UnityEditor.InputSystem.asmdef.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/AxisComposite.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/AxisComposite.cs index 48ae2a7c0e..9615cba078 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/AxisComposite.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/AxisComposite.cs @@ -3,12 +3,7 @@ using UnityEngine.InputSystem.Processors; using UnityEngine.InputSystem.Utilities; -#if UNITY_EDITOR -using System; -using UnityEditor; -using UnityEngine.InputSystem.Editor; -using UnityEngine.UIElements; -#endif + namespace UnityEngine.InputSystem.Composites { @@ -209,40 +204,5 @@ public enum WhichSideWins } } - #if UNITY_EDITOR - internal class AxisCompositeEditor : InputParameterEditor - { - private GUIContent m_WhichAxisWinsLabel = new GUIContent("Which Side Wins", - "Determine which axis 'wins' if both are actuated at the same time. " - + "If 'Neither' is selected, the result is 0 (or, more precisely, " - + "the midpoint between minValue and maxValue)."); - - public override void OnGUI() - { -#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - if (!InputSystem.settings.useIMGUIEditorForAssets) return; -#endif - target.whichSideWins = (AxisComposite.WhichSideWins)EditorGUILayout.EnumPopup(m_WhichAxisWinsLabel, target.whichSideWins); - } - -#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback) - { - var modeField = new EnumField(m_WhichAxisWinsLabel.text, target.whichSideWins) - { - tooltip = m_WhichAxisWinsLabel.tooltip - }; - - modeField.RegisterValueChangedCallback(evt => - { - target.whichSideWins = (AxisComposite.WhichSideWins)evt.newValue; - onChangedCallback(); - }); - - root.Add(modeField); - } - -#endif - } - #endif + } diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/Vector2Composite.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/Vector2Composite.cs index 2f970dda8b..4b8094d95f 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/Vector2Composite.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/Vector2Composite.cs @@ -4,11 +4,6 @@ using UnityEngine.InputSystem.Layouts; using UnityEngine.InputSystem.Utilities; -#if UNITY_EDITOR -using UnityEditor; -using UnityEngine.InputSystem.Editor; -using UnityEngine.UIElements; -#endif ////TODO: add support for ramp up/down @@ -189,40 +184,4 @@ public enum Mode } } - #if UNITY_EDITOR - internal class Vector2CompositeEditor : InputParameterEditor - { - private GUIContent m_ModeLabel = new GUIContent("Mode", - "How to synthesize a Vector2 from the inputs. Digital " - + "treats part bindings as buttons (on/off) whereas Analog preserves " - + "floating-point magnitudes as read from controls."); - - public override void OnGUI() - { -#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - if (!InputSystem.settings.useIMGUIEditorForAssets) return; -#endif - target.mode = (Vector2Composite.Mode)EditorGUILayout.EnumPopup(m_ModeLabel, target.mode); - } - -#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback) - { - var modeField = new EnumField(m_ModeLabel.text, target.mode) - { - tooltip = m_ModeLabel.tooltip - }; - - modeField.RegisterValueChangedCallback(evt => - { - target.mode = (Vector2Composite.Mode)evt.newValue; - onChangedCallback(); - }); - - root.Add(modeField); - } - -#endif - } - #endif } diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/Vector3Composite.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/Vector3Composite.cs index d9a0e510c4..93867ff464 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/Vector3Composite.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/Composites/Vector3Composite.cs @@ -3,11 +3,6 @@ using UnityEngine.InputSystem.Layouts; using UnityEngine.InputSystem.Utilities; -#if UNITY_EDITOR -using UnityEditor; -using UnityEngine.InputSystem.Editor; -using UnityEngine.UIElements; -#endif namespace UnityEngine.InputSystem.Composites { @@ -169,40 +164,4 @@ public enum Mode } } - #if UNITY_EDITOR - internal class Vector3CompositeEditor : InputParameterEditor - { - private GUIContent m_ModeLabel = new GUIContent("Mode", - "How to synthesize a Vector3 from the inputs. Digital " - + "treats part bindings as buttons (on/off) whereas Analog preserves " - + "floating-point magnitudes as read from controls."); - - public override void OnGUI() - { -#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - if (!InputSystem.settings.useIMGUIEditorForAssets) return; -#endif - target.mode = (Vector3Composite.Mode)EditorGUILayout.EnumPopup(m_ModeLabel, target.mode); - } - -#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback) - { - var modeField = new EnumField(m_ModeLabel.text, target.mode) - { - tooltip = m_ModeLabel.tooltip - }; - - modeField.RegisterValueChangedCallback(evt => - { - target.mode = (Vector3Composite.Mode)evt.newValue; - onChangedCallback(); - }); - - root.Add(modeField); - } - -#endif - } - #endif } diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/HoldInteraction.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/HoldInteraction.cs index 79e057da25..37f03fc9a0 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/HoldInteraction.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/HoldInteraction.cs @@ -2,10 +2,7 @@ using System.ComponentModel; using UnityEngine.InputSystem.Controls; using UnityEngine.Scripting; -#if UNITY_EDITOR -using UnityEngine.InputSystem.Editor; -using UnityEngine.UIElements; -#endif + namespace UnityEngine.InputSystem.Interactions { @@ -104,44 +101,4 @@ public void Reset() } } - #if UNITY_EDITOR - /// - /// UI that is displayed when editing in the editor. - /// - internal class HoldInteractionEditor : InputParameterEditor - { - protected override void OnEnable() - { - m_PressPointSetting.Initialize("Press Point", - "Float value that an axis control has to cross for it to be considered pressed.", - "Default Button Press Point", - () => target.pressPoint, v => target.pressPoint = v, () => ButtonControl.s_GlobalDefaultButtonPressPoint); - m_DurationSetting.Initialize("Hold Time", - "Time (in seconds) that a control has to be held in order for it to register as a hold.", - "Default Hold Time", - () => target.duration, x => target.duration = x, () => InputSystem.settings.defaultHoldTime); - } - - public override void OnGUI() - { -#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - if (!InputSystem.settings.useIMGUIEditorForAssets) return; -#endif - m_PressPointSetting.OnGUI(); - m_DurationSetting.OnGUI(); - } - -#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback) - { - m_PressPointSetting.OnDrawVisualElements(root, onChangedCallback); - m_DurationSetting.OnDrawVisualElements(root, onChangedCallback); - } - -#endif - - private CustomOrDefaultSetting m_PressPointSetting; - private CustomOrDefaultSetting m_DurationSetting; - } - #endif } diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/MultiTapInteraction.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/MultiTapInteraction.cs index 35768ca1b5..c5fb6db140 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/MultiTapInteraction.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/MultiTapInteraction.cs @@ -1,12 +1,7 @@ using System; using UnityEngine.InputSystem.Controls; using UnityEngine.Scripting; -#if UNITY_EDITOR -using UnityEditor; -using UnityEngine.InputSystem.Editor; -using UnityEngine.UIElements; -using UnityEditor.UIElements; -#endif + ////TODO: add ability to respond to any of the taps in the sequence (e.g. one response for single tap, another for double tap) @@ -169,69 +164,4 @@ private enum TapPhase } } - #if UNITY_EDITOR - /// - /// UI that is displayed when editing in the editor. - /// - internal class MultiTapInteractionEditor : InputParameterEditor - { - protected override void OnEnable() - { - m_TapTimeSetting.Initialize("Max Tap Duration", - "Time (in seconds) within with a control has to be released again for it to register as a tap. If the control is held " - + "for longer than this time, the tap is canceled.", - "Default Tap Time", - () => target.tapTime, x => target.tapTime = x, () => InputSystem.settings.defaultTapTime); - m_TapDelaySetting.Initialize("Max Tap Spacing", - "The maximum delay (in seconds) allowed between each tap. If this time is exceeded, the multi-tap is canceled.", - "Default Tap Spacing", - () => target.tapDelay, x => target.tapDelay = x, () => InputSystem.settings.multiTapDelayTime); - m_PressPointSetting.Initialize("Press Point", - "The amount of actuation a control requires before being considered pressed. If not set, default to " - + "'Default Button Press Point' in the global input settings.", - "Default Button Press Point", - () => target.pressPoint, v => target.pressPoint = v, - () => InputSystem.settings.defaultButtonPressPoint); - } - - public override void OnGUI() - { -#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - if (!InputSystem.settings.useIMGUIEditorForAssets) return; -#endif - target.tapCount = EditorGUILayout.IntField(m_TapCountLabel, target.tapCount); - m_TapDelaySetting.OnGUI(); - m_TapTimeSetting.OnGUI(); - m_PressPointSetting.OnGUI(); - } - -#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback) - { - var tapCountField = new IntegerField(m_TapCountLabel.text) - { - value = target.tapCount, - tooltip = m_TapCountLabel.tooltip - }; - tapCountField.RegisterValueChangedCallback(evt => - { - target.tapCount = evt.newValue; - onChangedCallback?.Invoke(); - }); - root.Add(tapCountField); - - m_TapDelaySetting.OnDrawVisualElements(root, onChangedCallback); - m_TapTimeSetting.OnDrawVisualElements(root, onChangedCallback); - m_PressPointSetting.OnDrawVisualElements(root, onChangedCallback); - } - -#endif - - private readonly GUIContent m_TapCountLabel = new GUIContent("Tap Count", "How many taps need to be performed in succession. Two means double-tap, three means triple-tap, and so on."); - - private CustomOrDefaultSetting m_PressPointSetting; - private CustomOrDefaultSetting m_TapTimeSetting; - private CustomOrDefaultSetting m_TapDelaySetting; - } - #endif } diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/PressInteraction.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/PressInteraction.cs index 33cdb0bc79..7616751deb 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/PressInteraction.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/PressInteraction.cs @@ -2,12 +2,7 @@ using System.ComponentModel; using UnityEngine.InputSystem.Controls; using UnityEngine.Scripting; -#if UNITY_EDITOR -using UnityEditor; -using UnityEngine.InputSystem.Editor; -using UnityEngine.UIElements; -using UnityEditor.UIElements; -#endif + ////TODO: protect against the control *hovering* around the press point; this should not fire the press repeatedly; probably need a zone around the press point ////TODO: also, for analog controls, we probably want a deadzone that gives just a tiny little buffer at the low end before the action starts @@ -194,64 +189,4 @@ public enum PressBehavior PressAndRelease = 2, } - #if UNITY_EDITOR - /// - /// UI that is displayed when editing in the editor. - /// - // ReSharper disable once UnusedMember.Global - internal class PressInteractionEditor : InputParameterEditor - { - protected override void OnEnable() - { - m_PressPointSetting.Initialize("Press Point", - "The amount of actuation a control requires before being considered pressed. If not set, default to " - + "'Default Button Press Point' in the global input settings.", - "Default Button Press Point", - () => target.pressPoint, v => target.pressPoint = v, - () => InputSystem.settings.defaultButtonPressPoint); - } - - public override void OnGUI() - { -#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - if (!InputSystem.settings.useIMGUIEditorForAssets) return; -#endif - EditorGUILayout.HelpBox(s_HelpBoxText); - target.behavior = (PressBehavior)EditorGUILayout.EnumPopup(s_PressBehaviorLabel, target.behavior); - m_PressPointSetting.OnGUI(); - } - -#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback) - { - root.Add(new HelpBox(s_HelpBoxText.text, HelpBoxMessageType.None)); - - var behaviourDropdown = new EnumField(s_PressBehaviorLabel.text, target.behavior) - { - tooltip = s_PressBehaviorLabel.tooltip - }; - behaviourDropdown.RegisterValueChangedCallback(evt => - { - target.behavior = (PressBehavior)evt.newValue; - onChangedCallback?.Invoke(); - }); - root.Add(behaviourDropdown); - - m_PressPointSetting.OnDrawVisualElements(root, onChangedCallback); - } - -#endif - - private CustomOrDefaultSetting m_PressPointSetting; - - private static readonly GUIContent s_HelpBoxText = EditorGUIUtility.TrTextContent("Note that the 'Press' interaction is only " - + "necessary when wanting to customize button press behavior. For default press behavior, simply set the action type to 'Button' " - + "and use the action without interactions added to it."); - - private static readonly GUIContent s_PressBehaviorLabel = EditorGUIUtility.TrTextContent("Trigger Behavior", - "Determines how button presses trigger the action. By default (PressOnly), the action is performed on press. " - + "With ReleaseOnly, the action is performed on release. With PressAndRelease, the action is performed on press and " - + "canceled on release."); - } - #endif } diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/SlowTapInteraction.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/SlowTapInteraction.cs index 5309ab7a5d..3675b7b5ab 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/SlowTapInteraction.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/SlowTapInteraction.cs @@ -2,10 +2,7 @@ using System.ComponentModel; using UnityEngine.InputSystem.Controls; using UnityEngine.Scripting; -#if UNITY_EDITOR -using UnityEngine.InputSystem.Editor; -using UnityEngine.UIElements; -#endif + ////REVIEW: this is confusing when considered next to HoldInteraction; also it's confusingly named @@ -68,44 +65,4 @@ public void Reset() } } - #if UNITY_EDITOR - internal class SlowTapInteractionEditor : InputParameterEditor - { - protected override void OnEnable() - { - m_DurationSetting.Initialize("Min Tap Duration", - "Minimum time (in seconds) that a control has to be held for it to register as a slow tap. If the control is released " - + "before this time, the slow tap is canceled.", - "Default Slow Tap Time", - () => target.duration, x => target.duration = x, () => InputSystem.settings.defaultSlowTapTime); - m_PressPointSetting.Initialize("Press Point", - "The amount of actuation a control requires before being considered pressed. If not set, default to " - + "'Default Button Press Point' in the global input settings.", - "Default Button Press Point", - () => target.pressPoint, v => target.pressPoint = v, - () => InputSystem.settings.defaultButtonPressPoint); - } - - public override void OnGUI() - { -#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - if (!InputSystem.settings.useIMGUIEditorForAssets) return; -#endif - m_DurationSetting.OnGUI(); - m_PressPointSetting.OnGUI(); - } - -#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback) - { - m_DurationSetting.OnDrawVisualElements(root, onChangedCallback); - m_PressPointSetting.OnDrawVisualElements(root, onChangedCallback); - } - -#endif - - private CustomOrDefaultSetting m_DurationSetting; - private CustomOrDefaultSetting m_PressPointSetting; - } - #endif } diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/TapInteraction.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/TapInteraction.cs index 510b1caef2..b6cb17b0a0 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/TapInteraction.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/TapInteraction.cs @@ -2,10 +2,7 @@ using System.ComponentModel; using UnityEngine.InputSystem.Controls; using UnityEngine.Scripting; -#if UNITY_EDITOR -using UnityEngine.InputSystem.Editor; -using UnityEngine.UIElements; -#endif + namespace UnityEngine.InputSystem.Interactions { @@ -94,44 +91,4 @@ public void Reset() } } - #if UNITY_EDITOR - internal class TapInteractionEditor : InputParameterEditor - { - protected override void OnEnable() - { - m_DurationSetting.Initialize("Max Tap Duration", - "Time (in seconds) within with a control has to be released again for it to register as a tap. If the control is held " - + "for longer than this time, the tap is canceled.", - "Default Tap Time", - () => target.duration, x => target.duration = x, () => InputSystem.settings.defaultTapTime); - m_PressPointSetting.Initialize("Press Point", - "The amount of actuation a control requires before being considered pressed. If not set, default to " - + "'Default Button Press Point' in the global input settings.", - "Default Button Press Point", - () => target.pressPoint, v => target.pressPoint = v, - () => InputSystem.settings.defaultButtonPressPoint); - } - - public override void OnGUI() - { -#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - if (!InputSystem.settings.useIMGUIEditorForAssets) return; -#endif - m_DurationSetting.OnGUI(); - m_PressPointSetting.OnGUI(); - } - -#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback) - { - m_DurationSetting.OnDrawVisualElements(root, onChangedCallback); - m_PressPointSetting.OnDrawVisualElements(root, onChangedCallback); - } - -#endif - - private CustomOrDefaultSetting m_DurationSetting; - private CustomOrDefaultSetting m_PressPointSetting; - } - #endif } diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/Processors/AxisDeadzoneProcessor.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/Processors/AxisDeadzoneProcessor.cs index d9c33718a4..e3aceb4b62 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Controls/Processors/AxisDeadzoneProcessor.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/Processors/AxisDeadzoneProcessor.cs @@ -1,11 +1,6 @@ using System; using UnityEngine.Scripting; -#if UNITY_EDITOR -using UnityEngine.InputSystem.Editor; -using UnityEngine.UIElements; -#endif - namespace UnityEngine.InputSystem.Processors { /// @@ -74,43 +69,4 @@ public override string ToString() } } - #if UNITY_EDITOR - internal class AxisDeadzoneProcessorEditor : InputParameterEditor - { - protected override void OnEnable() - { - m_MinSetting.Initialize("Min", - "Value below which input values will be clamped. After clamping, values will be renormalized to [0..1] between min and max.", - "Default Deadzone Min", - () => target.min, v => target.min = v, - () => InputSystem.settings.defaultDeadzoneMin); - m_MaxSetting.Initialize("Max", - "Value above which input values will be clamped. After clamping, values will be renormalized to [0..1] between min and max.", - "Default Deadzone Max", - () => target.max, v => target.max = v, - () => InputSystem.settings.defaultDeadzoneMax); - } - - public override void OnGUI() - { -#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - if (!InputSystem.settings.useIMGUIEditorForAssets) return; -#endif - m_MinSetting.OnGUI(); - m_MaxSetting.OnGUI(); - } - -#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback) - { - m_MinSetting.OnDrawVisualElements(root, onChangedCallback); - m_MaxSetting.OnDrawVisualElements(root, onChangedCallback); - } - -#endif - - private CustomOrDefaultSetting m_MinSetting; - private CustomOrDefaultSetting m_MaxSetting; - } - #endif } diff --git a/Packages/com.unity.inputsystem/InputSystem/Controls/Processors/StickDeadzoneProcessor.cs b/Packages/com.unity.inputsystem/InputSystem/Controls/Processors/StickDeadzoneProcessor.cs index b0115b977b..611c72aa5d 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Controls/Processors/StickDeadzoneProcessor.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Controls/Processors/StickDeadzoneProcessor.cs @@ -1,11 +1,6 @@ using System; using UnityEngine.Scripting; -#if UNITY_EDITOR -using UnityEngine.InputSystem.Editor; -using UnityEngine.UIElements; -#endif - ////REVIEW: rename to RadialDeadzone ////TODO: add different deadzone shapes and/or option to min/max X and Y separately @@ -63,43 +58,4 @@ public override string ToString() } } - #if UNITY_EDITOR - internal class StickDeadzoneProcessorEditor : InputParameterEditor - { - protected override void OnEnable() - { - m_MinSetting.Initialize("Min", - "Vector length below which input values will be clamped. After clamping, vector lengths will be renormalized to [0..1] between min and max.", - "Default Deadzone Min", - () => target.min, v => target.min = v, - () => InputSystem.settings.defaultDeadzoneMin); - m_MaxSetting.Initialize("Max", - "Vector length above which input values will be clamped. After clamping, vector lengths will be renormalized to [0..1] between min and max.", - "Default Deadzone Max", - () => target.max, v => target.max = v, - () => InputSystem.settings.defaultDeadzoneMax); - } - - public override void OnGUI() - { -#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - if (!InputSystem.settings.useIMGUIEditorForAssets) return; -#endif - m_MinSetting.OnGUI(); - m_MaxSetting.OnGUI(); - } - -#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback) - { - m_MinSetting.OnDrawVisualElements(root, onChangedCallback); - m_MaxSetting.OnDrawVisualElements(root, onChangedCallback); - } - -#endif - - private CustomOrDefaultSetting m_MinSetting; - private CustomOrDefaultSetting m_MaxSetting; - } - #endif } diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions.meta new file mode 100644 index 0000000000..6fb384287c --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 51c96b8e65b5a46b28c06e3fbc751c97 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/AxisCompositeEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/AxisCompositeEditor.cs new file mode 100644 index 0000000000..33c427f238 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/AxisCompositeEditor.cs @@ -0,0 +1,45 @@ +#if UNITY_EDITOR +using System; +using UnityEditor; +using UnityEngine.InputSystem.Editor; +using UnityEngine.UIElements; +#endif + +namespace UnityEditor.InputSystem.Composites { +#if UNITY_EDITOR + internal class AxisCompositeEditor : InputParameterEditor + { + private GUIContent m_WhichAxisWinsLabel = new GUIContent("Which Side Wins", + "Determine which axis 'wins' if both are actuated at the same time. " + + "If 'Neither' is selected, the result is 0 (or, more precisely, " + + "the midpoint between minValue and maxValue)."); + + public override void OnGUI() + { +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + if (!InputSystem.settings.useIMGUIEditorForAssets) return; +#endif + target.whichSideWins = (AxisComposite.WhichSideWins)EditorGUILayout.EnumPopup(m_WhichAxisWinsLabel, target.whichSideWins); + } + +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback) + { + var modeField = new EnumField(m_WhichAxisWinsLabel.text, target.whichSideWins) + { + tooltip = m_WhichAxisWinsLabel.tooltip + }; + + modeField.RegisterValueChangedCallback(evt => + { + target.whichSideWins = (AxisComposite.WhichSideWins)evt.newValue; + onChangedCallback(); + }); + + root.Add(modeField); + } + +#endif + } + #endif +} \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/AxisCompositeEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/AxisCompositeEditor.cs.meta new file mode 100644 index 0000000000..2551df2c89 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/AxisCompositeEditor.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f04048c85eab54bcc9c4cba980634c7c \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions.meta new file mode 100644 index 0000000000..865b6a58b4 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 79f4019b5557b4b8a87a46a5869d9666 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/HoldInteractionEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/HoldInteractionEditor.cs new file mode 100644 index 0000000000..286f543215 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/HoldInteractionEditor.cs @@ -0,0 +1,48 @@ +#if UNITY_EDITOR +using UnityEngine.InputSystem.Editor; +using UnityEngine.UIElements; +#endif + +namespace UnityEditor.InputSystem.Interactions +{ + #if UNITY_EDITOR + /// + /// UI that is displayed when editing in the editor. + /// + internal class HoldInteractionEditor : InputParameterEditor + { + protected override void OnEnable() + { + m_PressPointSetting.Initialize("Press Point", + "Float value that an axis control has to cross for it to be considered pressed.", + "Default Button Press Point", + () => target.pressPoint, v => target.pressPoint = v, () => ButtonControl.s_GlobalDefaultButtonPressPoint); + m_DurationSetting.Initialize("Hold Time", + "Time (in seconds) that a control has to be held in order for it to register as a hold.", + "Default Hold Time", + () => target.duration, x => target.duration = x, () => InputSystem.settings.defaultHoldTime); + } + + public override void OnGUI() + { +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + if (!InputSystem.settings.useIMGUIEditorForAssets) return; +#endif + m_PressPointSetting.OnGUI(); + m_DurationSetting.OnGUI(); + } + +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback) + { + m_PressPointSetting.OnDrawVisualElements(root, onChangedCallback); + m_DurationSetting.OnDrawVisualElements(root, onChangedCallback); + } + +#endif + + private CustomOrDefaultSetting m_PressPointSetting; + private CustomOrDefaultSetting m_DurationSetting; + } + #endif +} \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/HoldInteractionEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/HoldInteractionEditor.cs.meta new file mode 100644 index 0000000000..8df8a3ad74 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/HoldInteractionEditor.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 1813c37aa62dd457f8a68e4884883b46 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs new file mode 100644 index 0000000000..bd480bafd5 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs @@ -0,0 +1,75 @@ +#if UNITY_EDITOR +using UnityEditor; +using UnityEngine.InputSystem.Editor; +using UnityEngine.UIElements; +using UnityEditor.UIElements; +#endif + +namespace UnityEditor.InputSystem.Interactions { + + #if UNITY_EDITOR + /// + /// UI that is displayed when editing in the editor. + /// + internal class MultiTapInteractionEditor : InputParameterEditor + { + protected override void OnEnable() + { + m_TapTimeSetting.Initialize("Max Tap Duration", + "Time (in seconds) within with a control has to be released again for it to register as a tap. If the control is held " + + "for longer than this time, the tap is canceled.", + "Default Tap Time", + () => target.tapTime, x => target.tapTime = x, () => InputSystem.settings.defaultTapTime); + m_TapDelaySetting.Initialize("Max Tap Spacing", + "The maximum delay (in seconds) allowed between each tap. If this time is exceeded, the multi-tap is canceled.", + "Default Tap Spacing", + () => target.tapDelay, x => target.tapDelay = x, () => InputSystem.settings.multiTapDelayTime); + m_PressPointSetting.Initialize("Press Point", + "The amount of actuation a control requires before being considered pressed. If not set, default to " + + "'Default Button Press Point' in the global input settings.", + "Default Button Press Point", + () => target.pressPoint, v => target.pressPoint = v, + () => InputSystem.settings.defaultButtonPressPoint); + } + + public override void OnGUI() + { +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + if (!InputSystem.settings.useIMGUIEditorForAssets) return; +#endif + target.tapCount = EditorGUILayout.IntField(m_TapCountLabel, target.tapCount); + m_TapDelaySetting.OnGUI(); + m_TapTimeSetting.OnGUI(); + m_PressPointSetting.OnGUI(); + } + +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback) + { + var tapCountField = new IntegerField(m_TapCountLabel.text) + { + value = target.tapCount, + tooltip = m_TapCountLabel.tooltip + }; + tapCountField.RegisterValueChangedCallback(evt => + { + target.tapCount = evt.newValue; + onChangedCallback?.Invoke(); + }); + root.Add(tapCountField); + + m_TapDelaySetting.OnDrawVisualElements(root, onChangedCallback); + m_TapTimeSetting.OnDrawVisualElements(root, onChangedCallback); + m_PressPointSetting.OnDrawVisualElements(root, onChangedCallback); + } + +#endif + + private readonly GUIContent m_TapCountLabel = new GUIContent("Tap Count", "How many taps need to be performed in succession. Two means double-tap, three means triple-tap, and so on."); + + private CustomOrDefaultSetting m_PressPointSetting; + private CustomOrDefaultSetting m_TapTimeSetting; + private CustomOrDefaultSetting m_TapDelaySetting; + } + #endif +} \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs.meta new file mode 100644 index 0000000000..042b7f5f8b --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 85d8fcbf2ff9c43aeb6c2259780ee390 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/PressInteractionEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/PressInteractionEditor.cs new file mode 100644 index 0000000000..9cb81215c2 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/PressInteractionEditor.cs @@ -0,0 +1,70 @@ +#if UNITY_EDITOR +using UnityEditor; +using UnityEngine.InputSystem.Editor; +using UnityEngine.UIElements; +using UnityEditor.UIElements; +#endif + +namespace UnityEditor.InputSystem.Interactions { + + #if UNITY_EDITOR + /// + /// UI that is displayed when editing in the editor. + /// + // ReSharper disable once UnusedMember.Global + internal class PressInteractionEditor : InputParameterEditor + { + protected override void OnEnable() + { + m_PressPointSetting.Initialize("Press Point", + "The amount of actuation a control requires before being considered pressed. If not set, default to " + + "'Default Button Press Point' in the global input settings.", + "Default Button Press Point", + () => target.pressPoint, v => target.pressPoint = v, + () => InputSystem.settings.defaultButtonPressPoint); + } + + public override void OnGUI() + { +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + if (!InputSystem.settings.useIMGUIEditorForAssets) return; +#endif + EditorGUILayout.HelpBox(s_HelpBoxText); + target.behavior = (PressBehavior)EditorGUILayout.EnumPopup(s_PressBehaviorLabel, target.behavior); + m_PressPointSetting.OnGUI(); + } + +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback) + { + root.Add(new HelpBox(s_HelpBoxText.text, HelpBoxMessageType.None)); + + var behaviourDropdown = new EnumField(s_PressBehaviorLabel.text, target.behavior) + { + tooltip = s_PressBehaviorLabel.tooltip + }; + behaviourDropdown.RegisterValueChangedCallback(evt => + { + target.behavior = (PressBehavior)evt.newValue; + onChangedCallback?.Invoke(); + }); + root.Add(behaviourDropdown); + + m_PressPointSetting.OnDrawVisualElements(root, onChangedCallback); + } + +#endif + + private CustomOrDefaultSetting m_PressPointSetting; + + private static readonly GUIContent s_HelpBoxText = EditorGUIUtility.TrTextContent("Note that the 'Press' interaction is only " + + "necessary when wanting to customize button press behavior. For default press behavior, simply set the action type to 'Button' " + + "and use the action without interactions added to it."); + + private static readonly GUIContent s_PressBehaviorLabel = EditorGUIUtility.TrTextContent("Trigger Behavior", + "Determines how button presses trigger the action. By default (PressOnly), the action is performed on press. " + + "With ReleaseOnly, the action is performed on release. With PressAndRelease, the action is performed on press and " + + "canceled on release."); + } + #endif +} \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/PressInteractionEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/PressInteractionEditor.cs.meta new file mode 100644 index 0000000000..5db1d36423 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/PressInteractionEditor.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 228872d31667d4011bfcaff0a589c4a1 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs new file mode 100644 index 0000000000..6ab05f9290 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs @@ -0,0 +1,47 @@ +#if UNITY_EDITOR +using UnityEngine.InputSystem.Editor; +using UnityEngine.UIElements; +#endif + +namespace UnityEditor.InputSystem.Interactions { + #if UNITY_EDITOR + internal class SlowTapInteractionEditor : InputParameterEditor + { + protected override void OnEnable() + { + m_DurationSetting.Initialize("Min Tap Duration", + "Minimum time (in seconds) that a control has to be held for it to register as a slow tap. If the control is released " + + "before this time, the slow tap is canceled.", + "Default Slow Tap Time", + () => target.duration, x => target.duration = x, () => InputSystem.settings.defaultSlowTapTime); + m_PressPointSetting.Initialize("Press Point", + "The amount of actuation a control requires before being considered pressed. If not set, default to " + + "'Default Button Press Point' in the global input settings.", + "Default Button Press Point", + () => target.pressPoint, v => target.pressPoint = v, + () => InputSystem.settings.defaultButtonPressPoint); + } + + public override void OnGUI() + { +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + if (!InputSystem.settings.useIMGUIEditorForAssets) return; +#endif + m_DurationSetting.OnGUI(); + m_PressPointSetting.OnGUI(); + } + +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback) + { + m_DurationSetting.OnDrawVisualElements(root, onChangedCallback); + m_PressPointSetting.OnDrawVisualElements(root, onChangedCallback); + } + +#endif + + private CustomOrDefaultSetting m_DurationSetting; + private CustomOrDefaultSetting m_PressPointSetting; + } + #endif +} \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs.meta new file mode 100644 index 0000000000..396e87cc81 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 039c745f633954ebb99500cc5f3169b6 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/TapInteractionEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/TapInteractionEditor.cs new file mode 100644 index 0000000000..3f07fa9c7d --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/TapInteractionEditor.cs @@ -0,0 +1,47 @@ +#if UNITY_EDITOR +using UnityEngine.InputSystem.Editor; +using UnityEngine.UIElements; +#endif + +namespace UnityEditor.InputSystem.Interactions { + #if UNITY_EDITOR + internal class TapInteractionEditor : InputParameterEditor + { + protected override void OnEnable() + { + m_DurationSetting.Initialize("Max Tap Duration", + "Time (in seconds) within with a control has to be released again for it to register as a tap. If the control is held " + + "for longer than this time, the tap is canceled.", + "Default Tap Time", + () => target.duration, x => target.duration = x, () => InputSystem.settings.defaultTapTime); + m_PressPointSetting.Initialize("Press Point", + "The amount of actuation a control requires before being considered pressed. If not set, default to " + + "'Default Button Press Point' in the global input settings.", + "Default Button Press Point", + () => target.pressPoint, v => target.pressPoint = v, + () => InputSystem.settings.defaultButtonPressPoint); + } + + public override void OnGUI() + { +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + if (!InputSystem.settings.useIMGUIEditorForAssets) return; +#endif + m_DurationSetting.OnGUI(); + m_PressPointSetting.OnGUI(); + } + +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback) + { + m_DurationSetting.OnDrawVisualElements(root, onChangedCallback); + m_PressPointSetting.OnDrawVisualElements(root, onChangedCallback); + } + +#endif + + private CustomOrDefaultSetting m_DurationSetting; + private CustomOrDefaultSetting m_PressPointSetting; + } + #endif +} \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/TapInteractionEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/TapInteractionEditor.cs.meta new file mode 100644 index 0000000000..6e5baa0123 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/TapInteractionEditor.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ede705751310c4c47b92755caa86da69 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector2CompositeEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector2CompositeEditor.cs new file mode 100644 index 0000000000..baad150428 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector2CompositeEditor.cs @@ -0,0 +1,44 @@ +#if UNITY_EDITOR +using UnityEditor; +using UnityEngine.InputSystem.Editor; +using UnityEngine.UIElements; +#endif + +namespace UnityEditor.InputSystem.Composites { + #if UNITY_EDITOR + internal class Vector2CompositeEditor : InputParameterEditor + { + private GUIContent m_ModeLabel = new GUIContent("Mode", + "How to synthesize a Vector2 from the inputs. Digital " + + "treats part bindings as buttons (on/off) whereas Analog preserves " + + "floating-point magnitudes as read from controls."); + + public override void OnGUI() + { +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + if (!InputSystem.settings.useIMGUIEditorForAssets) return; +#endif + target.mode = (Vector2Composite.Mode)EditorGUILayout.EnumPopup(m_ModeLabel, target.mode); + } + +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback) + { + var modeField = new EnumField(m_ModeLabel.text, target.mode) + { + tooltip = m_ModeLabel.tooltip + }; + + modeField.RegisterValueChangedCallback(evt => + { + target.mode = (Vector2Composite.Mode)evt.newValue; + onChangedCallback(); + }); + + root.Add(modeField); + } + +#endif + } + #endif +} \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector2CompositeEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector2CompositeEditor.cs.meta new file mode 100644 index 0000000000..bd74d4d0a6 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector2CompositeEditor.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: bc26b75e5423c40078082d8e558222d0 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector3CompositeEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector3CompositeEditor.cs new file mode 100644 index 0000000000..c540c98402 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector3CompositeEditor.cs @@ -0,0 +1,45 @@ + +#if UNITY_EDITOR +using UnityEditor; +using UnityEngine.InputSystem.Editor; +using UnityEngine.UIElements; +#endif + +namespace UnityEditor.InputSystem.Composites { + #if UNITY_EDITOR + internal class Vector3CompositeEditor : InputParameterEditor + { + private GUIContent m_ModeLabel = new GUIContent("Mode", + "How to synthesize a Vector3 from the inputs. Digital " + + "treats part bindings as buttons (on/off) whereas Analog preserves " + + "floating-point magnitudes as read from controls."); + + public override void OnGUI() + { +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + if (!InputSystem.settings.useIMGUIEditorForAssets) return; +#endif + target.mode = (Vector3Composite.Mode)EditorGUILayout.EnumPopup(m_ModeLabel, target.mode); + } + +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback) + { + var modeField = new EnumField(m_ModeLabel.text, target.mode) + { + tooltip = m_ModeLabel.tooltip + }; + + modeField.RegisterValueChangedCallback(evt => + { + target.mode = (Vector3Composite.Mode)evt.newValue; + onChangedCallback(); + }); + + root.Add(modeField); + } + +#endif + } + #endif +} \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector3CompositeEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector3CompositeEditor.cs.meta new file mode 100644 index 0000000000..42ecbaaeef --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector3CompositeEditor.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 30d6e70def27c4f0bb92b90ed5d7431b \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Controls.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Controls.meta new file mode 100644 index 0000000000..24b3fff5bb --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Controls.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 51baa5495e14f4589bdd9593c6a72ae3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors.meta new file mode 100644 index 0000000000..aaac5804bc --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b4690836c3a9e42f18b8d14b10b92097 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs new file mode 100644 index 0000000000..3c1f7b5ede --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs @@ -0,0 +1,48 @@ + +#if UNITY_EDITOR +using UnityEngine.InputSystem.Editor; +using UnityEngine.UIElements; +#endif + +namespace UnityEditor.InputSystem.Processors { + + #if UNITY_EDITOR + internal class AxisDeadzoneProcessorEditor : InputParameterEditor + { + protected override void OnEnable() + { + m_MinSetting.Initialize("Min", + "Value below which input values will be clamped. After clamping, values will be renormalized to [0..1] between min and max.", + "Default Deadzone Min", + () => target.min, v => target.min = v, + () => InputSystem.settings.defaultDeadzoneMin); + m_MaxSetting.Initialize("Max", + "Value above which input values will be clamped. After clamping, values will be renormalized to [0..1] between min and max.", + "Default Deadzone Max", + () => target.max, v => target.max = v, + () => InputSystem.settings.defaultDeadzoneMax); + } + + public override void OnGUI() + { +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + if (!InputSystem.settings.useIMGUIEditorForAssets) return; +#endif + m_MinSetting.OnGUI(); + m_MaxSetting.OnGUI(); + } + +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback) + { + m_MinSetting.OnDrawVisualElements(root, onChangedCallback); + m_MaxSetting.OnDrawVisualElements(root, onChangedCallback); + } + +#endif + + private CustomOrDefaultSetting m_MinSetting; + private CustomOrDefaultSetting m_MaxSetting; + } + #endif +} \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs.meta new file mode 100644 index 0000000000..7552a98c48 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f99afff196aaa4c64afc7f43a7ffd427 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs new file mode 100644 index 0000000000..227f2cc199 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs @@ -0,0 +1,49 @@ + + +#if UNITY_EDITOR +using UnityEngine.InputSystem.Editor; +using UnityEngine.UIElements; +#endif + +namespace UnityEditor.InputSystem.Processors { + + #if UNITY_EDITOR + internal class StickDeadzoneProcessorEditor : InputParameterEditor + { + protected override void OnEnable() + { + m_MinSetting.Initialize("Min", + "Vector length below which input values will be clamped. After clamping, vector lengths will be renormalized to [0..1] between min and max.", + "Default Deadzone Min", + () => target.min, v => target.min = v, + () => InputSystem.settings.defaultDeadzoneMin); + m_MaxSetting.Initialize("Max", + "Vector length above which input values will be clamped. After clamping, vector lengths will be renormalized to [0..1] between min and max.", + "Default Deadzone Max", + () => target.max, v => target.max = v, + () => InputSystem.settings.defaultDeadzoneMax); + } + + public override void OnGUI() + { +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + if (!InputSystem.settings.useIMGUIEditorForAssets) return; +#endif + m_MinSetting.OnGUI(); + m_MaxSetting.OnGUI(); + } + +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback) + { + m_MinSetting.OnDrawVisualElements(root, onChangedCallback); + m_MaxSetting.OnDrawVisualElements(root, onChangedCallback); + } + +#endif + + private CustomOrDefaultSetting m_MinSetting; + private CustomOrDefaultSetting m_MaxSetting; + } + #endif +} \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs.meta new file mode 100644 index 0000000000..492af85bf7 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 59bbf7f4fa3af4e0eb0ed7eaabff05db \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins.meta new file mode 100644 index 0000000000..0394724d25 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b873975c6661d4c3a9442c4134bb5c63 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch.meta new file mode 100644 index 0000000000..a07605c224 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 802b0375540bb4a04be19fe17d88d659 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs new file mode 100644 index 0000000000..25fe546389 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs @@ -0,0 +1,49 @@ +#if UNITY_EDITOR +using UnityEditor; +using UnityEngine.InputSystem.Editor; +#endif + +namespace UnityEngine.InputSystem.EnhancedTouch { + + [InitializeOnLoad] + private class TouchSimulationEdtiorInitialization + { + static TouchSimulation() + { + // We're a MonoBehaviour so our cctor may get called as part of the MonoBehaviour being + // created. We don't want to trigger InputSystem initialization from there so delay-execute + // the code here. + EditorApplication.delayCall += + () => + { + InputSystem.onSettingsChange += OnSettingsChanged; + InputSystem.onBeforeUpdate += ReEnableAfterDomainReload; + }; + } + + private static void ReEnableAfterDomainReload() + { + OnSettingsChanged(); + InputSystem.onBeforeUpdate -= ReEnableAfterDomainReload; + } + + private static void OnSettingsChanged() + { + if (InputEditorUserSettings.simulateTouch) + TouchSimulation.Enable(); + else + TouchSimulation.Disable(); + } + + } + + + [CustomEditor(typeof(TouchSimulation))] + private class TouchSimulationEditor : UnityEditor.Editor + { + public void OnDisable() + { + new InputComponentEditorAnalytic(InputSystemComponent.TouchSimulation).Send(); + } + } +} \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs.meta new file mode 100644 index 0000000000..2a51a256cc --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 848690e04e53948a5b5ffb210a4fa64f \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/HID.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/HID.meta new file mode 100644 index 0000000000..fbae2f9e60 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/HID.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2a5747283a8db45e99cf4536241aeb9a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/HID/HIDDescriptorWindow.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/HID/HIDDescriptorWindow.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Plugins/HID/HIDDescriptorWindow.cs rename to Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/HID/HIDDescriptorWindow.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/HID/HIDDescriptorWindow.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/HID/HIDDescriptorWindow.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Plugins/HID/HIDDescriptorWindow.cs.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/HID/HIDDescriptorWindow.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/iOS/InputSettingsiOSProvider.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/InputSettingsiOSProvider.cs similarity index 97% rename from Packages/com.unity.inputsystem/InputSystem/Plugins/iOS/InputSettingsiOSProvider.cs rename to Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/InputSettingsiOSProvider.cs index 36eb6f92f9..159f21efed 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/iOS/InputSettingsiOSProvider.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/InputSettingsiOSProvider.cs @@ -2,7 +2,7 @@ using System; using UnityEditor; -namespace UnityEngine.InputSystem +namespace UnityEditor.InputSystem { internal class InputSettingsiOSProvider { diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/iOS/InputSettingsiOSProvider.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/InputSettingsiOSProvider.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Plugins/iOS/InputSettingsiOSProvider.cs.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/InputSettingsiOSProvider.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInput.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInput.meta new file mode 100644 index 0000000000..ab0256a2fc --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInput.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3797c94c0360c4497af338652e02249a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputManagerEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInput/PlayerInputManagerEditor.cs similarity index 99% rename from Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputManagerEditor.cs rename to Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInput/PlayerInputManagerEditor.cs index 48055a7373..5555838bc1 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputManagerEditor.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInput/PlayerInputManagerEditor.cs @@ -4,7 +4,7 @@ using UnityEditor; using UnityEngine.InputSystem.Users; -namespace UnityEngine.InputSystem.Editor +namespace UnityEditor.InputSystem.Editor { /// /// Custom inspector for . diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputManagerEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInput/PlayerInputManagerEditor.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputManagerEditor.cs.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInput/PlayerInputManagerEditor.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInputEditor.cs similarity index 99% rename from Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputEditor.cs rename to Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInputEditor.cs index cb5d9c89c8..8e9e8257b6 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputEditor.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInputEditor.cs @@ -15,7 +15,7 @@ ////TODO: detect if new input system isn't enabled and provide UI to enable it #pragma warning disable 0414 -namespace UnityEngine.InputSystem.Editor +namespace UnityEditor.InputSystem.Editor { /// /// A custom inspector for the component. diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInputEditor.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputEditor.cs.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInputEditor.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UnityEditor.InputSystem.asmdef b/Packages/com.unity.inputsystem/InputSystem/Editor/UnityEditor.InputSystem.asmdef new file mode 100644 index 0000000000..efdc92ba6e --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UnityEditor.InputSystem.asmdef @@ -0,0 +1,18 @@ +{ + "name": "UnityEditor.InputSystem", + "rootNamespace": "", + "references": [ + "GUID:75469ad4d38634e559750d17036d5f7c" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UnityEditor.InputSystem.asmdef.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/UnityEditor.InputSystem.asmdef.meta new file mode 100644 index 0000000000..18102de83d --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UnityEditor.InputSystem.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 43c9ed31071e54e6ab323e5e2f3bdc9c +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/EnhancedTouch/TouchSimulation.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/EnhancedTouch/TouchSimulation.cs index 108e83e5a4..d7bbc15ccd 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/EnhancedTouch/TouchSimulation.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/EnhancedTouch/TouchSimulation.cs @@ -3,10 +3,6 @@ using UnityEngine.InputSystem.Controls; using UnityEngine.InputSystem.LowLevel; using UnityEngine.InputSystem.Utilities; -#if UNITY_EDITOR -using UnityEditor; -using UnityEngine.InputSystem.Editor; -#endif ////TODO: add pressure support @@ -32,9 +28,6 @@ namespace UnityEngine.InputSystem.EnhancedTouch [AddComponentMenu("Input/Debug/Touch Simulation")] [ExecuteInEditMode] [HelpURL(InputSystem.kDocUrl + "/manual/Touch.html#touch-simulation")] - #if UNITY_EDITOR - [InitializeOnLoad] - #endif public class TouchSimulation : MonoBehaviour, IInputStateChangeMonitor { public Touchscreen simulatedTouchscreen { get; private set; } @@ -341,45 +334,6 @@ private unsafe void UpdateTouch(int touchIndex, int pointerIndex, TouchPhase pha internal static TouchSimulation s_Instance; - #if UNITY_EDITOR - static TouchSimulation() - { - // We're a MonoBehaviour so our cctor may get called as part of the MonoBehaviour being - // created. We don't want to trigger InputSystem initialization from there so delay-execute - // the code here. - EditorApplication.delayCall += - () => - { - InputSystem.onSettingsChange += OnSettingsChanged; - InputSystem.onBeforeUpdate += ReEnableAfterDomainReload; - }; - } - - private static void ReEnableAfterDomainReload() - { - OnSettingsChanged(); - InputSystem.onBeforeUpdate -= ReEnableAfterDomainReload; - } - - private static void OnSettingsChanged() - { - if (InputEditorUserSettings.simulateTouch) - Enable(); - else - Disable(); - } - - [CustomEditor(typeof(TouchSimulation))] - private class TouchSimulationEditor : UnityEditor.Editor - { - public void OnDisable() - { - new InputComponentEditorAnalytic(InputSystemComponent.TouchSimulation).Send(); - } - } - - #endif // UNITY_EDITOR - ////TODO: Remove IInputStateChangeMonitor from this class when we can break the API void IInputStateChangeMonitor.NotifyControlStateChanged(InputControl control, double time, InputEventPtr eventPtr, long monitorIndex) { From 89a020a987544037ee803d66903708a2445b068e Mon Sep 17 00:00:00 2001 From: leonardo Date: Thu, 25 Sep 2025 12:03:13 +0200 Subject: [PATCH 02/12] Moving some Editor and PropertyDrawers to an Editor Assembly --- .../{InputSystem => }/Editor/Actions.meta | 0 .../Editor/Actions/AxisCompositeEditor.cs | 3 +++ .../Editor/Actions/AxisCompositeEditor.cs.meta | 11 +++++++++++ .../Editor/Actions/Interactions.meta | 0 .../Actions/Interactions/HoldInteractionEditor.cs | 5 ++++- .../Interactions/HoldInteractionEditor.cs.meta | 11 +++++++++++ .../Actions/Interactions/MultiTapInteractionEditor.cs | 9 ++++++--- .../Interactions/MultiTapInteractionEditor.cs.meta | 11 +++++++++++ .../Actions/Interactions/PressInteractionEditor.cs | 5 ++++- .../Interactions/PressInteractionEditor.cs.meta | 11 +++++++++++ .../Actions/Interactions/SlowTapInteractionEditor.cs | 6 ++++-- .../Interactions/SlowTapInteractionEditor.cs.meta | 11 +++++++++++ .../Actions/Interactions/TapInteractionEditor.cs | 6 ++++-- .../Actions/Interactions/TapInteractionEditor.cs.meta | 11 +++++++++++ .../Editor/Actions/Vector2CompositeEditor.cs | 3 +++ .../Editor/Actions/Vector2CompositeEditor.cs.meta | 11 +++++++++++ .../Editor/Actions/Vector3CompositeEditor.cs | 3 +++ .../Editor/Actions/Vector3CompositeEditor.cs.meta | 11 +++++++++++ Packages/com.unity.inputsystem/Editor/AssemblyInfo.cs | 11 +++++++++++ .../com.unity.inputsystem/Editor/AssemblyInfo.cs.meta | 3 +++ .../com.unity.inputsystem/Editor/AssetEditor.meta | 3 +++ .../Editor/AssetEditor/InputActionEditorWindow.cs | 0 .../AssetEditor/InputActionEditorWindow.cs.meta | 0 .../Editor/AssetEditor/InputActionPropertiesView.cs | 0 .../AssetEditor/InputActionPropertiesView.cs.meta | 0 .../Editor/AssetEditor/InputBindingPropertiesView.cs | 0 .../AssetEditor/InputBindingPropertiesView.cs.meta | 0 .../Editor/AssetEditor/NameAndParameterListView.cs | 0 .../AssetEditor/NameAndParameterListView.cs.meta | 0 .../Editor/AssetEditor/ParameterListView.cs | 0 .../Editor/AssetEditor/ParameterListView.cs.meta | 0 .../Editor/AssetEditor/PropertiesViewBase.cs | 0 .../Editor/AssetEditor/PropertiesViewBase.cs.meta | 0 .../com.unity.inputsystem/Editor/AssetImporter.meta | 3 +++ .../Editor/AssetImporter/InputActionImporterEditor.cs | 0 .../AssetImporter/InputActionImporterEditor.cs.meta | 0 .../{InputSystem => }/Editor/Controls.meta | 0 .../{InputSystem => }/Editor/Controls/Processors.meta | 0 .../Processors/AxisDeadzoneProcessorEditor.cs | 8 +++++--- .../Processors/AxisDeadzoneProcessorEditor.cs.meta | 11 +++++++++++ .../Processors/StickDeadzoneProcessorEditor.cs | 6 ++++-- .../Processors/StickDeadzoneProcessorEditor.cs.meta | 11 +++++++++++ .../{InputSystem => }/Editor/InputParameterEditor.cs | 0 .../Editor/InputParameterEditor.cs.meta | 0 .../{InputSystem => }/Editor/PropertyDrawers.meta | 0 .../PropertyDrawers/GamepadButtonPropertyDrawer.cs | 0 .../GamepadButtonPropertyDrawer.cs.meta | 0 .../Editor/PropertyDrawers/InputActionAssetDrawer.cs | 0 .../PropertyDrawers/InputActionAssetDrawer.cs.meta | 0 .../PropertyDrawers/InputActionAssetSearchProvider.cs | 0 .../InputActionAssetSearchProvider.cs.meta | 0 .../Editor/PropertyDrawers/InputActionDrawer.cs | 0 .../Editor/PropertyDrawers/InputActionDrawer.cs.meta | 0 .../Editor/PropertyDrawers/InputActionDrawerBase.cs | 0 .../PropertyDrawers/InputActionDrawerBase.cs.meta | 0 .../Editor/PropertyDrawers/InputActionMapDrawer.cs | 0 .../PropertyDrawers/InputActionMapDrawer.cs.meta | 0 .../PropertyDrawers/InputActionPropertyDrawer.cs | 0 .../PropertyDrawers/InputActionPropertyDrawer.cs.meta | 0 .../InputActionReferencePropertyDrawer.cs | 0 .../InputActionReferencePropertyDrawer.cs.meta | 0 .../InputActionReferenceSearchProviders.cs | 0 .../InputActionReferenceSearchProviders.cs.meta | 0 .../Editor/PropertyDrawers/InputControlPathDrawer.cs | 0 .../PropertyDrawers/InputControlPathDrawer.cs.meta | 0 .../Unity.InputSystem.Editor.asmdef} | 2 +- .../Unity.InputSystem.Editor.asmdef.meta} | 2 +- .../InputSystem/Actions/InputActionAsset.cs | 1 - .../com.unity.inputsystem/InputSystem/AssemblyInfo.cs | 1 + .../Editor/Actions/AxisCompositeEditor.cs.meta | 2 -- .../Interactions/HoldInteractionEditor.cs.meta | 2 -- .../Interactions/MultiTapInteractionEditor.cs.meta | 2 -- .../Interactions/PressInteractionEditor.cs.meta | 2 -- .../Interactions/SlowTapInteractionEditor.cs.meta | 2 -- .../Actions/Interactions/TapInteractionEditor.cs.meta | 2 -- .../Editor/Actions/Vector2CompositeEditor.cs.meta | 2 -- .../Editor/Actions/Vector3CompositeEditor.cs.meta | 2 -- .../Processors/AxisDeadzoneProcessorEditor.cs.meta | 2 -- .../Processors/StickDeadzoneProcessorEditor.cs.meta | 2 -- .../Plugins/EnhancedTouch/TouchSimulationEditor.cs | 6 +++--- .../EnhancedTouch/TouchSimulationEditor.cs.meta | 11 ++++++++++- .../Editor/Plugins/InputSettingsiOSProvider.cs | 1 + .../Plugins/PlayerInput/PlayerInputManagerEditor.cs | 4 +++- .../InputSystem/Editor/Plugins/PlayerInputEditor.cs | 3 +++ .../Editor/Settings/InputSettingsProvider.cs | 1 + .../Plugins/UI/ExtendedSubmitCancelEventData.cs.meta | 11 ++++++++++- .../Plugins/UI/INavigationEventData.cs.meta | 11 ++++++++++- .../Plugins/UI/InputSystemUIInputModule.cs | 2 +- 88 files changed, 215 insertions(+), 45 deletions(-) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/Actions.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/Actions/AxisCompositeEditor.cs (96%) create mode 100644 Packages/com.unity.inputsystem/Editor/Actions/AxisCompositeEditor.cs.meta rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/Actions/Interactions.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/Actions/Interactions/HoldInteractionEditor.cs (91%) create mode 100644 Packages/com.unity.inputsystem/Editor/Actions/Interactions/HoldInteractionEditor.cs.meta rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/Actions/Interactions/MultiTapInteractionEditor.cs (91%) create mode 100644 Packages/com.unity.inputsystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs.meta rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/Actions/Interactions/PressInteractionEditor.cs (94%) create mode 100644 Packages/com.unity.inputsystem/Editor/Actions/Interactions/PressInteractionEditor.cs.meta rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/Actions/Interactions/SlowTapInteractionEditor.cs (89%) create mode 100644 Packages/com.unity.inputsystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs.meta rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/Actions/Interactions/TapInteractionEditor.cs (89%) create mode 100644 Packages/com.unity.inputsystem/Editor/Actions/Interactions/TapInteractionEditor.cs.meta rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/Actions/Vector2CompositeEditor.cs (95%) create mode 100644 Packages/com.unity.inputsystem/Editor/Actions/Vector2CompositeEditor.cs.meta rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/Actions/Vector3CompositeEditor.cs (95%) create mode 100644 Packages/com.unity.inputsystem/Editor/Actions/Vector3CompositeEditor.cs.meta create mode 100644 Packages/com.unity.inputsystem/Editor/AssemblyInfo.cs create mode 100644 Packages/com.unity.inputsystem/Editor/AssemblyInfo.cs.meta create mode 100644 Packages/com.unity.inputsystem/Editor/AssetEditor.meta rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetEditor/InputActionEditorWindow.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetEditor/InputActionEditorWindow.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetEditor/InputActionPropertiesView.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetEditor/InputActionPropertiesView.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetEditor/InputBindingPropertiesView.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetEditor/InputBindingPropertiesView.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetEditor/NameAndParameterListView.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetEditor/NameAndParameterListView.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetEditor/ParameterListView.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetEditor/ParameterListView.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetEditor/PropertiesViewBase.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetEditor/PropertiesViewBase.cs.meta (100%) create mode 100644 Packages/com.unity.inputsystem/Editor/AssetImporter.meta rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetImporter/InputActionImporterEditor.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetImporter/InputActionImporterEditor.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/Controls.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/Controls/Processors.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs (86%) create mode 100644 Packages/com.unity.inputsystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs.meta rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs (88%) create mode 100644 Packages/com.unity.inputsystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs.meta rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/InputParameterEditor.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/InputParameterEditor.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers/GamepadButtonPropertyDrawer.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers/GamepadButtonPropertyDrawer.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers/InputActionAssetDrawer.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers/InputActionAssetDrawer.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers/InputActionAssetSearchProvider.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers/InputActionAssetSearchProvider.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers/InputActionDrawer.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers/InputActionDrawer.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers/InputActionDrawerBase.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers/InputActionDrawerBase.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers/InputActionMapDrawer.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers/InputActionMapDrawer.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers/InputActionPropertyDrawer.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers/InputActionPropertyDrawer.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers/InputActionReferencePropertyDrawer.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers/InputActionReferencePropertyDrawer.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers/InputActionReferenceSearchProviders.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers/InputActionReferenceSearchProviders.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers/InputControlPathDrawer.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/PropertyDrawers/InputControlPathDrawer.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem/Editor/UnityEditor.InputSystem.asmdef => Editor/Unity.InputSystem.Editor.asmdef} (90%) rename Packages/com.unity.inputsystem/{InputSystem/Editor/UnityEditor.InputSystem.asmdef.meta => Editor/Unity.InputSystem.Editor.asmdef.meta} (76%) delete mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/AxisCompositeEditor.cs.meta delete mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/HoldInteractionEditor.cs.meta delete mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs.meta delete mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/PressInteractionEditor.cs.meta delete mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs.meta delete mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/TapInteractionEditor.cs.meta delete mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector2CompositeEditor.cs.meta delete mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector3CompositeEditor.cs.meta delete mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs.meta delete mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions.meta b/Packages/com.unity.inputsystem/Editor/Actions.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Actions.meta rename to Packages/com.unity.inputsystem/Editor/Actions.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/AxisCompositeEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/AxisCompositeEditor.cs similarity index 96% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Actions/AxisCompositeEditor.cs rename to Packages/com.unity.inputsystem/Editor/Actions/AxisCompositeEditor.cs index 33c427f238..db5ad13db8 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/AxisCompositeEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Actions/AxisCompositeEditor.cs @@ -1,3 +1,6 @@ + +using UnityEngine; +using UnityEngine.InputSystem.Composites; #if UNITY_EDITOR using System; using UnityEditor; diff --git a/Packages/com.unity.inputsystem/Editor/Actions/AxisCompositeEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Actions/AxisCompositeEditor.cs.meta new file mode 100644 index 0000000000..128754764f --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Actions/AxisCompositeEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f04048c85eab54bcc9c4cba980634c7c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions.meta b/Packages/com.unity.inputsystem/Editor/Actions/Interactions.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions.meta rename to Packages/com.unity.inputsystem/Editor/Actions/Interactions.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/HoldInteractionEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/HoldInteractionEditor.cs similarity index 91% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/HoldInteractionEditor.cs rename to Packages/com.unity.inputsystem/Editor/Actions/Interactions/HoldInteractionEditor.cs index 286f543215..dbb22dee0f 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/HoldInteractionEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/HoldInteractionEditor.cs @@ -1,3 +1,6 @@ + +using UnityEngine.InputSystem.Controls; +using UnityEngine.InputSystem.Interactions; #if UNITY_EDITOR using UnityEngine.InputSystem.Editor; using UnityEngine.UIElements; @@ -20,7 +23,7 @@ protected override void OnEnable() m_DurationSetting.Initialize("Hold Time", "Time (in seconds) that a control has to be held in order for it to register as a hold.", "Default Hold Time", - () => target.duration, x => target.duration = x, () => InputSystem.settings.defaultHoldTime); + () => target.duration, x => target.duration = x, () => UnityEngine.InputSystem.InputSystem.settings.defaultHoldTime); } public override void OnGUI() diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/HoldInteractionEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/HoldInteractionEditor.cs.meta new file mode 100644 index 0000000000..1bd4d64dec --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/HoldInteractionEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1813c37aa62dd457f8a68e4884883b46 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs similarity index 91% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs rename to Packages/com.unity.inputsystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs index bd480bafd5..9d0ee84f69 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs @@ -1,3 +1,6 @@ + +using UnityEngine; +using UnityEngine.InputSystem.Interactions; #if UNITY_EDITOR using UnityEditor; using UnityEngine.InputSystem.Editor; @@ -19,17 +22,17 @@ protected override void OnEnable() "Time (in seconds) within with a control has to be released again for it to register as a tap. If the control is held " + "for longer than this time, the tap is canceled.", "Default Tap Time", - () => target.tapTime, x => target.tapTime = x, () => InputSystem.settings.defaultTapTime); + () => target.tapTime, x => target.tapTime = x, () => UnityEngine.InputSystem.InputSystem.settings.defaultTapTime); m_TapDelaySetting.Initialize("Max Tap Spacing", "The maximum delay (in seconds) allowed between each tap. If this time is exceeded, the multi-tap is canceled.", "Default Tap Spacing", - () => target.tapDelay, x => target.tapDelay = x, () => InputSystem.settings.multiTapDelayTime); + () => target.tapDelay, x => target.tapDelay = x, () => UnityEngine.InputSystem.InputSystem.settings.multiTapDelayTime); m_PressPointSetting.Initialize("Press Point", "The amount of actuation a control requires before being considered pressed. If not set, default to " + "'Default Button Press Point' in the global input settings.", "Default Button Press Point", () => target.pressPoint, v => target.pressPoint = v, - () => InputSystem.settings.defaultButtonPressPoint); + () => UnityEngine.InputSystem.InputSystem.settings.defaultButtonPressPoint); } public override void OnGUI() diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs.meta new file mode 100644 index 0000000000..06911e1084 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 85d8fcbf2ff9c43aeb6c2259780ee390 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/PressInteractionEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/PressInteractionEditor.cs similarity index 94% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/PressInteractionEditor.cs rename to Packages/com.unity.inputsystem/Editor/Actions/Interactions/PressInteractionEditor.cs index 9cb81215c2..57d631d560 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/PressInteractionEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/PressInteractionEditor.cs @@ -1,3 +1,6 @@ + +using UnityEngine; +using UnityEngine.InputSystem.Interactions; #if UNITY_EDITOR using UnityEditor; using UnityEngine.InputSystem.Editor; @@ -21,7 +24,7 @@ protected override void OnEnable() + "'Default Button Press Point' in the global input settings.", "Default Button Press Point", () => target.pressPoint, v => target.pressPoint = v, - () => InputSystem.settings.defaultButtonPressPoint); + () => UnityEngine.InputSystem.InputSystem.settings.defaultButtonPressPoint); } public override void OnGUI() diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/PressInteractionEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/PressInteractionEditor.cs.meta new file mode 100644 index 0000000000..dac10f034e --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/PressInteractionEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 228872d31667d4011bfcaff0a589c4a1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs similarity index 89% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs rename to Packages/com.unity.inputsystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs index 6ab05f9290..dfb47ffe16 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs @@ -1,3 +1,5 @@ + +using UnityEngine.InputSystem.Interactions; #if UNITY_EDITOR using UnityEngine.InputSystem.Editor; using UnityEngine.UIElements; @@ -13,13 +15,13 @@ protected override void OnEnable() "Minimum time (in seconds) that a control has to be held for it to register as a slow tap. If the control is released " + "before this time, the slow tap is canceled.", "Default Slow Tap Time", - () => target.duration, x => target.duration = x, () => InputSystem.settings.defaultSlowTapTime); + () => target.duration, x => target.duration = x, () => UnityEngine.InputSystem.InputSystem.settings.defaultSlowTapTime); m_PressPointSetting.Initialize("Press Point", "The amount of actuation a control requires before being considered pressed. If not set, default to " + "'Default Button Press Point' in the global input settings.", "Default Button Press Point", () => target.pressPoint, v => target.pressPoint = v, - () => InputSystem.settings.defaultButtonPressPoint); + () => UnityEngine.InputSystem.InputSystem.settings.defaultButtonPressPoint); } public override void OnGUI() diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs.meta new file mode 100644 index 0000000000..0aa4ab6c16 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 039c745f633954ebb99500cc5f3169b6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/TapInteractionEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/TapInteractionEditor.cs similarity index 89% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/TapInteractionEditor.cs rename to Packages/com.unity.inputsystem/Editor/Actions/Interactions/TapInteractionEditor.cs index 3f07fa9c7d..e64ae11117 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/TapInteractionEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/TapInteractionEditor.cs @@ -1,3 +1,5 @@ + +using UnityEngine.InputSystem.Interactions; #if UNITY_EDITOR using UnityEngine.InputSystem.Editor; using UnityEngine.UIElements; @@ -13,13 +15,13 @@ protected override void OnEnable() "Time (in seconds) within with a control has to be released again for it to register as a tap. If the control is held " + "for longer than this time, the tap is canceled.", "Default Tap Time", - () => target.duration, x => target.duration = x, () => InputSystem.settings.defaultTapTime); + () => target.duration, x => target.duration = x, () => UnityEngine.InputSystem.InputSystem.settings.defaultTapTime); m_PressPointSetting.Initialize("Press Point", "The amount of actuation a control requires before being considered pressed. If not set, default to " + "'Default Button Press Point' in the global input settings.", "Default Button Press Point", () => target.pressPoint, v => target.pressPoint = v, - () => InputSystem.settings.defaultButtonPressPoint); + () => UnityEngine.InputSystem.InputSystem.settings.defaultButtonPressPoint); } public override void OnGUI() diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/TapInteractionEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/TapInteractionEditor.cs.meta new file mode 100644 index 0000000000..307bcd0b20 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/TapInteractionEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ede705751310c4c47b92755caa86da69 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector2CompositeEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Vector2CompositeEditor.cs similarity index 95% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector2CompositeEditor.cs rename to Packages/com.unity.inputsystem/Editor/Actions/Vector2CompositeEditor.cs index baad150428..cb2c708a11 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector2CompositeEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Actions/Vector2CompositeEditor.cs @@ -1,3 +1,6 @@ + +using UnityEngine; +using UnityEngine.InputSystem.Composites; #if UNITY_EDITOR using UnityEditor; using UnityEngine.InputSystem.Editor; diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Vector2CompositeEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Actions/Vector2CompositeEditor.cs.meta new file mode 100644 index 0000000000..439ded4947 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Actions/Vector2CompositeEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bc26b75e5423c40078082d8e558222d0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector3CompositeEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Vector3CompositeEditor.cs similarity index 95% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector3CompositeEditor.cs rename to Packages/com.unity.inputsystem/Editor/Actions/Vector3CompositeEditor.cs index c540c98402..7d05b7ca2b 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector3CompositeEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Actions/Vector3CompositeEditor.cs @@ -1,4 +1,7 @@ + +using UnityEngine; +using UnityEngine.InputSystem.Composites; #if UNITY_EDITOR using UnityEditor; using UnityEngine.InputSystem.Editor; diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Vector3CompositeEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Actions/Vector3CompositeEditor.cs.meta new file mode 100644 index 0000000000..7d74e81543 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Actions/Vector3CompositeEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 30d6e70def27c4f0bb92b90ed5d7431b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/Editor/AssemblyInfo.cs b/Packages/com.unity.inputsystem/Editor/AssemblyInfo.cs new file mode 100644 index 0000000000..ceb371b1b3 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/AssemblyInfo.cs @@ -0,0 +1,11 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using UnityEngine.InputSystem; + +[assembly: AssemblyVersion(InputSystem.kAssemblyVersion)] +[assembly: InternalsVisibleTo("Unity.InputSystem.TestFramework")] +[assembly: InternalsVisibleTo("Unity.InputSystem.Tests.Editor")] +[assembly: InternalsVisibleTo("Unity.InputSystem.Tests")] +[assembly: InternalsVisibleTo("Unity.InputSystem.IntegrationTests")] +[assembly: InternalsVisibleTo("Unity.InputSystem.ForUI")] // To avoid minor bump + diff --git a/Packages/com.unity.inputsystem/Editor/AssemblyInfo.cs.meta b/Packages/com.unity.inputsystem/Editor/AssemblyInfo.cs.meta new file mode 100644 index 0000000000..68551a6b1a --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/AssemblyInfo.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f2b7519ff14041d08d6e04091bbdbcfa +timeCreated: 1758794307 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/Editor/AssetEditor.meta b/Packages/com.unity.inputsystem/Editor/AssetEditor.meta new file mode 100644 index 0000000000..862e3bfa91 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/AssetEditor.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 637483ac519c47aabfe282710602ee91 +timeCreated: 1758793779 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionEditorWindow.cs b/Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionEditorWindow.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionEditorWindow.cs rename to Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionEditorWindow.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionEditorWindow.cs.meta b/Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionEditorWindow.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionEditorWindow.cs.meta rename to Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionEditorWindow.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionPropertiesView.cs b/Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionPropertiesView.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionPropertiesView.cs rename to Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionPropertiesView.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionPropertiesView.cs.meta b/Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionPropertiesView.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionPropertiesView.cs.meta rename to Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionPropertiesView.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs b/Packages/com.unity.inputsystem/Editor/AssetEditor/InputBindingPropertiesView.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs rename to Packages/com.unity.inputsystem/Editor/AssetEditor/InputBindingPropertiesView.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs.meta b/Packages/com.unity.inputsystem/Editor/AssetEditor/InputBindingPropertiesView.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs.meta rename to Packages/com.unity.inputsystem/Editor/AssetEditor/InputBindingPropertiesView.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/NameAndParameterListView.cs b/Packages/com.unity.inputsystem/Editor/AssetEditor/NameAndParameterListView.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/NameAndParameterListView.cs rename to Packages/com.unity.inputsystem/Editor/AssetEditor/NameAndParameterListView.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/NameAndParameterListView.cs.meta b/Packages/com.unity.inputsystem/Editor/AssetEditor/NameAndParameterListView.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/NameAndParameterListView.cs.meta rename to Packages/com.unity.inputsystem/Editor/AssetEditor/NameAndParameterListView.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/ParameterListView.cs b/Packages/com.unity.inputsystem/Editor/AssetEditor/ParameterListView.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/ParameterListView.cs rename to Packages/com.unity.inputsystem/Editor/AssetEditor/ParameterListView.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/ParameterListView.cs.meta b/Packages/com.unity.inputsystem/Editor/AssetEditor/ParameterListView.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/ParameterListView.cs.meta rename to Packages/com.unity.inputsystem/Editor/AssetEditor/ParameterListView.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PropertiesViewBase.cs b/Packages/com.unity.inputsystem/Editor/AssetEditor/PropertiesViewBase.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PropertiesViewBase.cs rename to Packages/com.unity.inputsystem/Editor/AssetEditor/PropertiesViewBase.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PropertiesViewBase.cs.meta b/Packages/com.unity.inputsystem/Editor/AssetEditor/PropertiesViewBase.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PropertiesViewBase.cs.meta rename to Packages/com.unity.inputsystem/Editor/AssetEditor/PropertiesViewBase.cs.meta diff --git a/Packages/com.unity.inputsystem/Editor/AssetImporter.meta b/Packages/com.unity.inputsystem/Editor/AssetImporter.meta new file mode 100644 index 0000000000..818321b406 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/AssetImporter.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3170f7532dc44cc493495f36f2eeffe5 +timeCreated: 1758794005 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetImporter/InputActionImporterEditor.cs b/Packages/com.unity.inputsystem/Editor/AssetImporter/InputActionImporterEditor.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetImporter/InputActionImporterEditor.cs rename to Packages/com.unity.inputsystem/Editor/AssetImporter/InputActionImporterEditor.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetImporter/InputActionImporterEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/AssetImporter/InputActionImporterEditor.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetImporter/InputActionImporterEditor.cs.meta rename to Packages/com.unity.inputsystem/Editor/AssetImporter/InputActionImporterEditor.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Controls.meta b/Packages/com.unity.inputsystem/Editor/Controls.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Controls.meta rename to Packages/com.unity.inputsystem/Editor/Controls.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors.meta b/Packages/com.unity.inputsystem/Editor/Controls/Processors.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors.meta rename to Packages/com.unity.inputsystem/Editor/Controls/Processors.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs b/Packages/com.unity.inputsystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs similarity index 86% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs rename to Packages/com.unity.inputsystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs index 3c1f7b5ede..a12a11e354 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs @@ -1,4 +1,6 @@ + +using UnityEngine.InputSystem.Processors; #if UNITY_EDITOR using UnityEngine.InputSystem.Editor; using UnityEngine.UIElements; @@ -7,7 +9,7 @@ namespace UnityEditor.InputSystem.Processors { #if UNITY_EDITOR - internal class AxisDeadzoneProcessorEditor : InputParameterEditor + internal class AxisDeadzoneProcessorEditor : InputParameterEditor { protected override void OnEnable() { @@ -15,12 +17,12 @@ protected override void OnEnable() "Value below which input values will be clamped. After clamping, values will be renormalized to [0..1] between min and max.", "Default Deadzone Min", () => target.min, v => target.min = v, - () => InputSystem.settings.defaultDeadzoneMin); + () => UnityEngine.InputSystem.InputSystem.settings.defaultDeadzoneMin); m_MaxSetting.Initialize("Max", "Value above which input values will be clamped. After clamping, values will be renormalized to [0..1] between min and max.", "Default Deadzone Max", () => target.max, v => target.max = v, - () => InputSystem.settings.defaultDeadzoneMax); + () => UnityEngine.InputSystem.InputSystem.settings.defaultDeadzoneMax); } public override void OnGUI() diff --git a/Packages/com.unity.inputsystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs.meta new file mode 100644 index 0000000000..b01efa3366 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f99afff196aaa4c64afc7f43a7ffd427 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs b/Packages/com.unity.inputsystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs similarity index 88% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs rename to Packages/com.unity.inputsystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs index 227f2cc199..1b36abce84 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs @@ -1,5 +1,7 @@ + +using UnityEngine.InputSystem.Processors; #if UNITY_EDITOR using UnityEngine.InputSystem.Editor; using UnityEngine.UIElements; @@ -16,12 +18,12 @@ protected override void OnEnable() "Vector length below which input values will be clamped. After clamping, vector lengths will be renormalized to [0..1] between min and max.", "Default Deadzone Min", () => target.min, v => target.min = v, - () => InputSystem.settings.defaultDeadzoneMin); + () => UnityEngine.InputSystem.InputSystem.settings.defaultDeadzoneMin); m_MaxSetting.Initialize("Max", "Vector length above which input values will be clamped. After clamping, vector lengths will be renormalized to [0..1] between min and max.", "Default Deadzone Max", () => target.max, v => target.max = v, - () => InputSystem.settings.defaultDeadzoneMax); + () => UnityEngine.InputSystem.InputSystem.settings.defaultDeadzoneMax); } public override void OnGUI() diff --git a/Packages/com.unity.inputsystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs.meta new file mode 100644 index 0000000000..aebdf7eb65 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 59bbf7f4fa3af4e0eb0ed7eaabff05db +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/InputParameterEditor.cs b/Packages/com.unity.inputsystem/Editor/InputParameterEditor.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/InputParameterEditor.cs rename to Packages/com.unity.inputsystem/Editor/InputParameterEditor.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/InputParameterEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/InputParameterEditor.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/InputParameterEditor.cs.meta rename to Packages/com.unity.inputsystem/Editor/InputParameterEditor.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers.meta b/Packages/com.unity.inputsystem/Editor/PropertyDrawers.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers.meta rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/GamepadButtonPropertyDrawer.cs b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/GamepadButtonPropertyDrawer.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/GamepadButtonPropertyDrawer.cs rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers/GamepadButtonPropertyDrawer.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/GamepadButtonPropertyDrawer.cs.meta b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/GamepadButtonPropertyDrawer.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/GamepadButtonPropertyDrawer.cs.meta rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers/GamepadButtonPropertyDrawer.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionAssetDrawer.cs b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionAssetDrawer.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionAssetDrawer.cs rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionAssetDrawer.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionAssetDrawer.cs.meta b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionAssetDrawer.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionAssetDrawer.cs.meta rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionAssetDrawer.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionAssetSearchProvider.cs b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionAssetSearchProvider.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionAssetSearchProvider.cs rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionAssetSearchProvider.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionAssetSearchProvider.cs.meta b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionAssetSearchProvider.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionAssetSearchProvider.cs.meta rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionAssetSearchProvider.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionDrawer.cs b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionDrawer.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionDrawer.cs rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionDrawer.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionDrawer.cs.meta b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionDrawer.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionDrawer.cs.meta rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionDrawer.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionDrawerBase.cs b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionDrawerBase.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionDrawerBase.cs rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionDrawerBase.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionDrawerBase.cs.meta b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionDrawerBase.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionDrawerBase.cs.meta rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionDrawerBase.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionMapDrawer.cs b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionMapDrawer.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionMapDrawer.cs rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionMapDrawer.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionMapDrawer.cs.meta b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionMapDrawer.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionMapDrawer.cs.meta rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionMapDrawer.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionPropertyDrawer.cs b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionPropertyDrawer.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionPropertyDrawer.cs rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionPropertyDrawer.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionPropertyDrawer.cs.meta b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionPropertyDrawer.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionPropertyDrawer.cs.meta rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionPropertyDrawer.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionReferencePropertyDrawer.cs b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionReferencePropertyDrawer.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionReferencePropertyDrawer.cs rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionReferencePropertyDrawer.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionReferencePropertyDrawer.cs.meta b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionReferencePropertyDrawer.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionReferencePropertyDrawer.cs.meta rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionReferencePropertyDrawer.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionReferenceSearchProviders.cs b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionReferenceSearchProviders.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionReferenceSearchProviders.cs rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionReferenceSearchProviders.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionReferenceSearchProviders.cs.meta b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionReferenceSearchProviders.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionReferenceSearchProviders.cs.meta rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputActionReferenceSearchProviders.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputControlPathDrawer.cs b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputControlPathDrawer.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputControlPathDrawer.cs rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputControlPathDrawer.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputControlPathDrawer.cs.meta b/Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputControlPathDrawer.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputControlPathDrawer.cs.meta rename to Packages/com.unity.inputsystem/Editor/PropertyDrawers/InputControlPathDrawer.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UnityEditor.InputSystem.asmdef b/Packages/com.unity.inputsystem/Editor/Unity.InputSystem.Editor.asmdef similarity index 90% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UnityEditor.InputSystem.asmdef rename to Packages/com.unity.inputsystem/Editor/Unity.InputSystem.Editor.asmdef index efdc92ba6e..383e305b01 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/UnityEditor.InputSystem.asmdef +++ b/Packages/com.unity.inputsystem/Editor/Unity.InputSystem.Editor.asmdef @@ -1,5 +1,5 @@ { - "name": "UnityEditor.InputSystem", + "name": "Unity.InputSystem.Editor", "rootNamespace": "", "references": [ "GUID:75469ad4d38634e559750d17036d5f7c" diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UnityEditor.InputSystem.asmdef.meta b/Packages/com.unity.inputsystem/Editor/Unity.InputSystem.Editor.asmdef.meta similarity index 76% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UnityEditor.InputSystem.asmdef.meta rename to Packages/com.unity.inputsystem/Editor/Unity.InputSystem.Editor.asmdef.meta index 18102de83d..61f135cab7 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/UnityEditor.InputSystem.asmdef.meta +++ b/Packages/com.unity.inputsystem/Editor/Unity.InputSystem.Editor.asmdef.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 43c9ed31071e54e6ab323e5e2f3bdc9c +guid: e5a857900e2d54b9098214647fcb5050 AssemblyDefinitionImporter: externalObjects: {} userData: diff --git a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionAsset.cs b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionAsset.cs index 3b9a70fcca..5854e6b0ee 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionAsset.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Actions/InputActionAsset.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using UnityEngine.InputSystem.Editor; using UnityEngine.InputSystem.Utilities; ////TODO: make the FindAction logic available on any IEnumerable and IInputActionCollection via extension methods diff --git a/Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs b/Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs index 96a9c404f1..b54b4a7553 100644 --- a/Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs +++ b/Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs @@ -7,6 +7,7 @@ [assembly: InternalsVisibleTo("Unity.InputSystem.Tests.Editor")] [assembly: InternalsVisibleTo("Unity.InputSystem.Tests")] [assembly: InternalsVisibleTo("Unity.InputSystem.IntegrationTests")] +[assembly: InternalsVisibleTo("Unity.InputSystem.Editor")] [assembly: InternalsVisibleTo("Unity.InputSystem.ForUI")] // To avoid minor bump namespace UnityEngine.InputSystem diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/AxisCompositeEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/AxisCompositeEditor.cs.meta deleted file mode 100644 index 2551df2c89..0000000000 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/AxisCompositeEditor.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: f04048c85eab54bcc9c4cba980634c7c \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/HoldInteractionEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/HoldInteractionEditor.cs.meta deleted file mode 100644 index 8df8a3ad74..0000000000 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/HoldInteractionEditor.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 1813c37aa62dd457f8a68e4884883b46 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs.meta deleted file mode 100644 index 042b7f5f8b..0000000000 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 85d8fcbf2ff9c43aeb6c2259780ee390 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/PressInteractionEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/PressInteractionEditor.cs.meta deleted file mode 100644 index 5db1d36423..0000000000 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/PressInteractionEditor.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 228872d31667d4011bfcaff0a589c4a1 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs.meta deleted file mode 100644 index 396e87cc81..0000000000 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 039c745f633954ebb99500cc5f3169b6 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/TapInteractionEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/TapInteractionEditor.cs.meta deleted file mode 100644 index 6e5baa0123..0000000000 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/TapInteractionEditor.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: ede705751310c4c47b92755caa86da69 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector2CompositeEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector2CompositeEditor.cs.meta deleted file mode 100644 index bd74d4d0a6..0000000000 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector2CompositeEditor.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: bc26b75e5423c40078082d8e558222d0 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector3CompositeEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector3CompositeEditor.cs.meta deleted file mode 100644 index 42ecbaaeef..0000000000 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Vector3CompositeEditor.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 30d6e70def27c4f0bb92b90ed5d7431b \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs.meta deleted file mode 100644 index 7552a98c48..0000000000 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: f99afff196aaa4c64afc7f43a7ffd427 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs.meta deleted file mode 100644 index 492af85bf7..0000000000 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 59bbf7f4fa3af4e0eb0ed7eaabff05db \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs index 25fe546389..6af3496b78 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs @@ -6,9 +6,9 @@ namespace UnityEngine.InputSystem.EnhancedTouch { [InitializeOnLoad] - private class TouchSimulationEdtiorInitialization + class TouchSimulationEdtiorInitialization { - static TouchSimulation() + static TouchSimulationEdtiorInitialization() { // We're a MonoBehaviour so our cctor may get called as part of the MonoBehaviour being // created. We don't want to trigger InputSystem initialization from there so delay-execute @@ -39,7 +39,7 @@ private static void OnSettingsChanged() [CustomEditor(typeof(TouchSimulation))] - private class TouchSimulationEditor : UnityEditor.Editor + class TouchSimulationEditor : UnityEditor.Editor { public void OnDisable() { diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs.meta index 2a51a256cc..50b4bbbff8 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs.meta +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 848690e04e53948a5b5ffb210a4fa64f \ No newline at end of file +guid: 848690e04e53948a5b5ffb210a4fa64f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/InputSettingsiOSProvider.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/InputSettingsiOSProvider.cs index 159f21efed..cca43b1e25 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/InputSettingsiOSProvider.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/InputSettingsiOSProvider.cs @@ -1,6 +1,7 @@ #if UNITY_EDITOR using System; using UnityEditor; +using UnityEngine; namespace UnityEditor.InputSystem { diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInput/PlayerInputManagerEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInput/PlayerInputManagerEditor.cs index 5555838bc1..776efee456 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInput/PlayerInputManagerEditor.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInput/PlayerInputManagerEditor.cs @@ -1,8 +1,10 @@ #if UNITY_EDITOR using System; using System.Linq; -using UnityEditor; +using UnityEngine; using UnityEngine.InputSystem.Users; +using UnityEngine.InputSystem; +using UnityEngine.InputSystem.Editor; namespace UnityEditor.InputSystem.Editor { diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInputEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInputEditor.cs index 8e9e8257b6..d950060b9a 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInputEditor.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInputEditor.cs @@ -5,6 +5,9 @@ using System.Linq; using System.Text; using UnityEditor; +using UnityEngine; +using UnityEngine.InputSystem; +using UnityEngine.InputSystem.Editor; using UnityEngine.InputSystem.Users; using UnityEngine.InputSystem.Utilities; diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Settings/InputSettingsProvider.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Settings/InputSettingsProvider.cs index 1b333b0ed4..45d56ae6ec 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Settings/InputSettingsProvider.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Settings/InputSettingsProvider.cs @@ -2,6 +2,7 @@ using System; using System.Linq; using UnityEditor; +using UnityEditor.InputSystem; using UnityEditorInternal; using UnityEngine.InputSystem.Utilities; using UnityEngine.UIElements; diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/ExtendedSubmitCancelEventData.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/ExtendedSubmitCancelEventData.cs.meta index 872b268403..818b9f386e 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/ExtendedSubmitCancelEventData.cs.meta +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/ExtendedSubmitCancelEventData.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: b7430542eee4694469709e804d36cbbb \ No newline at end of file +guid: b7430542eee4694469709e804d36cbbb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/INavigationEventData.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/INavigationEventData.cs.meta index 6e973b1c0d..18486a24f3 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/INavigationEventData.cs.meta +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/INavigationEventData.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 4ee65784bb8ce434a947aea199821419 \ No newline at end of file +guid: 4ee65784bb8ce434a947aea199821419 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs index 667a833494..1401d03c06 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs @@ -1626,7 +1626,7 @@ protected override void Reset() base.Reset(); var asset = (InputActionAsset)AssetDatabase.LoadAssetAtPath( - UnityEngine.InputSystem.Editor.PlayerInputEditor.kDefaultInputActionsAssetPath, + UnityEditor.InputSystem.Editor.PlayerInputEditor.kDefaultInputActionsAssetPath, typeof(InputActionAsset)); // Setting default asset and actions when creating via inspector Editor.InputSystemUIInputModuleEditor.ReassignActions(this, asset); From 5a133d60d23ca98282d2e25064280f4e81f944c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=CC=8Akan=20Sidenvall?= Date: Tue, 6 May 2025 13:37:14 +0200 Subject: [PATCH 03/12] Removed uielements package dependency from package.json --- Packages/com.unity.inputsystem/package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Packages/com.unity.inputsystem/package.json b/Packages/com.unity.inputsystem/package.json index 45ed7da907..b19ea6acde 100755 --- a/Packages/com.unity.inputsystem/package.json +++ b/Packages/com.unity.inputsystem/package.json @@ -13,8 +13,5 @@ "touch", "vr", "xr" - ], - "dependencies" : { - "com.unity.modules.uielements": "1.0.0" - } + ] } From be8a3abf697a4f13da6099dd15133eb3cf8b2945 Mon Sep 17 00:00:00 2001 From: leonardo Date: Sat, 10 May 2025 01:56:08 +0200 Subject: [PATCH 04/12] declare dependency --- Packages/com.unity.inputsystem/package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Packages/com.unity.inputsystem/package.json b/Packages/com.unity.inputsystem/package.json index b19ea6acde..d32d70c697 100755 --- a/Packages/com.unity.inputsystem/package.json +++ b/Packages/com.unity.inputsystem/package.json @@ -13,5 +13,8 @@ "touch", "vr", "xr" - ] + ], + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0" + } } From d5dc8cc68e2aa88ea051e774c2902175d4a66676 Mon Sep 17 00:00:00 2001 From: leonardo Date: Thu, 25 Sep 2025 14:55:04 +0200 Subject: [PATCH 05/12] Moving more things around that have a direct or indirect dependency on UIElements Create a mechanism for the Editor to be able to register hooks in the runtime assembly. --- .../ControlSchemeEditorTests.cs | 2 +- Assets/Tests/InputSystem/CoreTests_Editor.cs | 1 + .../Unity.InputSystem.Tests.asmdef | 1 + .../Editor/Actions/AxisCompositeEditor.cs | 2 +- .../Interactions/HoldInteractionEditor.cs | 3 +- .../Interactions/MultiTapInteractionEditor.cs | 3 +- .../Interactions/PressInteractionEditor.cs | 3 +- .../Interactions/SlowTapInteractionEditor.cs | 3 +- .../Interactions/TapInteractionEditor.cs | 3 +- .../Editor/Actions/Vector2CompositeEditor.cs | 3 +- .../Editor/Actions/Vector3CompositeEditor.cs | 3 +- .../AssetEditor/InputActionAssetManager.cs | 0 .../InputActionAssetManager.cs.meta | 0 .../AssetEditor/InputActionEditorToolbar.cs | 0 .../InputActionEditorToolbar.cs.meta | 0 .../Editor/AssetEditor/InputActionTreeView.cs | 0 .../AssetEditor/InputActionTreeView.cs.meta | 0 .../AssetEditor/InputActionTreeViewItems.cs | 0 .../InputActionTreeViewItems.cs.meta | 0 .../Editor/ControlPicker.meta | 0 .../IInputControlPickerLayout.cs | 0 .../IInputControlPickerLayout.cs.meta | 0 .../ControlPicker/InputControlDropdownItem.cs | 0 .../InputControlDropdownItem.cs.meta | 0 .../ControlPicker/InputControlPathEditor.cs | 0 .../InputControlPathEditor.cs.meta | 0 .../ControlPicker/InputControlPicker.cs | 0 .../ControlPicker/InputControlPicker.cs.meta | 0 .../InputControlPickerDropdown.cs | 0 .../InputControlPickerDropdown.cs.meta | 0 .../ControlPicker/InputControlPickerState.cs | 0 .../InputControlPickerState.cs.meta | 0 .../Editor/ControlPicker/Layouts.meta | 0 .../DefaultInputControlPickerLayout.cs | 0 .../DefaultInputControlPickerLayout.cs.meta | 0 .../Layouts/TouchscreenControlPickerLayout.cs | 0 .../TouchscreenControlPickerLayout.cs.meta | 0 .../Processors/AxisDeadzoneProcessorEditor.cs | 3 +- .../StickDeadzoneProcessorEditor.cs | 6 +- .../Editor/EditorInitialization.cs | 26 +++++ .../Editor/EditorInitialization.cs.meta | 3 + .../InputActionSerializationHelpers.cs | 0 .../InputActionSerializationHelpers.cs.meta | 0 .../Editor/Plugins/PlayerInputEditor.cs | 2 +- .../Editor/Plugins/PlayerInputEditor.cs.meta | 0 .../Editor/ProjectWideActions.meta | 0 .../ProjectWideActionsAsset.cs | 0 .../ProjectWideActionsAsset.cs.meta | 0 .../ProjectWideActionsBuildProvider.cs | 0 .../ProjectWideActionsBuildProvider.cs.meta | 0 .../ProjectWideActionsTemplate.json | 0 .../ProjectWideActionsTemplate.json.meta | 0 .../Editor/Settings/InputSettingsProvider.cs | 0 .../Settings/InputSettingsProvider.cs.meta | 0 .../Editor/UITKAssetEditor.meta | 0 .../Editor/UITKAssetEditor/Commands.meta | 0 .../UITKAssetEditor/Commands/Commands.cs | 1 - .../UITKAssetEditor/Commands/Commands.cs.meta | 0 .../Commands/ControlSchemeCommands.cs | 0 .../Commands/ControlSchemeCommands.cs.meta | 0 .../UITKAssetEditor/EnumerableExtensions.cs | 0 .../EnumerableExtensions.cs.meta | 0 .../Editor/UITKAssetEditor/ExpressionUtils.cs | 0 .../UITKAssetEditor/ExpressionUtils.cs.meta | 0 .../InputActionsEditorConstants.cs | 0 .../InputActionsEditorConstants.cs.meta | 0 .../InputActionsEditorSettingsProvider.cs | 0 ...InputActionsEditorSettingsProvider.cs.meta | 0 .../InputActionsEditorState.cs | 0 .../InputActionsEditorState.cs.meta | 0 .../InputActionsEditorWindow.cs | 0 .../InputActionsEditorWindow.cs.meta | 0 .../InputActionsEditorWindowUtils.cs | 0 .../InputActionsEditorWindowUtils.cs.meta | 0 .../UITKAssetEditor/PackageResources.meta | 0 .../BindingPanelRowTemplate.uxml | 0 .../BindingPanelRowTemplate.uxml.meta | 0 .../CompositeBindingPropertiesEditor.uxml | 0 ...CompositeBindingPropertiesEditor.uxml.meta | 0 .../CompositePartBindingPropertiesEditor.uxml | 0 ...ositePartBindingPropertiesEditor.uxml.meta | 0 .../PackageResources/ControlSchemeEditor.uxml | 0 .../ControlSchemeEditor.uxml.meta | 0 .../InputActionMapsTreeViewItem.uxml | 0 .../InputActionMapsTreeViewItem.uxml.meta | 0 .../PackageResources/InputActionsEditor.uxml | 0 .../InputActionsEditor.uxml.meta | 0 .../InputActionsEditorStyles.uss | 0 .../InputActionsEditorStyles.uss.meta | 0 .../InputActionsProjectSettings.uxml | 0 .../InputActionsProjectSettings.uxml.meta | 0 .../InputActionsTreeViewItem.uxml | 0 .../InputActionsTreeViewItem.uxml.meta | 0 .../PackageResources/InputAssetEditorDark.uss | 0 .../InputAssetEditorDark.uss.meta | 0 .../InputAssetEditorLight.uss | 0 .../InputAssetEditorLight.uss.meta | 0 .../NameAndParameterListViewItemTemplate.uxml | 0 ...AndParameterListViewItemTemplate.uxml.meta | 0 .../UITKAssetEditor/ReactiveProperty.cs | 0 .../UITKAssetEditor/ReactiveProperty.cs.meta | 0 .../UITKAssetEditor/SerializedInputAction.cs | 0 .../SerializedInputAction.cs.meta | 0 .../SerializedInputActionMap.cs | 0 .../SerializedInputActionMap.cs.meta | 0 .../UITKAssetEditor/SerializedInputBinding.cs | 0 .../SerializedInputBinding.cs.meta | 0 .../Editor/UITKAssetEditor/StateContainer.cs | 0 .../UITKAssetEditor/StateContainer.cs.meta | 0 .../Editor/UITKAssetEditor/Views.meta | 0 .../UITKAssetEditor/Views/ActionMapsView.cs | 0 .../Views/ActionMapsView.cs.meta | 0 .../Views/ActionPropertiesView.cs | 0 .../Views/ActionPropertiesView.cs.meta | 0 .../UITKAssetEditor/Views/ActionsTreeView.cs | 0 .../Views/ActionsTreeView.cs.meta | 0 .../Views/BindingPropertiesView.cs | 0 .../Views/BindingPropertiesView.cs.meta | 0 .../CollectionViewSelectionChangeFilter.cs | 0 ...ollectionViewSelectionChangeFilter.cs.meta | 0 .../Views/CompositeBindingPropertiesView.cs | 0 .../CompositeBindingPropertiesView.cs.meta | 0 .../CompositePartBindingPropertiesView.cs | 0 ...CompositePartBindingPropertiesView.cs.meta | 0 .../UITKAssetEditor/Views/ContextMenu.cs | 0 .../UITKAssetEditor/Views/ContextMenu.cs.meta | 0 .../Views/ControlSchemesView.cs | 0 .../Views/ControlSchemesView.cs.meta | 0 .../UITKAssetEditor/Views/CopyPasteHelper.cs | 0 .../Views/CopyPasteHelper.cs.meta | 0 .../UITKAssetEditor/Views/DropManipulator.cs | 0 .../Views/DropManipulator.cs.meta | 0 .../Views/IViewStateCollection.cs | 0 .../Views/IViewStateCollection.cs.meta | 0 .../Views/InputActionMapsTreeViewItem.cs | 0 .../Views/InputActionMapsTreeViewItem.cs.meta | 0 .../Views/InputActionsEditorView.cs | 0 .../Views/InputActionsEditorView.cs.meta | 0 .../Views/InputActionsTreeViewItem.cs | 0 .../Views/InputActionsTreeViewItem.cs.meta | 0 .../Views/MatchingControlPaths.cs | 0 .../Views/MatchingControlPaths.cs.meta | 0 .../Views/NameAndParametersListView.cs | 0 .../Views/NameAndParametersListView.cs.meta | 0 .../UITKAssetEditor/Views/PropertiesView.cs | 0 .../Views/PropertiesView.cs.meta | 0 .../Editor/UITKAssetEditor/Views/Selectors.cs | 0 .../UITKAssetEditor/Views/Selectors.cs.meta | 0 .../Editor/UITKAssetEditor/Views/ViewBase.cs | 0 .../UITKAssetEditor/Views/ViewBase.cs.meta | 0 .../Views/ViewStateCollection.cs | 0 .../Views/ViewStateCollection.cs.meta | 0 .../Views/VisualElementExtensions.cs | 0 .../Views/VisualElementExtensions.cs.meta | 0 .../Editor/Unity.InputSystem.Editor.asmdef | 108 +++++++++++++++++- .../InputSystem/Editor/EditorHooks.cs | 35 ++++++ .../InputSystem/InputManager.cs | 2 +- .../InputSystem/InputSystem.cs | 18 +-- .../Plugins/UI/InputSystemUIInputModule.cs | 4 +- 159 files changed, 207 insertions(+), 28 deletions(-) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetEditor/InputActionAssetManager.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetEditor/InputActionAssetManager.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetEditor/InputActionEditorToolbar.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetEditor/InputActionEditorToolbar.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetEditor/InputActionTreeView.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetEditor/InputActionTreeView.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetEditor/InputActionTreeViewItems.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/AssetEditor/InputActionTreeViewItems.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ControlPicker.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ControlPicker/IInputControlPickerLayout.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ControlPicker/IInputControlPickerLayout.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ControlPicker/InputControlDropdownItem.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ControlPicker/InputControlDropdownItem.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ControlPicker/InputControlPathEditor.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ControlPicker/InputControlPathEditor.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ControlPicker/InputControlPicker.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ControlPicker/InputControlPicker.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ControlPicker/InputControlPickerDropdown.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ControlPicker/InputControlPickerDropdown.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ControlPicker/InputControlPickerState.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ControlPicker/InputControlPickerState.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ControlPicker/Layouts.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ControlPicker/Layouts/DefaultInputControlPickerLayout.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ControlPicker/Layouts/DefaultInputControlPickerLayout.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ControlPicker/Layouts/TouchscreenControlPickerLayout.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ControlPicker/Layouts/TouchscreenControlPickerLayout.cs.meta (100%) create mode 100644 Packages/com.unity.inputsystem/Editor/EditorInitialization.cs create mode 100644 Packages/com.unity.inputsystem/Editor/EditorInitialization.cs.meta rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/Internal/InputActionSerializationHelpers.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/Internal/InputActionSerializationHelpers.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/Plugins/PlayerInputEditor.cs (99%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/Plugins/PlayerInputEditor.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ProjectWideActions.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ProjectWideActions/ProjectWideActionsAsset.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ProjectWideActions/ProjectWideActionsAsset.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ProjectWideActions/ProjectWideActionsBuildProvider.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ProjectWideActions/ProjectWideActionsBuildProvider.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ProjectWideActions/ProjectWideActionsTemplate.json (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/ProjectWideActions/ProjectWideActionsTemplate.json.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/Settings/InputSettingsProvider.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/Settings/InputSettingsProvider.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Commands.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Commands/Commands.cs (99%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Commands/Commands.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/EnumerableExtensions.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/EnumerableExtensions.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/ExpressionUtils.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/ExpressionUtils.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/InputActionsEditorConstants.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/InputActionsEditorConstants.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/InputActionsEditorState.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/InputActionsEditorState.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/InputActionsEditorWindow.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/InputActionsEditorWindow.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/InputActionsEditorWindowUtils.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/InputActionsEditorWindowUtils.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/BindingPanelRowTemplate.uxml (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/BindingPanelRowTemplate.uxml.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/CompositeBindingPropertiesEditor.uxml (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/CompositeBindingPropertiesEditor.uxml.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/CompositePartBindingPropertiesEditor.uxml (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/CompositePartBindingPropertiesEditor.uxml.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/ControlSchemeEditor.uxml (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/ControlSchemeEditor.uxml.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/InputActionsProjectSettings.uxml (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/InputActionsProjectSettings.uxml.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/InputActionsTreeViewItem.uxml (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/InputActionsTreeViewItem.uxml.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/InputAssetEditorDark.uss (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/InputAssetEditorDark.uss.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/InputAssetEditorLight.uss (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/InputAssetEditorLight.uss.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/NameAndParameterListViewItemTemplate.uxml (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/PackageResources/NameAndParameterListViewItemTemplate.uxml.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/ReactiveProperty.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/ReactiveProperty.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/SerializedInputAction.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/SerializedInputAction.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/SerializedInputActionMap.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/SerializedInputActionMap.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/SerializedInputBinding.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/SerializedInputBinding.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/StateContainer.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/StateContainer.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/ActionMapsView.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/ActionMapsView.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/ActionPropertiesView.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/ActionPropertiesView.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/ActionsTreeView.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/ActionsTreeView.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/CollectionViewSelectionChangeFilter.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/CollectionViewSelectionChangeFilter.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/CompositeBindingPropertiesView.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/CompositeBindingPropertiesView.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/ContextMenu.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/ContextMenu.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/ControlSchemesView.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/ControlSchemesView.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/DropManipulator.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/DropManipulator.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/IViewStateCollection.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/IViewStateCollection.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/InputActionMapsTreeViewItem.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/InputActionMapsTreeViewItem.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/MatchingControlPaths.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/MatchingControlPaths.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/NameAndParametersListView.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/NameAndParametersListView.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/PropertiesView.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/PropertiesView.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/Selectors.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/Selectors.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/ViewBase.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/ViewBase.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/ViewStateCollection.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/ViewStateCollection.cs.meta (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/VisualElementExtensions.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => }/Editor/UITKAssetEditor/Views/VisualElementExtensions.cs.meta (100%) create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/EditorHooks.cs diff --git a/Assets/Tests/InputSystem.Editor/ControlSchemeEditorTests.cs b/Assets/Tests/InputSystem.Editor/ControlSchemeEditorTests.cs index a90fedf61f..c7d6c5ac5d 100644 --- a/Assets/Tests/InputSystem.Editor/ControlSchemeEditorTests.cs +++ b/Assets/Tests/InputSystem.Editor/ControlSchemeEditorTests.cs @@ -43,7 +43,7 @@ public void RemoveRequirementCommand_RemovesDeviceRequirements() var state = TestData.editorState.Generate().With(selectedControlScheme: controlScheme); - var newState = ControlSchemeCommands.RemoveDeviceRequirement(0)(in state); + var newState = UnityEngine.InputSystem.Editor.ControlSchemeCommands.RemoveDeviceRequirement(0)(in state); Assert.That(newState.selectedControlScheme.deviceRequirements.Count, Is.EqualTo(1)); diff --git a/Assets/Tests/InputSystem/CoreTests_Editor.cs b/Assets/Tests/InputSystem/CoreTests_Editor.cs index 27302b5572..47dbffcaa4 100644 --- a/Assets/Tests/InputSystem/CoreTests_Editor.cs +++ b/Assets/Tests/InputSystem/CoreTests_Editor.cs @@ -23,6 +23,7 @@ using UnityEngine.InputSystem.Users; using UnityEngine.InputSystem.Utilities; using UnityEngine.TestTools; +using UnityEditor.InputSystem.Interactions; #pragma warning disable CS0649 partial class CoreTests diff --git a/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef b/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef index 02eb377895..d09d50c735 100644 --- a/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef +++ b/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef @@ -3,6 +3,7 @@ "rootNamespace": "", "references": [ "Unity.InputSystem", + "Unity.InputSystem.Editor", "Unity.InputSystem.TestFramework", "Unity.ugui", "Unity.PackageManagerDocTools.Editor", diff --git a/Packages/com.unity.inputsystem/Editor/Actions/AxisCompositeEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/AxisCompositeEditor.cs index db5ad13db8..e17425becb 100644 --- a/Packages/com.unity.inputsystem/Editor/Actions/AxisCompositeEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Actions/AxisCompositeEditor.cs @@ -20,7 +20,7 @@ internal class AxisCompositeEditor : InputParameterEditor public override void OnGUI() { #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - if (!InputSystem.settings.useIMGUIEditorForAssets) return; + if (!UnityEngine.InputSystem.InputSystem.settings.useIMGUIEditorForAssets) return; #endif target.whichSideWins = (AxisComposite.WhichSideWins)EditorGUILayout.EnumPopup(m_WhichAxisWinsLabel, target.whichSideWins); } diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/HoldInteractionEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/HoldInteractionEditor.cs index dbb22dee0f..06a9da5814 100644 --- a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/HoldInteractionEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/HoldInteractionEditor.cs @@ -1,4 +1,5 @@ +using System; using UnityEngine.InputSystem.Controls; using UnityEngine.InputSystem.Interactions; #if UNITY_EDITOR @@ -29,7 +30,7 @@ protected override void OnEnable() public override void OnGUI() { #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - if (!InputSystem.settings.useIMGUIEditorForAssets) return; + if (!UnityEngine.InputSystem.InputSystem.settings.useIMGUIEditorForAssets) return; #endif m_PressPointSetting.OnGUI(); m_DurationSetting.OnGUI(); diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs index 9d0ee84f69..682b8c81d1 100644 --- a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs @@ -1,4 +1,5 @@ +using System; using UnityEngine; using UnityEngine.InputSystem.Interactions; #if UNITY_EDITOR @@ -38,7 +39,7 @@ protected override void OnEnable() public override void OnGUI() { #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - if (!InputSystem.settings.useIMGUIEditorForAssets) return; + if (!UnityEngine.InputSystem.InputSystem.settings.useIMGUIEditorForAssets) return; #endif target.tapCount = EditorGUILayout.IntField(m_TapCountLabel, target.tapCount); m_TapDelaySetting.OnGUI(); diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/PressInteractionEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/PressInteractionEditor.cs index 57d631d560..0570067681 100644 --- a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/PressInteractionEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/PressInteractionEditor.cs @@ -1,4 +1,5 @@ +using System; using UnityEngine; using UnityEngine.InputSystem.Interactions; #if UNITY_EDITOR @@ -30,7 +31,7 @@ protected override void OnEnable() public override void OnGUI() { #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - if (!InputSystem.settings.useIMGUIEditorForAssets) return; + if (!UnityEngine.InputSystem.InputSystem.settings.useIMGUIEditorForAssets) return; #endif EditorGUILayout.HelpBox(s_HelpBoxText); target.behavior = (PressBehavior)EditorGUILayout.EnumPopup(s_PressBehaviorLabel, target.behavior); diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs index dfb47ffe16..da6659ecf6 100644 --- a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs @@ -1,4 +1,5 @@ +using System; using UnityEngine.InputSystem.Interactions; #if UNITY_EDITOR using UnityEngine.InputSystem.Editor; @@ -27,7 +28,7 @@ protected override void OnEnable() public override void OnGUI() { #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - if (!InputSystem.settings.useIMGUIEditorForAssets) return; + if (!UnityEngine.InputSystem.InputSystem.settings.useIMGUIEditorForAssets) return; #endif m_DurationSetting.OnGUI(); m_PressPointSetting.OnGUI(); diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/TapInteractionEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/TapInteractionEditor.cs index e64ae11117..f4273af159 100644 --- a/Packages/com.unity.inputsystem/Editor/Actions/Interactions/TapInteractionEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/TapInteractionEditor.cs @@ -1,4 +1,5 @@ +using System; using UnityEngine.InputSystem.Interactions; #if UNITY_EDITOR using UnityEngine.InputSystem.Editor; @@ -27,7 +28,7 @@ protected override void OnEnable() public override void OnGUI() { #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - if (!InputSystem.settings.useIMGUIEditorForAssets) return; + if (!UnityEngine.InputSystem.InputSystem.settings.useIMGUIEditorForAssets) return; #endif m_DurationSetting.OnGUI(); m_PressPointSetting.OnGUI(); diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Vector2CompositeEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Vector2CompositeEditor.cs index cb2c708a11..91cd1f3b32 100644 --- a/Packages/com.unity.inputsystem/Editor/Actions/Vector2CompositeEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Actions/Vector2CompositeEditor.cs @@ -1,4 +1,5 @@ +using System; using UnityEngine; using UnityEngine.InputSystem.Composites; #if UNITY_EDITOR @@ -19,7 +20,7 @@ internal class Vector2CompositeEditor : InputParameterEditor public override void OnGUI() { #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - if (!InputSystem.settings.useIMGUIEditorForAssets) return; + if (!UnityEngine.InputSystem.InputSystem.settings.useIMGUIEditorForAssets) return; #endif target.mode = (Vector2Composite.Mode)EditorGUILayout.EnumPopup(m_ModeLabel, target.mode); } diff --git a/Packages/com.unity.inputsystem/Editor/Actions/Vector3CompositeEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Vector3CompositeEditor.cs index 7d05b7ca2b..6c3ef4af7d 100644 --- a/Packages/com.unity.inputsystem/Editor/Actions/Vector3CompositeEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Actions/Vector3CompositeEditor.cs @@ -1,5 +1,6 @@ +using System; using UnityEngine; using UnityEngine.InputSystem.Composites; #if UNITY_EDITOR @@ -20,7 +21,7 @@ internal class Vector3CompositeEditor : InputParameterEditor public override void OnGUI() { #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - if (!InputSystem.settings.useIMGUIEditorForAssets) return; + if (!UnityEngine.InputSystem.InputSystem.settings.useIMGUIEditorForAssets) return; #endif target.mode = (Vector3Composite.Mode)EditorGUILayout.EnumPopup(m_ModeLabel, target.mode); } diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionAssetManager.cs b/Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionAssetManager.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionAssetManager.cs rename to Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionAssetManager.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionAssetManager.cs.meta b/Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionAssetManager.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionAssetManager.cs.meta rename to Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionAssetManager.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionEditorToolbar.cs b/Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionEditorToolbar.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionEditorToolbar.cs rename to Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionEditorToolbar.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionEditorToolbar.cs.meta b/Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionEditorToolbar.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionEditorToolbar.cs.meta rename to Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionEditorToolbar.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeView.cs b/Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionTreeView.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeView.cs rename to Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionTreeView.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeView.cs.meta b/Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionTreeView.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeView.cs.meta rename to Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionTreeView.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeViewItems.cs b/Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionTreeViewItems.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeViewItems.cs rename to Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionTreeViewItems.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeViewItems.cs.meta b/Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionTreeViewItems.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeViewItems.cs.meta rename to Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionTreeViewItems.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker.meta b/Packages/com.unity.inputsystem/Editor/ControlPicker.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker.meta rename to Packages/com.unity.inputsystem/Editor/ControlPicker.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/IInputControlPickerLayout.cs b/Packages/com.unity.inputsystem/Editor/ControlPicker/IInputControlPickerLayout.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/IInputControlPickerLayout.cs rename to Packages/com.unity.inputsystem/Editor/ControlPicker/IInputControlPickerLayout.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/IInputControlPickerLayout.cs.meta b/Packages/com.unity.inputsystem/Editor/ControlPicker/IInputControlPickerLayout.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/IInputControlPickerLayout.cs.meta rename to Packages/com.unity.inputsystem/Editor/ControlPicker/IInputControlPickerLayout.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlDropdownItem.cs b/Packages/com.unity.inputsystem/Editor/ControlPicker/InputControlDropdownItem.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlDropdownItem.cs rename to Packages/com.unity.inputsystem/Editor/ControlPicker/InputControlDropdownItem.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlDropdownItem.cs.meta b/Packages/com.unity.inputsystem/Editor/ControlPicker/InputControlDropdownItem.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlDropdownItem.cs.meta rename to Packages/com.unity.inputsystem/Editor/ControlPicker/InputControlDropdownItem.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs b/Packages/com.unity.inputsystem/Editor/ControlPicker/InputControlPathEditor.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs rename to Packages/com.unity.inputsystem/Editor/ControlPicker/InputControlPathEditor.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/ControlPicker/InputControlPathEditor.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs.meta rename to Packages/com.unity.inputsystem/Editor/ControlPicker/InputControlPathEditor.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPicker.cs b/Packages/com.unity.inputsystem/Editor/ControlPicker/InputControlPicker.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPicker.cs rename to Packages/com.unity.inputsystem/Editor/ControlPicker/InputControlPicker.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPicker.cs.meta b/Packages/com.unity.inputsystem/Editor/ControlPicker/InputControlPicker.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPicker.cs.meta rename to Packages/com.unity.inputsystem/Editor/ControlPicker/InputControlPicker.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs b/Packages/com.unity.inputsystem/Editor/ControlPicker/InputControlPickerDropdown.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs rename to Packages/com.unity.inputsystem/Editor/ControlPicker/InputControlPickerDropdown.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs.meta b/Packages/com.unity.inputsystem/Editor/ControlPicker/InputControlPickerDropdown.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs.meta rename to Packages/com.unity.inputsystem/Editor/ControlPicker/InputControlPickerDropdown.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerState.cs b/Packages/com.unity.inputsystem/Editor/ControlPicker/InputControlPickerState.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerState.cs rename to Packages/com.unity.inputsystem/Editor/ControlPicker/InputControlPickerState.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerState.cs.meta b/Packages/com.unity.inputsystem/Editor/ControlPicker/InputControlPickerState.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerState.cs.meta rename to Packages/com.unity.inputsystem/Editor/ControlPicker/InputControlPickerState.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/Layouts.meta b/Packages/com.unity.inputsystem/Editor/ControlPicker/Layouts.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/Layouts.meta rename to Packages/com.unity.inputsystem/Editor/ControlPicker/Layouts.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/Layouts/DefaultInputControlPickerLayout.cs b/Packages/com.unity.inputsystem/Editor/ControlPicker/Layouts/DefaultInputControlPickerLayout.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/Layouts/DefaultInputControlPickerLayout.cs rename to Packages/com.unity.inputsystem/Editor/ControlPicker/Layouts/DefaultInputControlPickerLayout.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/Layouts/DefaultInputControlPickerLayout.cs.meta b/Packages/com.unity.inputsystem/Editor/ControlPicker/Layouts/DefaultInputControlPickerLayout.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/Layouts/DefaultInputControlPickerLayout.cs.meta rename to Packages/com.unity.inputsystem/Editor/ControlPicker/Layouts/DefaultInputControlPickerLayout.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/Layouts/TouchscreenControlPickerLayout.cs b/Packages/com.unity.inputsystem/Editor/ControlPicker/Layouts/TouchscreenControlPickerLayout.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/Layouts/TouchscreenControlPickerLayout.cs rename to Packages/com.unity.inputsystem/Editor/ControlPicker/Layouts/TouchscreenControlPickerLayout.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/Layouts/TouchscreenControlPickerLayout.cs.meta b/Packages/com.unity.inputsystem/Editor/ControlPicker/Layouts/TouchscreenControlPickerLayout.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/Layouts/TouchscreenControlPickerLayout.cs.meta rename to Packages/com.unity.inputsystem/Editor/ControlPicker/Layouts/TouchscreenControlPickerLayout.cs.meta diff --git a/Packages/com.unity.inputsystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs b/Packages/com.unity.inputsystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs index a12a11e354..944f8e0d71 100644 --- a/Packages/com.unity.inputsystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs @@ -1,5 +1,6 @@ +using System; using UnityEngine.InputSystem.Processors; #if UNITY_EDITOR using UnityEngine.InputSystem.Editor; @@ -28,7 +29,7 @@ protected override void OnEnable() public override void OnGUI() { #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - if (!InputSystem.settings.useIMGUIEditorForAssets) return; + if (!UnityEngine.InputSystem.InputSystem.settings.useIMGUIEditorForAssets) return; #endif m_MinSetting.OnGUI(); m_MaxSetting.OnGUI(); diff --git a/Packages/com.unity.inputsystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs b/Packages/com.unity.inputsystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs index 1b36abce84..fe11efc755 100644 --- a/Packages/com.unity.inputsystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs @@ -1,6 +1,4 @@ - - - +using System; using UnityEngine.InputSystem.Processors; #if UNITY_EDITOR using UnityEngine.InputSystem.Editor; @@ -29,7 +27,7 @@ protected override void OnEnable() public override void OnGUI() { #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS - if (!InputSystem.settings.useIMGUIEditorForAssets) return; + if (!UnityEngine.InputSystem.InputSystem.settings.useIMGUIEditorForAssets) return; #endif m_MinSetting.OnGUI(); m_MaxSetting.OnGUI(); diff --git a/Packages/com.unity.inputsystem/Editor/EditorInitialization.cs b/Packages/com.unity.inputsystem/Editor/EditorInitialization.cs new file mode 100644 index 0000000000..f5dc3db9b0 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/EditorInitialization.cs @@ -0,0 +1,26 @@ +using UnityEditor; + +namespace UnityEngine.InputSystem.Editor +{ + [InitializeOnLoad] + class EditorInitialization + { + static EditorInitialization() + { + Debug.Log("Input System: Initializing Editor Hooks"); + EditorHooks.m_SettingsProviderConfigKeyGetter = () => InputSettingsProvider.kEditorBuildSettingsConfigKey; + + EditorHooks.m_ProjectWideActionsBuildProvideractionsToIncludeInPlayerBuildSetter = (value) => + ProjectWideActionsBuildProvider.actionsToIncludeInPlayerBuild = value; + EditorHooks.m_ProjectWideActionsBuildProvideractionsToIncludeInPlayerBuildGetter = () => + ProjectWideActionsBuildProvider.actionsToIncludeInPlayerBuild; + + EditorHooks.m_InputSettingsProviderForceReload = InputSettingsProvider.ForceReload; + + EditorHooks.m_PlayerInputEditorDefaultInputActionsAssetPath = () => + UnityEditor.InputSystem.Editor.PlayerInputEditor.kDefaultInputActionsAssetPath; + + InputSystem.InitializeInEditor(); + } + } +} \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/Editor/EditorInitialization.cs.meta b/Packages/com.unity.inputsystem/Editor/EditorInitialization.cs.meta new file mode 100644 index 0000000000..8c2b932efa --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/EditorInitialization.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 88718d8fbb8d44b2926b7f6c1403ab91 +timeCreated: 1758802517 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs b/Packages/com.unity.inputsystem/Editor/Internal/InputActionSerializationHelpers.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs rename to Packages/com.unity.inputsystem/Editor/Internal/InputActionSerializationHelpers.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs.meta b/Packages/com.unity.inputsystem/Editor/Internal/InputActionSerializationHelpers.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs.meta rename to Packages/com.unity.inputsystem/Editor/Internal/InputActionSerializationHelpers.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInputEditor.cs b/Packages/com.unity.inputsystem/Editor/Plugins/PlayerInputEditor.cs similarity index 99% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInputEditor.cs rename to Packages/com.unity.inputsystem/Editor/Plugins/PlayerInputEditor.cs index d950060b9a..d17f86bfa8 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInputEditor.cs +++ b/Packages/com.unity.inputsystem/Editor/Plugins/PlayerInputEditor.cs @@ -89,7 +89,7 @@ public override void OnInspectorGUI() if (m_ActionsProperty.objectReferenceValue != null) { InputActionAsset actions = m_ActionsProperty.objectReferenceValue as InputActionAsset; - if (actions == InputSystem.actions) + if (actions == UnityEngine.InputSystem.InputSystem.actions) { EditorGUILayout.HelpBox("Project-wide actions asset is not recommended to be used with Player " + "Input because it is a singleton reference and all actions maps are enabled by default.\r\n" + diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInputEditor.cs.meta b/Packages/com.unity.inputsystem/Editor/Plugins/PlayerInputEditor.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/PlayerInputEditor.cs.meta rename to Packages/com.unity.inputsystem/Editor/Plugins/PlayerInputEditor.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ProjectWideActions.meta b/Packages/com.unity.inputsystem/Editor/ProjectWideActions.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ProjectWideActions.meta rename to Packages/com.unity.inputsystem/Editor/ProjectWideActions.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ProjectWideActions/ProjectWideActionsAsset.cs b/Packages/com.unity.inputsystem/Editor/ProjectWideActions/ProjectWideActionsAsset.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ProjectWideActions/ProjectWideActionsAsset.cs rename to Packages/com.unity.inputsystem/Editor/ProjectWideActions/ProjectWideActionsAsset.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ProjectWideActions/ProjectWideActionsAsset.cs.meta b/Packages/com.unity.inputsystem/Editor/ProjectWideActions/ProjectWideActionsAsset.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ProjectWideActions/ProjectWideActionsAsset.cs.meta rename to Packages/com.unity.inputsystem/Editor/ProjectWideActions/ProjectWideActionsAsset.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ProjectWideActions/ProjectWideActionsBuildProvider.cs b/Packages/com.unity.inputsystem/Editor/ProjectWideActions/ProjectWideActionsBuildProvider.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ProjectWideActions/ProjectWideActionsBuildProvider.cs rename to Packages/com.unity.inputsystem/Editor/ProjectWideActions/ProjectWideActionsBuildProvider.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ProjectWideActions/ProjectWideActionsBuildProvider.cs.meta b/Packages/com.unity.inputsystem/Editor/ProjectWideActions/ProjectWideActionsBuildProvider.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ProjectWideActions/ProjectWideActionsBuildProvider.cs.meta rename to Packages/com.unity.inputsystem/Editor/ProjectWideActions/ProjectWideActionsBuildProvider.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ProjectWideActions/ProjectWideActionsTemplate.json b/Packages/com.unity.inputsystem/Editor/ProjectWideActions/ProjectWideActionsTemplate.json similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ProjectWideActions/ProjectWideActionsTemplate.json rename to Packages/com.unity.inputsystem/Editor/ProjectWideActions/ProjectWideActionsTemplate.json diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ProjectWideActions/ProjectWideActionsTemplate.json.meta b/Packages/com.unity.inputsystem/Editor/ProjectWideActions/ProjectWideActionsTemplate.json.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ProjectWideActions/ProjectWideActionsTemplate.json.meta rename to Packages/com.unity.inputsystem/Editor/ProjectWideActions/ProjectWideActionsTemplate.json.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Settings/InputSettingsProvider.cs b/Packages/com.unity.inputsystem/Editor/Settings/InputSettingsProvider.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Settings/InputSettingsProvider.cs rename to Packages/com.unity.inputsystem/Editor/Settings/InputSettingsProvider.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Settings/InputSettingsProvider.cs.meta b/Packages/com.unity.inputsystem/Editor/Settings/InputSettingsProvider.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Settings/InputSettingsProvider.cs.meta rename to Packages/com.unity.inputsystem/Editor/Settings/InputSettingsProvider.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Commands.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Commands.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Commands/Commands.cs similarity index 99% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Commands/Commands.cs index 113efe6c38..1ce9e12e41 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs +++ b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Commands/Commands.cs @@ -1,7 +1,6 @@ #if UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS using System; using System.Collections.Generic; -using System.IO; using System.Linq; using UnityEditor; using UnityEngine.InputSystem.Editor.Lists; diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Commands/Commands.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Commands/Commands.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/EnumerableExtensions.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/EnumerableExtensions.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/EnumerableExtensions.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/EnumerableExtensions.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/EnumerableExtensions.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/EnumerableExtensions.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/EnumerableExtensions.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/EnumerableExtensions.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/ExpressionUtils.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/ExpressionUtils.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/ExpressionUtils.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/ExpressionUtils.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/ExpressionUtils.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/ExpressionUtils.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/ExpressionUtils.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/ExpressionUtils.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorConstants.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorConstants.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorConstants.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorConstants.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorConstants.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorConstants.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorConstants.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorConstants.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorState.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorState.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorState.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorState.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorState.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorState.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorState.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorState.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindowUtils.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorWindowUtils.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindowUtils.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorWindowUtils.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindowUtils.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorWindowUtils.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindowUtils.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorWindowUtils.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/BindingPanelRowTemplate.uxml b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/BindingPanelRowTemplate.uxml similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/BindingPanelRowTemplate.uxml rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/BindingPanelRowTemplate.uxml diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/BindingPanelRowTemplate.uxml.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/BindingPanelRowTemplate.uxml.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/BindingPanelRowTemplate.uxml.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/BindingPanelRowTemplate.uxml.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/CompositeBindingPropertiesEditor.uxml b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/CompositeBindingPropertiesEditor.uxml similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/CompositeBindingPropertiesEditor.uxml rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/CompositeBindingPropertiesEditor.uxml diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/CompositeBindingPropertiesEditor.uxml.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/CompositeBindingPropertiesEditor.uxml.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/CompositeBindingPropertiesEditor.uxml.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/CompositeBindingPropertiesEditor.uxml.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/CompositePartBindingPropertiesEditor.uxml b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/CompositePartBindingPropertiesEditor.uxml similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/CompositePartBindingPropertiesEditor.uxml rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/CompositePartBindingPropertiesEditor.uxml diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/CompositePartBindingPropertiesEditor.uxml.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/CompositePartBindingPropertiesEditor.uxml.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/CompositePartBindingPropertiesEditor.uxml.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/CompositePartBindingPropertiesEditor.uxml.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/ControlSchemeEditor.uxml b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/ControlSchemeEditor.uxml similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/ControlSchemeEditor.uxml rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/ControlSchemeEditor.uxml diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/ControlSchemeEditor.uxml.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/ControlSchemeEditor.uxml.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/ControlSchemeEditor.uxml.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/ControlSchemeEditor.uxml.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsProjectSettings.uxml b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsProjectSettings.uxml similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsProjectSettings.uxml rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsProjectSettings.uxml diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsProjectSettings.uxml.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsProjectSettings.uxml.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsProjectSettings.uxml.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsProjectSettings.uxml.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsTreeViewItem.uxml b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsTreeViewItem.uxml similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsTreeViewItem.uxml rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsTreeViewItem.uxml diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsTreeViewItem.uxml.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsTreeViewItem.uxml.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsTreeViewItem.uxml.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsTreeViewItem.uxml.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorDark.uss b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorDark.uss similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorDark.uss rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorDark.uss diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorDark.uss.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorDark.uss.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorDark.uss.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorDark.uss.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorLight.uss b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorLight.uss similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorLight.uss rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorLight.uss diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorLight.uss.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorLight.uss.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorLight.uss.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputAssetEditorLight.uss.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/NameAndParameterListViewItemTemplate.uxml b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/NameAndParameterListViewItemTemplate.uxml similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/NameAndParameterListViewItemTemplate.uxml rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/NameAndParameterListViewItemTemplate.uxml diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/NameAndParameterListViewItemTemplate.uxml.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/NameAndParameterListViewItemTemplate.uxml.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/NameAndParameterListViewItemTemplate.uxml.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/NameAndParameterListViewItemTemplate.uxml.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/ReactiveProperty.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/ReactiveProperty.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/ReactiveProperty.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/ReactiveProperty.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/ReactiveProperty.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/ReactiveProperty.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/ReactiveProperty.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/ReactiveProperty.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/SerializedInputAction.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/SerializedInputAction.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/SerializedInputAction.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/SerializedInputAction.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/SerializedInputAction.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/SerializedInputAction.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/SerializedInputAction.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/SerializedInputAction.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/SerializedInputActionMap.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/SerializedInputActionMap.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/SerializedInputActionMap.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/SerializedInputActionMap.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/SerializedInputActionMap.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/SerializedInputActionMap.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/SerializedInputActionMap.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/SerializedInputActionMap.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/SerializedInputBinding.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/SerializedInputBinding.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/SerializedInputBinding.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/SerializedInputBinding.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/SerializedInputBinding.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/SerializedInputBinding.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/SerializedInputBinding.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/SerializedInputBinding.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/StateContainer.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/StateContainer.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/StateContainer.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/StateContainer.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/StateContainer.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/StateContainer.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/StateContainer.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/StateContainer.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionPropertiesView.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ActionPropertiesView.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionPropertiesView.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ActionPropertiesView.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionPropertiesView.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ActionPropertiesView.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionPropertiesView.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ActionPropertiesView.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CollectionViewSelectionChangeFilter.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/CollectionViewSelectionChangeFilter.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CollectionViewSelectionChangeFilter.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/CollectionViewSelectionChangeFilter.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CollectionViewSelectionChangeFilter.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/CollectionViewSelectionChangeFilter.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CollectionViewSelectionChangeFilter.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/CollectionViewSelectionChangeFilter.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositeBindingPropertiesView.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/CompositeBindingPropertiesView.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositeBindingPropertiesView.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/CompositeBindingPropertiesView.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositeBindingPropertiesView.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/CompositeBindingPropertiesView.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositeBindingPropertiesView.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/CompositeBindingPropertiesView.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ContextMenu.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ContextMenu.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ContextMenu.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ContextMenu.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ContextMenu.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ContextMenu.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ContextMenu.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ContextMenu.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/DropManipulator.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/DropManipulator.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/DropManipulator.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/DropManipulator.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/IViewStateCollection.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/IViewStateCollection.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/IViewStateCollection.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/IViewStateCollection.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/IViewStateCollection.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/IViewStateCollection.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/IViewStateCollection.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/IViewStateCollection.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionMapsTreeViewItem.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/InputActionMapsTreeViewItem.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionMapsTreeViewItem.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/InputActionMapsTreeViewItem.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionMapsTreeViewItem.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/InputActionMapsTreeViewItem.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionMapsTreeViewItem.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/InputActionMapsTreeViewItem.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/MatchingControlPaths.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/MatchingControlPaths.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/MatchingControlPaths.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/MatchingControlPaths.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/MatchingControlPaths.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/MatchingControlPaths.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/MatchingControlPaths.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/MatchingControlPaths.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/NameAndParametersListView.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/NameAndParametersListView.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/NameAndParametersListView.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/NameAndParametersListView.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/NameAndParametersListView.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/NameAndParametersListView.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/NameAndParametersListView.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/NameAndParametersListView.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/PropertiesView.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/PropertiesView.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/PropertiesView.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/PropertiesView.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/PropertiesView.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/PropertiesView.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/PropertiesView.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/PropertiesView.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/Selectors.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/Selectors.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/Selectors.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/Selectors.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ViewBase.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ViewBase.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ViewBase.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ViewBase.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ViewBase.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ViewBase.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ViewBase.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ViewBase.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ViewStateCollection.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ViewStateCollection.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ViewStateCollection.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ViewStateCollection.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ViewStateCollection.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ViewStateCollection.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ViewStateCollection.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/ViewStateCollection.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/VisualElementExtensions.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/VisualElementExtensions.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/VisualElementExtensions.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/VisualElementExtensions.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/VisualElementExtensions.cs.meta b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/VisualElementExtensions.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/VisualElementExtensions.cs.meta rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/Views/VisualElementExtensions.cs.meta diff --git a/Packages/com.unity.inputsystem/Editor/Unity.InputSystem.Editor.asmdef b/Packages/com.unity.inputsystem/Editor/Unity.InputSystem.Editor.asmdef index 383e305b01..672019e384 100644 --- a/Packages/com.unity.inputsystem/Editor/Unity.InputSystem.Editor.asmdef +++ b/Packages/com.unity.inputsystem/Editor/Unity.InputSystem.Editor.asmdef @@ -13,6 +13,112 @@ "precompiledReferences": [], "autoReferenced": true, "defineConstraints": [], - "versionDefines": [], + "versionDefines": [ + { + "name": "com.unity.xr.oculus", + "expression": "1.0.3", + "define": "DISABLE_BUILTIN_INPUT_SYSTEM_OCULUS" + }, + { + "name": "com.unity.xr.googlevr", + "expression": "1.0.0", + "define": "DISABLE_BUILTIN_INPUT_SYSTEM_GOOGLEVR" + }, + { + "name": "com.unity.xr.openvr", + "expression": "1.0.0", + "define": "DISABLE_BUILTIN_INPUT_SYSTEM_OPENVR" + }, + { + "name": "com.unity.xr.windowsmr", + "expression": "2.0.3", + "define": "DISABLE_BUILTIN_INPUT_SYSTEM_WINDOWSMR" + }, + { + "name": "com.unity.modules.vr", + "expression": "1.0.0", + "define": "UNITY_INPUT_SYSTEM_ENABLE_VR" + }, + { + "name": "com.unity.modules.xr", + "expression": "1.0.0", + "define": "UNITY_INPUT_SYSTEM_ENABLE_XR" + }, + { + "name": "com.unity.modules.physics", + "expression": "1.0.0", + "define": "UNITY_INPUT_SYSTEM_ENABLE_PHYSICS" + }, + { + "name": "com.unity.modules.physics2d", + "expression": "1.0.0", + "define": "UNITY_INPUT_SYSTEM_ENABLE_PHYSICS2D" + }, + { + "name": "com.unity.ugui", + "expression": "1.0.0", + "define": "UNITY_INPUT_SYSTEM_ENABLE_UI" + }, + { + "name": "Unity", + "expression": "[2021.3.11,2022.1)", + "define": "HAS_SET_LOCAL_POSITION_AND_ROTATION" + }, + { + "name": "Unity", + "expression": "[2022.1.19,2022.2)", + "define": "HAS_SET_LOCAL_POSITION_AND_ROTATION" + }, + { + "name": "Unity", + "expression": "2022.2", + "define": "HAS_SET_LOCAL_POSITION_AND_ROTATION" + }, + { + "name": "Unity", + "expression": "2022.3", + "define": "UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS" + }, + { + "name": "Unity", + "expression": "1", + "define": "UNITY_INPUT_SYSTEM_INPUT_ACTIONS_EDITOR_AUTO_SAVE_ON_FOCUS_LOST" + }, + { + "name": "Unity", + "expression": "6000.0.9", + "define": "UNITY_INPUT_SYSTEM_PLATFORM_SCROLL_DELTA" + }, + { + "name": "Unity", + "expression": "6000.0.11", + "define": "UNITY_INPUT_SYSTEM_INPUT_MODULE_SCROLL_DELTA" + }, + { + "name": "Unity", + "expression": "6000.1.0b9", + "define": "UNITY_INPUT_SYSTEM_INPUT_MODULE_NAVIGATION_DEVICE_TYPE" + }, + { + "name": "Unity", + "expression": "6000.2.0a4", + "define": "UNITY_INPUT_SYSTEM_INPUT_MODULE_NAVIGATION_DEVICE_TYPE" + }, + { + "name": "Unity", + "expression": "6000.0.15", + "define": "UNITY_INPUT_SYSTEM_SENDPOINTERHOVERTOPARENT" + }, + { + "name": "com.unity.modules.unityanalytics", + "expression": "1", + "define": "UNITY_INPUT_SYSTEM_ENABLE_ANALYTICS" + }, + { + "name": "Unity", + "expression": "6000.3.0a6", + "define": "UNITY_INPUT_SYSTEM_PLATFORM_POLLING_FREQUENCY" + } + ], "noEngineReferences": false } \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/EditorHooks.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/EditorHooks.cs new file mode 100644 index 0000000000..b2bad8d5c1 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/EditorHooks.cs @@ -0,0 +1,35 @@ +#if UNITY_EDITOR +using System; + +namespace UnityEngine.InputSystem.Editor +{ + internal static class EditorHooks + { +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + //Inverse of control to allow the Editor to register a way to get/set the project wide actions + internal static Action m_ProjectWideActionsBuildProvideractionsToIncludeInPlayerBuildSetter; + internal static Func m_ProjectWideActionsBuildProvideractionsToIncludeInPlayerBuildGetter; + internal static InputActionAsset ActionsToIncludeInPlayerBuild + { + get => m_ProjectWideActionsBuildProvideractionsToIncludeInPlayerBuildGetter.Invoke(); + set => m_ProjectWideActionsBuildProvideractionsToIncludeInPlayerBuildSetter.Invoke(value); + } +#endif + + internal static Func m_SettingsProviderConfigKeyGetter; + internal static string SettingsProviderConfigKey => m_SettingsProviderConfigKeyGetter.Invoke(); + + internal static Action m_InputSettingsProviderForceReload; + public static void InputSettingsProviderForceReload() + { + m_InputSettingsProviderForceReload.Invoke(); + } + + internal static Func m_PlayerInputEditorDefaultInputActionsAssetPath; + internal static string DefaultInputActionsAssetPath => m_PlayerInputEditorDefaultInputActionsAssetPath.Invoke(); + + } + + +} +#endif \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs index 4926f14b08..7b3424b95d 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs @@ -1898,7 +1898,7 @@ internal void Destroy() private void InitializeActions() { #if UNITY_EDITOR - m_Actions = ProjectWideActionsBuildProvider.actionsToIncludeInPlayerBuild; + m_Actions = EditorHooks.ActionsToIncludeInPlayerBuild; #else m_Actions = null; var candidates = Resources.FindObjectsOfTypeAll(); diff --git a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs index 34d4462e22..b8b3e05b46 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs @@ -2907,7 +2907,7 @@ public static InputSettings settings #if UNITY_EDITOR if (!string.IsNullOrEmpty(AssetDatabase.GetAssetPath(value))) { - EditorBuildSettings.AddConfigObject(InputSettingsProvider.kEditorBuildSettingsConfigKey, + EditorBuildSettings.AddConfigObject(EditorHooks.SettingsProviderConfigKey, value, true); } #endif @@ -3108,7 +3108,7 @@ public static InputActionAsset actions // Track reference to enable including it in built Players, note that it will discard any non-persisted // object reference - ProjectWideActionsBuildProvider.actionsToIncludeInPlayerBuild = value; + EditorHooks.ActionsToIncludeInPlayerBuild = value; #endif // UNITY_EDITOR // Update underlying value @@ -3494,9 +3494,10 @@ private static bool ShouldEnableRemoting() // and to support the reset ability for tests. static InputSystem() { - #if UNITY_EDITOR - InitializeInEditor(); - #else + //EditorInitialization takes care of initialization in the editor + //that ensures all hooks have been initialized which otherwise + //woudl be a problem since we would have dependent code running in 2 separate static constructors. + #if !UNITY_EDITOR InitializeInPlayer(); #endif } @@ -3570,7 +3571,7 @@ internal static void InitializeInEditor(IInputRuntime runtime = null) s_SystemObject.hideFlags = HideFlags.HideAndDontSave; // See if we have a remembered settings object. - if (EditorBuildSettings.TryGetConfigObject(InputSettingsProvider.kEditorBuildSettingsConfigKey, + if (EditorBuildSettings.TryGetConfigObject(EditorHooks.SettingsProviderConfigKey, out InputSettings settingsAsset)) { if (s_Manager.m_Settings.hideFlags == HideFlags.HideAndDontSave) @@ -3581,7 +3582,7 @@ internal static void InitializeInEditor(IInputRuntime runtime = null) #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS // See if we have a saved actions object - var savedActions = ProjectWideActionsBuildProvider.actionsToIncludeInPlayerBuild; + var savedActions = EditorHooks.ActionsToIncludeInPlayerBuild; if (savedActions != null) s_Manager.actions = savedActions; #endif // UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS @@ -3710,7 +3711,8 @@ private static void OnProjectChange() ////TODO: use dirty count to find whether settings have actually changed // May have added, removed, moved, or renamed settings asset. Force a refresh // of the UI. - InputSettingsProvider.ForceReload(); + EditorHooks.InputSettingsProviderForceReload(); + // Also, if the asset holding our current settings got deleted, switch back to a // temporary settings object. diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs index 1401d03c06..9e70ddd9e8 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs @@ -9,6 +9,7 @@ using UnityEngine.UI; #if UNITY_EDITOR using UnityEditor; +using UnityEngine.InputSystem.Editor; #endif ////FIXME: The UI is currently not reacting to pointers until they are moved after the UI module has been enabled. What needs to @@ -1625,8 +1626,7 @@ protected override void Reset() { base.Reset(); - var asset = (InputActionAsset)AssetDatabase.LoadAssetAtPath( - UnityEditor.InputSystem.Editor.PlayerInputEditor.kDefaultInputActionsAssetPath, + var asset = (InputActionAsset)AssetDatabase.LoadAssetAtPath( EditorHooks.DefaultInputActionsAssetPath, typeof(InputActionAsset)); // Setting default asset and actions when creating via inspector Editor.InputSystemUIInputModuleEditor.ReassignActions(this, asset); From 0927db03765b87d31f6913208c9a22be30ab61ba Mon Sep 17 00:00:00 2001 From: leonardo Date: Thu, 25 Sep 2025 15:02:03 +0200 Subject: [PATCH 06/12] Updating the path to the DefaultTemplateAsset as we moved it --- Packages/com.unity.inputsystem/Editor/EditorInitialization.cs | 1 - .../Editor/ProjectWideActions/ProjectWideActionsAsset.cs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Packages/com.unity.inputsystem/Editor/EditorInitialization.cs b/Packages/com.unity.inputsystem/Editor/EditorInitialization.cs index f5dc3db9b0..70fe4649a5 100644 --- a/Packages/com.unity.inputsystem/Editor/EditorInitialization.cs +++ b/Packages/com.unity.inputsystem/Editor/EditorInitialization.cs @@ -7,7 +7,6 @@ class EditorInitialization { static EditorInitialization() { - Debug.Log("Input System: Initializing Editor Hooks"); EditorHooks.m_SettingsProviderConfigKeyGetter = () => InputSettingsProvider.kEditorBuildSettingsConfigKey; EditorHooks.m_ProjectWideActionsBuildProvideractionsToIncludeInPlayerBuildSetter = (value) => diff --git a/Packages/com.unity.inputsystem/Editor/ProjectWideActions/ProjectWideActionsAsset.cs b/Packages/com.unity.inputsystem/Editor/ProjectWideActions/ProjectWideActionsAsset.cs index 848af6320a..49eae9a294 100644 --- a/Packages/com.unity.inputsystem/Editor/ProjectWideActions/ProjectWideActionsAsset.cs +++ b/Packages/com.unity.inputsystem/Editor/ProjectWideActions/ProjectWideActionsAsset.cs @@ -13,7 +13,7 @@ internal static class ProjectWideActionsAsset { private const string kDefaultAssetName = "InputSystem_Actions"; private const string kDefaultAssetPath = "Assets/" + kDefaultAssetName + ".inputactions"; - private const string kDefaultTemplateAssetPath = "Packages/com.unity.inputsystem/InputSystem/Editor/ProjectWideActions/ProjectWideActionsTemplate.json"; + private const string kDefaultTemplateAssetPath = "Packages/com.unity.inputsystem/Editor/ProjectWideActions/ProjectWideActionsTemplate.json"; internal static class ProjectSettingsProjectWideActionsAssetConverter { From 327126da6916517fbc12af53efbf705c7bfa9ea9 Mon Sep 17 00:00:00 2001 From: leonardo Date: Thu, 25 Sep 2025 19:52:29 +0200 Subject: [PATCH 07/12] making it work on more recent versions of unity --- .../Unity.InputSystem.Tests.Editor.asmdef | 1 + .../InputSystem/Unity.InputSystem.Tests.asmdef | 3 ++- Packages/com.unity.inputsystem/Editor.meta | 8 ++++++++ .../Editor/AssemblyInfo.cs | 1 + .../Editor/EditorInitialization.cs | 2 ++ .../com.unity.inputsystem/Editor/Internal.meta | 3 +++ .../com.unity.inputsystem/Editor/Plugins.meta | 3 +++ .../Editor/Plugins/InputForUI.meta | 3 +++ .../Editor/Plugins/InputForUI/AssemblyInfo.cs | 7 +++++++ .../Plugins/InputForUI/AssemblyInfo.cs.meta | 3 +++ .../InputForUI/InputActionAssetVerifier.cs | 0 .../InputForUI/InputActionAssetVerifier.cs.meta | 0 .../InputForUI/InputSystemForUIEditor.asmdef | 17 +++++++++++++++++ .../InputSystemForUIEditor.asmdef.meta | 3 +++ .../com.unity.inputsystem/Editor/Settings.meta | 3 +++ .../InputSystem/Editor/EditorHooks.cs.meta | 3 +++ .../Plugins/InputForUI/AssemblyInfo.cs | 1 + .../Plugins/InputForUI/InputSystemForUI.asmdef | 3 ++- 18 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 Packages/com.unity.inputsystem/Editor.meta create mode 100644 Packages/com.unity.inputsystem/Editor/Internal.meta create mode 100644 Packages/com.unity.inputsystem/Editor/Plugins.meta create mode 100644 Packages/com.unity.inputsystem/Editor/Plugins/InputForUI.meta create mode 100644 Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/AssemblyInfo.cs create mode 100644 Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/AssemblyInfo.cs.meta rename Packages/com.unity.inputsystem/{InputSystem => Editor}/Plugins/InputForUI/InputActionAssetVerifier.cs (100%) rename Packages/com.unity.inputsystem/{InputSystem => Editor}/Plugins/InputForUI/InputActionAssetVerifier.cs.meta (100%) create mode 100644 Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/InputSystemForUIEditor.asmdef create mode 100644 Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/InputSystemForUIEditor.asmdef.meta create mode 100644 Packages/com.unity.inputsystem/Editor/Settings.meta create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/EditorHooks.cs.meta diff --git a/Assets/Tests/InputSystem.Editor/Unity.InputSystem.Tests.Editor.asmdef b/Assets/Tests/InputSystem.Editor/Unity.InputSystem.Tests.Editor.asmdef index c5ecbdbc5d..e54b7919f8 100644 --- a/Assets/Tests/InputSystem.Editor/Unity.InputSystem.Tests.Editor.asmdef +++ b/Assets/Tests/InputSystem.Editor/Unity.InputSystem.Tests.Editor.asmdef @@ -5,6 +5,7 @@ "UnityEngine.TestRunner", "UnityEditor.TestRunner", "Unity.InputSystem", + "Unity.InputSystem.Editor", "Unity.InputSystem.TestFramework" ], "includePlatforms": [ diff --git a/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef b/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef index d09d50c735..ca403634c3 100644 --- a/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef +++ b/Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef @@ -11,7 +11,8 @@ "UnityEditor.TestRunner", "Unity.PerformanceTesting", "Unity.Coding.Editor", - "Unity.InputSystem.ForUI" + "Unity.InputSystem.ForUI", + "Unity.InputSystem.ForUI.Editor" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Packages/com.unity.inputsystem/Editor.meta b/Packages/com.unity.inputsystem/Editor.meta new file mode 100644 index 0000000000..e255d2a447 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6a3f90756103c4e06a0dc060336a1814 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/Editor/AssemblyInfo.cs b/Packages/com.unity.inputsystem/Editor/AssemblyInfo.cs index ceb371b1b3..7c26fbd06b 100644 --- a/Packages/com.unity.inputsystem/Editor/AssemblyInfo.cs +++ b/Packages/com.unity.inputsystem/Editor/AssemblyInfo.cs @@ -8,4 +8,5 @@ [assembly: InternalsVisibleTo("Unity.InputSystem.Tests")] [assembly: InternalsVisibleTo("Unity.InputSystem.IntegrationTests")] [assembly: InternalsVisibleTo("Unity.InputSystem.ForUI")] // To avoid minor bump +[assembly: InternalsVisibleTo("Unity.InputSystem.ForUI.Editor")] // To avoid minor bump diff --git a/Packages/com.unity.inputsystem/Editor/EditorInitialization.cs b/Packages/com.unity.inputsystem/Editor/EditorInitialization.cs index 70fe4649a5..251fe11b1b 100644 --- a/Packages/com.unity.inputsystem/Editor/EditorInitialization.cs +++ b/Packages/com.unity.inputsystem/Editor/EditorInitialization.cs @@ -9,10 +9,12 @@ static EditorInitialization() { EditorHooks.m_SettingsProviderConfigKeyGetter = () => InputSettingsProvider.kEditorBuildSettingsConfigKey; +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS EditorHooks.m_ProjectWideActionsBuildProvideractionsToIncludeInPlayerBuildSetter = (value) => ProjectWideActionsBuildProvider.actionsToIncludeInPlayerBuild = value; EditorHooks.m_ProjectWideActionsBuildProvideractionsToIncludeInPlayerBuildGetter = () => ProjectWideActionsBuildProvider.actionsToIncludeInPlayerBuild; +#endif EditorHooks.m_InputSettingsProviderForceReload = InputSettingsProvider.ForceReload; diff --git a/Packages/com.unity.inputsystem/Editor/Internal.meta b/Packages/com.unity.inputsystem/Editor/Internal.meta new file mode 100644 index 0000000000..9d9b065759 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Internal.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a0e69dbb5fa64786897ef5be68dd5f8d +timeCreated: 1758801747 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/Editor/Plugins.meta b/Packages/com.unity.inputsystem/Editor/Plugins.meta new file mode 100644 index 0000000000..fd79d6379e --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Plugins.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e98d7e97894a4d88874eaf4a1ce3ae5d +timeCreated: 1758802094 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI.meta b/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI.meta new file mode 100644 index 0000000000..420789bf9a --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 602da8484450437da75b8f6e54bf41c0 +timeCreated: 1758822048 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/AssemblyInfo.cs b/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/AssemblyInfo.cs new file mode 100644 index 0000000000..8ba4c70eee --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/AssemblyInfo.cs @@ -0,0 +1,7 @@ +using System.Runtime.CompilerServices; +using UnityEngine.Scripting; + +[assembly: InternalsVisibleTo("UnityEngine.InputForUIVisualizer")] +[assembly: InternalsVisibleTo("Unity.InputSystem.ForUI")] +[assembly: InternalsVisibleTo("Unity.InputSystem.Tests")] +[assembly: AlwaysLinkAssembly] diff --git a/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/AssemblyInfo.cs.meta b/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/AssemblyInfo.cs.meta new file mode 100644 index 0000000000..3c3bb742bf --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/AssemblyInfo.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2dfb58de189443e6b81ce584e8bc1f4f +timeCreated: 1758822111 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI/InputActionAssetVerifier.cs b/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/InputActionAssetVerifier.cs similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI/InputActionAssetVerifier.cs rename to Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/InputActionAssetVerifier.cs diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI/InputActionAssetVerifier.cs.meta b/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/InputActionAssetVerifier.cs.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI/InputActionAssetVerifier.cs.meta rename to Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/InputActionAssetVerifier.cs.meta diff --git a/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/InputSystemForUIEditor.asmdef b/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/InputSystemForUIEditor.asmdef new file mode 100644 index 0000000000..9c516f4b9a --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/InputSystemForUIEditor.asmdef @@ -0,0 +1,17 @@ +{ + "name": "Unity.InputSystem.ForUI.Editor", + "references": [ + "Unity.InputSystem", + "Unity.InputSystem.Editor", + "Unity.InputSystem.ForUI" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/InputSystemForUIEditor.asmdef.meta b/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/InputSystemForUIEditor.asmdef.meta new file mode 100644 index 0000000000..8fb9259782 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/InputSystemForUIEditor.asmdef.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: bbd728851aad46ed9ac83ae9526a8fc5 +timeCreated: 1758822065 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/Editor/Settings.meta b/Packages/com.unity.inputsystem/Editor/Settings.meta new file mode 100644 index 0000000000..f385285898 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Settings.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9c01034d84d84cda81d1b6b3debfaad6 +timeCreated: 1758801965 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/EditorHooks.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/EditorHooks.cs.meta new file mode 100644 index 0000000000..cfef04e9dd --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/EditorHooks.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: eb968d4ecf13496ca7feb4089c11553d +timeCreated: 1758803284 \ No newline at end of file diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI/AssemblyInfo.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI/AssemblyInfo.cs index 3a20b53558..3116737cd7 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI/AssemblyInfo.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI/AssemblyInfo.cs @@ -3,4 +3,5 @@ [assembly: InternalsVisibleTo("UnityEngine.InputForUIVisualizer")] [assembly: InternalsVisibleTo("Unity.InputSystem.Tests")] +[assembly: InternalsVisibleTo("Unity.InputSystem.ForUI.Editor")] [assembly: AlwaysLinkAssembly] diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI/InputSystemForUI.asmdef b/Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI/InputSystemForUI.asmdef index b1326b2bfa..5f2075f050 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI/InputSystemForUI.asmdef +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI/InputSystemForUI.asmdef @@ -1,7 +1,8 @@ { "name": "Unity.InputSystem.ForUI", "references": [ - "Unity.InputSystem" + "Unity.InputSystem", + "Unity.InputSystem.Editor" ], "includePlatforms": [], "excludePlatforms": [], From cf727a539c329268a2511591cc81ba1c19a05abd Mon Sep 17 00:00:00 2001 From: leonardo Date: Fri, 26 Sep 2025 10:33:14 +0200 Subject: [PATCH 08/12] Updating the package resources path since we moved it a few commits ago --- .../Editor/AssetEditor/InputActionTreeView.cs | 2 +- .../Editor/UITKAssetEditor/InputActionsEditorConstants.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionTreeView.cs b/Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionTreeView.cs index 55b91a3185..449f63965c 100644 --- a/Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionTreeView.cs +++ b/Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionTreeView.cs @@ -1524,7 +1524,7 @@ private GUIContent plusIcon private static readonly GUIContent s_ExpandAllLabel = EditorGUIUtility.TrTextContent("Expand All"); private static readonly GUIContent s_CollapseAllLabel = EditorGUIUtility.TrTextContent("Collapse All"); - public static string SharedResourcesPath = "Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/"; + public static string SharedResourcesPath = "Packages/com.unity.inputsystem/Editor/AssetEditor/PackageResources/"; public static string ResourcesPath { get diff --git a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorConstants.cs b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorConstants.cs index c0c2c07c3b..5e03a3015d 100644 --- a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorConstants.cs +++ b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorConstants.cs @@ -6,7 +6,7 @@ internal static class InputActionsEditorConstants { // Paths public const string PackagePath = "Packages/com.unity.inputsystem"; - public const string ResourcesPath = "/InputSystem/Editor/UITKAssetEditor/PackageResources"; + public const string ResourcesPath = "/Editor/UITKAssetEditor/PackageResources"; /// Template names public const string ProjectSettingsUxml = "/InputActionsProjectSettings.uxml"; From 668a792433697e0972568988a7f24358846f4120 Mon Sep 17 00:00:00 2001 From: leonardo Date: Fri, 26 Sep 2025 10:42:56 +0200 Subject: [PATCH 09/12] Fix file not guarded by UNITY_EDITOR and failing a project built --- .../Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs index 6af3496b78..16a9cf44b3 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/EnhancedTouch/TouchSimulationEditor.cs @@ -1,14 +1,13 @@ #if UNITY_EDITOR using UnityEditor; using UnityEngine.InputSystem.Editor; -#endif namespace UnityEngine.InputSystem.EnhancedTouch { [InitializeOnLoad] - class TouchSimulationEdtiorInitialization + class TouchSimulationEditorInitialization { - static TouchSimulationEdtiorInitialization() + static TouchSimulationEditorInitialization() { // We're a MonoBehaviour so our cctor may get called as part of the MonoBehaviour being // created. We don't want to trigger InputSystem initialization from there so delay-execute @@ -46,4 +45,5 @@ public void OnDisable() new InputComponentEditorAnalytic(InputSystemComponent.TouchSimulation).Send(); } } -} \ No newline at end of file +} +#endif \ No newline at end of file From 09ac5309d009e031a8c2681a9c6e386f955b7393 Mon Sep 17 00:00:00 2001 From: leonardo Date: Fri, 26 Sep 2025 10:56:13 +0200 Subject: [PATCH 10/12] Marking the asmdef as Editor only --- .../Plugins/InputForUI/InputSystemForUIEditor.asmdef | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/InputSystemForUIEditor.asmdef b/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/InputSystemForUIEditor.asmdef index 9c516f4b9a..e2a9ed79f6 100644 --- a/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/InputSystemForUIEditor.asmdef +++ b/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/InputSystemForUIEditor.asmdef @@ -1,11 +1,14 @@ { "name": "Unity.InputSystem.ForUI.Editor", + "rootNamespace": "", "references": [ - "Unity.InputSystem", - "Unity.InputSystem.Editor", - "Unity.InputSystem.ForUI" + "Unity.InputSystem", + "Unity.InputSystem.Editor", + "Unity.InputSystem.ForUI" + ], + "includePlatforms": [ + "Editor" ], - "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": false, From 95626a153c23df761b7636ca8106d3ee55d65e33 Mon Sep 17 00:00:00 2001 From: leonardo Date: Fri, 26 Sep 2025 11:47:16 +0200 Subject: [PATCH 11/12] Validation was complaining about missing reference to imgui module --- Packages/com.unity.inputsystem/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Packages/com.unity.inputsystem/package.json b/Packages/com.unity.inputsystem/package.json index d32d70c697..9c97eb727e 100755 --- a/Packages/com.unity.inputsystem/package.json +++ b/Packages/com.unity.inputsystem/package.json @@ -15,6 +15,7 @@ "xr" ], "dependencies": { - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.imgui": "1.0.0" } } From d3f4847e8a12ecdc1149d85e36c891a92f08e811 Mon Sep 17 00:00:00 2001 From: leonardo Date: Mon, 29 Sep 2025 18:57:23 +0200 Subject: [PATCH 12/12] fix uss path --- .../PackageResources/InputActionMapsTreeViewItem.uxml | 2 +- .../UITKAssetEditor/PackageResources/InputActionsEditor.uxml | 2 +- .../PackageResources/InputActionsProjectSettings.uxml | 2 +- .../PackageResources/InputActionsTreeViewItem.uxml | 2 +- .../PackageResources/NameAndParameterListViewItemTemplate.uxml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml index a26d706df2..28e56ee2e7 100644 --- a/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml +++ b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml @@ -1,5 +1,5 @@ -