Bump version

src/Core/Reflection/Il2CppReflection.cs

@@ -67,6 +67,8 @@ namespace UnityExplorer
 
         private static void BuildDeobfuscationCache()
         {
+            float start = UnityEngine.Time.realtimeSinceStartup;
+
             foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
             {
                 foreach (var type in asm.TryGetTypes())
@@ -74,7 +76,10 @@ namespace UnityExplorer
             }
 
             if (DeobfuscatedTypes.Count > 0)
-                ExplorerCore.Log($"Built IL2CPP deobfuscation cache, initial count: {DeobfuscatedTypes.Count}");
+            {
+                ExplorerCore.Log($"Built deobfuscation cache in {UnityEngine.Time.realtimeSinceStartup - start} seconds, " +
+                    $"initial count: {DeobfuscatedTypes.Count} ");
+            }
         }
 
         private static void TryCacheDeobfuscatedType(Type type)

src/ExplorerCore.cs

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

src/UI/Inspectors/InspectUnderMouse.cs

@@ -64,7 +64,6 @@ namespace UnityExplorer.UI.Inspectors
         internal static Camera MainCamera;
         internal static GraphicRaycaster[] graphicRaycasters;
 
-
         public void StartInspect(MouseInspectMode mode)
         {
             MainCamera = Camera.main;
@@ -94,8 +93,14 @@ namespace UnityExplorer.UI.Inspectors
         public void StopInspect()
         {
             Inspecting = false;
+
             UIManager.NavBarRect.gameObject.SetActive(true);
             UIManager.PanelHolder.SetActive(true); 
+            
+            var drop = UIManager.MouseInspectDropdown;
+            if (drop.transform.Find("Dropdown List") is Transform list)
+                drop.DestroyDropdownList(list.gameObject);
+
             UIRoot.SetActive(false);
 
             if (Mode == MouseInspectMode.UI)

src/UI/ObjectExplorer/SearchProvider.cs

@@ -58,25 +58,13 @@ namespace UnityExplorer.UI.ObjectExplorer
         {
             var results = new List<object>();
 
-            Type searchType;
-            switch (context)
-            {
-                //case SearchContext.GameObject:
-                //    searchType = typeof(GameObject); 
-                //    break;
-
-                case SearchContext.UnityObject:
-                default:
-
+            Type searchType = null;
             if (!string.IsNullOrEmpty(customTypeInput))
             {
                 if (ReflectionUtility.GetTypeByName(customTypeInput) is Type customType)
                 {
                     if (typeof(UnityEngine.Object).IsAssignableFrom(customType))
-                            {
                         searchType = customType;
-                                break;
-                            }
                     else
                         ExplorerCore.LogWarning($"Custom type '{customType.FullName}' is not assignable from UnityEngine.Object!");
                 }
@@ -84,13 +72,8 @@ namespace UnityExplorer.UI.ObjectExplorer
                     ExplorerCore.LogWarning($"Could not find any type by name '{customTypeInput}'!");
             }
 
-                    searchType = typeof(UnityEngine.Object); 
-                    break;
-            }
-
-
             if (searchType == null)
-                return results;
+                searchType = typeof(UnityEngine.Object);
 
             var allObjects = RuntimeProvider.Instance.FindObjectsOfTypeAll(searchType);
 
@@ -100,7 +83,7 @@ namespace UnityExplorer.UI.ObjectExplorer
             if (!string.IsNullOrEmpty(input))
                 nameFilter = input;
 
-            bool canGetGameObject = searchType == typeof(GameObject) || typeof(Component).IsAssignableFrom(searchType);
+            bool shouldFilterGOs = searchType == typeof(GameObject) || typeof(Component).IsAssignableFrom(searchType);
 
             foreach (var obj in allObjects)
             {
@@ -108,13 +91,20 @@ namespace UnityExplorer.UI.ObjectExplorer
                 if (!string.IsNullOrEmpty(nameFilter) && !obj.name.ContainsIgnoreCase(nameFilter))
                     continue;
 
-                if (canGetGameObject)
+                var type = obj.GetActualType();
+                if (type == typeof(GameObject) || typeof(Component).IsAssignableFrom(type))
                 {
-                    var go = searchType == typeof(GameObject)
+                    GameObject go = type == typeof(GameObject)
                                     ? obj.TryCast<GameObject>()
-                            : obj.TryCast<Component>().gameObject;
+                                    : obj.TryCast<Component>()?.gameObject;
 
                     if (go)
+                    {
+                        // hide unityexplorer objects
+                        if (go.transform.root.name == "ExplorerCanvas")
+                            continue;
+
+                        if (shouldFilterGOs)
                         {
                             // scene check
                             if (sceneFilter != SceneFilter.Any)
@@ -136,6 +126,7 @@ namespace UnityExplorer.UI.ObjectExplorer
                             }
                         }
                     }
+                }
 
                 results.Add(obj);
             }

src/UI/Widgets/ScrollPool/DataHeightCache.cs

@@ -6,13 +6,29 @@ using UnityEngine;
 
 namespace UnityExplorer.UI.Widgets
 {
-    public class DataViewInfo
+    public struct DataViewInfo
     {
-        public int dataIndex;
-        public float height, startPosition;
-        public int normalizedSpread;
+        // static
+        public static DataViewInfo None => s_default;
+        private static DataViewInfo s_default = default;
 
         public static implicit operator float(DataViewInfo it) => it.height;
+
+        // instance
+        public int dataIndex, normalizedSpread;
+        public float height, startPosition;
+
+        public override bool Equals(object obj)
+        {
+            var other = (DataViewInfo)obj;
+
+            return this.dataIndex == other.dataIndex
+                && this.height == other.height
+                && this.startPosition == other.startPosition
+                && this.normalizedSpread == other.normalizedSpread;
+        }
+
+        public override int GetHashCode() => base.GetHashCode();
     }
 
     public class DataHeightCache<T> where T : ICell
@@ -53,14 +69,8 @@ namespace UnityExplorer.UI.Widgets
         /// <summary>Get the first range (division of DefaultHeight) which the position appears in.</summary>
         private int GetRangeFloorOfPosition(float position) => (int)Math.Floor((decimal)position / (decimal)DefaultHeight);
 
-        /// <summary>Get the data index at the specified position of the total height cache.</summary>
-        public int GetFirstDataIndexAtPosition(float desiredHeight) => GetFirstDataIndexAtPosition(desiredHeight, out _);
-
-        /// <summary>Get the data index and DataViewInfo at the specified position of the total height cache.</summary>
-        public int GetFirstDataIndexAtPosition(float desiredHeight, out DataViewInfo cache)
+        public int GetFirstDataIndexAtPosition(float desiredHeight)
         {
-            cache = default;
-
             if (!heightCache.Any())
                 return 0;
 
@@ -72,12 +82,11 @@ namespace UnityExplorer.UI.Widgets
             if (rangeIndex >= rangeCache.Count)
             {
                 int idx = ScrollPool.DataSource.ItemCount - 1;
-                cache = heightCache[idx];
                 return idx;
             }
 
             int dataIndex = rangeCache[rangeIndex];
-            cache = heightCache[dataIndex];
+            var cache = heightCache[dataIndex];
 
             // if the DataViewInfo is outdated, need to rebuild
             int expectedMin = GetRangeCeilingOfPosition(cache.startPosition);
@@ -88,7 +97,7 @@ namespace UnityExplorer.UI.Widgets
 
                 rangeIndex = GetRangeFloorOfPosition(desiredHeight);
                 dataIndex = rangeCache[rangeIndex];
-                cache = heightCache[dataIndex];
+                //cache = heightCache[dataIndex];
             }
 
             return dataIndex;
@@ -141,8 +150,7 @@ namespace UnityExplorer.UI.Widgets
             if (!heightCache.Any())
                 return;
 
-            var val = heightCache[heightCache.Count - 1];
-            totalHeight -= val;            
+            totalHeight -= heightCache[heightCache.Count - 1];            
             heightCache.RemoveAt(heightCache.Count - 1);
 
             int idx = heightCache.Count;
@@ -214,6 +222,9 @@ namespace UnityExplorer.UI.Widgets
 
                 SetSpread(dataIndex, rangeIndex, spreadDiff);
             }
+
+            // set the struct back to the array (TODO necessary?)
+            heightCache[dataIndex] = cache;
         }
 
         private void SetSpread(int dataIndex, int rangeIndex, int spreadDiff)
@@ -244,12 +255,12 @@ namespace UnityExplorer.UI.Widgets
                 return;
 
             DataViewInfo cache;
-            DataViewInfo prev = null;
+            DataViewInfo prev = DataViewInfo.None;
             for (int i = 0; i <= toIndex && i < heightCache.Count; i++)
             {
                 cache = heightCache[i];
 
-                if (prev != null)
+                if (prev != DataViewInfo.None)
                     cache.startPosition = prev.startPosition + prev.height;
                 else
                     cache.startPosition = 0;
@@ -262,19 +273,5 @@ namespace UnityExplorer.UI.Widgets
                 prev = cache;
             }
         }
-
-        //private void HardRebuildRanges()
-        //{
-        //    var tempList = new List<float>();
-        //    for (int i = 0; i < heightCache.Count; i++)
-        //        tempList.Add(heightCache[i]);
-        //
-        //    heightCache.Clear();
-        //    rangeCache.Clear();
-        //    totalHeight = 0;
-        //
-        //    for (int i = 0; i < tempList.Count; i++)
-        //        SetIndex(i, tempList[i]);
-        //}
     }
 }