Merge pull request #39 from eviltwo/0.7.5-dev

0.7.5
eviltwo · Jul 9, 2024 · ac22a5f · ac22a5f
2 parents 28cec6e + 255a200
commit ac22a5f
Show file tree

Hide file tree

Showing 12 changed files with 111 additions and 13 deletions.
diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/DuoPlayerSample.unity b/InputGlyphs/Assets/InputGlyphs/Samples/DuoPlayerSample.unity
@@ -316,11 +316,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
+  m_ReferenceResolution: {x: 800, y: 450}
+  m_ScreenMatchMode: 2
   m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3
   m_FallbackScreenDPI: 96

diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/SoloPlayerSample.unity b/InputGlyphs/Assets/InputGlyphs/Samples/SoloPlayerSample.unity
@@ -314,11 +314,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
+  m_ReferenceResolution: {x: 800, y: 450}
+  m_ScreenMatchMode: 2
   m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3
   m_FallbackScreenDPI: 96

diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample.unity b/InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample.unity
@@ -171,11 +171,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
+  m_ReferenceResolution: {x: 800, y: 450}
+  m_ScreenMatchMode: 2
   m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3
   m_FallbackScreenDPI: 96

diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/InputGlyphImageEditor.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/InputGlyphImageEditor.cs
@@ -0,0 +1,24 @@
+#if INPUT_SYSTEM && ENABLE_INPUT_SYSTEM
+using UnityEditor;
+
+namespace InputGlyphs.Display.Editor
+{
+    [CustomEditor(typeof(InputGlyphImage))]
+    public class InputGlyphImageEditor : UnityEditor.Editor
+    {
+        public override void OnInspectorGUI()
+        {
+            base.OnInspectorGUI();
+
+            var glyphImage = (InputGlyphImage)target;
+
+            if (glyphImage.PlayerInput != null
+                && glyphImage.PlayerInput.notificationBehavior != UnityEngine.InputSystem.PlayerNotifications.InvokeUnityEvents
+                && glyphImage.PlayerInput.notificationBehavior != UnityEngine.InputSystem.PlayerNotifications.InvokeCSharpEvents)
+            {
+                EditorGUILayout.HelpBox("PlayerInput.notificationBehavior must be set to InvokeUnityEvents or InvokeCSharpEvents.", MessageType.Error);
+            }
+        }
+    }
+}
+#endif
diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/InputGlyphImageEditor.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/InputGlyphImageEditor.cs.meta
diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/InputGlyphSpriteEditor.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/InputGlyphSpriteEditor.cs
@@ -0,0 +1,24 @@
+#if INPUT_SYSTEM && ENABLE_INPUT_SYSTEM
+using UnityEditor;
+
+namespace InputGlyphs.Display.Editor
+{
+    [CustomEditor(typeof(InputGlyphSprite))]
+    public class InputGlyphSpriteEditor : UnityEditor.Editor
+    {
+        public override void OnInspectorGUI()
+        {
+            base.OnInspectorGUI();
+
+            var glyphSprite = (InputGlyphSprite)target;
+
+            if (glyphSprite.PlayerInput != null
+                && glyphSprite.PlayerInput.notificationBehavior != UnityEngine.InputSystem.PlayerNotifications.InvokeUnityEvents
+                && glyphSprite.PlayerInput.notificationBehavior != UnityEngine.InputSystem.PlayerNotifications.InvokeCSharpEvents)
+            {
+                EditorGUILayout.HelpBox("PlayerInput.notificationBehavior must be set to InvokeUnityEvents or InvokeCSharpEvents.", MessageType.Error);
+            }
+        }
+    }
+}
+#endif
diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/InputGlyphSpriteEditor.cs.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/InputGlyphSpriteEditor.cs.meta
diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/InputGlyphTextEditor.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Editor/InputGlyphTextEditor.cs
@@ -40,6 +40,13 @@ public override void OnInspectorGUI()
                     }
                 }
             }
+
+            if (glyphText.PlayerInput != null
+                && glyphText.PlayerInput.notificationBehavior != UnityEngine.InputSystem.PlayerNotifications.InvokeUnityEvents
+                && glyphText.PlayerInput.notificationBehavior != UnityEngine.InputSystem.PlayerNotifications.InvokeCSharpEvents)
+            {
+                EditorGUILayout.HelpBox("PlayerInput.notificationBehavior must be set to InvokeUnityEvents or InvokeCSharpEvents.", MessageType.Error);
+            }
         }
     }
 }

diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/Sprite/InputGlyphSprite.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/Sprite/InputGlyphSprite.cs
@@ -36,6 +36,10 @@ private void Awake()
             {
                 SpriteRenderer = GetComponent<SpriteRenderer>();
             }
+            if (PlayerInput == null)
+            {
+                Debug.LogError("PlayerInput is not set.", this);
+            }
             _texture = new Texture2D(2, 2);
         }
 
@@ -108,7 +112,10 @@ private void UnregisterPlayerInputEvents(PlayerInput playerInput)
 
         private void OnControlsChanged(PlayerInput playerInput)
         {
-            UpdateGlyphs(playerInput);
+            if (playerInput == PlayerInput)
+            {
+                UpdateGlyphs(playerInput);
+            }
         }
 
         private void UpdateGlyphs(PlayerInput playerInput)

diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/TextMeshPro/InputGlyphText.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/TextMeshPro/InputGlyphText.cs
@@ -50,6 +50,10 @@ private void Awake()
             {
                 Text = GetComponent<TMP_Text>();
             }
+            if (PlayerInput == null)
+            {
+                Debug.LogError("PlayerInput is not set.", this);
+            }
             _packedTexture = new Texture2D(2, 2);
             _sharedMaterial = new Material(Material);
             _sharedMaterial.SetTexture("_MainTex", _packedTexture);
@@ -132,7 +136,10 @@ private void UnregisterPlayerInputEvents(PlayerInput playerInput)
 
         private void OnControlsChanged(PlayerInput playerInput)
         {
-            UpdateGlyphs(playerInput);
+            if (playerInput == PlayerInput)
+            {
+                UpdateGlyphs(playerInput);
+            }
         }
 
         private void UpdateGlyphs(PlayerInput playerInput)

diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/UI/InputGlyphImage.cs b/InputGlyphs/Assets/InputGlyphs/Scripts/Runtime/Display/UI/InputGlyphImage.cs
@@ -38,6 +38,10 @@ private void Awake()
             {
                 Image = GetComponent<Image>();
             }
+            if (PlayerInput == null)
+            {
+                Debug.LogError("PlayerInput is not set.", this);
+            }
             _defaultSizeDelta = Image.rectTransform.sizeDelta;
             _texture = new Texture2D(2, 2);
         }
@@ -111,7 +115,10 @@ private void UnregisterPlayerInputEvents(PlayerInput playerInput)
 
         private void OnControlsChanged(PlayerInput playerInput)
         {
-            UpdateGlyphs(playerInput);
+            if (playerInput == PlayerInput)
+            {
+                UpdateGlyphs(playerInput);
+            }
         }
 
         private void UpdateGlyphs(PlayerInput playerInput)

diff --git 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.4",
+    "version": "0.7.5",
     "unity": "2022.3",
     "description": "Displays glyphs (icons) of keyboard & mouse or controller buttons recognized by Unity's InputSystem.",
     "author": {