Fix issue with InputSystem

sinai-dev · sinai-dev · commit bc5d16051f26 · 2021-09-30T21:08:08.000+10:00
diff --git a/src/Core/Input/CursorUnlocker.cs b/src/Core/Input/CursorUnlocker.cs
@@ -113,9 +113,6 @@ public static void UpdateCursorControl()
 
         public static void SetEventSystem()
         {
-            if (InputManager.CurrentType == InputType.InputSystem)
-                return;
-
             if (EventSystem.current && EventSystem.current != UIManager.EventSys)
             {
                 lastEventSystem = EventSystem.current;
@@ -132,14 +129,12 @@ public static void SetEventSystem()
 
         public static void ReleaseEventSystem()
         {
-            if (InputManager.CurrentType == InputType.InputSystem)
-                return;
-
             if (lastEventSystem && lastEventSystem.gameObject.activeSelf)
             {
                 lastEventSystem.enabled = true;
 
                 settingEventSystem = true;
+                UIManager.EventSys.enabled = false;
                 EventSystem.current = lastEventSystem;
                 lastInputModule?.ActivateModule();
                 settingEventSystem = false;
diff --git a/src/Core/Input/IHandleInput.cs b/src/Core/Input/IHandleInput.cs
@@ -14,7 +14,7 @@ public interface IHandleInput
         bool GetMouseButtonDown(int btn);
         bool GetMouseButton(int btn);
 
-        BaseInputModule UIModule { get; }
+        BaseInputModule UIInputModule { get; }
 
         void AddUIInputModule();
         void ActivateModule();
diff --git a/src/Core/Input/InputManager.cs b/src/Core/Input/InputManager.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics.CodeAnalysis;
 using UnityEngine;
 using UnityEngine.EventSystems;
+using UnityExplorer.UI;
 
 namespace UnityExplorer.Core.Input
 {
@@ -16,37 +17,42 @@ public static class InputManager
     {
         public static InputType CurrentType { get; private set; }
 
-        private static IHandleInput m_inputModule;
+        private static IHandleInput m_inputHandler;
 
-        public static Vector3 MousePosition => m_inputModule.MousePosition;
+        public static Vector3 MousePosition => m_inputHandler.MousePosition;
 
         public static bool GetKeyDown(KeyCode key)
         {
             if (key == KeyCode.None)
                 return false;
-            return m_inputModule.GetKeyDown(key);
+            return m_inputHandler.GetKeyDown(key);
         }
 
         public static bool GetKey(KeyCode key)
         {
             if (key == KeyCode.None)
                 return false;
-            return m_inputModule.GetKey(key);
+            return m_inputHandler.GetKey(key);
         }
 
-        public static bool GetMouseButtonDown(int btn) => m_inputModule.GetMouseButtonDown(btn);
-        public static bool GetMouseButton(int btn) => m_inputModule.GetMouseButton(btn);
+        public static bool GetMouseButtonDown(int btn) => m_inputHandler.GetMouseButtonDown(btn);
+        public static bool GetMouseButton(int btn) => m_inputHandler.GetMouseButton(btn);
 
-        public static BaseInputModule UIInput => m_inputModule.UIModule;
+        public static BaseInputModule UIInput => m_inputHandler.UIInputModule;
 
-        public static Vector2 MouseScrollDelta => m_inputModule.MouseScrollDelta;
-
-        public static void ActivateUIModule() => m_inputModule.ActivateModule();
+        public static Vector2 MouseScrollDelta => m_inputHandler.MouseScrollDelta;
 
         public static void AddUIModule()
         {
-            m_inputModule.AddUIInputModule();
-            ActivateUIModule();
+            m_inputHandler.AddUIInputModule();
+            //ActivateUIModule();
+            CursorUnlocker.SetEventSystem();
+        }
+
+        public static void ActivateUIModule()
+        {
+            UIManager.EventSys.m_CurrentInputModule = UIInput;
+            m_inputHandler.ActivateModule();
         }
 
         public static void Init()
@@ -65,7 +71,7 @@ private static void InitHandler()
             {
                 try
                 {
-                    m_inputModule = new LegacyInput();
+                    m_inputHandler = new LegacyInput();
                     CurrentType = InputType.Legacy;
 
                     // make sure its working
@@ -84,7 +90,7 @@ private static void InitHandler()
             {
                 try
                 {
-                    m_inputModule = new InputSystem();
+                    m_inputHandler = new InputSystem();
                     CurrentType = InputType.InputSystem;
                     ExplorerCore.Log("Initialized new InputSystem support.");
                     return;
@@ -96,7 +102,7 @@ private static void InitHandler()
             }
 
             ExplorerCore.LogWarning("Could not find any Input Module Type!");
-            m_inputModule = new NoInput();
+            m_inputHandler = new NoInput();
             CurrentType = InputType.None;
         }
     }
diff --git a/src/Core/Input/InputSystem.cs b/src/Core/Input/InputSystem.cs
@@ -201,7 +201,7 @@ public Type TInputSystemUIInputModule
             ?? (m_tUIInputModule = ReflectionUtility.GetTypeByName("UnityEngine.InputSystem.UI.InputSystemUIInputModule"));
         internal Type m_tUIInputModule;
 
-        public BaseInputModule UIModule => m_newInputModule;
+        public BaseInputModule UIInputModule => m_newInputModule;
         internal BaseInputModule m_newInputModule;
 
         public void AddUIInputModule()
@@ -239,6 +239,9 @@ public void AddUIInputModule()
 
         private void CreateAction(object map, string actionName, string[] bindings, string propertyName)
         {
+            var disable = map.GetType().GetMethod("Disable");
+            disable.Invoke(map, ArgumentUtility.EmptyArgs);
+
             var inputActionType = ReflectionUtility.GetTypeByName("UnityEngine.InputSystem.InputAction");
             var addAction = inputExtensions.GetMethod("AddAction");
             var action = addAction.Invoke(null, new object[] { map, actionName, default, null, null, null, null, null })
@@ -262,8 +265,16 @@ private void CreateAction(object map, string actionName, string[] bindings, stri
 
         public void ActivateModule()
         {
-            m_newInputModule.ActivateModule();
-            UI_Enable.Invoke(UI_ActionMap, ArgumentUtility.EmptyArgs);
+            try
+            {
+                m_newInputModule.m_EventSystem = UIManager.EventSys;
+                m_newInputModule.ActivateModule();
+                UI_Enable.Invoke(UI_ActionMap, ArgumentUtility.EmptyArgs);
+            }
+            catch (Exception ex)
+            {
+                ExplorerCore.LogWarning("Exception enabling InputSystem UI Input Module: " + ex);
+            }
         }
     }
 }
diff --git a/src/Core/Input/LegacyInput.cs b/src/Core/Input/LegacyInput.cs
@@ -42,17 +42,25 @@ public LegacyInput()
 
         // UI Input module
 
-        public BaseInputModule UIModule => m_inputModule;
+        public BaseInputModule UIInputModule => m_inputModule;
         internal StandaloneInputModule m_inputModule;
 
         public void AddUIInputModule()
         {
             m_inputModule = UIManager.CanvasRoot.gameObject.AddComponent<StandaloneInputModule>();
+            m_inputModule.m_EventSystem = UIManager.EventSys;
         }
 
         public void ActivateModule()
         {
-            m_inputModule.ActivateModule();
+            try
+            {
+                m_inputModule.ActivateModule();
+            }
+            catch (Exception ex)
+            {
+                ExplorerCore.LogWarning($"Exception enabling StandaloneInputModule: {ex}");
+            }
         }
     }
 }
diff --git a/src/Core/Input/NoInput.cs b/src/Core/Input/NoInput.cs
@@ -16,7 +16,7 @@ public class NoInput : IHandleInput
         public bool GetMouseButton(int btn) => false;
         public bool GetMouseButtonDown(int btn) => false;
 
-        public BaseInputModule UIModule => null;
+        public BaseInputModule UIInputModule => null;
         public void ActivateModule() { }
         public void AddUIInputModule() { }
     }

Original file line number	Diff line number	Diff line change
`@@ -113,9 +113,6 @@ public static void UpdateCursorControl()`
`113`	`113`
`114`	`114`	`public static void SetEventSystem()`
`115`	`115`	`{`
`116`		`- if (InputManager.CurrentType == InputType.InputSystem)`
`117`		`- return;`
`118`		`-`
`119`	`116`	`if (EventSystem.current && EventSystem.current != UIManager.EventSys)`
`120`	`117`	`{`
`121`	`118`	`lastEventSystem = EventSystem.current;`
`@@ -132,14 +129,12 @@ public static void SetEventSystem()`
`132`	`129`
`133`	`130`	`public static void ReleaseEventSystem()`
`134`	`131`	`{`
`135`		`- if (InputManager.CurrentType == InputType.InputSystem)`
`136`		`- return;`
`137`		`-`
`138`	`132`	`if (lastEventSystem && lastEventSystem.gameObject.activeSelf)`
`139`	`133`	`{`
`140`	`134`	`lastEventSystem.enabled = true;`
`141`	`135`
`142`	`136`	`settingEventSystem = true;`
	`137`	`+ UIManager.EventSys.enabled = false;`
`143`	`138`	`EventSystem.current = lastEventSystem;`
`144`	`139`	`lastInputModule?.ActivateModule();`
`145`	`140`	`settingEventSystem = false;`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Diagnostics.CodeAnalysis;`
`3`	`3`	`using UnityEngine;`
`4`	`4`	`using UnityEngine.EventSystems;`
	`5`	`+using UnityExplorer.UI;`
`5`	`6`
`6`	`7`	`namespace UnityExplorer.Core.Input`
`7`	`8`	`{`
`@@ -16,37 +17,42 @@ public static class InputManager`
`16`	`17`	`{`
`17`	`18`	`public static InputType CurrentType { get; private set; }`
`18`	`19`
`19`		`- private static IHandleInput m_inputModule;`
	`20`	`+ private static IHandleInput m_inputHandler;`
`20`	`21`
`21`		`- public static Vector3 MousePosition => m_inputModule.MousePosition;`
	`22`	`+ public static Vector3 MousePosition => m_inputHandler.MousePosition;`
`22`	`23`
`23`	`24`	`public static bool GetKeyDown(KeyCode key)`
`24`	`25`	`{`
`25`	`26`	`if (key == KeyCode.None)`
`26`	`27`	`return false;`
`27`		`- return m_inputModule.GetKeyDown(key);`
	`28`	`+ return m_inputHandler.GetKeyDown(key);`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`public static bool GetKey(KeyCode key)`
`31`	`32`	`{`
`32`	`33`	`if (key == KeyCode.None)`
`33`	`34`	`return false;`
`34`		`- return m_inputModule.GetKey(key);`
	`35`	`+ return m_inputHandler.GetKey(key);`
`35`	`36`	`}`
`36`	`37`
`37`		`- public static bool GetMouseButtonDown(int btn) => m_inputModule.GetMouseButtonDown(btn);`
`38`		`- public static bool GetMouseButton(int btn) => m_inputModule.GetMouseButton(btn);`
	`38`	`+ public static bool GetMouseButtonDown(int btn) => m_inputHandler.GetMouseButtonDown(btn);`
	`39`	`+ public static bool GetMouseButton(int btn) => m_inputHandler.GetMouseButton(btn);`
`39`	`40`
`40`		`- public static BaseInputModule UIInput => m_inputModule.UIModule;`
	`41`	`+ public static BaseInputModule UIInput => m_inputHandler.UIInputModule;`
`41`	`42`
`42`		`- public static Vector2 MouseScrollDelta => m_inputModule.MouseScrollDelta;`
`43`		`-`
`44`		`- public static void ActivateUIModule() => m_inputModule.ActivateModule();`
	`43`	`+ public static Vector2 MouseScrollDelta => m_inputHandler.MouseScrollDelta;`
`45`	`44`
`46`	`45`	`public static void AddUIModule()`
`47`	`46`	`{`
`48`		`- m_inputModule.AddUIInputModule();`
`49`		`- ActivateUIModule();`
	`47`	`+ m_inputHandler.AddUIInputModule();`
	`48`	`+ //ActivateUIModule();`
	`49`	`+ CursorUnlocker.SetEventSystem();`
	`50`	`+ }`
	`51`	`+`
	`52`	`+ public static void ActivateUIModule()`
	`53`	`+ {`
	`54`	`+ UIManager.EventSys.m_CurrentInputModule = UIInput;`
	`55`	`+ m_inputHandler.ActivateModule();`
`50`	`56`	`}`
`51`	`57`
`52`	`58`	`public static void Init()`
`@@ -65,7 +71,7 @@ private static void InitHandler()`
`65`	`71`	`{`
`66`	`72`	`try`
`67`	`73`	`{`
`68`		`- m_inputModule = new LegacyInput();`
	`74`	`+ m_inputHandler = new LegacyInput();`
`69`	`75`	`CurrentType = InputType.Legacy;`
`70`	`76`
`71`	`77`	`// make sure its working`
`@@ -84,7 +90,7 @@ private static void InitHandler()`
`84`	`90`	`{`
`85`	`91`	`try`
`86`	`92`	`{`
`87`		`- m_inputModule = new InputSystem();`
	`93`	`+ m_inputHandler = new InputSystem();`
`88`	`94`	`CurrentType = InputType.InputSystem;`
`89`	`95`	`ExplorerCore.Log("Initialized new InputSystem support.");`
`90`	`96`	`return;`
`@@ -96,7 +102,7 @@ private static void InitHandler()`
`96`	`102`	`}`
`97`	`103`
`98`	`104`	`ExplorerCore.LogWarning("Could not find any Input Module Type!");`
`99`		`- m_inputModule = new NoInput();`
	`105`	`+ m_inputHandler = new NoInput();`
`100`	`106`	`CurrentType = InputType.None;`
`101`	`107`	`}`
`102`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,17 +42,25 @@ public LegacyInput()`
`42`	`42`
`43`	`43`	`// UI Input module`
`44`	`44`
`45`		`- public BaseInputModule UIModule => m_inputModule;`
	`45`	`+ public BaseInputModule UIInputModule => m_inputModule;`
`46`	`46`	`internal StandaloneInputModule m_inputModule;`
`47`	`47`
`48`	`48`	`public void AddUIInputModule()`
`49`	`49`	`{`
`50`	`50`	`m_inputModule = UIManager.CanvasRoot.gameObject.AddComponent<StandaloneInputModule>();`
	`51`	`+ m_inputModule.m_EventSystem = UIManager.EventSys;`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`public void ActivateModule()`
`54`	`55`	`{`
`55`		`- m_inputModule.ActivateModule();`
	`56`	`+ try`
	`57`	`+ {`
	`58`	`+ m_inputModule.ActivateModule();`
	`59`	`+ }`
	`60`	`+ catch (Exception ex)`
	`61`	`+ {`
	`62`	`+ ExplorerCore.LogWarning($"Exception enabling StandaloneInputModule: {ex}");`
	`63`	`+ }`
`56`	`64`	`}`
`57`	`65`	`}`
`58`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class NoInput : IHandleInput`
`16`	`16`	`public bool GetMouseButton(int btn) => false;`
`17`	`17`	`public bool GetMouseButtonDown(int btn) => false;`
`18`	`18`
`19`		`- public BaseInputModule UIModule => null;`
	`19`	`+ public BaseInputModule UIInputModule => null;`
`20`	`20`	`public void ActivateModule() { }`
`21`	`21`	`public void AddUIInputModule() { }`
`22`	`22`	`}`