Bump version

- Option to use Game's camera
- Button to reset position back to original cam pos
- Free cam position will be stored between stopping/starting free cam

src/CSConsole/ConsoleController.cs

@@ -61,8 +61,6 @@ namespace UnityExplorer.CSConsole
 
         public static void Init()
         {
-            InitEventSystemPropertyHandlers();
-
             // Make sure console is supported on this platform
             try
             {
@@ -386,77 +384,17 @@ namespace UnityExplorer.CSConsole
             RuntimeHelper.StartCoroutine(SetCaretCoroutine(caretPosition));
         }
 
-        static void InitEventSystemPropertyHandlers()
-        {
-            try
-            {
-                foreach (MemberInfo member in typeof(EventSystem).GetMembers(AccessTools.all))
-                {
-                    if (member.Name == "m_CurrentSelected")
-                    {
-                        Type backingType;
-                        if (member.MemberType == MemberTypes.Property)
-                            backingType = (member as PropertyInfo).PropertyType;
-                        else
-                            backingType = (member as FieldInfo).FieldType;
-
-                        usingEventSystemDictionaryMembers = ReflectionUtility.IsDictionary(backingType);
-                        break;
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                ExplorerCore.LogWarning($"Exception checking EventSystem property backing type: {ex}");
-            }
-        }
-
-        static bool usingEventSystemDictionaryMembers;
-
-        static readonly AmbiguousMemberHandler<EventSystem, GameObject> m_CurrentSelected_Handler_Normal
-            = new(true, true, "m_CurrentSelected", "m_currentSelected");
-        static readonly AmbiguousMemberHandler<EventSystem, Dictionary<int, GameObject>> m_CurrentSelected_Handler_Dictionary
-            = new(true, true, "m_CurrentSelected", "m_currentSelected");
-
-        static readonly AmbiguousMemberHandler<EventSystem, bool> m_SelectionGuard_Handler_Normal
-            = new(true, true, "m_SelectionGuard", "m_selectionGuard");
-        static readonly AmbiguousMemberHandler<EventSystem, Dictionary<int, bool>> m_SelectionGuard_Handler_Dictionary
-            = new(true, true, "m_SelectionGuard", "m_selectionGuard");
-
-        static void SetCurrentSelectedGameObject(EventSystem instance, GameObject value)
-        {
-            instance.SetSelectedGameObject(value);
-
-            if (usingEventSystemDictionaryMembers)
-                m_CurrentSelected_Handler_Dictionary.GetValue(instance)[0] = value;
-            else
-                m_CurrentSelected_Handler_Normal.SetValue(instance, value);
-        }
-
-        static void SetSelectionGuard(EventSystem instance, bool value)
-        {
-            if (usingEventSystemDictionaryMembers)
-                m_SelectionGuard_Handler_Dictionary.GetValue(instance)[0] = value;
-            else
-                m_SelectionGuard_Handler_Normal.SetValue(instance, value);
-        }
-
         private static IEnumerator SetCaretCoroutine(int caretPosition)
         {
             Color color = Input.Component.selectionColor;
             color.a = 0f;
             Input.Component.selectionColor = color;
 
-            try { SetCurrentSelectedGameObject(CursorUnlocker.CurrentEventSystem, null); }
+            EventSystemHelper.SetSelectedGameObject(null);
-            catch (Exception ex) { ExplorerCore.Log($"Failed removing selected object: {ex}"); }
 
             yield return null; // ~~~~~~~ YIELD FRAME ~~~~~~~~~
 
-            try { SetSelectionGuard(CursorUnlocker.CurrentEventSystem, false); }
+            EventSystemHelper.SetSelectedGameObject(null);
-            catch (Exception ex) { ExplorerCore.Log($"Failed setting selection guard: {ex}"); }
-
-            try { SetCurrentSelectedGameObject(CursorUnlocker.CurrentEventSystem, Input.GameObject); }
-            catch (Exception ex) { ExplorerCore.Log($"Failed setting selected gameobject: {ex}"); }
 
             yield return null; // ~~~~~~~ YIELD FRAME ~~~~~~~~~
 

src/ExplorerCore.cs

@@ -14,7 +14,7 @@ namespace UnityExplorer
     public static class ExplorerCore
     {
         public const string NAME = "UnityExplorer";
-        public const string VERSION = "4.7.3";
+        public const string VERSION = "4.7.5";
         public const string AUTHOR = "Sinai";
         public const string GUID = "com.sinai.unityexplorer";
 

src/UI/Panels/FreeCamPanel.cs

@@ -1,6 +1,8 @@
-using System;
+using HarmonyLib;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using UnityEngine;
 using UnityEngine.EventSystems;
@@ -21,45 +23,91 @@ namespace UnityExplorer.UI.Panels
 
         public override string Name => "Freecam";
         public override UIManager.Panels PanelType => UIManager.Panels.Freecam;
-
         public override int MinWidth => 400;
-        public override int MinHeight => 300;
+        public override int MinHeight => 320;
         public override Vector2 DefaultAnchorMin => new(0.4f, 0.4f);
         public override Vector2 DefaultAnchorMax => new(0.6f, 0.6f);
         public override bool NavButtonWanted => true;
         public override bool ShouldSaveActiveState => true;
 
         internal static bool inFreeCamMode;
+        internal static bool usingGameCamera;
         internal static Camera ourCamera;
         internal static Camera lastMainCamera;
-        internal static Vector3 lastCameraMainPos;
+        internal static FreeCamBehaviour freeCamScript;
-        internal static Quaternion lastCameraMainRot;
 
         internal static float desiredMoveSpeed = 10f;
+
+        internal static Vector3 originalCameraPosition;
+        internal static Quaternion originalCameraRotation;
+
+        internal static Vector3? currentUserCameraPosition;
+        internal static Quaternion? currentUserCameraRotation;
+
         internal static Vector3 previousMousePosition;
+
         internal static Vector3 lastSetCameraPosition;
 
         static ButtonRef startStopButton;
+        static Toggle useGameCameraToggle;
         static InputFieldRef positionInput;
         static InputFieldRef moveSpeedInput;
         static ButtonRef inspectButton;
 
-        void BeginFreecam()
+        internal static void BeginFreecam()
         {
             inFreeCamMode = true;
 
             previousMousePosition = InputManager.MousePosition;
 
+            CacheMainCamera();
+            SetupFreeCamera();
+
+            inspectButton.GameObject.SetActive(true);
+        }
+
+        static void CacheMainCamera()
+        {
             Camera currentMain = Camera.main;
             if (currentMain)
             {
                 lastMainCamera = currentMain;
-                lastCameraMainPos = currentMain.transform.position;
+                originalCameraPosition = currentMain.transform.position;
-                lastCameraMainRot = currentMain.transform.rotation;
+                originalCameraRotation = currentMain.transform.rotation;
-                lastMainCamera.enabled = false;
+
+                if (currentUserCameraPosition == null)
+                {
+                    currentUserCameraPosition = currentMain.transform.position;
+                    currentUserCameraRotation = currentMain.transform.rotation;
+                }
             }
             else
-                lastCameraMainRot = Quaternion.identity;
+                originalCameraRotation = Quaternion.identity;
+        }
+
+        static void SetupFreeCamera()
+        {
+            if (useGameCameraToggle.isOn)
+            {
+                if (!lastMainCamera)
+                {
+                    ExplorerCore.LogWarning($"There is no previous Camera found, reverting to default Free Cam.");
+                    useGameCameraToggle.isOn = false;
+                }
+                else
+                {
+                    usingGameCamera = true;
+                    ourCamera = lastMainCamera;
+                }
+            }
+
+            if (!useGameCameraToggle.isOn)
+            {
+                usingGameCamera = false;
+
+                if (lastMainCamera)
+                    lastMainCamera.enabled = false;
+            }
 
             if (!ourCamera)
             {
@@ -67,44 +115,49 @@ namespace UnityExplorer.UI.Panels
                 ourCamera.gameObject.tag = "MainCamera";
                 GameObject.DontDestroyOnLoad(ourCamera.gameObject);
                 ourCamera.gameObject.hideFlags = HideFlags.HideAndDontSave;
-                ourCamera.gameObject.AddComponent<FreeCamBehaviour>();
             }
 
+            if (!freeCamScript)
+                freeCamScript = ourCamera.gameObject.AddComponent<FreeCamBehaviour>();
+
+            ourCamera.transform.position = (Vector3)currentUserCameraPosition;
+            ourCamera.transform.rotation = (Quaternion)currentUserCameraRotation;
+
             ourCamera.gameObject.SetActive(true);
-            ourCamera.transform.position = lastCameraMainPos;
+            ourCamera.enabled = true;
-            ourCamera.transform.rotation = lastCameraMainRot;
-
-            inspectButton.GameObject.SetActive(true);
         }
 
-        void EndFreecam()
+        internal static void EndFreecam()
         {
             inFreeCamMode = false;
 
+            if (usingGameCamera)
+            {
+                ourCamera = null;
+
+                if (lastMainCamera)
+                {
+                    lastMainCamera.transform.position = originalCameraPosition;
+                    lastMainCamera.transform.rotation = originalCameraRotation;
+                }
+            }
+
             if (ourCamera)
                 ourCamera.gameObject.SetActive(false);
             else
                 inspectButton.GameObject.SetActive(false);
 
+            if (freeCamScript)
+            {
+                GameObject.Destroy(freeCamScript);
+                freeCamScript = null;
+            }
+
             if (lastMainCamera)
                 lastMainCamera.enabled = true;
         }
 
-        void SetToggleButtonState()
+        static void SetCameraPosition(Vector3 pos)
-        {
-            if (inFreeCamMode)
-            {
-                RuntimeHelper.SetColorBlockAuto(startStopButton.Component, new(0.4f, 0.2f, 0.2f));
-                startStopButton.ButtonText.text = "End Freecam";
-            }
-            else
-            {
-                RuntimeHelper.SetColorBlockAuto(startStopButton.Component, new(0.2f, 0.4f, 0.2f));
-                startStopButton.ButtonText.text = "Begin Freecam";
-            }
-        }
-
-        void SetCameraPosition(Vector3 pos)
         {
             if (!ourCamera || lastSetCameraPosition == pos)
                 return;
@@ -122,16 +175,30 @@ namespace UnityExplorer.UI.Panels
             positionInput.Text = ParseUtility.ToStringForInput<Vector3>(lastSetCameraPosition);
         }
 
+        // ~~~~~~~~ UI construction / callbacks ~~~~~~~~
+
         protected override void ConstructPanelContent()
         {
             startStopButton = UIFactory.CreateButton(ContentRoot, "ToggleButton", "Freecam");
             UIFactory.SetLayoutElement(startStopButton.GameObject, minWidth: 150, minHeight: 25, flexibleWidth: 9999);
-            startStopButton.OnClick += ToggleButton_OnClick;
+            startStopButton.OnClick += StartStopButton_OnClick;
             SetToggleButtonState();
 
             AddSpacer(5);
 
-            AddInputField("Position", "Camera Pos:", "eg. 0 0 0", out positionInput, PositionInput_OnEndEdit);
+            GameObject toggleObj = UIFactory.CreateToggle(ContentRoot, "UseGameCameraToggle", out useGameCameraToggle, out Text toggleText);
+            UIFactory.SetLayoutElement(toggleObj, minHeight: 25, flexibleWidth: 9999);
+            useGameCameraToggle.onValueChanged.AddListener(OnUseGameCameraToggled);
+            useGameCameraToggle.isOn = false;
+            toggleText.text = "Use Game Camera?";
+
+            AddSpacer(5);
+
+            GameObject posRow = AddInputField("Position", "Freecam Pos:", "eg. 0 0 0", out positionInput, PositionInput_OnEndEdit);
+
+            ButtonRef resetPosButton = UIFactory.CreateButton(posRow, "ResetButton", "Reset");
+            UIFactory.SetLayoutElement(resetPosButton.GameObject, minWidth: 70, minHeight: 25);
+            resetPosButton.OnClick += OnResetPosButtonClicked;
 
             AddSpacer(5);
 
@@ -141,11 +208,11 @@ namespace UnityExplorer.UI.Panels
             AddSpacer(5);
 
             string instructions = @"Controls:
-- WASD/Arrows: Movement
+- WASD / Arrows: Movement
-- Space/PgUp: Move up
+- Space / PgUp: Move up
-- LeftControl/PgDown: Move down
+- LeftCtrl / PgDown: Move down
 - Right Mouse Button: Free look
-- Left Shift: Super speed";
+- Shift: Super speed";
 
             Text instructionsText = UIFactory.CreateLabel(ContentRoot, "Instructions", instructions, TextAnchor.UpperLeft);
             UIFactory.SetLayoutElement(instructionsText.gameObject, flexibleWidth: 9999, flexibleHeight: 9999);
@@ -180,9 +247,9 @@ namespace UnityExplorer.UI.Panels
             return row;
         }
 
-        void ToggleButton_OnClick()
+        void StartStopButton_OnClick()
         {
-            InputManager.SetSelectedEventSystemGameObject(null);
+            EventSystemHelper.SetSelectedGameObject(null);
 
             if (inFreeCamMode)
                 EndFreecam();
@@ -192,9 +259,48 @@ namespace UnityExplorer.UI.Panels
             SetToggleButtonState();
         }
 
-        private void PositionInput_OnEndEdit(string input)
+        void SetToggleButtonState()
         {
-            InputManager.SetSelectedEventSystemGameObject(null);
+            if (inFreeCamMode)
+            {
+                RuntimeHelper.SetColorBlockAuto(startStopButton.Component, new(0.4f, 0.2f, 0.2f));
+                startStopButton.ButtonText.text = "End Freecam";
+            }
+            else
+            {
+                RuntimeHelper.SetColorBlockAuto(startStopButton.Component, new(0.2f, 0.4f, 0.2f));
+                startStopButton.ButtonText.text = "Begin Freecam";
+            }
+        }
+
+        void OnUseGameCameraToggled(bool value)
+        {
+            EventSystemHelper.SetSelectedGameObject(null);
+
+            if (!inFreeCamMode)
+                return;
+
+            EndFreecam();
+            BeginFreecam();
+        }
+
+        void OnResetPosButtonClicked()
+        {
+            currentUserCameraPosition = originalCameraPosition;
+            currentUserCameraRotation = originalCameraRotation;
+
+            if (inFreeCamMode && ourCamera)
+            {
+                ourCamera.transform.position = (Vector3)currentUserCameraPosition;
+                ourCamera.transform.rotation = (Quaternion)currentUserCameraRotation;
+            }
+
+            positionInput.Text = ParseUtility.ToStringForInput<Vector3>(originalCameraPosition);
+        }
+
+        void PositionInput_OnEndEdit(string input)
+        {
+            EventSystemHelper.SetSelectedGameObject(null);
 
             if (!ParseUtility.TryParse(input, out Vector3 parsed, out Exception parseEx))
             {
@@ -206,9 +312,9 @@ namespace UnityExplorer.UI.Panels
             SetCameraPosition(parsed);
         }
 
-        private void MoveSpeedInput_OnEndEdit(string input)
+        void MoveSpeedInput_OnEndEdit(string input)
         {
-            InputManager.SetSelectedEventSystemGameObject(null);
+            EventSystemHelper.SetSelectedGameObject(null);
 
             if (!ParseUtility.TryParse(input, out float parsed, out Exception parseEx))
             {
@@ -236,8 +342,17 @@ namespace UnityExplorer.UI.Panels
         {
             if (FreeCamPanel.inFreeCamMode)
             {
+                if (!FreeCamPanel.ourCamera)
+                {
+                    FreeCamPanel.EndFreecam();
+                    return;
+                }
+
                 Transform transform = FreeCamPanel.ourCamera.transform;
 
+                FreeCamPanel.currentUserCameraPosition = transform.position;
+                FreeCamPanel.currentUserCameraRotation = transform.rotation;
+
                 float moveSpeed = FreeCamPanel.desiredMoveSpeed * Time.deltaTime;
 
                 if (InputManager.GetKey(KeyCode.LeftShift) || InputManager.GetKey(KeyCode.RightShift))

src/UnityExplorer.csproj

@@ -79,11 +79,11 @@
     <!-- il2cpp nuget -->
     <ItemGroup Condition="'$(Configuration)'=='ML_Cpp_net6' or '$(Configuration)'=='ML_Cpp_net472' or '$(Configuration)'=='STANDALONE_Cpp' or '$(Configuration)'=='BIE_Cpp'">
         <PackageReference Include="Il2CppAssemblyUnhollower.BaseLib" Version="0.4.22" IncludeAssets="compile" />
-        <PackageReference Include="UniverseLib.IL2CPP" Version="1.3.5" />
+        <PackageReference Include="UniverseLib.IL2CPP" Version="1.3.7" />
     </ItemGroup>
     <!-- mono nuget -->
     <ItemGroup Condition="'$(Configuration)'=='BIE6_Mono' or '$(Configuration)'=='BIE5_Mono' or '$(Configuration)'=='ML_Mono' or '$(Configuration)'=='STANDALONE_Mono'">
-        <PackageReference Include="UniverseLib.Mono" Version="1.3.5" />
+        <PackageReference Include="UniverseLib.Mono" Version="1.3.7" />
     </ItemGroup>
 
     <!-- ~~~~~ ASSEMBLY REFERENCES ~~~~~ -->