3.0.4

see release notes

Author: sinai-dev

src/ExplorerCore.cs

@@ -1,21 +1,22 @@
 using System;
+using System.IO;
+using UnityEngine;
+using UnityEngine.SceneManagement;
 using UnityExplorer.Config;
 using UnityExplorer.Input;
+using UnityExplorer.Inspectors;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Modules;
-using UnityEngine;
-using UnityExplorer.Inspectors;
-using System.IO;
-using UnityExplorer.Unstrip;
-using UnityEngine.SceneManagement;
+#if CPP
 using UnityExplorer.Helpers;
+#endif
 
 namespace UnityExplorer
 {
     public class ExplorerCore
     {
         public const string NAME = "UnityExplorer";
-        public const string VERSION = "3.0.3";
+        public const string VERSION = "3.0.4";
         public const string AUTHOR = "Sinai";
         public const string GUID = "com.sinai.unityexplorer";
         public const string EXPLORER_FOLDER = @"Mods\UnityExplorer";

src/Helpers/Texture2DHelpers.cs

@@ -35,7 +35,6 @@ private static MethodInfo GetEncodeToPNGMethod()
         }
 #endif
 
-
         public static bool IsReadable(this Texture2D tex)
         {
             try
@@ -68,6 +67,10 @@ public static Texture2D Copy(Texture2D orig, Rect rect) //, bool isDTXnmNormal =
             return _newTex;
         }
 
+#if CPP
+        internal delegate void d_Blit2(IntPtr source, IntPtr dest);
+#endif
+
         public static Texture2D ForceReadTexture(Texture2D tex)
         {
             try
@@ -78,7 +81,13 @@ public static Texture2D ForceReadTexture(Texture2D tex)
                 var rt = RenderTexture.GetTemporary(tex.width, tex.height, 0, RenderTextureFormat.ARGB32);
                 rt.filterMode = FilterMode.Point;
                 RenderTexture.active = rt;
+
+#if MONO
                 Graphics.Blit(tex, rt);
+#else
+                var iCall = ICallHelper.GetICall<d_Blit2>("UnityEngine.Graphics::Blit2");
+                iCall.Invoke(tex.Pointer, rt.Pointer);
+#endif
 
                 var _newTex = new Texture2D(tex.width, tex.height, TextureFormat.ARGB32, false);
 

src/Inspectors/InspectorManager.cs

@@ -231,23 +231,34 @@ private static void ConstructToolbar(GameObject topRowObj)
             invisGroup.spacing = 10;
 
             // inspect under mouse button
+            AddMouseInspectButton(topRowObj, MouseInspector.MouseInspectMode.UI);
+            AddMouseInspectButton(topRowObj, MouseInspector.MouseInspectMode.World);
+        }
 
+        private static void AddMouseInspectButton(GameObject topRowObj, MouseInspector.MouseInspectMode mode)
+        {
             var inspectObj = UIFactory.CreateButton(topRowObj);
             var inspectLayout = inspectObj.AddComponent<LayoutElement>();
             inspectLayout.minWidth = 120;
             inspectLayout.flexibleWidth = 0;
+
+            var inspectText = inspectObj.GetComponentInChildren<Text>();
+            inspectText.text = "Mouse Inspect";
+            inspectText.fontSize = 13;
+
+            if (mode == MouseInspector.MouseInspectMode.UI)
+                inspectText.text += " (UI)";
+
             var inspectBtn = inspectObj.GetComponent<Button>();
             var inspectColors = inspectBtn.colors;
             inspectColors.normalColor = new Color(0.2f, 0.2f, 0.2f);
             inspectBtn.colors = inspectColors;
-            var inspectText = inspectObj.GetComponentInChildren<Text>();
-            inspectText.text = "Mouse Inspect";
-            inspectText.fontSize = 13;
 
             inspectBtn.onClick.AddListener(OnInspectMouseClicked);
 
             void OnInspectMouseClicked()
             {
+                MouseInspector.Mode = mode;
                 MouseInspector.StartInspect();
             }
         }

src/Inspectors/MouseInspector.cs

@@ -3,18 +3,27 @@
 using System.Linq;
 using System.Text;
 using UnityEngine;
+using UnityEngine.EventSystems;
 using UnityEngine.UI;
 using UnityExplorer.Helpers;
 using UnityExplorer.Input;
 using UnityExplorer.UI;
+using UnityExplorer.Unstrip;
 
 namespace UnityExplorer.Inspectors
 {
     public class MouseInspector
     {
+        public enum MouseInspectMode
+        {
+            World,
+            UI
+        }
+
         public static bool Enabled { get; set; }
 
-        //internal static Text s_objUnderMouseName;
+        public static MouseInspectMode Mode { get; set; }
+
         internal static Text s_objNameLabel;
         internal static Text s_objPathLabel;
         internal static Text s_mousePosLabel;
@@ -29,6 +38,18 @@ public static void StartInspect()
             Enabled = true;
             MainMenu.Instance.MainPanel.SetActive(false);
             s_UIContent.SetActive(true);
+
+            // recache Graphic Raycasters each time we start
+            var casters = ResourcesUnstrip.FindObjectsOfTypeAll(typeof(GraphicRaycaster));
+            m_gCasters = new GraphicRaycaster[casters.Length];
+            for (int i = 0; i < casters.Length; i++)
+            {
+#if CPP
+                m_gCasters[i] = casters[i].TryCast<GraphicRaycaster>();
+#else
+                m_gCasters[i] = casters[i] as GraphicRaycaster;
+#endif
+            }
         }
 
         public static void StopInspect()
@@ -40,49 +61,68 @@ public static void StopInspect()
             ClearHitData();
         }
 
+        internal static GraphicRaycaster[] m_gCasters;
+
         public static void UpdateInspect()
         {
             if (InputManager.GetKeyDown(KeyCode.Escape))
             {
                 StopInspect();
+                return;
             }
 
             var mousePos = InputManager.MousePosition;
 
             if (mousePos != s_lastMousePos)
-            {
-                s_lastMousePos = mousePos;
+                UpdatePosition(mousePos);
 
-                var inversePos = UIManager.CanvasRoot.transform.InverseTransformPoint(mousePos);
+            if (!UnityHelpers.MainCamera)
+                return;
 
-                s_mousePosLabel.text = $"<color=grey>Mouse Position:</color> {((Vector2)InputManager.MousePosition).ToString()}";
+            // actual inspect raycast 
 
-                float yFix = mousePos.y < 120 ? 80 : -80;
+            switch (Mode)
+            {
+                case MouseInspectMode.UI:
+                    RaycastUI(mousePos); break;
+                case MouseInspectMode.World:
+                    RaycastWorld(mousePos); break;
+            }
+        }
 
-                s_UIContent.transform.localPosition = new Vector3(inversePos.x, inversePos.y + yFix, 0);
+        internal static void OnHitGameObject(GameObject obj)
+        {
+            if (obj != s_lastHit)
+            {
+                s_lastHit = obj;
+                s_objNameLabel.text = $"<b>Click to Inspect:</b> <color=cyan>{obj.name}</color>";
+                s_objPathLabel.text = $"Path: {obj.transform.GetTransformPath(true)}";
             }
 
-            if (!UnityHelpers.MainCamera)
-                return;
+            if (InputManager.GetMouseButtonDown(0))
+            {
+                StopInspect();
+                InspectorManager.Instance.Inspect(obj);
+            }
+        }
 
-            // actual inspect raycast 
+        internal static void RaycastWorld(Vector2 mousePos)
+        {
             var ray = UnityHelpers.MainCamera.ScreenPointToRay(mousePos);
+            var casts = Physics.RaycastAll(ray, 1000f);
 
-            if (Physics.Raycast(ray, out RaycastHit hit, 1000f))
+            if (casts.Length > 0)
             {
-                var obj = hit.transform.gameObject;
-
-                if (obj != s_lastHit)
+                foreach (var cast in casts)
                 {
-                    s_lastHit = obj;
-                    s_objNameLabel.text = $"<b>Click to Inspect:</b> <color=cyan>{obj.name}</color>";
-                    s_objPathLabel.text = $"Path: {obj.transform.GetTransformPath(true)}";
-                }
+                    if (cast.transform)
+                    {
+                        var obj = cast.transform.gameObject;
 
-                if (InputManager.GetMouseButtonDown(0))
-                {
-                    StopInspect();
-                    InspectorManager.Instance.Inspect(obj);
+                        OnHitGameObject(obj);
+
+                        break;
+                    }
                 }
             }
             else
@@ -92,14 +132,64 @@ public static void UpdateInspect()
             }
         }
 
+        internal static void RaycastUI(Vector2 mousePos)
+        {
+            var ped = new PointerEventData(null)
+            {
+                position = mousePos
+            };
+
+#if MONO
+            var list = new List<RaycastResult>();
+#else
+            var list = new Il2CppSystem.Collections.Generic.List<RaycastResult>();
+#endif
+            foreach (var gr in m_gCasters)
+            {
+                gr.Raycast(ped, list);
+
+                if (list.Count > 0)
+                {
+                    foreach (var hit in list)
+                    {
+                        if (hit.gameObject)
+                        {
+                            var obj = hit.gameObject;
+
+                            OnHitGameObject(obj);
+
+                            break;
+                        }
+                    }
+                }
+                else
+                {
+                    if (s_lastHit)
+                        ClearHitData();
+                }
+            }
+        }
+
+        internal static void UpdatePosition(Vector2 mousePos)
+        {
+            s_lastMousePos = mousePos;
+
+            var inversePos = UIManager.CanvasRoot.transform.InverseTransformPoint(mousePos);
+
+            s_mousePosLabel.text = $"<color=grey>Mouse Position:</color> {mousePos.ToString()}";
+
+            float yFix = mousePos.y < 120 ? 80 : -80;
+            s_UIContent.transform.localPosition = new Vector3(inversePos.x, inversePos.y + yFix, 0);
+        }
+
         internal static void ClearHitData()
         {
             s_lastHit = null;
             s_objNameLabel.text = "No hits...";
             s_objPathLabel.text = "";
         }
 
-        #region UI Construction
+#region UI Construction
 
         internal static void ConstructUI()
         {
@@ -112,7 +202,10 @@ internal static void ConstructUI()
             baseRect.anchorMin = half;
             baseRect.anchorMax = half;
             baseRect.pivot = half;
-            baseRect.sizeDelta = new Vector2(700, 100);
+            baseRect.sizeDelta = new Vector2(700, 150);
+
+            var group = content.GetComponent<VerticalLayoutGroup>();
+            group.childForceExpandHeight = true;
 
             // Title text
 
@@ -131,13 +224,16 @@ internal static void ConstructUI()
 
             var pathLabelObj = UIFactory.CreateLabel(content, TextAnchor.MiddleLeft);
             s_objPathLabel = pathLabelObj.GetComponent<Text>();
-            s_objPathLabel.color = Color.grey;
             s_objPathLabel.fontStyle = FontStyle.Italic;
-            s_objPathLabel.horizontalOverflow = HorizontalWrapMode.Overflow;
+            s_objPathLabel.horizontalOverflow = HorizontalWrapMode.Wrap;
+
+            var pathLayout = pathLabelObj.AddComponent<LayoutElement>();
+            pathLayout.minHeight = 75;
+            pathLayout.flexibleHeight = 0;
 
             s_UIContent.SetActive(false);
         }
 
-        #endregion
+#endregion
     }
 }

src/Inspectors/Reflection/InteractiveValue/InteractiveEnum.cs

@@ -37,14 +37,7 @@ internal void GetNames()
 
             if (m_subContentConstructed)
             {
-                // changing types, destroy subcontent
-                for (int i = 0; i < m_subContentParent.transform.childCount; i++)
-                {
-                    var child = m_subContentParent.transform.GetChild(i);
-                    GameObject.Destroy(child.gameObject);
-                }
-
-                m_subContentConstructed = false;
+                DestroySubContent();
             }
 
             if (!s_enumNamesCache.ContainsKey(type))