2.0.2

* Added support for viewing Texture2D (and Sprite) from the Inspector, and exporting them to PNG
* Fixed an issue with generic methods not showing their return value type
* Fixed an issue where destroyed UnityEngine.Objects would cause issues in the inspector
* Fixed an issue when caching a ValueCollection of a Dictionary (the generic argument for the Entry Type is the last arg, not the first as with other Enumerables)

Author: sinai-dev

src/CacheObject/CacheMember.cs

@@ -129,7 +129,7 @@ public void DrawArgsInput()
 
                 GUILayout.Label(i.ToString(), new GUILayoutOption[] { GUILayout.Width(15) });
                 GUILayout.Label(label, new GUILayoutOption[] { GUILayout.ExpandWidth(false) });
-                this.m_argumentInput[i] = GUILayout.TextField(input, new GUILayoutOption[] { GUILayout.ExpandWidth(true) });
+                this.m_argumentInput[i] = GUIUnstrip.TextField(input, new GUILayoutOption[] { GUILayout.ExpandWidth(true) });
 
                 GUI.skin.label.alignment = TextAnchor.MiddleLeft;
 

src/CacheObject/CacheMethod.cs

@@ -73,7 +73,7 @@ public void Evaluate()
             if (ret != null)
             {
                 //m_cachedReturnValue = CacheFactory.GetTypeAndCacheObject(ret);
-                m_cachedReturnValue = CacheFactory.GetCacheObject(ret, IValue.ValueType);
+                m_cachedReturnValue = CacheFactory.GetCacheObject(ret);
                 m_cachedReturnValue.UpdateValue();
             }
             else

src/CacheObject/CacheObjectBase.cs

@@ -25,12 +25,22 @@ public virtual void Init(object obj, Type valueType)
                 return;
             }
 
+            //ExplorerCore.Log("Initializing InteractiveValue of type " + valueType.FullName);
+
             InteractiveValue interactive;
 
             if (valueType == typeof(GameObject) || valueType == typeof(Transform))
             {
                 interactive = new InteractiveGameObject();
             }
+            else if (valueType == typeof(Texture2D))
+            {
+                interactive = new InteractiveTexture2D();
+            }
+            else if (valueType == typeof(Sprite))
+            {
+                interactive = new InteractiveSprite();
+            }
             else if (valueType.IsPrimitive || valueType == typeof(string))
             {
                 interactive = new InteractivePrimitive();

src/Config/ModConfig.cs

@@ -19,7 +19,7 @@ public class ModConfig
         public int     Default_Page_Limit  = 20;
         public bool    Bitwise_Support     = false;
         public bool    Tab_View            = true;
-        //public bool    Main_Toggle_Global  = true;
+        public string  Default_Output_Path = @"Mods\Explorer";
 
         public static void OnLoad()
         {

src/Explorer.csproj

@@ -212,6 +212,8 @@
     <Compile Include="UI\InteractiveValue\Object\InteractiveDictionary.cs" />
     <Compile Include="UI\InteractiveValue\Object\InteractiveEnumerable.cs" />
     <Compile Include="UI\InteractiveValue\Object\InteractiveGameObject.cs" />
+    <Compile Include="UI\InteractiveValue\Object\InteractiveSprite.cs" />
+    <Compile Include="UI\InteractiveValue\Object\InteractiveTexture2D.cs" />
     <Compile Include="UI\InteractiveValue\Struct\InteractiveQuaternion.cs" />
     <Compile Include="UI\InteractiveValue\Struct\InteractiveRect.cs" />
     <Compile Include="UI\InteractiveValue\Struct\InteractiveVector.cs" />
@@ -257,6 +259,7 @@
     <Compile Include="UI\TabViewWindow.cs" />
     <Compile Include="UI\WindowBase.cs" />
     <Compile Include="UI\WindowManager.cs" />
+    <Compile Include="Unstrip\ImageConversion\ImageConversionUnstrip.cs" />
     <Compile Include="Unstrip\Scene\SceneUnstrip.cs" />
     <Compile Include="Unstrip\IMGUI\GUIUnstrip.cs" />
     <Compile Include="Unstrip\IMGUI\Internal_LayoutUtility.cs" />

src/Tests/TestClass.cs

@@ -4,6 +4,7 @@
 using UnityEngine;
 using System.Reflection;
 using System.Runtime.InteropServices;
+using Explorer.UI.Shared;
 #if CPP
 using UnhollowerBaseLib;
 using UnityEngine.SceneManagement;
@@ -33,6 +34,9 @@ public class TestClass
         public static TestClass Instance => m_instance ?? (m_instance = new TestClass());
         private static TestClass m_instance;
 
+        public Texture2D TestTexture = UIStyles.MakeTex(200, 200, Color.white);
+        public static Sprite TestSprite;
+
         public static int StaticProperty => 5;
         public static int StaticField = 5;
         public int NonStaticField;
@@ -52,6 +56,16 @@ public class TestClass
         public TestClass()
         {
 #if CPP
+            TestTexture.name = "TestTexture";
+
+            var r = new Rect(0, 0, TestTexture.width, TestTexture.height);
+            var v2 = Vector2.zero;
+            var v4 = Vector4.zero;
+            TestSprite = Sprite.CreateSprite_Injected(TestTexture, ref r, ref v2, 100f, 0u, SpriteMeshType.Tight, ref v4, false);
+
+            GameObject.DontDestroyOnLoad(TestTexture);
+            GameObject.DontDestroyOnLoad(TestSprite);
+
             ILHashSetTest = new Il2CppSystem.Collections.Generic.HashSet<string>();
             ILHashSetTest.Add("1");
             ILHashSetTest.Add("2");

src/UI/Inspectors/ReflectionInspector.cs

@@ -160,7 +160,7 @@ private void CacheMembers(Type[] types)
                 {
                     try
                     {
-                        // make sure member type is Field, Method of Property (4 / 8 / 16)
+                        // make sure member type is Field, Method or Property (4 / 8 / 16)
                         int m = (int)member.MemberType;
                         if (m < 4 || m > 16)
                             continue;

src/UI/InteractiveValue/InteractiveValue.cs

@@ -146,7 +146,7 @@ public void Draw(Rect window, float labelWidth = 215f)
             {
                 GUILayout.Label($"<color=grey><i>Not yet evaluated</i></color> ({typeName})", new GUILayoutOption[0]);
             }
-            else if (Value == null && !(cacheMember is CacheMethod))
+            else if ((Value == null || Value is UnityEngine.Object uObj && !uObj) && !(cacheMember is CacheMethod))
             {
                 GUILayout.Label($"<i>null ({typeName})</i>", new GUILayoutOption[0]);
             }

src/UI/InteractiveValue/Object/InteractiveEnumerable.cs

@@ -173,38 +173,20 @@ private IList CppIListToMono()
 
         private Type GetEntryType()
         {
-            if (m_entryType == null)
+            if (ValueType.IsGenericType)
             {
-                if (OwnerCacheObject is CacheMember cacheMember && cacheMember.MemInfo != null)
-                {
-                    Type memberType = null;
-                    switch (cacheMember.MemInfo.MemberType)
-                    {
-                        case MemberTypes.Field:
-                            memberType = (cacheMember.MemInfo as FieldInfo).FieldType;
-                            break;
-                        case MemberTypes.Property:
-                            memberType = (cacheMember.MemInfo as PropertyInfo).PropertyType;
-                            break;
-                    }
+                var gArgs = ValueType.GetGenericArguments();
 
-                    if (memberType != null && memberType.IsGenericType)
-                    {
-                        m_entryType = memberType.GetGenericArguments()[0];
-                    }
+                if (ValueType.FullName.Contains("ValueCollection"))
+                {
+                    m_entryType = gArgs[gArgs.Length - 1];
                 }
-                else if (Value != null)
+                else
                 {
-                    var type = Value.GetType();
-                    if (type.IsGenericType)
-                    {
-                        m_entryType = type.GetGenericArguments()[0];
-                    }
+                    m_entryType = gArgs[0];
                 }
             }
-
-            // use System.Object for non-generic.
-            if (m_entryType == null)
+            else
             {
                 m_entryType = typeof(object);
             }
@@ -255,18 +237,11 @@ public void CacheEntries()
                     }
 #endif
 
+                    //ExplorerCore.Log("Caching enumeration entry " + obj.ToString() + " as " + EntryType.FullName);
+
                     var cached = new CacheEnumerated() { Index = index, RefIList = Value as IList, ParentEnumeration = this };
                     cached.Init(obj, EntryType);
                     list.Add(cached);
-
-                    //if (CacheFactory.GetCacheObject(obj, t) is CacheObjectBase cached)
-                    //{
-                    //    list.Add(cached);
-                    //}
-                    //else
-                    //{
-                    //    list.Add(null);
-                    //}
                 }
                 else
                 {

src/UI/InteractiveValue/Object/InteractiveSprite.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+
+namespace Explorer.UI
+{
+    public class InteractiveSprite : InteractiveTexture2D
+    {
+        public override void GetTexture2D()
+        {
+#if CPP
+            if (Value != null && Value.Il2CppCast(typeof(Sprite)) is Sprite sprite)
+#else
+            if (Value is Sprite sprite)
+#endif
+            {
+                currentTex = sprite.texture;
+                texContent = new GUIContent
+                {
+                    image = currentTex
+                };
+            }
+        }
+
+    }
+}