Few more Bugfixes

Fix Serialization issue and less GC overhead

Author: willnode

Assets/Plugins/MeshDebugger/Editor/IMGizmo.cs

@@ -229,8 +229,8 @@ public void End()
         m_Mesh.SetColors(m_Color);
         m_Mesh.SetUVs(0, m_UV);
         m_Mesh.subMeshCount = 2;
-        m_Mesh.SetIndices(m_Lines.ToArray(), MeshTopology.Lines, 0);
-        m_Mesh.SetIndices(m_Quads.ToArray(), MeshTopology.Quads, 1);
+        InternalMeshUtil.SetIndices(m_Mesh, m_Lines, MeshTopology.Lines, 0, false);
+        InternalMeshUtil.SetIndices(m_Mesh, m_Quads, MeshTopology.Quads, 1, false);
         m_Mesh.RecalculateBounds();
     }
 

Assets/Plugins/MeshDebugger/Editor/MeshDebugger.cs

@@ -100,7 +100,7 @@ void ChangeMaterial(Material mat)
         {
             if (mat)
             {
-                if (m_backupMats == null)
+                if (m_backupMats == null || m_backupMats.Length == 0)
                 {
                     m_backupMats = r.sharedMaterials;
                     m_matModificationBreaksPrefab = (PrefabUtility.GetPrefabType(r) > PrefabType.ModelPrefab
@@ -110,7 +110,7 @@ void ChangeMaterial(Material mat)
                 mat.SetInt(Styles.UV_Mode, (int)m_DebugSurfaceUV);
                 mat.SetInt(Styles.Tan_Mode, (int)m_DebugSurfaceTangents);
             }
-            else if (m_backupMats != null)
+            else if (m_backupMats != null && m_backupMats.Length > 0)
             {
                 if (m_matModificationBreaksPrefab)
                 {
@@ -207,7 +207,7 @@ void OnSceneGUI(SceneView view)
         if (Event.current.type != EventType.Repaint)
             return;
 
-        if (!m_Mesh || !m_Mesh.isReadable)
+        if (!m_Transform || !m_Mesh || !m_Mesh.isReadable)
         {
             if (m_Gizmo != null)
                 m_Gizmo.Clear();
@@ -442,6 +442,7 @@ private void DrawLabel(Vector3 pos, Vector3 normal, string text)
             m_gui.text = text;
             var GUIPos = HandleUtility.WorldPointToSizedRect(pos, m_gui, Styles.blockLabel);
             GUIPos.y -= 7f;
+            GUIPos.x -= GUIPos.width / 2;
             GUI.Label(GUIPos, m_gui, Styles.blockLabel);
         }
     }

Assets/Plugins/MeshDebugger/Editor/MeshDebugger_GUI.cs

@@ -159,7 +159,7 @@ void OnGUI()
         {
             EditorGUILayout.Space();
             if (m_Mesh)
-                EditorGUILayout.HelpBox( "Mesh Features:\n" + m_cpu.m_Features, MessageType.Info);
+                EditorGUILayout.HelpBox(m_cpu.m_Features, MessageType.Info);
             if (!m_UseHeatmap && (m_DebugVert != DebugVertice.None || m_DebugTris != DebugTriangle.None) && !IsSafeToDrawGUI())
                 EditorGUILayout.HelpBox("Verts / Triangle count are too large to be displayed with GUI index rendering.\nConsider set smaller section or enable Heatmap instead.", MessageType.Warning);
         }

Assets/Plugins/MeshDebugger/Editor/MeshInfo.cs

@@ -202,17 +202,17 @@ public void Update()
             }
         }
         {
-            m_Features =
-                "Vertices: " + m_VertCount + " total, " + (m_VertOrphan > 0 ? m_VertOrphan + " orphan, " : "") + (m_VertDuplicates > 0 ? m_VertDuplicates + " duplicates, " : "") +
+            m_Features = "Mesh Features:" +
+                "\nVertices: " + m_VertCount + " total, " + (m_VertOrphan > 0 ? m_VertOrphan + " orphan, " : "") + (m_VertDuplicates > 0 ? m_VertDuplicates + " duplicates, " : "") +
                 "\nIndices: " + m_IndiceCountNormalized + " total, " + m_IndiceCount + " buffer capacity, " + m_IndiceAreaTotal.ToString("0.##") + " unit surface area, " +
                 (m_MeshSubmeshCount > 1 ? m_MeshSubmeshCount + " submeshes, " : "") + (m_IndiceInvalidArea > 0 ? m_IndiceInvalidArea + " invalid, " : "") +
-                "\nChannels: position," + (m_NormalChannels >= 1 ? "normals," + ( m_NormalChannels >= 3 ? "tangents," : "") : "") + InternalMeshUtil.GetVertexFormat(m_Mesh) +
+                "\nChannels: position, " + (m_NormalChannels >= 1 ? "normals, " + ( m_NormalChannels >= 3 ? "tangents, " : "") : "") + InternalMeshUtil.GetVertexFormat(m_Mesh).Replace(",", ", ") +
                 "\nSize: " + m_MeshBounds.size.ToString("0.00");
         }
         m_lastMeshId = m_Mesh.GetInstanceID();
     }
 
-    static public Dictionary<MeshTopology, int> m_TopologyDivision = new Dictionary<MeshTopology, int>()
+    static public Dictionary<MeshTopology, int> m_TopologyDivision = new Dictionary<MeshTopology, int>(new MeshTopologyComparer())
         {
             {MeshTopology.Lines, 2},
             {MeshTopology.LineStrip, 2},
@@ -221,6 +221,20 @@ public void Update()
             {MeshTopology.Triangles, 3},
         };
 
+    // for performance godsake
+    public class MeshTopologyComparer : IEqualityComparer<MeshTopology>
+    {
+        public bool Equals(MeshTopology x, MeshTopology y)
+        {
+            return x == y;
+        }
+
+        public int GetHashCode(MeshTopology obj)
+        {
+            return (int)obj;
+        }
+    }
+
     private static float GetTriArea(Vector3 A, Vector3 B, Vector3 C)
     {
         var a = Vector3.Distance(B, C);
@@ -310,10 +324,89 @@ internal static class InternalMeshUtil
 {
     public static Func<Mesh, string> GetVertexFormat;
 
+
     static InternalMeshUtil()
     {
         var type = typeof(Editor).Assembly.GetTypes().First((x) => x.Name == "InternalMeshUtil");
         GetVertexFormat = (Func<Mesh, string>)Delegate.CreateDelegate(typeof(Func<Mesh, string>), null,
             type.GetMethod("GetVertexFormat", BindingFlags.Static | BindingFlags.Public));
     }
+
+    // https://gist.github.com/willnode/032eb0c73733ffc862bdfec0a8e8af0e
+
+    static Func<object, Array> _ExtractArrayFromList;
+
+    static void CreateExtractDelegate()
+    {
+
+#if UNITY_2017_2 || UNITY_2017_1 || UNITY_5 || UNITY_4
+        var type = typeof(Mesh);
+#else
+        var type = typeof(Mesh).Assembly.GetTypes().First(x => x.Name == "NoAllocHelpers");
+#endif
+
+        var m = type.GetMethod("ExtractArrayFromList", BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy);
+        _ExtractArrayFromList = (Func<object, Array>)Delegate.CreateDelegate(typeof(Func<object, Array>), m);
+    }
+
+    /// <summary>
+    /// Extract array from list
+    /// </summary>
+    public static Array ExtractArrayFromList<T>(List<T> list)
+    {
+        if (_ExtractArrayFromList == null)
+            CreateExtractDelegate();
+        return _ExtractArrayFromList(list);
+    }
+
+    // -----------------------------------------------------
+
+    private delegate void Action<T1, T2, T3, T4, T5, T6>(T1 a, T2 b, T3 c, T4 d, T5 e, T6 f);
+    private delegate void Action<T1, T2, T3, T4, T5, T6, T7>(T1 a, T2 b, T3 c, T4 d, T5 e, T6 f, T7 g);
+
+#if UNITY_2017_2 || UNITY_2017_1 || UNITY_5 || UNITY_4
+
+    static Action<Mesh, int, MeshTopology, Array, int, bool> _SetIndices;
+
+    static void CreateSetIndicesDelegate()
+    {
+        // See ILSpy for this hidden feature
+        var m = typeof(Mesh).GetMethod("SetIndicesImpl", BindingFlags.DeclaredOnly | BindingFlags.NonPublic | BindingFlags.Instance, null, new Type[] { typeof(int), typeof(MeshTopology), typeof(Array), typeof(int), typeof(bool) }, null);
+        _SetIndices = (Action<Mesh, int, MeshTopology, Array, int, bool>)Delegate.CreateDelegate(typeof(Action<Mesh, int, MeshTopology, Array, int, bool>), null, m);
+    }
+
+    /// <summary>
+    /// Mesh.SetIndices with generic list variant
+    /// </summary>
+    public static void SetIndices(Mesh m, List<int> buffer, MeshTopology topology, int submesh, bool recalculate)
+    {
+        if (_SetIndices == null)
+            CreateSetIndicesDelegate();
+        _SetIndices(m, submesh, topology, ExtractArrayFromList(buffer), buffer.Count, recalculate);
+    }
+
+#else
+
+    static Action<Mesh, int, MeshTopology, Array, int, bool, int> _SetIndices;
+
+    static void CreateSetIndicesDelegate()
+    {
+        // See ILSpy for this hidden feature
+        var m = typeof(Mesh).GetMethod("SetIndicesImpl", BindingFlags.DeclaredOnly | BindingFlags.NonPublic | BindingFlags.Instance, null, new Type[] { typeof(int), typeof(MeshTopology), typeof(Array), typeof(int), typeof(bool), typeof(int) }, null);
+        _SetIndices = (Action<Mesh, int, MeshTopology, Array, int, bool, int>)Delegate.CreateDelegate(typeof(Action<Mesh, int, MeshTopology, Array, int, bool, int>), null, m);
+    }
+
+    /// <summary>
+    /// Mesh.SetIndices with generic list variant
+    /// </summary>
+    public static void SetIndices(Mesh m, List<int> buffer, MeshTopology topology, int submesh, bool recalculate)
+    {
+        if (_SetIndices == null)
+            CreateSetIndicesDelegate();
+        _SetIndices(m, submesh, topology, ExtractArrayFromList(buffer), buffer.Count, recalculate, 0);
+    }
+
+
+#endif
+
 }