Backups/UnityExplorer
1
0
Fork 0
mirror of https://github.com/sinai-dev/UnityExplorer.git synced 2025-06-16 22:27:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Sinai 2021-05-19 18:45:53 +10:00
parent 44c6503ae2
commit f1b83e7c9e
1 changed files with 31 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/Core/Input/CursorUnlocker.cs
View File

@ -26,18 +26,16 @@ namespace UnityExplorer.Core.Input
public static bool ShouldActuallyUnlock => UIManager.ShowMenu && Unlock; public static bool ShouldActuallyUnlock => UIManager.ShowMenu && Unlock;
private static CursorLockMode m_lastLockMode; private static CursorLockMode lastLockMode;
private static bool m_lastVisibleState; private static bool lastVisibleState;
private static bool m_currentlySettingCursor = false; private static bool currentlySettingCursor = false;
private static Type CursorType
=> m_cursorType
?? (m_cursorType = ReflectionUtility.GetTypeByName("UnityEngine.Cursor"));
private static Type m_cursorType;
public static void Init() public static void Init()
{ {
lastLockMode = Cursor.lockState;
lastVisibleState = Cursor.visible;
SetupPatches(); SetupPatches();
UpdateCursorControl(); UpdateCursorControl();
@ -78,7 +76,7 @@ namespace UnityExplorer.Core.Input
{ {
try try
{ {
m_currentlySettingCursor = true; currentlySettingCursor = true;
if (ShouldActuallyUnlock) if (ShouldActuallyUnlock)
{ {
@ -90,14 +88,14 @@ namespace UnityExplorer.Core.Input
} }
else else
{ {
Cursor.lockState = m_lastLockMode; Cursor.lockState = lastLockMode;
Cursor.visible = m_lastVisibleState; Cursor.visible = lastVisibleState;
if (UIManager.EventSys) if (UIManager.EventSys)
ReleaseEventSystem(); ReleaseEventSystem();
} }
m_currentlySettingCursor = false; currentlySettingCursor = false;
} }
catch (Exception e) catch (Exception e)
{ {
@ -107,9 +105,9 @@ namespace UnityExplorer.Core.Input
// Event system overrides // Event system overrides
private static bool m_settingEventSystem; private static bool settingEventSystem;
private static EventSystem m_lastEventSystem; private static EventSystem lastEventSystem;
private static BaseInputModule m_lastInputModule; private static BaseInputModule lastInputModule;
public static void SetEventSystem() public static void SetEventSystem()
{ {
@ -118,16 +116,16 @@ namespace UnityExplorer.Core.Input
if (EventSystem.current && EventSystem.current != UIManager.EventSys) if (EventSystem.current && EventSystem.current != UIManager.EventSys)
{ {
m_lastEventSystem = EventSystem.current; lastEventSystem = EventSystem.current;
m_lastEventSystem.enabled = false; lastEventSystem.enabled = false;
} }
// Set to our current system // Set to our current system
m_settingEventSystem = true; settingEventSystem = true;
UIManager.EventSys.enabled = true; UIManager.EventSys.enabled = true;
EventSystem.current = UIManager.EventSys; EventSystem.current = UIManager.EventSys;
InputManager.ActivateUIModule(); InputManager.ActivateUIModule();
m_settingEventSystem = false; settingEventSystem = false;
} }
public static void ReleaseEventSystem() public static void ReleaseEventSystem()
@ -135,14 +133,14 @@ namespace UnityExplorer.Core.Input
if (InputManager.CurrentType == InputType.InputSystem) if (InputManager.CurrentType == InputType.InputSystem)
return; return;
if (m_lastEventSystem && m_lastEventSystem.gameObject.activeSelf) if (lastEventSystem && lastEventSystem.gameObject.activeSelf)
{ {
m_lastEventSystem.enabled = true; lastEventSystem.enabled = true;
m_settingEventSystem = true; settingEventSystem = true;
EventSystem.current = m_lastEventSystem; EventSystem.current = lastEventSystem;
m_lastInputModule?.ActivateModule(); lastInputModule?.ActivateModule();
m_settingEventSystem = false; settingEventSystem = false;
} }
} }
@ -152,30 +150,20 @@ namespace UnityExplorer.Core.Input
{ {
try try
{ {
if (CursorType == null)
throw new Exception("Could not load Type 'UnityEngine.Cursor'!");
// Get current cursor state and enable cursor
m_lastLockMode = (CursorLockMode?)CursorType.GetProperty("lockState", BF.Public | BF.Static)?.GetValue(null, null)
?? CursorLockMode.None;
m_lastVisibleState = (bool?)CursorType.GetProperty("visible", BF.Public | BF.Static)?.GetValue(null, null)
?? false;
ExplorerCore.Loader.SetupCursorPatches(); ExplorerCore.Loader.SetupCursorPatches();
} }
catch (Exception e) catch (Exception e)
{ {
ExplorerCore.Log($"Error on CursorUnlocker.Init! {e.GetType()}, {e.Message}"); ExplorerCore.Log($"Exception setting up Cursor patches: {e.GetType()}, {e.Message}");
} }
} }
public static void Prefix_EventSystem_set_current(ref EventSystem value) public static void Prefix_EventSystem_set_current(ref EventSystem value)
{ {
if (!m_settingEventSystem && value != UIManager.EventSys) if (!settingEventSystem && value != UIManager.EventSys)
{ {
m_lastEventSystem = value; lastEventSystem = value;
m_lastInputModule = value?.currentInputModule; lastInputModule = value?.currentInputModule;
if (ShouldActuallyUnlock) if (ShouldActuallyUnlock)
{ {
@ -191,9 +179,9 @@ namespace UnityExplorer.Core.Input
public static void Prefix_set_lockState(ref CursorLockMode value) public static void Prefix_set_lockState(ref CursorLockMode value)
{ {
if (!m_currentlySettingCursor) if (!currentlySettingCursor)
{ {
m_lastLockMode = value; lastLockMode = value;
if (ShouldActuallyUnlock) if (ShouldActuallyUnlock)
value = CursorLockMode.None; value = CursorLockMode.None;
@ -202,9 +190,9 @@ namespace UnityExplorer.Core.Input
public static void Prefix_set_visible(ref bool value) public static void Prefix_set_visible(ref bool value)
{ {
if (!m_currentlySettingCursor) if (!currentlySettingCursor)
{ {
m_lastVisibleState = value; lastVisibleState = value;
if (ShouldActuallyUnlock) if (ShouldActuallyUnlock)
value = true; value = true;