[UUM-131032] Coreclr - fast enter playmode (#666)

* builtin mat and csg files changes

* Updating Poly2Tri for fast enter playmode

* fast enter playmode for materials, log, normals

* moving the rest of the runtime scripts to be compatible with fast enter playmode

* update ShowHoveredInfo

* Updating editor menu actions for fast enter playmode

* Fixing overlay not showing on the first action

* Adding Runtime Init on load attribute to reset editor scripts part.1

* switch attribute to InitializeOnEnterPlaymode for the editor only code

* best support of fast entering playmode for editor scripts

* fixing errors after fast enter playmode

* fixing tools states on enter fast playmode

* changelog

* fix error on enter playmode

* Fixing tools icons not loading properly when importing the package (#668)

* remove old tests not used anymore

Author: lopezt-unity

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changes
 
+- [UUM-131032] Added a reset of static variables when entering playmode to allow fast enter playmode compatibility.
 - [UUM-138539] Removed the pb_ObjectArray file that was deprecated 8 years ago and is not used amymore.
 - [UUM-138960] Removed a large utility dictionary to reduce binary size and runtime memory overhead. 
 

Debug/Scripts/ShowHoveredInfo.cs

@@ -10,6 +10,14 @@ public class ShowHoveredInfo : MonoBehaviour
         static Material m_Material;
         bool m_IsHovering;
 
+#if UNITY_EDITOR
+        [RuntimeInitializeOnLoadMethod]
+        static void ResetStaticsOnLoad()
+        {
+            m_Material = null;
+        }
+#endif
+
         void Start()
         {
             if (m_Material == null)

Editor/EditorCore/CutTool.cs

@@ -19,6 +19,7 @@
 namespace UnityEditor.ProBuilder
 {
     [EditorTool("Cut Tool", typeof(ProBuilderMesh), typeof(PositionToolContext))]
+    [Icon("Packages/com.unity.probuilder/Editor Default Resources/Icons/Toolbar/CutTool.png")]
     class CutTool : EditorTool
     {
         ProBuilderMesh m_Mesh;
@@ -85,12 +86,6 @@ public CutVertexData(Vector3 position, Vector3 normal, VertexTypes types = Verte
 
         Color m_CurrentHandleColor = k_HandleColor;
 
-        GUIContent m_IconContent;
-        public override GUIContent toolbarIcon
-        {
-            get { return m_IconContent; }
-        }
-
         //Handles and point placement
         int m_ControlId;
         bool m_PlacingPoint;
@@ -169,13 +164,6 @@ public override bool IsAvailable()
 
         void OnEnable()
         {
-            m_IconContent = new GUIContent()
-            {
-                image = IconUtility.GetIcon("Toolbar/CutTool"),
-                text = "Cut Tool",
-                tooltip = "Cut Tool"
-            };
-
             s_HandleColorUseExistingVertex = Handles.selectedColor;
             s_HandleColorAddVertexOnEdge = Handles.selectedColor;
 
@@ -201,6 +189,7 @@ public override void OnActivated()
             Undo.undoRedoPerformed += UndoRedoPerformed;
             MeshSelection.objectSelectionChanged += UpdateTarget;
             ProBuilderEditor.selectModeChanged += OnSelectModeChanged;
+            EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
         }
 
         public override void OnWillBeDeactivated()
@@ -210,6 +199,7 @@ public override void OnWillBeDeactivated()
             Undo.undoRedoPerformed -= UndoRedoPerformed;
             MeshSelection.objectSelectionChanged -= UpdateTarget;
             ProBuilderEditor.selectModeChanged -= OnSelectModeChanged;
+            EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
         }
 
         /// <summary>
@@ -242,6 +232,16 @@ void ExitTool()
             ToolManager.RestorePreviousTool();
         }
 
+        private void OnPlayModeStateChanged(PlayModeStateChange state)
+        {
+            if (state == PlayModeStateChange.ExitingEditMode || state == PlayModeStateChange.ExitingPlayMode)
+            {
+                // Reset tool state when entering/exiting playmode
+                if (ToolManager.IsActiveTool(this))
+                    ExitTool();
+            }
+        }
+
         /// <summary>
         /// Undo/Redo callback: Reset and recompute lines, and update the targeted face if needed
         /// </summary>