[UUM-131032] Coreclr - fast enter playmode

CHANGELOG.md

@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## Unreleased
 
 ### Changes
+
+- [UUM-131032] Added a reset of static variables when entering playmode to allow fast enter playmode compatibility.
 - [UUM-138960] Removed a large utility dictionary to reduce binary size and runtime memory overhead. 
 
 ### Fixed

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

@@ -201,6 +201,7 @@
             Undo.undoRedoPerformed += UndoRedoPerformed;
             MeshSelection.objectSelectionChanged += UpdateTarget;
             ProBuilderEditor.selectModeChanged += OnSelectModeChanged;
+            EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
         }
 
         public override void OnWillBeDeactivated()
@@ -210,6 +211,7 @@
             Undo.undoRedoPerformed -= UndoRedoPerformed;
             MeshSelection.objectSelectionChanged -= UpdateTarget;
             ProBuilderEditor.selectModeChanged -= OnSelectModeChanged;
+            EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
         }
 
         /// <summary>
@@ -242,6 +244,16 @@
             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>

Editor/EditorCore/DrawShapeTool.cs

@@ -723,6 +723,7 @@
             ToolManager.activeToolChanged += OnActiveToolChanged;
             ToolManager.activeContextChanged += OnActiveContextChanged;
             ProBuilderEditor.selectModeChanged += OnSelectModeChanged;
+            EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
 
             if (m_CurrentState == null)
                 m_CurrentState = InitStateMachine();
@@ -741,6 +742,7 @@
             ToolManager.activeToolChanged -= OnActiveToolChanged;
             ToolManager.activeContextChanged -= OnActiveContextChanged;
             ProBuilderEditor.selectModeChanged -= OnSelectModeChanged;
+            EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
 
             if (m_ProBuilderShape != null && !( m_CurrentState is ShapeState_InitShape ))
                 m_CurrentState = ShapeState.ResetState();
@@ -766,6 +768,19 @@
                 ToolManager.RestorePreviousPersistentTool();
         }
 
+        private void OnPlayModeStateChanged(PlayModeStateChange state)
+        {
+            if (state == PlayModeStateChange.ExitingEditMode || state == PlayModeStateChange.ExitingPlayMode)
+            {
+                // Reset tool state when entering/exiting playmode
+                if (ToolManager.IsActiveTool(this))
+                {
+                    m_CurrentState = ShapeState.ResetState();
+                    ToolManager.RestorePreviousPersistentTool();
+                }
+            }
+        }
+
         void HandleUndoRedoPerformed()
         {
             if(ToolManager.IsActiveTool(this))

Editor/EditorCore/EditShapeTool.cs

@@ -94,6 +94,30 @@
             }
         }
 
+        [InitializeOnEnterPlayMode]
+        static void ResetStaticsOnLoad()
+        {
+            s_Faces = null;
+            s_CurrentId = -1;
+            s_SizeManipulationInit = false;
+            s_SizeDelta = 0f;
+            s_StartMousePosition = Vector2.zero;
+            s_StartSize = Vector3.zero;
+            s_StartPositionLocal = Vector3.zero;
+            s_StartPositionGlobal = Vector3.zero;
+            s_StartScale = Vector3.zero;
+            s_StartScaleInverse = Vector3.zero;
+            s_StartCenter = Vector3.zero;
+            s_Direction = Vector3.zero;
+            s_DefaultMidpointHandleSize = 0.03f;
+            s_DefaultMidpointSquareSize = 0.15f;
+            s_CurrentAngle = 0f;
+            s_CurrentArrowHovered = -1;
+            s_ShapeRotation = Quaternion.identity;
+            s_ArrowsLines = null;
+            s_IconContent = null;
+        }
+
         public override bool gridSnapEnabled => true;
 
         static GUIContent s_IconContent;

Editor/EditorCore/EditorGUILayout.cs

@@ -195,6 +195,14 @@
         static int s_ResizeHandleAreaDimension = 6;
         static int s_MoveWindowAreaHeight = 30;
 
+        [InitializeOnEnterPlayMode]
+        static void ResetStaticsOnLoad()
+        {
+            s_RowToggle = true;
+            s_ResizeHandleAreaDimension = 6;
+            s_MoveWindowAreaHeight = 30;
+        }
+
         public static Rect DoResizeHandle(Rect rect, int minimumWidth, int minimumHeight)
         {
             var evt = Event.current;

Editor/EditorCore/EditorGUIUtility.cs

@@ -45,6 +45,15 @@
                     : new GUIContent("FCE", "Face Selection"),
                 };
             }
+
+            internal static void ResetForPlayMode()
+            {
+                selectModeIcons = null;
+                s_ObjectIcon = null;
+                s_VertexIcon = null;
+                s_EdgeIcon = null;
+                s_FaceIcon = null;
+            }
         }
 
         static readonly Color TOOL_SETTINGS_COLOR = UnityEditor.EditorGUIUtility.isProSkin
@@ -469,6 +478,18 @@
 
         static GUIStyle _sceneBoldLabel = null;
 
+        [InitializeOnEnterPlayMode]
+        static void ResetStaticsOnLoad()
+        {
+            Styles.ResetForPlayMode();
+            _splitStyle = null;
+            _centeredGreyMiniLabel = null;
+            _solidBackgroundStyle = null;
+            _buttonNoBackgroundSmallMarginStyle = null;
+            _sceneBoldLabel = null;
+            sceneLabelRect = new Rect(0f, 0f, 0f, 0f);
+        }
+
         /**
          *  Draw a label in the scene view with a solid color background.
          */

Editor/EditorCore/EditorHandleDrawing.cs

@@ -200,17 +200,36 @@
             ResetPreferences();
         }
 
+        [InitializeOnEnterPlayMode]
+        static void ResetStaticsOnLoad()
+        {
+            ReleaseResources();
+            s_Initialized = false;
+            s_WireHandles = null;
+            s_VertexHandles = null;
+            s_SelectedFaceHandles = null;
+            s_SelectedVertexHandles = null;
+            s_SelectedEdgeHandles = null;
+            s_TemporaryHandles = null;
+        }
+
         internal static void ReleaseResources()
         {
             ClearHandles();
-            if(s_MeshPool2 != null)
-                s_MeshPool2.Dispose();
-            if(s_EdgeMaterial != null) UnityObject.DestroyImmediate(s_EdgeMaterial);
-            if(s_WireMaterial != null) UnityObject.DestroyImmediate(s_WireMaterial);
-            if(s_LineMaterial != null) UnityObject.DestroyImmediate(s_LineMaterial);
-            if(s_VertMaterial != null) UnityObject.DestroyImmediate(s_VertMaterial);
-            if(s_GlWireMaterial != null) UnityObject.DestroyImmediate(s_GlWireMaterial);
-            if(s_FaceMaterial != null) UnityObject.DestroyImmediate(s_FaceMaterial);
+            if (s_MeshPool2 != null) s_MeshPool2.Dispose();
+            if (s_FaceMaterial != null) UnityObject.DestroyImmediate(s_FaceMaterial);
+            if (s_EdgeMaterial != null) UnityObject.DestroyImmediate(s_EdgeMaterial);
+            if (s_VertMaterial != null) UnityObject.DestroyImmediate(s_VertMaterial);
+            if (s_WireMaterial != null) UnityObject.DestroyImmediate(s_WireMaterial);
+            if (s_LineMaterial != null) UnityObject.DestroyImmediate(s_LineMaterial);
+            if (s_GlWireMaterial != null) UnityObject.DestroyImmediate(s_GlWireMaterial);
+            s_MeshPool2 = null;
+            s_FaceMaterial = null;
+            s_EdgeMaterial = null;
+            s_VertMaterial = null;
+            s_WireMaterial = null;
+            s_LineMaterial = null;
+            s_GlWireMaterial = null;
         }
 
         internal static void ResetPreferences()

Editor/EditorCore/EditorHandleUtility.cs

@@ -67,6 +67,19 @@
         public static int CurrentID { get { return currentId; } }
         static int currentId = -1;
 
+        [InitializeOnEnterPlayMode]
+        static void ResetStaticsOnLoad()
+        {
+            if (s_HandleMaterial != null)
+                Object.DestroyImmediate(s_HandleMaterial);
+            s_HandleMaterial = null;
+            currentId = -1;
+            s_HandleMatrix.Clear();
+            handleOffset = Vector2.zero;
+            initialMousePosition = Vector2.zero;
+            axisConstraint = new HandleConstraint2D(0, 0);
+        }
+
         static Vector2 handleOffset = Vector2.zero;
         static Vector2 initialMousePosition = Vector2.zero;
 

Editor/EditorCore/EditorSceneViewPicker.cs

@@ -33,6 +33,18 @@
         // When enabled, a mouse click on an unselected mesh will select both the GameObject and the mesh element picked.
         const bool k_AllowUnselected = true;
 
+        [InitializeOnEnterPlayMode]
+        static void ResetStaticsOnLoad()
+        {
+            s_DeepSelectionPrevious = 0x0;
+            s_AppendModifierPreviousState = false;
+            s_Selection.Clear();
+            s_NearestVertices.Clear();
+            s_OverlappingGameObjects.Clear();
+            s_IndexBuffer.Clear();
+            s_EdgeBuffer.Clear();
+        }
+
         public static void DoMouseHover(SceneSelection selection)
         {
             if (selection.faces.Count == 0)

Editor/EditorCore/EditorShapeUtility.cs

@@ -103,6 +103,14 @@
             }
         }
 
+        [InitializeOnEnterPlayMode]
+        static void ResetStaticsOnLoad()
+        {
+            s_AvailableShapeTypes = null;
+            s_ShapeTypes = null;
+            s_ShapeTypesGUILists = null;
+        }
+
         static EditorShapeUtility()
         {
             ResetPrefs();

Editor/EditorCore/EditorStyles.cs

@@ -28,6 +28,12 @@
         static GUIStyle s_HeaderLabel;
         static GUIStyle s_SceneTextBox;
 
+        [InitializeOnEnterPlayMode]
+        static void ResetStaticsOnLoad()
+        {
+            s_Initialized = false;
+        }
+
         public static GUIStyle buttonStyle { get { Init(); return s_ButtonStyle; } }
         public static GUIStyle toolbarHelpIcon { get { Init(); return s_ToolbarHelpIcon; } }
         public static GUIStyle settingsGroup { get { Init(); return s_SettingsGroup; } }

Editor/EditorCore/EditorUtility.cs

@@ -28,6 +28,22 @@
         static EditorWindow s_NotificationWindow;
         static bool s_IsNotificationDisplayed;
 
+        [InitializeOnEnterPlayMode]
+        static void ResetStaticsOnLoad()
+        {
+            s_IsNotificationDisplayed = false;
+            EditorApplication.update -= NotifUpdate;
+            if (s_NotificationWindow != null)
+            {
+                // Window may be destroyed when entering Play Mode without domain reload.
+                try { s_NotificationWindow.RemoveNotification(); }
+                catch {}
+            }
+
+            s_NotificationWindow = null;
+            s_NotificationTimer = 0f;
+        }
+
         [UserSetting("General", "Show Action Notifications", "Enable or disable notification popups when performing actions.")]
         static Pref<bool> s_ShowNotifications = new Pref<bool>("editor.showEditorNotifications", false);
 

Editor/EditorCore/IconUtility.cs

@@ -20,6 +20,12 @@
 
         static string s_IconFolderPath = "Packages/com.unity.probuilder/Editor Default Resources/Icons/";
 
+        [InitializeOnEnterPlayMode]
+        static void ResetStaticsOnLoad()
+        {
+            s_Icons.Clear();
+        }
+
         /// <summary>
         /// Load an icon from icons folder located in the package's 'Editor Default Resources'.
         /// Naming convention is: "path/to/iconName" (without extension). Use the 'd_' prefix for dark skin  icons.

Editor/EditorCore/Lightmapping.cs

@@ -37,7 +37,8 @@
             public static readonly GUIContent areaError = new GUIContent("Area Error", "");
 
             static bool s_Initialized;
-            public static GUIStyle miniButton;
+            public static GUIStyle s_MiniButton;
+            public static GUIStyle miniButton { get { Init(); return s_MiniButton; } }
             public static bool unwrapSettingsFoldout;
 
             public static void Init()
@@ -47,12 +48,20 @@
 
                 s_Initialized = true;
 
-                miniButton = new GUIStyle(GUI.skin.button);
-                miniButton.stretchHeight = false;
-                miniButton.stretchWidth = false;
-                miniButton.padding = new RectOffset(6, 6, 3, 3);
-                miniButton.margin = new RectOffset(4, 4, 4, 0);
+                s_MiniButton = new GUIStyle(GUI.skin.button);
+                s_MiniButton.stretchHeight = false;
+                s_MiniButton.stretchWidth = false;
+                s_MiniButton.padding = new RectOffset(6, 6, 3, 3);
+                s_MiniButton.margin = new RectOffset(4, 4, 4, 0);
             }
+
+#if UNITY_EDITOR
+            internal static void Reset()
+            {
+                s_Initialized = false;
+                unwrapSettingsFoldout = false;
+            }
+#endif
         }
 
         [UserSettingBlock("Mesh Settings")]
@@ -106,6 +115,12 @@
             Undo.postprocessModifications += PostprocessModifications;
         }
 
+        [InitializeOnEnterPlayMode]
+        static void ResetStaticsOnLoad()
+        {
+            Styles.Reset();
+        }
+
         /// <summary>
         /// Toggles the LightmapStatic bit of an objects Static flags.
         /// </summary>

Editor/EditorCore/MaterialEditor.cs

@@ -131,6 +131,13 @@
         // The currently loaded material palette asset.
         static MaterialPalette s_CurrentPalette = null;
 
+        [InitializeOnEnterPlayMode]
+        static void ResetStaticsOnLoad()
+        {
+            s_CurrentPalette = null;
+            instance?.RefreshAvailablePalettes();
+        }
+
         // The user set "quick material"
         Pref<Material> m_QueuedMaterial = new Pref<Material>("materialEditor.quickMaterial", null, SettingsScope.User);