1.5.2

* Added ability to force Reflection Inspector for GameObjects and Transforms if you hold Left Shift while clicking the Inspect button
* Fixed a bug causing duplicate windows to open when you inspect Transforms, the current active window will now be focused. Note: does not apply if you hold Left Shift for forced reflection.

Author: sinai-dev

src/CachedObjects/CacheGameObject.cs

@@ -10,32 +10,9 @@ namespace Explorer
 {
     public class CacheGameObject : CacheObjectBase
     {
-        private GameObject GameObj
-        {
-            get 
-            {
-                if (m_gameObject == null)
-                {
-                    if (Value is Il2CppSystem.Object ilObj)
-                    {
-                        var ilType = ilObj.GetIl2CppType();
-
-                        if (ilType == ReflectionHelpers.GameObjectType || ilType == ReflectionHelpers.TransformType)
-                        {
-                            m_gameObject = ilObj.TryCast<GameObject>() ?? ilObj.TryCast<Transform>()?.gameObject;
-                        }
-                    }
-                }
-
-                return m_gameObject;
-            }
-        }
-
-        private GameObject m_gameObject;
-
         public override void DrawValue(Rect window, float width)
         {
-            UIHelpers.GameobjButton(GameObj, null, false, width);
+            UIHelpers.GameobjButton(Value, null, false, width);
         }
 
         public override void UpdateValue()

src/Helpers/UIHelpers.cs

@@ -22,8 +22,10 @@ public static void InstantiateButton(Object obj, float width = 100)
         }
 
         // helper for drawing a styled button for a GameObject or Transform
-        public static void GameobjButton(GameObject obj, Action<Transform> specialInspectMethod = null, bool showSmallInspectBtn = true, float width = 380)
+        public static void GameobjButton(object _obj, Action<Transform> specialInspectMethod = null, bool showSmallInspectBtn = true, float width = 380)
         {
+            var obj = (_obj as GameObject) ?? (_obj as Transform).gameObject;
+
             bool children = obj.transform.childCount > 0;
 
             string label = children ? "[" + obj.transform.childCount + " children] " : "";
@@ -49,11 +51,13 @@ public static void GameobjButton(GameObject obj, Action<Transform> specialInspec
                 color = Color.red;
             }
 
-            FastGameobjButton(obj, color, label, obj.activeSelf, specialInspectMethod, showSmallInspectBtn, width);
+            FastGameobjButton(_obj, color, label, obj.activeSelf, specialInspectMethod, showSmallInspectBtn, width);
         }
 
-        public static void FastGameobjButton(GameObject obj, Color activeColor, string label, bool enabled, Action<Transform> specialInspectMethod = null, bool showSmallInspectBtn = true, float width = 380)
+        public static void FastGameobjButton(object _obj, Color activeColor, string label, bool enabled, Action<Transform> specialInspectMethod = null, bool showSmallInspectBtn = true, float width = 380)
         {
+            var obj = _obj as GameObject ?? (_obj as Transform).gameObject;
+
             if (!obj)
             {
                 GUILayout.Label("<i><color=red>null</color></i>", null);
@@ -83,7 +87,7 @@ public static void FastGameobjButton(GameObject obj, Color activeColor, string l
                 }
                 else
                 {
-                    WindowManager.InspectObject(obj, out bool _);
+                    WindowManager.InspectObject(_obj, out bool _);
                 }
             }
 
@@ -94,7 +98,7 @@ public static void FastGameobjButton(GameObject obj, Color activeColor, string l
 
             if (showSmallInspectBtn)
             {
-                SmallInspectButton(obj);
+                SmallInspectButton(_obj);
             }
 
             GUILayout.EndHorizontal();

src/Windows/GameObjectWindow.cs

@@ -175,12 +175,16 @@ public override void WindowFunction(int windowID)
                 GUILayout.Label("Scene: <color=cyan>" + (m_scene == "" ? "n/a" : m_scene) + "</color>", null);
                 if (m_scene == UnityHelpers.ActiveSceneName)
                 {
-                    if (GUILayout.Button("<color=#00FF00>< View in Scene Explorer</color>", new GUILayoutOption[] { GUILayout.Width(230) }))
+                    if (GUILayout.Button("<color=#00FF00>Send to Scene View</color>", new GUILayoutOption[] { GUILayout.Width(150) }))
                     {
                         ScenePage.Instance.SetTransformTarget(m_object.transform);
                         MainMenu.SetCurrentPage(0);
                     }
                 }
+                if (GUILayout.Button("Reflection Inspect", new GUILayoutOption[] { GUILayout.Width(150) }))
+                {
+                    WindowManager.InspectObject(Target, out _, true);
+                }
                 GUILayout.EndHorizontal();
 
                 GUILayout.BeginHorizontal(null);

src/Windows/WindowManager.cs

@@ -86,34 +86,50 @@ public void OnGUI()
 
         // ========= Public Helpers =========
 
-        public static UIWindow InspectObject(object obj, out bool createdNew)
+        public static UIWindow InspectObject(object obj, out bool createdNew, bool forceReflection = false)
         {
             createdNew = false;
 
-            UnityEngine.Object uObj = null;
-            if (obj is UnityEngine.Object)
+            if (Input.GetKey(KeyCode.LeftShift))
             {
-                uObj = obj as UnityEngine.Object;
+                forceReflection = true;
             }
-
-            foreach (var window in Windows)
+            
+            Il2CppSystem.Object iObj = null;
+            if (obj is Il2CppSystem.Object isObj)
             {
-                bool equals = ReferenceEquals(obj, window.Target);
+                iObj = isObj;
+            }
 
-                if (!equals && uObj != null && window.Target is UnityEngine.Object uTarget)
+            if (!forceReflection)
+            {
+                foreach (var window in Windows)
                 {
-                    equals = uObj.m_CachedPtr == uTarget.m_CachedPtr;
-                }
+                    bool equals = ReferenceEquals(obj, window.Target);
 
-                if (equals)
-                {
-                    FocusWindow(window);
-                    return window;
+                    if (!equals && iObj is Il2CppSystem.Object iCurrent && window.Target is Il2CppSystem.Object iTarget)
+                    {
+                        if (iCurrent.GetIl2CppType() != iTarget.GetIl2CppType())
+                        {
+                            if (iCurrent is Transform transform)
+                            {
+                                iCurrent = transform.gameObject;
+                            }
+                        }
+
+                        equals = iCurrent.Pointer == iTarget.Pointer;
+                    }
+
+                    if (equals)
+                    {
+                        FocusWindow(window);
+                        return window;
+                    }
                 }
             }
 
             createdNew = true;
-            if (obj is GameObject || obj is Transform)
+            if (!forceReflection && (obj is GameObject || obj is Transform))
             {
                 return InspectGameObject(obj as GameObject ?? (obj as Transform).gameObject);
             }
@@ -144,7 +160,7 @@ private static UIWindow InspectGameObject(GameObject obj)
             return new_window;
         }
 
-        public static UIWindow InspectReflection(object obj)
+        private static UIWindow InspectReflection(object obj)
         {
             var new_window = UIWindow.CreateWindow<ReflectionWindow>(obj);
             FocusWindow(new_window);