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.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/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..ca403634c3 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", @@ -10,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/Actions.meta b/Packages/com.unity.inputsystem/Editor/Actions.meta new file mode 100644 index 0000000000..6fb384287c --- /dev/null +++ b/Packages/com.unity.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/Editor/Actions/AxisCompositeEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/AxisCompositeEditor.cs new file mode 100644 index 0000000000..e17425becb --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Actions/AxisCompositeEditor.cs @@ -0,0 +1,48 @@ + +using UnityEngine; +using UnityEngine.InputSystem.Composites; +#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 (!UnityEngine.InputSystem.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/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/Editor/Actions/Interactions.meta b/Packages/com.unity.inputsystem/Editor/Actions/Interactions.meta new file mode 100644 index 0000000000..865b6a58b4 --- /dev/null +++ b/Packages/com.unity.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/Editor/Actions/Interactions/HoldInteractionEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/HoldInteractionEditor.cs new file mode 100644 index 0000000000..06a9da5814 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/HoldInteractionEditor.cs @@ -0,0 +1,52 @@ + +using System; +using UnityEngine.InputSystem.Controls; +using UnityEngine.InputSystem.Interactions; +#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, () => UnityEngine.InputSystem.InputSystem.settings.defaultHoldTime); + } + + public override void OnGUI() + { +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + if (!UnityEngine.InputSystem.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/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/Editor/Actions/Interactions/MultiTapInteractionEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs new file mode 100644 index 0000000000..682b8c81d1 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs @@ -0,0 +1,79 @@ + +using System; +using UnityEngine; +using UnityEngine.InputSystem.Interactions; +#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, () => 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, () => 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, + () => UnityEngine.InputSystem.InputSystem.settings.defaultButtonPressPoint); + } + + public override void OnGUI() + { +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + if (!UnityEngine.InputSystem.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/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/Editor/Actions/Interactions/PressInteractionEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/PressInteractionEditor.cs new file mode 100644 index 0000000000..0570067681 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/PressInteractionEditor.cs @@ -0,0 +1,74 @@ + +using System; +using UnityEngine; +using UnityEngine.InputSystem.Interactions; +#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, + () => UnityEngine.InputSystem.InputSystem.settings.defaultButtonPressPoint); + } + + public override void OnGUI() + { +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + if (!UnityEngine.InputSystem.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/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/Editor/Actions/Interactions/SlowTapInteractionEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs new file mode 100644 index 0000000000..da6659ecf6 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs @@ -0,0 +1,50 @@ + +using System; +using UnityEngine.InputSystem.Interactions; +#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, () => 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, + () => UnityEngine.InputSystem.InputSystem.settings.defaultButtonPressPoint); + } + + public override void OnGUI() + { +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + if (!UnityEngine.InputSystem.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/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/Editor/Actions/Interactions/TapInteractionEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/TapInteractionEditor.cs new file mode 100644 index 0000000000..f4273af159 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Actions/Interactions/TapInteractionEditor.cs @@ -0,0 +1,50 @@ + +using System; +using UnityEngine.InputSystem.Interactions; +#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, () => 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, + () => UnityEngine.InputSystem.InputSystem.settings.defaultButtonPressPoint); + } + + public override void OnGUI() + { +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + if (!UnityEngine.InputSystem.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/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/Editor/Actions/Vector2CompositeEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Vector2CompositeEditor.cs new file mode 100644 index 0000000000..91cd1f3b32 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Actions/Vector2CompositeEditor.cs @@ -0,0 +1,48 @@ + +using System; +using UnityEngine; +using UnityEngine.InputSystem.Composites; +#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 (!UnityEngine.InputSystem.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/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/Editor/Actions/Vector3CompositeEditor.cs b/Packages/com.unity.inputsystem/Editor/Actions/Vector3CompositeEditor.cs new file mode 100644 index 0000000000..6c3ef4af7d --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Actions/Vector3CompositeEditor.cs @@ -0,0 +1,49 @@ + + +using System; +using UnityEngine; +using UnityEngine.InputSystem.Composites; +#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 (!UnityEngine.InputSystem.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/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..7c26fbd06b --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/AssemblyInfo.cs @@ -0,0 +1,12 @@ +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 +[assembly: InternalsVisibleTo("Unity.InputSystem.ForUI.Editor")] // 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/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/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/InputActionTreeView.cs b/Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionTreeView.cs similarity index 99% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeView.cs rename to Packages/com.unity.inputsystem/Editor/AssetEditor/InputActionTreeView.cs index 55b91a3185..449f63965c 100644 --- a/Packages/com.unity.inputsystem/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/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/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/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.meta b/Packages/com.unity.inputsystem/Editor/Controls.meta new file mode 100644 index 0000000000..24b3fff5bb --- /dev/null +++ b/Packages/com.unity.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/Editor/Controls/Processors.meta b/Packages/com.unity.inputsystem/Editor/Controls/Processors.meta new file mode 100644 index 0000000000..aaac5804bc --- /dev/null +++ b/Packages/com.unity.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/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs b/Packages/com.unity.inputsystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs new file mode 100644 index 0000000000..944f8e0d71 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs @@ -0,0 +1,51 @@ + + +using System; +using UnityEngine.InputSystem.Processors; +#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, + () => 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, + () => UnityEngine.InputSystem.InputSystem.settings.defaultDeadzoneMax); + } + + public override void OnGUI() + { +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + if (!UnityEngine.InputSystem.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/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/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs b/Packages/com.unity.inputsystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs new file mode 100644 index 0000000000..fe11efc755 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs @@ -0,0 +1,49 @@ +using System; +using UnityEngine.InputSystem.Processors; +#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, + () => 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, + () => UnityEngine.InputSystem.InputSystem.settings.defaultDeadzoneMax); + } + + public override void OnGUI() + { +#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS + if (!UnityEngine.InputSystem.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/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/Editor/EditorInitialization.cs b/Packages/com.unity.inputsystem/Editor/EditorInitialization.cs new file mode 100644 index 0000000000..251fe11b1b --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/EditorInitialization.cs @@ -0,0 +1,27 @@ +using UnityEditor; + +namespace UnityEngine.InputSystem.Editor +{ + [InitializeOnLoad] + class EditorInitialization + { + 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; + + 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/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/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/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/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..e2a9ed79f6 --- /dev/null +++ b/Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/InputSystemForUIEditor.asmdef @@ -0,0 +1,20 @@ +{ + "name": "Unity.InputSystem.ForUI.Editor", + "rootNamespace": "", + "references": [ + "Unity.InputSystem", + "Unity.InputSystem.Editor", + "Unity.InputSystem.ForUI" + ], + "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/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/InputSystem/Plugins/PlayerInput/PlayerInputEditor.cs b/Packages/com.unity.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/Editor/Plugins/PlayerInputEditor.cs index cb5d9c89c8..d17f86bfa8 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputEditor.cs +++ b/Packages/com.unity.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; @@ -15,7 +18,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. @@ -86,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/Plugins/PlayerInput/PlayerInputEditor.cs.meta b/Packages/com.unity.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/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 99% rename from Packages/com.unity.inputsystem/InputSystem/Editor/ProjectWideActions/ProjectWideActionsAsset.cs rename to Packages/com.unity.inputsystem/Editor/ProjectWideActions/ProjectWideActionsAsset.cs index 848af6320a..49eae9a294 100644 --- a/Packages/com.unity.inputsystem/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 { 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/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/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/Settings/InputSettingsProvider.cs b/Packages/com.unity.inputsystem/Editor/Settings/InputSettingsProvider.cs similarity index 99% rename from Packages/com.unity.inputsystem/InputSystem/Editor/Settings/InputSettingsProvider.cs rename to Packages/com.unity.inputsystem/Editor/Settings/InputSettingsProvider.cs index 1b333b0ed4..45d56ae6ec 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Settings/InputSettingsProvider.cs +++ b/Packages/com.unity.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/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 96% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorConstants.cs rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/InputActionsEditorConstants.cs index c0c2c07c3b..5e03a3015d 100644 --- a/Packages/com.unity.inputsystem/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"; 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 89% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml rename to Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml index a26d706df2..28e56ee2e7 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml +++ b/Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml @@ -1,5 +1,5 @@ -