Fix Editor naming

Author: jcs090218

Assets/JCSUnity/Scripts/Input/JCS_InputController.cs

@@ -22,6 +22,24 @@ namespace JCSUnity
     public class JCS_InputController
         : MonoBehaviour
     {
+        public static int GAME_PAD_COUNT = 0;  // How many gampad in this game?
+
+        public static int SelectGamepadType = 0;
+        public static string[] GamepadPlatform = {
+            "Select Platform",
+
+            /* Sony Play Station */
+            "PS",
+            "PS2",
+            "PS3",
+            "PS4",
+
+            /* Microsoft XBox */
+            "XBox",
+            "XBox 360",
+            "XBox One",
+        };
+
         /// <summary>
         /// Get the serialize property from Unity's 'InputManager' 
         /// element structure.
@@ -147,10 +165,7 @@ public static void ClearInputManagerSettings()
         /// </summary>
         public static void SetupInputManager()
         {
-            // Add gamepad definitions
-            JCSUnity_EditorWindow jcsunity_ew = JCSUnity_EditorWindow.instance;
-
-            switch (jcsunity_ew.SelectGamepadType)
+            switch (SelectGamepadType)
             {
                 case 0:  /* ==> Select Platform <== */
 
@@ -542,13 +557,11 @@ public static void DefaultInputManagerSettings()
         /// </summary>
         public static void SetupPS4Joystick()
         {
-            int gamePadCount = JCSUnity_EditorWindow.instance.GAME_PAD_COUNT;
-
             float defalutSenstivity = JCS_InputSettings.DEFAULT_SENSITIVITY;
             float defaultDead = JCS_InputSettings.DEFAULT_DEAD;
             float defaultGravity = JCS_InputSettings.DEFAULT_GRAVITY;
 
-            for (int joystickNum = 0; joystickNum < gamePadCount; ++joystickNum)
+            for (int joystickNum = 0; joystickNum < GAME_PAD_COUNT; ++joystickNum)
             {
                 foreach (JCS_JoystickButton val in JCS_Utility.GetValues<JCS_JoystickButton>())
                 {
@@ -577,13 +590,11 @@ public static void SetupPS4Joystick()
         /// </summary>
         public static void SetupXBox360Joystick()
         {
-            int gamePadCount = JCSUnity_EditorWindow.instance.GAME_PAD_COUNT;
-
             float defalutSenstivity = JCS_InputSettings.DEFAULT_SENSITIVITY;
             float defaultDead = JCS_InputSettings.DEFAULT_DEAD;
             float defaultGravity = JCS_InputSettings.DEFAULT_GRAVITY;
 
-            for (int joystickNum = 0; joystickNum < gamePadCount; ++joystickNum)
+            for (int joystickNum = 0; joystickNum < GAME_PAD_COUNT; ++joystickNum)
             {
                 foreach (JCS_JoystickButton val in JCS_Utility.GetValues<JCS_JoystickButton>())
                 {

Assets/JCSUnity/Scripts/Settings/JCS_InputSettings.cs

@@ -331,9 +331,7 @@ public static string GetPositiveNameByLabel(JCS_JoystickButton label)
 #if (UNITY_EDITOR)
             if (instance == null)
             {
-                JCSUnity_EditorWindow jcsunity_ew = JCSUnity_EditorWindow.instance;
-
-                switch (jcsunity_ew.SelectGamepadType)
+                switch (JCS_InputController.SelectGamepadType)
                 {
                     case 0:  /* ==> Select Platform <== */
                         return "";
@@ -398,9 +396,7 @@ public static string GetPositiveNameByLabel(JCS_JoystickButton label)
         /// <returns></returns>
         public static bool IsInvert(JCS_JoystickButton label)
         {
-            JCSUnity_EditorWindow jcsunity_ew = JCSUnity_EditorWindow.instance;
-
-            switch (jcsunity_ew.SelectGamepadType)
+            switch (JCS_InputController.SelectGamepadType)
             {
                 case 0:  /* ==> Select Platform <== */
                     return false;
@@ -448,9 +444,7 @@ public static bool IsInvert(JCS_JoystickButton label)
         /// <returns></returns>
         public static JCS_AxisChannel GetAxisChannel(JCS_JoystickButton label)
         {
-            JCSUnity_EditorWindow jcsunity_ew = JCSUnity_EditorWindow.instance;
-
-            switch (jcsunity_ew.SelectGamepadType)
+            switch (JCS_InputController.SelectGamepadType)
             {
                 case 0:  /* ==> Select Platform <== */
                     break;
@@ -532,9 +526,7 @@ public static JCS_AxisChannel GetAxisChannel(JCS_JoystickButton label)
         /// <returns></returns>
         public static JCS_AxisType GetAxisType(JCS_JoystickButton label)
         {
-            JCSUnity_EditorWindow jcsunity_ew = JCSUnity_EditorWindow.instance;
-
-            switch (jcsunity_ew.SelectGamepadType)
+            switch (JCS_InputController.SelectGamepadType)
             {
                 case 0:  /* ==> Select Platform <== */
                     break;