show bindings in settings menu

Assets/Resources/Sprites/GeneralPurpose/ButtonsControllers/ButtonSDFMaterial.mat

@@ -2,14 +2,15 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: ButtonSDFMaterial
   m_Shader: {fileID: 4800000, guid: 574134bcfa99f7140a2cd7986bf57c25, type: 3}
-  m_ShaderKeywords: 
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -67,6 +68,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _Ambient: 0.5
     - _Bevel: 0.5
@@ -101,7 +103,7 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _OffBright: 0.25
-    - _OutSmoothness: 0.075
+    - _OutSmoothness: 0.025
     - _OutThickness: 0.6
     - _OutlineSoftness: 0
     - _OutlineUVSpeedX: 0
@@ -118,7 +120,7 @@ Material:
     - _ScaleY: 1
     - _ShaderFlags: 0
     - _Sharpness: 0
-    - _Smoothness: 0.075
+    - _Smoothness: 0.025
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SpecularPower: 2

Assets/Scripts/InputSystem/ControllerTypes/InputJoyshock.cs

@@ -165,6 +165,97 @@ namespace HeavenStudio.InputSystem
             -1
         };
 
+        static readonly string[] nsProButtonNames = new[]
+        {
+            "Up",
+            "Down",
+            "Left",
+            "Right",
+            "Plus",
+            "Minus",
+            "Left Stick Click",
+            "Right Stick Click",
+            "L",
+            "R",
+            "ZL",
+            "ZR",
+            "B",
+            "A",
+            "Y",
+            "X",
+            "Home",
+            "Capture",
+        };
+
+        static readonly string[] nsConButtonNames = new[]
+        {
+            "Up",
+            "Down",
+            "Left",
+            "Right",
+            "Plus",
+            "Minus",
+            "Left Stick Click",
+            "Right Stick Click",
+            "L",
+            "R",
+            "ZL",
+            "ZR",
+            "B",
+            "A",
+            "Y",
+            "X",
+            "Home",
+            "Capture",
+            "SL",
+            "SR",
+        };
+
+        static readonly string[] ps4ButtonNames = new[]
+        {
+            "Up",
+            "Down",
+            "Left",
+            "Right",
+            "Options",
+            "Share",
+            "L3",
+            "R3",
+            "L",
+            "R",
+            "L2",
+            "R2",
+            "X",
+            "Circle",
+            "Square",
+            "Triangle",
+            "PS",
+            "Touchpad Click",
+        };
+
+        static readonly string[] ps5ButtonNames = new[]
+        {
+            "Up",
+            "Down",
+            "Left",
+            "Right",
+            "Options",
+            "Share",
+            "L3",
+            "R3",
+            "L",
+            "R",
+            "L2",
+            "R2",
+            "X",
+            "Circle",
+            "Square",
+            "Triangle",
+            "PS",
+            "Create",
+            "Mic",
+        };
+
         public static Dictionary<int, InputJoyshock> joyshocks;
 
         float stickDeadzone = 0.5f;
@@ -215,7 +306,7 @@ namespace HeavenStudio.InputSystem
 
         int GetButtonForSplitType(int action)
         {
-            if (currentBindings.ControllerName == null) return -1;
+            if (currentBindings.Pad == null) return -1;
             if (action < 0 || action >= BINDS_MAX) return -1;
             ControlBindings actionMap = currentBindings;
             if (otherHalf == null)
@@ -367,6 +458,21 @@ namespace HeavenStudio.InputSystem
             return joyshockName;
         }
 
+        public override string[] GetButtonNames()
+        {
+            switch (type)
+            {
+                case TypeProController:
+                    return nsProButtonNames;
+                case TypeDualShock4:
+                    return ps4ButtonNames;
+                case TypeDualSense:
+                    return ps5ButtonNames;
+                default:
+                    return nsConButtonNames;
+            }
+        }
+
         public override InputFeatures GetFeatures()
         {
             InputFeatures features = InputFeatures.Readable_MotionSensor | InputFeatures.Extra_Rumble | InputFeatures.Style_Pad | InputFeatures.Style_Baton;
@@ -408,23 +514,18 @@ namespace HeavenStudio.InputSystem
             {
                 case TypeJoyConLeft:
                     binds.Pad = defaultMappingsL;
-                    binds.ControllerName = "Joy-Con (L)";
                     break;
                 case TypeJoyConRight:
                     binds.Pad = defaultMappingsR;
-                    binds.ControllerName = "Joy-Con (R)";
                     break;
                 case TypeProController:
                     binds.Pad = defaultMappings;
-                    binds.ControllerName = "Pro Controller";
                     break;
                 case TypeDualShock4:
                     binds.Pad = defaultMappings;
-                    binds.ControllerName = "DualShock 4";
                     break;
                 case TypeDualSense:
                     binds.Pad = defaultMappings;
-                    binds.ControllerName = "DualSense";
                     break;
             }
             return binds;

Assets/Scripts/InputSystem/ControllerTypes/InputKeyboard.cs

@@ -42,7 +42,6 @@ namespace HeavenStudio.InputSystem
 
         static readonly ControlBindings defaultBindings = new()
         {
-            ControllerName = "Keyboard",
             Pad = new int[]
             {
                 (int)KeyCode.W,
@@ -77,6 +76,16 @@ namespace HeavenStudio.InputSystem
             return "Keyboard";
         }
 
+        public override string[] GetButtonNames()
+        {
+            string[] names = new string[(int)KeyCode.Mouse0];
+            for (int i = 0; i < keyCodes.Length; i++)
+            {
+                names[(int)keyCodes[i]] = keyCodes[i].ToString();
+            }
+            return names;
+        }
+
         public override InputFeatures GetFeatures()
         {
             return InputFeatures.Readable_StringInput | InputFeatures.Style_Pad | InputFeatures.Style_Baton;

Assets/Scripts/InputSystem/InputController.cs

@@ -119,7 +119,6 @@ namespace HeavenStudio.InputSystem
         [System.Serializable]
         public struct ControlBindings
         {
-            public string ControllerName;
             public int[] Pad;
             public int[] Baton;
             public int[] Touch;
@@ -137,6 +136,7 @@ namespace HeavenStudio.InputSystem
         public abstract void UpdateState(); // Update the state of the controller
 
         public abstract string GetDeviceName(); // Get the name of the controller
+        public abstract string[] GetButtonNames(); // Get the names of the buttons on the controller
         public abstract InputFeatures GetFeatures(); // Get the features of the controller
         public abstract bool GetIsConnected();
         public abstract bool GetIsPoorConnection();

Assets/Scripts/UI/SettingsDialog/Tabs/ControllerSettings.cs

@@ -25,6 +25,14 @@ namespace HeavenStudio.Editor
 
         [SerializeField] private Material controllerMat;
 
+        [SerializeField] private List<GameObject> PadBindingsMenus;
+        [SerializeField] private List<GameObject> BatonBindingsMenus;
+        [SerializeField] private List<GameObject> TouchBindingsMenus;
+
+        [SerializeField] private List<TMP_Text> PadBindingsTxt;
+        [SerializeField] private List<TMP_Text> BatonBindingsTxt;
+        [SerializeField] private List<TMP_Text> TouchBindingsTxt;
+
         private bool isAutoSearching = false;
         private bool isPairSearching = false;
         private bool pairSelectLR = false;  //true = left, false = right
@@ -171,6 +179,31 @@ namespace HeavenStudio.Editor
         public void ShowControllerIcon(InputController controller)
         {
             string name = controller.GetDeviceName();
+            string[] buttons = controller.GetButtonNames();
+
+            //show binds
+            int ac = 0;
+            foreach (int i in controller.GetCurrentBindings().Pad)
+            {
+                if (ac >= PadBindingsTxt.Count) break;
+                if (buttons[i] == null)
+                {
+                    PadBindingsTxt[ac].text = "UNKNOWN";
+                    ac++;
+                    continue;
+                }
+                if (i != -1)
+                {
+                    PadBindingsTxt[ac].text = buttons[i];
+                }
+                else
+                {
+                    PadBindingsTxt[ac].text = "NOT BOUND";
+                }
+                ac++;
+            }
+
+            //show icon
             foreach (var icon in controllerIcons)
             {
                 if (icon.name == name)
@@ -182,6 +215,7 @@ namespace HeavenStudio.Editor
                     icon.SetActive(false);
                 }
             }
+
             //setup material
             Color colour;
             switch (name)