From 46e332fec9f9a323976196907b7b0f2167320432 Mon Sep 17 00:00:00 2001 From: DAIKI Date: Sun, 7 Jul 2024 17:36:58 +0900 Subject: [PATCH 01/10] Change version --- InputGlyphs/Assets/InputGlyphs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InputGlyphs/Assets/InputGlyphs/package.json b/InputGlyphs/Assets/InputGlyphs/package.json index 517a860..3358016 100644 --- a/InputGlyphs/Assets/InputGlyphs/package.json +++ b/InputGlyphs/Assets/InputGlyphs/package.json @@ -1,7 +1,7 @@ { "name": "com.eviltwo.input-glyphs", "displayName": "Input Glyphs", - "version": "0.7.2", + "version": "0.7.3", "unity": "2022.3", "description": "Displays glyphs (icons) of keyboard & mouse or controller buttons recognized by Unity's InputSystem.", "author": { From d5489604bc8c13fa6e735966ad415b8fca266778 Mon Sep 17 00:00:00 2001 From: DAIKI Date: Sun, 7 Jul 2024 18:41:24 +0900 Subject: [PATCH 02/10] Add define for input system --- .../Samples/InputCheckSample/Scripts/InputCheckSample.cs | 2 +- .../Scripts/InputGlyphs.Sample.InputCheck.asmdef | 8 +++++++- .../Assets/InputGlyphs/Scripts/Core/IInputGlyphLoader.cs | 2 +- .../Assets/InputGlyphs/Scripts/Core/InputGlyphManager.cs | 2 +- .../Assets/InputGlyphs/Scripts/Core/InputGlyphs.asmdef | 8 +++++++- .../Scripts/Display/DisplayGlyphTextureGenerator.cs | 2 +- .../Scripts/Display/InputGlyphs.Display.asmdef | 8 +++++++- .../Scripts/Display/Sprite/InputGlyphSprite.cs | 2 +- .../Display/Sprite/InputGlyps.Display.Sprite.asmdef | 8 +++++++- .../Display/TextMeshPro/Editor/InputGlyphTextEditor.cs | 2 +- .../Editor/InputGlyphs.Display.TextMeshPro.Editor.asmdef | 5 +++++ .../Scripts/Display/TextMeshPro/InputGlyphText.cs | 2 +- .../TextMeshPro/InputGlyphs.Display.TextMeshPro.asmdef | 5 +++++ .../InputGlyphs/Scripts/Display/UI/InputGlyphImage.cs | 2 +- .../Scripts/Display/UI/InputGlyphs.Display.UI.asmdef | 8 +++++++- .../Scripts/Loaders/Gamepad/GamepadGlyphInitializer.cs | 2 +- .../Scripts/Loaders/Gamepad/GamepadGlyphLoader.cs | 2 +- .../Loaders/Gamepad/InputGlyphs.Loaders.Gamepad.asmdef | 8 +++++++- .../Loaders/Keyboard/InputGlyphs.Loaders.Keyboard.asmdef | 8 +++++++- .../Scripts/Loaders/Keyboard/KeyboardGlyphInitializer.cs | 2 +- .../Loaders/Mouse/InputGlyphs.Loaders.Mouse.asmdef | 8 +++++++- .../Scripts/Loaders/Mouse/MouseGlyphInitializer.cs | 2 +- .../Loaders/SteamGamepad/InputGlyphs.Loaders.Steam.asmdef | 5 +++++ .../Scripts/Loaders/Utils/DeviceGlyphLoader.cs | 2 +- .../Scripts/Loaders/Utils/DeviceGlyphLoaderInitializer.cs | 2 +- .../Loaders/Utils/InputGlyphs.Loaders.Utils.asmdef | 8 +++++++- .../Scripts/Utils/InputActionRebindingExtensions.cs | 2 +- .../InputGlyphs/Scripts/Utils/InputGlyphs.Utils.asmdef | 8 +++++++- .../InputGlyphs/Scripts/Utils/InputLayoutPathUtility.cs | 2 +- 29 files changed, 101 insertions(+), 26 deletions(-) diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts/InputCheckSample.cs b/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts/InputCheckSample.cs index a6b390e..79e8917 100644 --- a/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts/InputCheckSample.cs +++ b/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts/InputCheckSample.cs @@ -1,4 +1,4 @@ -#if ENABLE_INPUT_SYSTEM +#if INPUT_SYSTEM && ENABLE_INPUT_SYSTEM using System; using System.Collections.Generic; using InputGlyphs.Display; diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts/InputGlyphs.Sample.InputCheck.asmdef b/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts/InputGlyphs.Sample.InputCheck.asmdef index e31f23b..c7377e1 100644 --- a/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts/InputGlyphs.Sample.InputCheck.asmdef +++ b/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts/InputGlyphs.Sample.InputCheck.asmdef @@ -13,6 +13,12 @@ "precompiledReferences": [], "autoReferenced": false, "defineConstraints": [], - "versionDefines": [], + "versionDefines": [ + { + "name": "com.unity.inputsystem", + "expression": "", + "define": "INPUT_SYSTEM" + } + ], "noEngineReferences": false } \ No newline at end of file diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Core/IInputGlyphLoader.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Core/IInputGlyphLoader.cs index 4c86187..105c09a 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Core/IInputGlyphLoader.cs +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Core/IInputGlyphLoader.cs @@ -1,4 +1,4 @@ -#if ENABLE_INPUT_SYSTEM +#if INPUT_SYSTEM && ENABLE_INPUT_SYSTEM using System.Collections.Generic; using UnityEngine; using UnityEngine.InputSystem; diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Core/InputGlyphManager.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Core/InputGlyphManager.cs index 3e222ab..fa48564 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Core/InputGlyphManager.cs +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Core/InputGlyphManager.cs @@ -1,4 +1,4 @@ -#if ENABLE_INPUT_SYSTEM +#if INPUT_SYSTEM && ENABLE_INPUT_SYSTEM using System.Collections.Generic; using UnityEngine; using UnityEngine.InputSystem; diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Core/InputGlyphs.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Core/InputGlyphs.asmdef index ef036e6..d49032c 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Core/InputGlyphs.asmdef +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Core/InputGlyphs.asmdef @@ -11,6 +11,12 @@ "precompiledReferences": [], "autoReferenced": true, "defineConstraints": [], - "versionDefines": [], + "versionDefines": [ + { + "name": "com.unity.inputsystem", + "expression": "", + "define": "INPUT_SYSTEM" + } + ], "noEngineReferences": false } \ No newline at end of file diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/DisplayGlyphTextureGenerator.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/DisplayGlyphTextureGenerator.cs index f7e5927..0c699fc 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/DisplayGlyphTextureGenerator.cs +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/DisplayGlyphTextureGenerator.cs @@ -1,4 +1,4 @@ -#if ENABLE_INPUT_SYSTEM +#if INPUT_SYSTEM && ENABLE_INPUT_SYSTEM using System.Collections.Generic; using InputGlyphs.Utils; using UnityEngine; diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/InputGlyphs.Display.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/InputGlyphs.Display.asmdef index 5858643..60287cc 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/InputGlyphs.Display.asmdef +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/InputGlyphs.Display.asmdef @@ -13,6 +13,12 @@ "precompiledReferences": [], "autoReferenced": true, "defineConstraints": [], - "versionDefines": [], + "versionDefines": [ + { + "name": "com.unity.inputsystem", + "expression": "", + "define": "INPUT_SYSTEM" + } + ], "noEngineReferences": false } \ No newline at end of file diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyphSprite.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyphSprite.cs index 378b1ee..1b11a57 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyphSprite.cs +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyphSprite.cs @@ -1,4 +1,4 @@ -#if ENABLE_INPUT_SYSTEM +#if INPUT_SYSTEM && ENABLE_INPUT_SYSTEM using System.Collections.Generic; using InputGlyphs.Utils; using UnityEngine; diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyps.Display.Sprite.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyps.Display.Sprite.asmdef index 41216b2..9f8405b 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyps.Display.Sprite.asmdef +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyps.Display.Sprite.asmdef @@ -14,6 +14,12 @@ "precompiledReferences": [], "autoReferenced": true, "defineConstraints": [], - "versionDefines": [], + "versionDefines": [ + { + "name": "com.unity.inputsystem", + "expression": "", + "define": "INPUT_SYSTEM" + } + ], "noEngineReferences": false } \ No newline at end of file diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphTextEditor.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphTextEditor.cs index df019fa..0d02399 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphTextEditor.cs +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphTextEditor.cs @@ -1,4 +1,4 @@ -#if ENABLE_INPUT_SYSTEM && SUPPORT_TMPRO +#if INPUT_SYSTEM && ENABLE_INPUT_SYSTEM && SUPPORT_TMPRO using System.Text; using UnityEditor; using UnityEngine; diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphs.Display.TextMeshPro.Editor.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphs.Display.TextMeshPro.Editor.asmdef index b6b3e19..9514473 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphs.Display.TextMeshPro.Editor.asmdef +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphs.Display.TextMeshPro.Editor.asmdef @@ -15,6 +15,11 @@ "autoReferenced": false, "defineConstraints": [], "versionDefines": [ + { + "name": "com.unity.inputsystem", + "expression": "", + "define": "INPUT_SYSTEM" + }, { "name": "com.unity.textmeshpro", "expression": "", diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphText.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphText.cs index e6a6b4f..80136c6 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphText.cs +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphText.cs @@ -1,4 +1,4 @@ -#if ENABLE_INPUT_SYSTEM && SUPPORT_TMPRO +#if INPUT_SYSTEM && ENABLE_INPUT_SYSTEM && SUPPORT_TMPRO using System; using System.Collections.Generic; using System.Reflection; diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphs.Display.TextMeshPro.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphs.Display.TextMeshPro.asmdef index 41434eb..6cfe226 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphs.Display.TextMeshPro.asmdef +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphs.Display.TextMeshPro.asmdef @@ -16,6 +16,11 @@ "autoReferenced": true, "defineConstraints": [], "versionDefines": [ + { + "name": "com.unity.inputsystem", + "expression": "", + "define": "INPUT_SYSTEM" + }, { "name": "com.unity.textmeshpro", "expression": "", diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphImage.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphImage.cs index e8d7d1f..e8ba939 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphImage.cs +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphImage.cs @@ -1,4 +1,4 @@ -#if ENABLE_INPUT_SYSTEM +#if INPUT_SYSTEM && ENABLE_INPUT_SYSTEM using System.Collections.Generic; using InputGlyphs.Utils; using UnityEngine; diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphs.Display.UI.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphs.Display.UI.asmdef index 04ea1b0..86e519d 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphs.Display.UI.asmdef +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphs.Display.UI.asmdef @@ -14,6 +14,12 @@ "precompiledReferences": [], "autoReferenced": true, "defineConstraints": [], - "versionDefines": [], + "versionDefines": [ + { + "name": "com.unity.inputsystem", + "expression": "", + "define": "INPUT_SYSTEM" + } + ], "noEngineReferences": false } \ No newline at end of file diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/GamepadGlyphInitializer.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/GamepadGlyphInitializer.cs index e4133b1..a484570 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/GamepadGlyphInitializer.cs +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/GamepadGlyphInitializer.cs @@ -1,4 +1,4 @@ -#if ENABLE_INPUT_SYSTEM +#if INPUT_SYSTEM && ENABLE_INPUT_SYSTEM using InputGlyphs.Loaders.Utils; using UnityEngine; diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/GamepadGlyphLoader.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/GamepadGlyphLoader.cs index 350e351..7907aaa 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/GamepadGlyphLoader.cs +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/GamepadGlyphLoader.cs @@ -1,4 +1,4 @@ -#if ENABLE_INPUT_SYSTEM +#if INPUT_SYSTEM && ENABLE_INPUT_SYSTEM using System.Collections.Generic; using InputGlyphs.Loaders.Utils; using InputGlyphs.Utils; diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/InputGlyphs.Loaders.Gamepad.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/InputGlyphs.Loaders.Gamepad.asmdef index 71ba03f..37d8396 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/InputGlyphs.Loaders.Gamepad.asmdef +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/InputGlyphs.Loaders.Gamepad.asmdef @@ -14,6 +14,12 @@ "precompiledReferences": [], "autoReferenced": false, "defineConstraints": [], - "versionDefines": [], + "versionDefines": [ + { + "name": "com.unity.inputsystem", + "expression": "", + "define": "INPUT_SYSTEM" + } + ], "noEngineReferences": false } \ No newline at end of file diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard/InputGlyphs.Loaders.Keyboard.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard/InputGlyphs.Loaders.Keyboard.asmdef index 798cdfb..2b58184 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard/InputGlyphs.Loaders.Keyboard.asmdef +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard/InputGlyphs.Loaders.Keyboard.asmdef @@ -12,6 +12,12 @@ "precompiledReferences": [], "autoReferenced": false, "defineConstraints": [], - "versionDefines": [], + "versionDefines": [ + { + "name": "com.unity.inputsystem", + "expression": "", + "define": "INPUT_SYSTEM" + } + ], "noEngineReferences": false } \ No newline at end of file diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard/KeyboardGlyphInitializer.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard/KeyboardGlyphInitializer.cs index 9338c14..3692cdf 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard/KeyboardGlyphInitializer.cs +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard/KeyboardGlyphInitializer.cs @@ -1,4 +1,4 @@ -#if ENABLE_INPUT_SYSTEM +#if INPUT_SYSTEM && ENABLE_INPUT_SYSTEM using InputGlyphs.Loaders.Utils; using UnityEngine.InputSystem; diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse/InputGlyphs.Loaders.Mouse.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse/InputGlyphs.Loaders.Mouse.asmdef index 6b424ba..6f09daa 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse/InputGlyphs.Loaders.Mouse.asmdef +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse/InputGlyphs.Loaders.Mouse.asmdef @@ -12,6 +12,12 @@ "precompiledReferences": [], "autoReferenced": false, "defineConstraints": [], - "versionDefines": [], + "versionDefines": [ + { + "name": "com.unity.inputsystem", + "expression": "", + "define": "INPUT_SYSTEM" + } + ], "noEngineReferences": false } \ No newline at end of file diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse/MouseGlyphInitializer.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse/MouseGlyphInitializer.cs index 7b683ad..b762d38 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse/MouseGlyphInitializer.cs +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse/MouseGlyphInitializer.cs @@ -1,4 +1,4 @@ -#if ENABLE_INPUT_SYSTEM +#if INPUT_SYSTEM && ENABLE_INPUT_SYSTEM using InputGlyphs.Loaders.Utils; using UnityEngine.InputSystem; diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/InputGlyphs.Loaders.Steam.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/InputGlyphs.Loaders.Steam.asmdef index a3675a4..64161d8 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/InputGlyphs.Loaders.Steam.asmdef +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/InputGlyphs.Loaders.Steam.asmdef @@ -16,6 +16,11 @@ "autoReferenced": false, "defineConstraints": [], "versionDefines": [ + { + "name": "com.unity.inputsystem", + "expression": "", + "define": "INPUT_SYSTEM" + }, { "name": "com.eviltwo.unity-steam-input-adapter", "expression": "", diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/DeviceGlyphLoader.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/DeviceGlyphLoader.cs index 4ed786b..6b42c83 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/DeviceGlyphLoader.cs +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/DeviceGlyphLoader.cs @@ -1,4 +1,4 @@ -#if ENABLE_INPUT_SYSTEM +#if INPUT_SYSTEM && ENABLE_INPUT_SYSTEM using System.Collections.Generic; using InputGlyphs.Utils; using UnityEngine; diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/DeviceGlyphLoaderInitializer.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/DeviceGlyphLoaderInitializer.cs index f12c441..92590d7 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/DeviceGlyphLoaderInitializer.cs +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/DeviceGlyphLoaderInitializer.cs @@ -1,4 +1,4 @@ -#if ENABLE_INPUT_SYSTEM +#if INPUT_SYSTEM && ENABLE_INPUT_SYSTEM using UnityEngine; using UnityEngine.InputSystem; diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/InputGlyphs.Loaders.Utils.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/InputGlyphs.Loaders.Utils.asmdef index d5913ea..57dc5d9 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/InputGlyphs.Loaders.Utils.asmdef +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/InputGlyphs.Loaders.Utils.asmdef @@ -13,6 +13,12 @@ "precompiledReferences": [], "autoReferenced": true, "defineConstraints": [], - "versionDefines": [], + "versionDefines": [ + { + "name": "com.unity.inputsystem", + "expression": "", + "define": "INPUT_SYSTEM" + } + ], "noEngineReferences": false } \ No newline at end of file diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputActionRebindingExtensions.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputActionRebindingExtensions.cs index 7fb6c25..b5a89ef 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputActionRebindingExtensions.cs +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputActionRebindingExtensions.cs @@ -1,4 +1,4 @@ -#if ENABLE_INPUT_SYSTEM +#if INPUT_SYSTEM && ENABLE_INPUT_SYSTEM using System; using System.Collections.Generic; using UnityEngine.InputSystem; diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputGlyphs.Utils.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputGlyphs.Utils.asmdef index 987ef8d..49a47a5 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputGlyphs.Utils.asmdef +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputGlyphs.Utils.asmdef @@ -11,6 +11,12 @@ "precompiledReferences": [], "autoReferenced": true, "defineConstraints": [], - "versionDefines": [], + "versionDefines": [ + { + "name": "com.unity.inputsystem", + "expression": "", + "define": "INPUT_SYSTEM" + } + ], "noEngineReferences": false } \ No newline at end of file diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputLayoutPathUtility.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputLayoutPathUtility.cs index e503a00..f69fcce 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputLayoutPathUtility.cs +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputLayoutPathUtility.cs @@ -1,4 +1,4 @@ -#if ENABLE_INPUT_SYSTEM +#if INPUT_SYSTEM && ENABLE_INPUT_SYSTEM using System.Collections.Generic; using System.Text; using UnityEngine.InputSystem; From b0b586667add3e072a25f82194ef617472d4b1e4 Mon Sep 17 00:00:00 2001 From: DAIKI Date: Sun, 7 Jul 2024 19:40:26 +0900 Subject: [PATCH 03/10] Change directory script and asmdef --- .../DuoPlayerSample.unity | 0 .../DuoPlayerSample.unity.meta | 0 .../InputGlyphs/Samples/InputCheckSample.meta | 8 ----- .../InputCheckSample.unity | 0 .../InputCheckSample.unity.meta | 0 .../Samples/InputCheckSample/Scripts.meta | 8 ----- .../{SteamworksSample => }/Scripts.meta | 2 +- .../Scripts/InputCheckSample.cs | 0 .../Scripts/InputCheckSample.cs.meta | 0 .../InputGlyphs.Sample.asmdef} | 8 ++++- .../InputGlyphs.Sample.asmdef.meta} | 0 .../Scripts/SteamworksSample.cs | 0 .../Scripts/SteamworksSample.cs.meta | 0 .../InputGlyphs/Samples/SoloPlayerSample.meta | 8 ----- .../SoloPlayerSample.unity | 0 .../SoloPlayerSample.unity.meta | 0 .../InputGlyphs/Samples/SteamworksSample.meta | 8 ----- .../SteamworksSample.unity | 0 .../SteamworksSample.unity.meta | 0 .../InputGlyphs.Sample.Steamworks.asmdef | 22 -------------- .../Assets/InputGlyphs/Scripts/Core.meta | 8 ----- .../Display/InputGlyphs.Display.asmdef | 24 --------------- .../Sprite/InputGlyps.Display.Sprite.asmdef | 25 ---------------- .../InputGlyps.Display.Sprite.asmdef.meta | 7 ----- .../Scripts/Display/TextMeshPro/Editor.meta | 8 ----- ...utGlyphs.Display.TextMeshPro.Editor.asmdef | 30 ------------------- ...phs.Display.TextMeshPro.Editor.asmdef.meta | 7 ----- ...nputGlyphs.Display.TextMeshPro.asmdef.meta | 7 ----- .../Display/UI/InputGlyphs.Display.UI.asmdef | 25 ---------------- .../UI/InputGlyphs.Display.UI.asmdef.meta | 7 ----- .../{Loaders/SteamGamepad => }/Editor.meta | 0 .../Editor/InputGlyphTextEditor.cs | 0 .../Editor/InputGlyphTextEditor.cs.meta | 0 .../InputGlyphs.Editor.asmdef} | 15 +++++++++- .../InputGlyphs.Editor.asmdef.meta} | 0 .../SteamGamepadGlyphInitializerEditor.cs | 0 ...SteamGamepadGlyphInitializerEditor.cs.meta | 0 .../InputGlyphs.Loaders.Gamepad.asmdef | 25 ---------------- .../InputGlyphs.Loaders.Gamepad.asmdef.meta | 7 ----- .../InputGlyphs.Loaders.Keyboard.asmdef | 23 -------------- .../InputGlyphs.Loaders.Keyboard.asmdef.meta | 7 ----- .../InputGlyphs.Loaders.Mouse.asmdef.meta | 7 ----- .../Utils/InputGlyphs.Loaders.Utils.asmdef | 24 --------------- .../InputGlyphs.Loaders.Utils.asmdef.meta | 7 ----- .../Runtime.meta} | 2 +- .../Scripts/{ => Runtime}/Display.meta | 0 .../Display/DisplayGlyphTextureGenerator.cs | 0 .../DisplayGlyphTextureGenerator.cs.meta | 0 .../{ => Runtime}/Display/GlyphsLayout.cs | 0 .../Display/GlyphsLayout.cs.meta | 0 .../Display/InputGlyphs.Display.asmdef} | 6 ++-- .../Display/InputGlyphs.Display.asmdef.meta | 0 .../Scripts/{ => Runtime}/Display/Sprite.meta | 0 .../Display/Sprite/InputGlyphSprite.cs | 0 .../Display/Sprite/InputGlyphSprite.cs.meta | 0 .../{ => Runtime}/Display/TextMeshPro.meta | 0 .../Display/TextMeshPro/InputGlyphText.cs | 0 .../TextMeshPro/InputGlyphText.cs.meta | 0 .../Scripts/{ => Runtime}/Display/UI.meta | 0 .../Display/UI/InputGlyphImage.cs | 0 .../Display/UI/InputGlyphImage.cs.meta | 0 .../{Core => Runtime}/IInputGlyphLoader.cs | 0 .../IInputGlyphLoader.cs.meta | 0 .../{Core => Runtime}/InputGlyphManager.cs | 0 .../InputGlyphManager.cs.meta | 0 .../{Core => Runtime}/InputGlyphs.asmdef | 0 .../{Core => Runtime}/InputGlyphs.asmdef.meta | 0 .../Scripts/{ => Runtime}/Loaders.meta | 0 .../{ => Runtime}/Loaders/Gamepad.meta | 0 .../Gamepad/GamepadGlyphInitializer.cs | 0 .../Gamepad/GamepadGlyphInitializer.cs.meta | 0 .../Loaders/Gamepad/GamepadGlyphLoader.cs | 0 .../Gamepad/GamepadGlyphLoader.cs.meta | 0 .../Loaders/InputGlyphs.Loaders.asmdef} | 6 ++-- .../Loaders/InputGlyphs.Loaders.asmdef.meta} | 2 +- .../{ => Runtime}/Loaders/Keyboard.meta | 0 .../Keyboard/KeyboardGlyphInitializer.cs | 0 .../Keyboard/KeyboardGlyphInitializer.cs.meta | 0 .../Scripts/{ => Runtime}/Loaders/Mouse.meta | 0 .../Loaders/Mouse/MouseGlyphInitializer.cs | 0 .../Mouse/MouseGlyphInitializer.cs.meta | 0 .../{ => Runtime}/Loaders/SteamGamepad.meta | 0 .../InputGlyphs.Loaders.Steam.asmdef | 0 .../InputGlyphs.Loaders.Steam.asmdef.meta | 0 .../SteamGamepadGlyphInitializer.cs | 0 .../SteamGamepadGlyphInitializer.cs.meta | 0 .../SteamGamepad/SteamGamepadGlyphLoader.cs | 0 .../SteamGamepadGlyphLoader.cs.meta | 0 .../Scripts/{ => Runtime}/Loaders/Utils.meta | 0 .../Loaders/Utils/DeviceGlyphLoader.cs | 0 .../Loaders/Utils/DeviceGlyphLoader.cs.meta | 0 .../Utils/DeviceGlyphLoaderInitializer.cs | 0 .../DeviceGlyphLoaderInitializer.cs.meta | 0 .../Loaders/Utils/InputGlyphTextureMap.cs | 0 .../Utils/InputGlyphTextureMap.cs.meta | 0 .../Scripts/{ => Runtime}/Utils.meta | 0 .../Utils/GlyphTextureUtility.cs | 0 .../Utils/GlyphTextureUtility.cs.meta | 0 .../Utils/InputActionRebindingExtensions.cs | 0 .../InputActionRebindingExtensions.cs.meta | 0 .../Utils/InputLayoutPathUtility.cs | 0 .../Utils/InputLayoutPathUtility.cs.meta | 0 .../Scripts/Utils/InputGlyphs.Utils.asmdef | 22 -------------- .../Utils/InputGlyphs.Utils.asmdef.meta | 7 ----- .../Utils/InputGlyphs.Utils.Tests.asmdef | 2 +- .../ProjectSettings/EditorBuildSettings.asset | 6 ++-- 106 files changed, 33 insertions(+), 347 deletions(-) rename InputGlyphs/Assets/InputGlyphs/Samples/{DuoPlayerSample => }/DuoPlayerSample.unity (100%) rename InputGlyphs/Assets/InputGlyphs/Samples/{DuoPlayerSample => }/DuoPlayerSample.unity.meta (100%) delete mode 100644 InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample.meta rename InputGlyphs/Assets/InputGlyphs/Samples/{InputCheckSample => }/InputCheckSample.unity (100%) rename InputGlyphs/Assets/InputGlyphs/Samples/{InputCheckSample => }/InputCheckSample.unity.meta (100%) delete mode 100644 InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts.meta rename InputGlyphs/Assets/InputGlyphs/Samples/{SteamworksSample => }/Scripts.meta (77%) rename InputGlyphs/Assets/InputGlyphs/Samples/{InputCheckSample => }/Scripts/InputCheckSample.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Samples/{InputCheckSample => }/Scripts/InputCheckSample.cs.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Samples/{InputCheckSample/Scripts/InputGlyphs.Sample.InputCheck.asmdef => Scripts/InputGlyphs.Sample.asmdef} (72%) rename InputGlyphs/Assets/InputGlyphs/Samples/{InputCheckSample/Scripts/InputGlyphs.Sample.InputCheck.asmdef.meta => Scripts/InputGlyphs.Sample.asmdef.meta} (100%) rename InputGlyphs/Assets/InputGlyphs/Samples/{SteamworksSample => }/Scripts/SteamworksSample.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Samples/{SteamworksSample => }/Scripts/SteamworksSample.cs.meta (100%) delete mode 100644 InputGlyphs/Assets/InputGlyphs/Samples/SoloPlayerSample.meta rename InputGlyphs/Assets/InputGlyphs/Samples/{SoloPlayerSample => }/SoloPlayerSample.unity (100%) rename InputGlyphs/Assets/InputGlyphs/Samples/{SoloPlayerSample => }/SoloPlayerSample.unity.meta (100%) delete mode 100644 InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample.meta rename InputGlyphs/Assets/InputGlyphs/Samples/{SteamworksSample => }/SteamworksSample.unity (100%) rename InputGlyphs/Assets/InputGlyphs/Samples/{SteamworksSample => }/SteamworksSample.unity.meta (100%) delete mode 100644 InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample/Scripts/InputGlyphs.Sample.Steamworks.asmdef delete mode 100644 InputGlyphs/Assets/InputGlyphs/Scripts/Core.meta delete mode 100644 InputGlyphs/Assets/InputGlyphs/Scripts/Display/InputGlyphs.Display.asmdef delete mode 100644 InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyps.Display.Sprite.asmdef delete mode 100644 InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyps.Display.Sprite.asmdef.meta delete mode 100644 InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor.meta delete mode 100644 InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphs.Display.TextMeshPro.Editor.asmdef delete mode 100644 InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphs.Display.TextMeshPro.Editor.asmdef.meta delete mode 100644 InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphs.Display.TextMeshPro.asmdef.meta delete mode 100644 InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphs.Display.UI.asmdef delete mode 100644 InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphs.Display.UI.asmdef.meta rename InputGlyphs/Assets/InputGlyphs/Scripts/{Loaders/SteamGamepad => }/Editor.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{Display/TextMeshPro => }/Editor/InputGlyphTextEditor.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{Display/TextMeshPro => }/Editor/InputGlyphTextEditor.cs.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{Loaders/SteamGamepad/Editor/InputGlyphs.Loaders.Steam.Editor.asmdef => Editor/InputGlyphs.Editor.asmdef} (65%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{Loaders/SteamGamepad/Editor/InputGlyphs.Loaders.Steam.Editor.asmdef.meta => Editor/InputGlyphs.Editor.asmdef.meta} (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{Loaders/SteamGamepad => }/Editor/SteamGamepadGlyphInitializerEditor.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{Loaders/SteamGamepad => }/Editor/SteamGamepadGlyphInitializerEditor.cs.meta (100%) delete mode 100644 InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/InputGlyphs.Loaders.Gamepad.asmdef delete mode 100644 InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/InputGlyphs.Loaders.Gamepad.asmdef.meta delete mode 100644 InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard/InputGlyphs.Loaders.Keyboard.asmdef delete mode 100644 InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard/InputGlyphs.Loaders.Keyboard.asmdef.meta delete mode 100644 InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse/InputGlyphs.Loaders.Mouse.asmdef.meta delete mode 100644 InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/InputGlyphs.Loaders.Utils.asmdef delete mode 100644 InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/InputGlyphs.Loaders.Utils.asmdef.meta rename InputGlyphs/Assets/InputGlyphs/{Samples/DuoPlayerSample.meta => Scripts/Runtime.meta} (77%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Display.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Display/DisplayGlyphTextureGenerator.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Display/DisplayGlyphTextureGenerator.cs.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Display/GlyphsLayout.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Display/GlyphsLayout.cs.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{Display/TextMeshPro/InputGlyphs.Display.TextMeshPro.asmdef => Runtime/Display/InputGlyphs.Display.asmdef} (78%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Display/InputGlyphs.Display.asmdef.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Display/Sprite.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Display/Sprite/InputGlyphSprite.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Display/Sprite/InputGlyphSprite.cs.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Display/TextMeshPro.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Display/TextMeshPro/InputGlyphText.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Display/TextMeshPro/InputGlyphText.cs.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Display/UI.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Display/UI/InputGlyphImage.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Display/UI/InputGlyphImage.cs.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{Core => Runtime}/IInputGlyphLoader.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{Core => Runtime}/IInputGlyphLoader.cs.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{Core => Runtime}/InputGlyphManager.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{Core => Runtime}/InputGlyphManager.cs.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{Core => Runtime}/InputGlyphs.asmdef (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{Core => Runtime}/InputGlyphs.asmdef.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/Gamepad.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/Gamepad/GamepadGlyphInitializer.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/Gamepad/GamepadGlyphInitializer.cs.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/Gamepad/GamepadGlyphLoader.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/Gamepad/GamepadGlyphLoader.cs.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{Loaders/Mouse/InputGlyphs.Loaders.Mouse.asmdef => Runtime/Loaders/InputGlyphs.Loaders.asmdef} (80%) rename InputGlyphs/Assets/InputGlyphs/{Samples/SteamworksSample/Scripts/InputGlyphs.Sample.Steamworks.asmdef.meta => Scripts/Runtime/Loaders/InputGlyphs.Loaders.asmdef.meta} (76%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/Keyboard.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/Keyboard/KeyboardGlyphInitializer.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/Keyboard/KeyboardGlyphInitializer.cs.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/Mouse.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/Mouse/MouseGlyphInitializer.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/Mouse/MouseGlyphInitializer.cs.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/SteamGamepad.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/SteamGamepad/InputGlyphs.Loaders.Steam.asmdef (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/SteamGamepad/InputGlyphs.Loaders.Steam.asmdef.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/SteamGamepad/SteamGamepadGlyphInitializer.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/SteamGamepad/SteamGamepadGlyphInitializer.cs.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/SteamGamepad/SteamGamepadGlyphLoader.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/SteamGamepad/SteamGamepadGlyphLoader.cs.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/Utils.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/Utils/DeviceGlyphLoader.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/Utils/DeviceGlyphLoader.cs.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/Utils/DeviceGlyphLoaderInitializer.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/Utils/DeviceGlyphLoaderInitializer.cs.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/Utils/InputGlyphTextureMap.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Loaders/Utils/InputGlyphTextureMap.cs.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Utils.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Utils/GlyphTextureUtility.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Utils/GlyphTextureUtility.cs.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Utils/InputActionRebindingExtensions.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Utils/InputActionRebindingExtensions.cs.meta (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Utils/InputLayoutPathUtility.cs (100%) rename InputGlyphs/Assets/InputGlyphs/Scripts/{ => Runtime}/Utils/InputLayoutPathUtility.cs.meta (100%) delete mode 100644 InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputGlyphs.Utils.asmdef delete mode 100644 InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputGlyphs.Utils.asmdef.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/DuoPlayerSample/DuoPlayerSample.unity b/InputGlyphs/Assets/InputGlyphs/Samples/DuoPlayerSample.unity similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Samples/DuoPlayerSample/DuoPlayerSample.unity rename to InputGlyphs/Assets/InputGlyphs/Samples/DuoPlayerSample.unity diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/DuoPlayerSample/DuoPlayerSample.unity.meta b/InputGlyphs/Assets/InputGlyphs/Samples/DuoPlayerSample.unity.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Samples/DuoPlayerSample/DuoPlayerSample.unity.meta rename to InputGlyphs/Assets/InputGlyphs/Samples/DuoPlayerSample.unity.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample.meta b/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample.meta deleted file mode 100644 index 37c82ef..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bc3a35f9c2ddc4245ae1c4d3464b05a9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/InputCheckSample.unity b/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample.unity similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/InputCheckSample.unity rename to InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample.unity diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/InputCheckSample.unity.meta b/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample.unity.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/InputCheckSample.unity.meta rename to InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample.unity.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts.meta b/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts.meta deleted file mode 100644 index 65c9889..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d3586d59135c539499c4623f9bee5890 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample/Scripts.meta b/InputGlyphs/Assets/InputGlyphs/Samples/Scripts.meta similarity index 77% rename from InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample/Scripts.meta rename to InputGlyphs/Assets/InputGlyphs/Samples/Scripts.meta index ccc4c6f..9a1c60f 100644 --- a/InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample/Scripts.meta +++ b/InputGlyphs/Assets/InputGlyphs/Samples/Scripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e43ca4e3a0c48954ca55b8f2d7b97db6 +guid: bd53b7d698be39246a166379d270c2cc folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts/InputCheckSample.cs b/InputGlyphs/Assets/InputGlyphs/Samples/Scripts/InputCheckSample.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts/InputCheckSample.cs rename to InputGlyphs/Assets/InputGlyphs/Samples/Scripts/InputCheckSample.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts/InputCheckSample.cs.meta b/InputGlyphs/Assets/InputGlyphs/Samples/Scripts/InputCheckSample.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts/InputCheckSample.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Samples/Scripts/InputCheckSample.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts/InputGlyphs.Sample.InputCheck.asmdef b/InputGlyphs/Assets/InputGlyphs/Samples/Scripts/InputGlyphs.Sample.asmdef similarity index 72% rename from InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts/InputGlyphs.Sample.InputCheck.asmdef rename to InputGlyphs/Assets/InputGlyphs/Samples/Scripts/InputGlyphs.Sample.asmdef index c7377e1..af42d07 100644 --- a/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts/InputGlyphs.Sample.InputCheck.asmdef +++ b/InputGlyphs/Assets/InputGlyphs/Samples/Scripts/InputGlyphs.Sample.asmdef @@ -1,8 +1,9 @@ { - "name": "InputGlyphs.Sample.InputCheck", + "name": "InputGlyphs.Sample", "rootNamespace": "", "references": [ "GUID:75469ad4d38634e559750d17036d5f7c", + "GUID:68bd7fdb68ef2684e982e8a9825b18a5", "GUID:fc48f7dd8f1155d429d2f9eeb74a4fd4", "GUID:41e8b111addd18e47a62477e330b80c7" ], @@ -18,6 +19,11 @@ "name": "com.unity.inputsystem", "expression": "", "define": "INPUT_SYSTEM" + }, + { + "name": "com.rlabrecque.steamworks.net", + "expression": "", + "define": "SUPPORT_STEAMWORKS" } ], "noEngineReferences": false diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts/InputGlyphs.Sample.InputCheck.asmdef.meta b/InputGlyphs/Assets/InputGlyphs/Samples/Scripts/InputGlyphs.Sample.asmdef.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts/InputGlyphs.Sample.InputCheck.asmdef.meta rename to InputGlyphs/Assets/InputGlyphs/Samples/Scripts/InputGlyphs.Sample.asmdef.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample/Scripts/SteamworksSample.cs b/InputGlyphs/Assets/InputGlyphs/Samples/Scripts/SteamworksSample.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample/Scripts/SteamworksSample.cs rename to InputGlyphs/Assets/InputGlyphs/Samples/Scripts/SteamworksSample.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample/Scripts/SteamworksSample.cs.meta b/InputGlyphs/Assets/InputGlyphs/Samples/Scripts/SteamworksSample.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample/Scripts/SteamworksSample.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Samples/Scripts/SteamworksSample.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/SoloPlayerSample.meta b/InputGlyphs/Assets/InputGlyphs/Samples/SoloPlayerSample.meta deleted file mode 100644 index 636d9d4..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Samples/SoloPlayerSample.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7721e20beb87d134dbc31fae9d4038d8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/SoloPlayerSample/SoloPlayerSample.unity b/InputGlyphs/Assets/InputGlyphs/Samples/SoloPlayerSample.unity similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Samples/SoloPlayerSample/SoloPlayerSample.unity rename to InputGlyphs/Assets/InputGlyphs/Samples/SoloPlayerSample.unity diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/SoloPlayerSample/SoloPlayerSample.unity.meta b/InputGlyphs/Assets/InputGlyphs/Samples/SoloPlayerSample.unity.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Samples/SoloPlayerSample/SoloPlayerSample.unity.meta rename to InputGlyphs/Assets/InputGlyphs/Samples/SoloPlayerSample.unity.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample.meta b/InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample.meta deleted file mode 100644 index 4935050..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 87dbb86962b47264fa1cd56225410d4a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample/SteamworksSample.unity b/InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample.unity similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample/SteamworksSample.unity rename to InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample.unity diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample/SteamworksSample.unity.meta b/InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample.unity.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample/SteamworksSample.unity.meta rename to InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample.unity.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample/Scripts/InputGlyphs.Sample.Steamworks.asmdef b/InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample/Scripts/InputGlyphs.Sample.Steamworks.asmdef deleted file mode 100644 index 5461645..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample/Scripts/InputGlyphs.Sample.Steamworks.asmdef +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "InputGlyphs.Sample.Steamworks", - "rootNamespace": "", - "references": [ - "GUID:68bd7fdb68ef2684e982e8a9825b18a5" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": false, - "defineConstraints": [], - "versionDefines": [ - { - "name": "com.rlabrecque.steamworks.net", - "expression": "", - "define": "SUPPORT_STEAMWORKS" - } - ], - "noEngineReferences": false -} \ No newline at end of file diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Core.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Core.meta deleted file mode 100644 index 419f708..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Core.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: da8867dd6d04f0e418803932fd6d435d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/InputGlyphs.Display.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/InputGlyphs.Display.asmdef deleted file mode 100644 index 60287cc..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/InputGlyphs.Display.asmdef +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "InputGlyphs.Display", - "rootNamespace": "", - "references": [ - "GUID:75469ad4d38634e559750d17036d5f7c", - "GUID:fc48f7dd8f1155d429d2f9eeb74a4fd4", - "GUID:8149eef813b3f0349807ebbba05a55cd" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [ - { - "name": "com.unity.inputsystem", - "expression": "", - "define": "INPUT_SYSTEM" - } - ], - "noEngineReferences": false -} \ No newline at end of file diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyps.Display.Sprite.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyps.Display.Sprite.asmdef deleted file mode 100644 index 9f8405b..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyps.Display.Sprite.asmdef +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "InputGlyps.Display.Sprite", - "rootNamespace": "", - "references": [ - "GUID:75469ad4d38634e559750d17036d5f7c", - "GUID:fc48f7dd8f1155d429d2f9eeb74a4fd4", - "GUID:8149eef813b3f0349807ebbba05a55cd", - "GUID:41e8b111addd18e47a62477e330b80c7" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [ - { - "name": "com.unity.inputsystem", - "expression": "", - "define": "INPUT_SYSTEM" - } - ], - "noEngineReferences": false -} \ No newline at end of file diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyps.Display.Sprite.asmdef.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyps.Display.Sprite.asmdef.meta deleted file mode 100644 index 40ad498..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyps.Display.Sprite.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 82fde0816ab54d74d9ce457f78dd6b14 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor.meta deleted file mode 100644 index ed9ad61..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ca341dc71a2846243b1365634befe6d8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphs.Display.TextMeshPro.Editor.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphs.Display.TextMeshPro.Editor.asmdef deleted file mode 100644 index 9514473..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphs.Display.TextMeshPro.Editor.asmdef +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "InputGlyphs.Display.TextMeshPro.Editor", - "rootNamespace": "", - "references": [ - "GUID:75469ad4d38634e559750d17036d5f7c", - "GUID:1f6dfe89326c1df4db8a18418293db90" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": false, - "defineConstraints": [], - "versionDefines": [ - { - "name": "com.unity.inputsystem", - "expression": "", - "define": "INPUT_SYSTEM" - }, - { - "name": "com.unity.textmeshpro", - "expression": "", - "define": "SUPPORT_TMPRO" - } - ], - "noEngineReferences": false -} \ No newline at end of file diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphs.Display.TextMeshPro.Editor.asmdef.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphs.Display.TextMeshPro.Editor.asmdef.meta deleted file mode 100644 index d73f006..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphs.Display.TextMeshPro.Editor.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 793680fa4e789a04d9829a30f2b0d416 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphs.Display.TextMeshPro.asmdef.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphs.Display.TextMeshPro.asmdef.meta deleted file mode 100644 index c7c59b7..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphs.Display.TextMeshPro.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 1f6dfe89326c1df4db8a18418293db90 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphs.Display.UI.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphs.Display.UI.asmdef deleted file mode 100644 index 86e519d..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphs.Display.UI.asmdef +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "InputGlyphs.Display.UI", - "rootNamespace": "", - "references": [ - "GUID:75469ad4d38634e559750d17036d5f7c", - "GUID:fc48f7dd8f1155d429d2f9eeb74a4fd4", - "GUID:8149eef813b3f0349807ebbba05a55cd", - "GUID:41e8b111addd18e47a62477e330b80c7" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [ - { - "name": "com.unity.inputsystem", - "expression": "", - "define": "INPUT_SYSTEM" - } - ], - "noEngineReferences": false -} \ No newline at end of file diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphs.Display.UI.asmdef.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphs.Display.UI.asmdef.meta deleted file mode 100644 index f5819a3..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphs.Display.UI.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 91854ac339534994193148d227ad1312 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/Editor.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Editor.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/Editor.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Editor.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphTextEditor.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/InputGlyphTextEditor.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphTextEditor.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Editor/InputGlyphTextEditor.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphTextEditor.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/InputGlyphTextEditor.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphTextEditor.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Editor/InputGlyphTextEditor.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/Editor/InputGlyphs.Loaders.Steam.Editor.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/InputGlyphs.Editor.asmdef similarity index 65% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/Editor/InputGlyphs.Loaders.Steam.Editor.asmdef rename to InputGlyphs/Assets/InputGlyphs/Scripts/Editor/InputGlyphs.Editor.asmdef index 3034cc9..a6b376b 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/Editor/InputGlyphs.Loaders.Steam.Editor.asmdef +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/InputGlyphs.Editor.asmdef @@ -1,7 +1,10 @@ { - "name": "InputGlyphs.Loaders.Steam.Editor", + "name": "InputGlyphs.Editor", "rootNamespace": "", "references": [ + "GUID:75469ad4d38634e559750d17036d5f7c", + "GUID:6055be8ebefd69e48b49212b09b47b2f", + "GUID:41e8b111addd18e47a62477e330b80c7", "GUID:32a76035dbfa1e5489ee883a5e9e4570" ], "includePlatforms": [ @@ -14,6 +17,11 @@ "autoReferenced": false, "defineConstraints": [], "versionDefines": [ + { + "name": "com.unity.inputsystem", + "expression": "", + "define": "INPUT_SYSTEM" + }, { "name": "com.rlabrecque.steamworks.net", "expression": "", @@ -28,6 +36,11 @@ "name": "com.eviltwo.unity-steam-input-glyph-loader", "expression": "", "define": "SUPPORT_LOADER" + }, + { + "name": "com.unity.textmeshpro", + "expression": "", + "define": "SUPPORT_TMPRO" } ], "noEngineReferences": false diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/Editor/InputGlyphs.Loaders.Steam.Editor.asmdef.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/InputGlyphs.Editor.asmdef.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/Editor/InputGlyphs.Loaders.Steam.Editor.asmdef.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Editor/InputGlyphs.Editor.asmdef.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/Editor/SteamGamepadGlyphInitializerEditor.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/SteamGamepadGlyphInitializerEditor.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/Editor/SteamGamepadGlyphInitializerEditor.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Editor/SteamGamepadGlyphInitializerEditor.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/Editor/SteamGamepadGlyphInitializerEditor.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/SteamGamepadGlyphInitializerEditor.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/Editor/SteamGamepadGlyphInitializerEditor.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Editor/SteamGamepadGlyphInitializerEditor.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/InputGlyphs.Loaders.Gamepad.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/InputGlyphs.Loaders.Gamepad.asmdef deleted file mode 100644 index 37d8396..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/InputGlyphs.Loaders.Gamepad.asmdef +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "InputGlyphs.Loaders.Gamepad", - "rootNamespace": "", - "references": [ - "GUID:75469ad4d38634e559750d17036d5f7c", - "GUID:fc48f7dd8f1155d429d2f9eeb74a4fd4", - "GUID:d4753dfc093d37d4ba2730954f152368", - "GUID:8149eef813b3f0349807ebbba05a55cd" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": false, - "defineConstraints": [], - "versionDefines": [ - { - "name": "com.unity.inputsystem", - "expression": "", - "define": "INPUT_SYSTEM" - } - ], - "noEngineReferences": false -} \ No newline at end of file diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/InputGlyphs.Loaders.Gamepad.asmdef.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/InputGlyphs.Loaders.Gamepad.asmdef.meta deleted file mode 100644 index f4c78f8..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/InputGlyphs.Loaders.Gamepad.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e9546434dcf862a49918aab511d488f1 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard/InputGlyphs.Loaders.Keyboard.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard/InputGlyphs.Loaders.Keyboard.asmdef deleted file mode 100644 index 2b58184..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard/InputGlyphs.Loaders.Keyboard.asmdef +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "InputGlyphs.Loaders.Keyboard", - "rootNamespace": "", - "references": [ - "GUID:75469ad4d38634e559750d17036d5f7c", - "GUID:d4753dfc093d37d4ba2730954f152368" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": false, - "defineConstraints": [], - "versionDefines": [ - { - "name": "com.unity.inputsystem", - "expression": "", - "define": "INPUT_SYSTEM" - } - ], - "noEngineReferences": false -} \ No newline at end of file diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard/InputGlyphs.Loaders.Keyboard.asmdef.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard/InputGlyphs.Loaders.Keyboard.asmdef.meta deleted file mode 100644 index 9ebc36a..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard/InputGlyphs.Loaders.Keyboard.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0b3deaea46909e049b63620c8d9c6da2 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse/InputGlyphs.Loaders.Mouse.asmdef.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse/InputGlyphs.Loaders.Mouse.asmdef.meta deleted file mode 100644 index d2a810b..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse/InputGlyphs.Loaders.Mouse.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 790d72c6203928f4183b6954eaec1936 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/InputGlyphs.Loaders.Utils.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/InputGlyphs.Loaders.Utils.asmdef deleted file mode 100644 index 57dc5d9..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/InputGlyphs.Loaders.Utils.asmdef +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "InputGlyphs.Loaders.Utils", - "rootNamespace": "", - "references": [ - "GUID:75469ad4d38634e559750d17036d5f7c", - "GUID:fc48f7dd8f1155d429d2f9eeb74a4fd4", - "GUID:8149eef813b3f0349807ebbba05a55cd" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [ - { - "name": "com.unity.inputsystem", - "expression": "", - "define": "INPUT_SYSTEM" - } - ], - "noEngineReferences": false -} \ No newline at end of file diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/InputGlyphs.Loaders.Utils.asmdef.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/InputGlyphs.Loaders.Utils.asmdef.meta deleted file mode 100644 index c014f6a..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/InputGlyphs.Loaders.Utils.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d4753dfc093d37d4ba2730954f152368 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/DuoPlayerSample.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime.meta similarity index 77% rename from InputGlyphs/Assets/InputGlyphs/Samples/DuoPlayerSample.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime.meta index f9ab6e4..8d6640e 100644 --- a/InputGlyphs/Assets/InputGlyphs/Samples/DuoPlayerSample.meta +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c39089a608c232d4eb7cf295dbfd8dba +guid: b28c8238ed92c4548823697a62e0d5d8 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Display.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/DisplayGlyphTextureGenerator.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/DisplayGlyphTextureGenerator.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Display/DisplayGlyphTextureGenerator.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/DisplayGlyphTextureGenerator.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/DisplayGlyphTextureGenerator.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/DisplayGlyphTextureGenerator.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Display/DisplayGlyphTextureGenerator.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/DisplayGlyphTextureGenerator.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/GlyphsLayout.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/GlyphsLayout.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Display/GlyphsLayout.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/GlyphsLayout.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/GlyphsLayout.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/GlyphsLayout.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Display/GlyphsLayout.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/GlyphsLayout.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphs.Display.TextMeshPro.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/InputGlyphs.Display.asmdef similarity index 78% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphs.Display.TextMeshPro.asmdef rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/InputGlyphs.Display.asmdef index 6cfe226..8606362 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphs.Display.TextMeshPro.asmdef +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/InputGlyphs.Display.asmdef @@ -1,12 +1,10 @@ { - "name": "InputGlyphs.Display.TextMeshPro", + "name": "InputGlyphs.Display", "rootNamespace": "", "references": [ "GUID:75469ad4d38634e559750d17036d5f7c", "GUID:6055be8ebefd69e48b49212b09b47b2f", - "GUID:fc48f7dd8f1155d429d2f9eeb74a4fd4", - "GUID:8149eef813b3f0349807ebbba05a55cd", - "GUID:41e8b111addd18e47a62477e330b80c7" + "GUID:fc48f7dd8f1155d429d2f9eeb74a4fd4" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/InputGlyphs.Display.asmdef.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/InputGlyphs.Display.asmdef.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Display/InputGlyphs.Display.asmdef.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/InputGlyphs.Display.asmdef.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/Sprite.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/Sprite.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyphSprite.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/Sprite/InputGlyphSprite.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyphSprite.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/Sprite/InputGlyphSprite.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyphSprite.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/Sprite/InputGlyphSprite.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyphSprite.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/Sprite/InputGlyphSprite.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/TextMeshPro.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/TextMeshPro.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphText.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/TextMeshPro/InputGlyphText.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphText.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/TextMeshPro/InputGlyphText.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphText.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/TextMeshPro/InputGlyphText.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphText.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/TextMeshPro/InputGlyphText.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/UI.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/UI.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphImage.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/UI/InputGlyphImage.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphImage.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/UI/InputGlyphImage.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphImage.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/UI/InputGlyphImage.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphImage.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/UI/InputGlyphImage.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Core/IInputGlyphLoader.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/IInputGlyphLoader.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Core/IInputGlyphLoader.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/IInputGlyphLoader.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Core/IInputGlyphLoader.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/IInputGlyphLoader.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Core/IInputGlyphLoader.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/IInputGlyphLoader.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Core/InputGlyphManager.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/InputGlyphManager.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Core/InputGlyphManager.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/InputGlyphManager.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Core/InputGlyphManager.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/InputGlyphManager.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Core/InputGlyphManager.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/InputGlyphManager.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Core/InputGlyphs.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/InputGlyphs.asmdef similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Core/InputGlyphs.asmdef rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/InputGlyphs.asmdef diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Core/InputGlyphs.asmdef.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/InputGlyphs.asmdef.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Core/InputGlyphs.asmdef.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/InputGlyphs.asmdef.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Gamepad.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Gamepad.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/GamepadGlyphInitializer.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Gamepad/GamepadGlyphInitializer.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/GamepadGlyphInitializer.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Gamepad/GamepadGlyphInitializer.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/GamepadGlyphInitializer.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Gamepad/GamepadGlyphInitializer.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/GamepadGlyphInitializer.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Gamepad/GamepadGlyphInitializer.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/GamepadGlyphLoader.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Gamepad/GamepadGlyphLoader.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/GamepadGlyphLoader.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Gamepad/GamepadGlyphLoader.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/GamepadGlyphLoader.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Gamepad/GamepadGlyphLoader.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Gamepad/GamepadGlyphLoader.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Gamepad/GamepadGlyphLoader.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse/InputGlyphs.Loaders.Mouse.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/InputGlyphs.Loaders.asmdef similarity index 80% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse/InputGlyphs.Loaders.Mouse.asmdef rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/InputGlyphs.Loaders.asmdef index 6f09daa..68830a4 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse/InputGlyphs.Loaders.Mouse.asmdef +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/InputGlyphs.Loaders.asmdef @@ -1,16 +1,16 @@ { - "name": "InputGlyphs.Loaders.Mouse", + "name": "InputGlyphs.Loaders", "rootNamespace": "", "references": [ "GUID:75469ad4d38634e559750d17036d5f7c", - "GUID:d4753dfc093d37d4ba2730954f152368" + "GUID:fc48f7dd8f1155d429d2f9eeb74a4fd4" ], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": false, "precompiledReferences": [], - "autoReferenced": false, + "autoReferenced": true, "defineConstraints": [], "versionDefines": [ { diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample/Scripts/InputGlyphs.Sample.Steamworks.asmdef.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/InputGlyphs.Loaders.asmdef.meta similarity index 76% rename from InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample/Scripts/InputGlyphs.Sample.Steamworks.asmdef.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/InputGlyphs.Loaders.asmdef.meta index 1cc74c2..0d295a2 100644 --- a/InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample/Scripts/InputGlyphs.Sample.Steamworks.asmdef.meta +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/InputGlyphs.Loaders.asmdef.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aca8b1a3c33d0ab41868c6058d0cc9b1 +guid: 1e2f80b28d432fb4c832dcdef2e8b273 AssemblyDefinitionImporter: externalObjects: {} userData: diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Keyboard.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Keyboard.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard/KeyboardGlyphInitializer.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Keyboard/KeyboardGlyphInitializer.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard/KeyboardGlyphInitializer.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Keyboard/KeyboardGlyphInitializer.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard/KeyboardGlyphInitializer.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Keyboard/KeyboardGlyphInitializer.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Keyboard/KeyboardGlyphInitializer.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Keyboard/KeyboardGlyphInitializer.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Mouse.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Mouse.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse/MouseGlyphInitializer.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Mouse/MouseGlyphInitializer.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse/MouseGlyphInitializer.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Mouse/MouseGlyphInitializer.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse/MouseGlyphInitializer.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Mouse/MouseGlyphInitializer.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Mouse/MouseGlyphInitializer.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Mouse/MouseGlyphInitializer.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/SteamGamepad.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/SteamGamepad.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/InputGlyphs.Loaders.Steam.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/SteamGamepad/InputGlyphs.Loaders.Steam.asmdef similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/InputGlyphs.Loaders.Steam.asmdef rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/SteamGamepad/InputGlyphs.Loaders.Steam.asmdef diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/InputGlyphs.Loaders.Steam.asmdef.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/SteamGamepad/InputGlyphs.Loaders.Steam.asmdef.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/InputGlyphs.Loaders.Steam.asmdef.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/SteamGamepad/InputGlyphs.Loaders.Steam.asmdef.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/SteamGamepadGlyphInitializer.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/SteamGamepad/SteamGamepadGlyphInitializer.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/SteamGamepadGlyphInitializer.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/SteamGamepad/SteamGamepadGlyphInitializer.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/SteamGamepadGlyphInitializer.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/SteamGamepad/SteamGamepadGlyphInitializer.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/SteamGamepadGlyphInitializer.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/SteamGamepad/SteamGamepadGlyphInitializer.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/SteamGamepadGlyphLoader.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/SteamGamepad/SteamGamepadGlyphLoader.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/SteamGamepadGlyphLoader.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/SteamGamepad/SteamGamepadGlyphLoader.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/SteamGamepadGlyphLoader.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/SteamGamepad/SteamGamepadGlyphLoader.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/SteamGamepad/SteamGamepadGlyphLoader.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/SteamGamepad/SteamGamepadGlyphLoader.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Utils.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Utils.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/DeviceGlyphLoader.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Utils/DeviceGlyphLoader.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/DeviceGlyphLoader.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Utils/DeviceGlyphLoader.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/DeviceGlyphLoader.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Utils/DeviceGlyphLoader.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/DeviceGlyphLoader.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Utils/DeviceGlyphLoader.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/DeviceGlyphLoaderInitializer.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Utils/DeviceGlyphLoaderInitializer.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/DeviceGlyphLoaderInitializer.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Utils/DeviceGlyphLoaderInitializer.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/DeviceGlyphLoaderInitializer.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Utils/DeviceGlyphLoaderInitializer.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/DeviceGlyphLoaderInitializer.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Utils/DeviceGlyphLoaderInitializer.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/InputGlyphTextureMap.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Utils/InputGlyphTextureMap.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/InputGlyphTextureMap.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Utils/InputGlyphTextureMap.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/InputGlyphTextureMap.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Utils/InputGlyphTextureMap.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Loaders/Utils/InputGlyphTextureMap.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Loaders/Utils/InputGlyphTextureMap.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Utils.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Utils.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Utils.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Utils.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/GlyphTextureUtility.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Utils/GlyphTextureUtility.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Utils/GlyphTextureUtility.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Utils/GlyphTextureUtility.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/GlyphTextureUtility.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Utils/GlyphTextureUtility.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Utils/GlyphTextureUtility.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Utils/GlyphTextureUtility.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputActionRebindingExtensions.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Utils/InputActionRebindingExtensions.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputActionRebindingExtensions.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Utils/InputActionRebindingExtensions.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputActionRebindingExtensions.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Utils/InputActionRebindingExtensions.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputActionRebindingExtensions.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Utils/InputActionRebindingExtensions.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputLayoutPathUtility.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Utils/InputLayoutPathUtility.cs similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputLayoutPathUtility.cs rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Utils/InputLayoutPathUtility.cs diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputLayoutPathUtility.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Utils/InputLayoutPathUtility.cs.meta similarity index 100% rename from InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputLayoutPathUtility.cs.meta rename to InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Utils/InputLayoutPathUtility.cs.meta diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputGlyphs.Utils.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputGlyphs.Utils.asmdef deleted file mode 100644 index 49a47a5..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputGlyphs.Utils.asmdef +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "InputGlyphs.Utils", - "rootNamespace": "", - "references": [ - "GUID:75469ad4d38634e559750d17036d5f7c" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [ - { - "name": "com.unity.inputsystem", - "expression": "", - "define": "INPUT_SYSTEM" - } - ], - "noEngineReferences": false -} \ No newline at end of file diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputGlyphs.Utils.asmdef.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputGlyphs.Utils.asmdef.meta deleted file mode 100644 index 9903969..0000000 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Utils/InputGlyphs.Utils.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8149eef813b3f0349807ebbba05a55cd -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/InputGlyphs/Assets/InputGlyphsTests/Utils/InputGlyphs.Utils.Tests.asmdef b/InputGlyphs/Assets/InputGlyphsTests/Utils/InputGlyphs.Utils.Tests.asmdef index 71d50dc..f662931 100644 --- a/InputGlyphs/Assets/InputGlyphsTests/Utils/InputGlyphs.Utils.Tests.asmdef +++ b/InputGlyphs/Assets/InputGlyphsTests/Utils/InputGlyphs.Utils.Tests.asmdef @@ -4,7 +4,7 @@ "references": [ "UnityEngine.TestRunner", "UnityEditor.TestRunner", - "InputGlyphs.Utils" + "InputGlyphs" ], "includePlatforms": [ "Editor" diff --git a/InputGlyphs/ProjectSettings/EditorBuildSettings.asset b/InputGlyphs/ProjectSettings/EditorBuildSettings.asset index 8579ef8..4145e66 100644 --- a/InputGlyphs/ProjectSettings/EditorBuildSettings.asset +++ b/InputGlyphs/ProjectSettings/EditorBuildSettings.asset @@ -6,12 +6,12 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/InputGlyphs/Samples/SoloPlayerSample/SoloPlayerSample.unity + path: Assets/InputGlyphs/Samples/SoloPlayerSample.unity guid: 592ff5f548281bf4098929b2f12ac957 - enabled: 1 - path: Assets/InputGlyphs/Samples/DuoPlayerSample/DuoPlayerSample.unity + path: Assets/InputGlyphs/Samples/DuoPlayerSample.unity guid: eae37cced830b50469bb1ecea398d830 - enabled: 1 - path: Assets/InputGlyphs/Samples/SteamworksSample/SteamworksSample.unity + path: Assets/InputGlyphs/Samples/SteamworksSample.unity guid: bb3990966a9b94e4eae91302a5ea64a2 m_configObjects: {} From 97554d613f72975e7b108f14bff06236a83ed650 Mon Sep 17 00:00:00 2001 From: DAIKI Date: Sun, 7 Jul 2024 19:48:12 +0900 Subject: [PATCH 04/10] Remove unused value --- InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample.unity | 1 - .../Assets/InputGlyphs/Samples/Scripts/InputCheckSample.cs | 3 --- 2 files changed, 4 deletions(-) diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample.unity b/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample.unity index 074a978..583b6e5 100644 --- a/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample.unity +++ b/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample.unity @@ -448,7 +448,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0e15330025853949aa116196e2f3f3a, type: 3} m_Name: m_EditorClassIdentifier: - _playerInput: {fileID: 1847320111} _spriteRenderer: {fileID: 1399903892} --- !u!4 &1399903891 Transform: diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/Scripts/InputCheckSample.cs b/InputGlyphs/Assets/InputGlyphs/Samples/Scripts/InputCheckSample.cs index 79e8917..19b2389 100644 --- a/InputGlyphs/Assets/InputGlyphs/Samples/Scripts/InputCheckSample.cs +++ b/InputGlyphs/Assets/InputGlyphs/Samples/Scripts/InputCheckSample.cs @@ -11,9 +11,6 @@ namespace InputGlyphs.Samples [AddComponentMenu("")] // Disable the script from the Add Component menu public class InputCheckSample : MonoBehaviour { - [SerializeField] - private PlayerInput _playerInput = null; - [SerializeField] private SpriteRenderer _spriteRenderer = null; From 021887f9f71df924d2a01435a89508fb2665b95c Mon Sep 17 00:00:00 2001 From: DAIKI Date: Sun, 7 Jul 2024 20:12:04 +0900 Subject: [PATCH 05/10] Draw current package version in inspector. --- .../SteamGamepadGlyphInitializerEditor.cs | 44 ++++++++++++++++++- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/SteamGamepadGlyphInitializerEditor.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/SteamGamepadGlyphInitializerEditor.cs index 8488845..d349960 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/SteamGamepadGlyphInitializerEditor.cs +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/SteamGamepadGlyphInitializerEditor.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using UnityEditor; using UnityEditor.PackageManager; using UnityEngine; @@ -10,6 +11,7 @@ public class SteamGamepadGlyphInitializerEditor : UnityEditor.Editor private bool _foldoutSteamworks; private bool _foldoutAdapter; private bool _foldoutLoader; + private Dictionary _versionCache = new Dictionary(); public override void OnInspectorGUI() { @@ -47,6 +49,7 @@ public override void OnInspectorGUI() DrawPackageInfo( "Steamworks.NET", + GetPackageVersion("com.rlabrecque.steamworks.net"), isSteamworksInstalled, "https://github.com/rlabrecque/Steamworks.NET", "https://github.com/rlabrecque/Steamworks.NET.git?path=/com.rlabrecque.steamworks.net", @@ -54,6 +57,7 @@ public override void OnInspectorGUI() DrawPackageInfo( "SteamInputAdapter", + GetPackageVersion("com.eviltwo.unity-steam-input-adapter"), isAdapterInstalled, "https://github.com/eviltwo/UnitySteamInputAdapter", "https://github.com/eviltwo/UnitySteamInputAdapter.git?path=UnitySteamInputAdapter/Assets/UnitySteamInputAdapter", @@ -61,6 +65,7 @@ public override void OnInspectorGUI() DrawPackageInfo( "SteamInputGlyphLoader", + GetPackageVersion("com.eviltwo.unity-steam-input-glyph-loader"), isLoaderInstalled, "https://github.com/eviltwo/UnitySteamInputGlyphLoader", "https://github.com/eviltwo/UnitySteamInputGlyphLoader.git?path=UnitySteamInputGlyphLoader/Assets/UnitySteamInputGlyphLoader", @@ -68,7 +73,8 @@ public override void OnInspectorGUI() } private static void DrawPackageInfo( - string packageName, + string packageTitle, + string installedPackageVersion, bool installed, string packagePageUrl, string packageUrl, @@ -76,7 +82,7 @@ private static void DrawPackageInfo( { var foldoutStyle = new GUIStyle(EditorStyles.foldoutHeader); foldoutStyle.richText = true; - var foldoutTitle = installed ? $"{packageName} (Installed)" : "Steamworks (Not installed)"; + var foldoutTitle = installed ? $"{packageTitle} (Installed)" : "Steamworks (Not installed)"; foldout = EditorGUILayout.BeginFoldoutHeaderGroup(foldout, foldoutTitle, foldoutStyle); if (foldout) { @@ -84,6 +90,7 @@ private static void DrawPackageInfo( { Application.OpenURL(packagePageUrl); } + EditorGUILayout.LabelField($"Installed version : {installedPackageVersion}"); if (GUILayout.Button("Import package using Unity Package Manager")) { Client.Add(packageUrl); @@ -91,5 +98,38 @@ private static void DrawPackageInfo( } EditorGUILayout.EndFoldoutHeaderGroup(); } + + private string GetPackageVersion(string packageName) + { + if (_versionCache.TryGetValue(packageName, out var cachedVersion)) + { + return cachedVersion; + } + var packageInfo = FindPackageInfo(packageName); + var version = packageInfo?.version ?? string.Empty; + _versionCache[packageName] = version; + return version; + } + + private static UnityEditor.PackageManager.PackageInfo FindPackageInfo(string packageName) + { + var guids = AssetDatabase.FindAssets("package t:TextAsset"); + for (var i = 0; i < guids.Length; i++) + { + var path = AssetDatabase.GUIDToAssetPath(guids[i]); + var textAsset = AssetDatabase.LoadAssetAtPath(path); + if (textAsset == null) + { + continue; + } + var packageInfo = UnityEditor.PackageManager.PackageInfo.FindForAssetPath(path); + if (packageInfo != null && packageInfo.name == packageName) + { + return packageInfo; + } + } + + return null; + } } } From eef812bd30d0a38f424807217081a36b53927c89 Mon Sep 17 00:00:00 2001 From: DAIKI Date: Sun, 7 Jul 2024 21:37:44 +0900 Subject: [PATCH 06/10] Add package version to import url --- .../SteamGamepadGlyphInitializerEditor.cs | 129 +++++++++++------- InputGlyphs/Packages/manifest.json | 6 +- InputGlyphs/Packages/packages-lock.json | 8 +- 3 files changed, 86 insertions(+), 57 deletions(-) diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/SteamGamepadGlyphInitializerEditor.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/SteamGamepadGlyphInitializerEditor.cs index d349960..30841a5 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/SteamGamepadGlyphInitializerEditor.cs +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/SteamGamepadGlyphInitializerEditor.cs @@ -8,76 +8,99 @@ namespace InputGlyphs.Loaders.Steam.Editor [CustomEditor(typeof(SteamGamepadGlyphInitializer))] public class SteamGamepadGlyphInitializerEditor : UnityEditor.Editor { - private bool _foldoutSteamworks; - private bool _foldoutAdapter; - private bool _foldoutLoader; - private Dictionary _versionCache = new Dictionary(); - - public override void OnInspectorGUI() + private class RequiredPackageInfo { - base.OnInspectorGUI(); - - var requirePackages = 0; - var installedPackages = 0; + public string title; + public string name; + public string pageUrl; + public string packageUrl; + public string requiredVersion; + public bool isInstalled; + public double installTime; + public bool isFoldout; + } - var isSteamworksInstalled = false; - requirePackages++; + private RequiredPackageInfo[] _requiredPackages = new RequiredPackageInfo[] + { + new RequiredPackageInfo + { + title = "Steamworks.NET", + name = "com.rlabrecque.steamworks.net", + pageUrl = "https://github.com/rlabrecque/Steamworks.NET", + packageUrl = "https://github.com/rlabrecque/Steamworks.NET.git?path=/com.rlabrecque.steamworks.net", + requiredVersion = "20.2.0", #if SUPPORT_STEAMWORKS - isSteamworksInstalled = true; - installedPackages++; + isInstalled = true, #endif - - var isAdapterInstalled = false; - requirePackages++; + }, + new RequiredPackageInfo + { + title = "Steam Input Adapter", + name = "com.eviltwo.unity-steam-input-adapter", + pageUrl = "https://github.com/eviltwo/UnitySteamInputAdapter", + packageUrl = "https://github.com/eviltwo/UnitySteamInputAdapter.git?path=UnitySteamInputAdapter/Assets/UnitySteamInputAdapter", + requiredVersion = "0.9.2", #if SUPPORT_ADAPTER - isAdapterInstalled = true; - installedPackages++; + isInstalled = true, #endif - - var isLoaderInstalled = false; - requirePackages++; + }, + new RequiredPackageInfo + { + title = "Steam Input Glyph Loader", + name = "com.eviltwo.unity-steam-input-glyph-loader", + pageUrl = "https://github.com/eviltwo/UnitySteamInputGlyphLoader", + packageUrl = "https://github.com/eviltwo/UnitySteamInputGlyphLoader.git?path=UnitySteamInputGlyphLoader/Assets/UnitySteamInputGlyphLoader", + requiredVersion = "0.10.0", #if SUPPORT_LOADER - isLoaderInstalled = true; - installedPackages++; + isInstalled = true #endif + } + }; + + private Dictionary _versionCache = new Dictionary(); + public override void OnInspectorGUI() + { + base.OnInspectorGUI(); + + var installedPackages = 0; + for (var i = 0; i < _requiredPackages.Length; i++) + { + if (_requiredPackages[i].isInstalled) + { + installedPackages++; + } + } + var requirePackages = _requiredPackages.Length; var labelStyle = new GUIStyle(EditorStyles.label); labelStyle.richText = true; var packageCompleted = installedPackages == requirePackages; var labelTitle = packageCompleted ? "All packages are installed." : $"Packages installed: {installedPackages}/{requirePackages}"; EditorGUILayout.LabelField(labelTitle, labelStyle); - DrawPackageInfo( - "Steamworks.NET", - GetPackageVersion("com.rlabrecque.steamworks.net"), - isSteamworksInstalled, - "https://github.com/rlabrecque/Steamworks.NET", - "https://github.com/rlabrecque/Steamworks.NET.git?path=/com.rlabrecque.steamworks.net", - ref _foldoutSteamworks); - - DrawPackageInfo( - "SteamInputAdapter", - GetPackageVersion("com.eviltwo.unity-steam-input-adapter"), - isAdapterInstalled, - "https://github.com/eviltwo/UnitySteamInputAdapter", - "https://github.com/eviltwo/UnitySteamInputAdapter.git?path=UnitySteamInputAdapter/Assets/UnitySteamInputAdapter", - ref _foldoutAdapter); - - DrawPackageInfo( - "SteamInputGlyphLoader", - GetPackageVersion("com.eviltwo.unity-steam-input-glyph-loader"), - isLoaderInstalled, - "https://github.com/eviltwo/UnitySteamInputGlyphLoader", - "https://github.com/eviltwo/UnitySteamInputGlyphLoader.git?path=UnitySteamInputGlyphLoader/Assets/UnitySteamInputGlyphLoader", - ref _foldoutLoader); + for (var i = 0; i < _requiredPackages.Length; i++) + { + var requiredPackage = _requiredPackages[i]; + DrawPackageInfo( + requiredPackage.title, + GetPackageVersion(requiredPackage.name), + requiredPackage.requiredVersion, + requiredPackage.pageUrl, + requiredPackage.packageUrl, + requiredPackage.isInstalled, + ref requiredPackage.installTime, + ref requiredPackage.isFoldout); + } } private static void DrawPackageInfo( string packageTitle, string installedPackageVersion, - bool installed, + string requiredPackageVersion, string packagePageUrl, string packageUrl, + bool installed, + ref double installTime, ref bool foldout) { var foldoutStyle = new GUIStyle(EditorStyles.foldoutHeader); @@ -91,9 +114,15 @@ private static void DrawPackageInfo( Application.OpenURL(packagePageUrl); } EditorGUILayout.LabelField($"Installed version : {installedPackageVersion}"); - if (GUILayout.Button("Import package using Unity Package Manager")) + EditorGUILayout.LabelField($"Required version : {requiredPackageVersion}"); + if (EditorApplication.timeSinceStartup < installTime + 5.0) + { + EditorGUILayout.LabelField("Installing..."); + } + else if (GUILayout.Button("Import package using Package Manager")) { - Client.Add(packageUrl); + installTime = EditorApplication.timeSinceStartup; + Client.Add($"{packageUrl}#{requiredPackageVersion}"); } } EditorGUILayout.EndFoldoutHeaderGroup(); diff --git a/InputGlyphs/Packages/manifest.json b/InputGlyphs/Packages/manifest.json index 14c8b61..dd0f66a 100644 --- a/InputGlyphs/Packages/manifest.json +++ b/InputGlyphs/Packages/manifest.json @@ -1,8 +1,8 @@ { "dependencies": { - "com.eviltwo.unity-steam-input-adapter": "https://github.com/eviltwo/UnitySteamInputAdapter.git?path=UnitySteamInputAdapter/Assets/UnitySteamInputAdapter", - "com.eviltwo.unity-steam-input-glyph-loader": "https://github.com/eviltwo/UnitySteamInputGlyphLoader.git?path=UnitySteamInputGlyphLoader/Assets/UnitySteamInputGlyphLoader", - "com.rlabrecque.steamworks.net": "https://github.com/rlabrecque/Steamworks.NET.git?path=/com.rlabrecque.steamworks.net", + "com.eviltwo.unity-steam-input-adapter": "https://github.com/eviltwo/UnitySteamInputAdapter.git?path=UnitySteamInputAdapter/Assets/UnitySteamInputAdapter#0.9.2", + "com.eviltwo.unity-steam-input-glyph-loader": "https://github.com/eviltwo/UnitySteamInputGlyphLoader.git?path=UnitySteamInputGlyphLoader/Assets/UnitySteamInputGlyphLoader#0.10.0", + "com.rlabrecque.steamworks.net": "https://github.com/rlabrecque/Steamworks.NET.git?path=/com.rlabrecque.steamworks.net#20.2.0", "com.unity.collab-proxy": "2.4.3", "com.unity.feature.development": "1.0.1", "com.unity.inputsystem": "1.5.1", diff --git a/InputGlyphs/Packages/packages-lock.json b/InputGlyphs/Packages/packages-lock.json index 9529568..ac201a1 100644 --- a/InputGlyphs/Packages/packages-lock.json +++ b/InputGlyphs/Packages/packages-lock.json @@ -1,25 +1,25 @@ { "dependencies": { "com.eviltwo.unity-steam-input-adapter": { - "version": "https://github.com/eviltwo/UnitySteamInputAdapter.git?path=UnitySteamInputAdapter/Assets/UnitySteamInputAdapter", + "version": "https://github.com/eviltwo/UnitySteamInputAdapter.git?path=UnitySteamInputAdapter/Assets/UnitySteamInputAdapter#0.9.2", "depth": 0, "source": "git", "dependencies": {}, "hash": "6d5522dc32a741fb338f385bb8a8779d0b837526" }, "com.eviltwo.unity-steam-input-glyph-loader": { - "version": "https://github.com/eviltwo/UnitySteamInputGlyphLoader.git?path=UnitySteamInputGlyphLoader/Assets/UnitySteamInputGlyphLoader", + "version": "https://github.com/eviltwo/UnitySteamInputGlyphLoader.git?path=UnitySteamInputGlyphLoader/Assets/UnitySteamInputGlyphLoader#0.10.0", "depth": 0, "source": "git", "dependencies": {}, "hash": "93a2f359075827dba7a563604f0e42fcc56fad41" }, "com.rlabrecque.steamworks.net": { - "version": "https://github.com/rlabrecque/Steamworks.NET.git?path=/com.rlabrecque.steamworks.net", + "version": "https://github.com/rlabrecque/Steamworks.NET.git?path=/com.rlabrecque.steamworks.net#20.2.0", "depth": 0, "source": "git", "dependencies": {}, - "hash": "78cdcd24236765c71223e29ba2f4c2e8ca2c68d9" + "hash": "a3fe8091f7237eef3f38becc3faa29b2dc6f9ce9" }, "com.unity.collab-proxy": { "version": "2.4.3", From d5af3136f00cd74a3d68d8d72aae3add00c4be32 Mon Sep 17 00:00:00 2001 From: DAIKI Date: Sun, 7 Jul 2024 21:46:02 +0900 Subject: [PATCH 07/10] Update CHANGELOG.md --- InputGlyphs/Assets/InputGlyphs/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/InputGlyphs/Assets/InputGlyphs/CHANGELOG.md b/InputGlyphs/Assets/InputGlyphs/CHANGELOG.md index c06e5f3..cba6989 100644 --- a/InputGlyphs/Assets/InputGlyphs/CHANGELOG.md +++ b/InputGlyphs/Assets/InputGlyphs/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [0.7.3] - 2024-07-07 +### Changed +- Added version to URLs importing packages such as steamworks. + ## [0.7.2] - 2024-07-07 ### Fixed - Fix glyphs not display in built game From e20ca8f515bea5d897fa3bd1947235c1e58efc12 Mon Sep 17 00:00:00 2001 From: DAIKI Date: Mon, 8 Jul 2024 00:11:28 +0900 Subject: [PATCH 08/10] Remove dummy docs --- docs/index.md | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 docs/index.md diff --git a/docs/index.md b/docs/index.md deleted file mode 100644 index f4b49a4..0000000 --- a/docs/index.md +++ /dev/null @@ -1,32 +0,0 @@ -# Overview -Displays glyphs (icons) of keyboard & mouse or controller buttons recognized by Unity's InputSystem. - -# Setup -TODO: overview of setup - -## Input System -TODO: overview of inputsystem, InputActionMap and PlayerInput - -## Place initializer -Place InputGlyphSetup.prefab in the first scene. - -TODO: xxxInitializer tutorial and SteamGlyph tutorial - -## Create Texture Map -If you are using a prefab, you do not need to do anything. - -TODO: InputGlyphTextureMap custom tutorial. Texture Read/Write must be enabled. - -# Display glyphs -TODO: overview of display components - -TODO: detail of glyph layout (Single, Horizontal) - -## Sprite Renderer - -## UI Image - -## Text Mesh Pro - -# Samples -TODO: Sample scene list and description From 5075a49d938ae48097532f6662db751020ec0fca Mon Sep 17 00:00:00 2001 From: DAIKI Date: Mon, 8 Jul 2024 17:56:05 +0900 Subject: [PATCH 09/10] Fix package title when not installed --- .../Scripts/Editor/SteamGamepadGlyphInitializerEditor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/SteamGamepadGlyphInitializerEditor.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/SteamGamepadGlyphInitializerEditor.cs index 30841a5..50ee740 100644 --- a/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/SteamGamepadGlyphInitializerEditor.cs +++ b/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/SteamGamepadGlyphInitializerEditor.cs @@ -105,7 +105,7 @@ private static void DrawPackageInfo( { var foldoutStyle = new GUIStyle(EditorStyles.foldoutHeader); foldoutStyle.richText = true; - var foldoutTitle = installed ? $"{packageTitle} (Installed)" : "Steamworks (Not installed)"; + var foldoutTitle = installed ? $"{packageTitle} (Installed)" : $"{packageTitle} (Not installed)"; foldout = EditorGUILayout.BeginFoldoutHeaderGroup(foldout, foldoutTitle, foldoutStyle); if (foldout) { From 48d671c1c584da699bb0aa17092867ca923f7960 Mon Sep 17 00:00:00 2001 From: DAIKI Date: Mon, 8 Jul 2024 19:44:07 +0900 Subject: [PATCH 10/10] fix readme --- README.md | 38 +++++++------------------------------- 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index fda744d..dd47e84 100644 --- a/README.md +++ b/README.md @@ -1,38 +1,11 @@ # Input Glyphs -Displays glyphs (icons) of keyboard & mouse or controller buttons recognized by Unity's InputSystem. +InputGlyphs is a package designed to display button glyph images (icons) of input devices detected by Unity's InputSystem. It is easy to install and designed to allow for the extension of devices and glyph images. -Easy to use and extensible. Glyph images are taken from [Xelu's FREE Controller Prompts](https://thoseawesomeguys.com/prompts/) (CC0). This package can also load Glyphs for Gamepads provided by Steamworks. +The glyph images in the game will automatically switch according to the device in use. -![duo](https://github.com/eviltwo/InputGlyphs/assets/7721151/93cadf60-385d-44ea-86b5-50b2e4ba28f6) +The package includes pre-configured glyph images for keyboards & mice and various controllers, but you can add or change your own glyph images or use the glyphs provided by Steamworks. -|Supported deveices| -|---| -|Keyboard & Mouse| -|Xbox controller| -|Playstation controller| -|Switch pro controller| - -|Glyph display modules| -|---| -|Text Mesh Pro| -|UI Image| -|Sprite Renderer| - - -|Other contents|Status| -|---|:---:| -|Sample scenes|✅| -|Useage document|writing| - -# Required packages -- Core system - - InputSystem -- Sprite in UI Text (optional) - - TextMeshPro -- Use gamepad glyphs provided by Steamworks (optional) - - [Steamworks.NET](https://github.com/rlabrecque/Steamworks.NET) - - [SteamInputAdapter](https://github.com/eviltwo/UnitySteamInputAdapter) - - [SteamInputGlyphLoader](https://github.com/eviltwo/UnitySteamInputGlyphLoader) +![Duo player glyphs](https://eviltwo.github.io/InputGlyphs_Docs/assets/duo_glyphs.png) # Install with AssetStore Comming soon! @@ -43,3 +16,6 @@ Publisher page: https://assetstore.unity.com/publishers/12117 ``` https://github.com/eviltwo/InputGlyphs.git?path=InputGlyphs/Assets/InputGlyphs ``` + +# Documentation +https://eviltwo.github.io/InputGlyphs_Docs/ \ No newline at end of file