Unity 2021.1.0a4 C# reference source code

Author: Unity Technologies

Editor/Mono/Animation/AnimationWindow/AnimEditor.cs

@@ -857,6 +857,7 @@ private void LinkOptionsOnGUI()
                 {
                     m_State.linkedWithSequencer = false;
                     m_State.selection = null;
+                    m_State.overrideControlInterface = null;
 
                     // Layout has changed, bail out now.
                     EditorGUIUtility.ExitGUI();

Editor/Mono/Animation/ZoomableArea.cs

@@ -88,6 +88,8 @@ private void SetAllowExceed(ref float rangeEnd, ref bool allowExceed, float valu
         private float m_MinWidth = 0.05f;
         private const float kMinHeight = 0.05f;
 
+        private const float k_ScrollStepSize = 10f; // mirrors GUI scrollstepsize as there is no global const for this.
+
         public float minWidth
         {
             get { return m_MinWidth; }
@@ -712,7 +714,11 @@ public void HandleZoomAndPanEvents(Rect area)
                     break;
                 case EventType.ScrollWheel:
                     if (!area.Contains(Event.current.mousePosition))
+                    {
+                        HandleScrolling(area);
                         break;
+                    }
+
                     if (m_IgnoreScrollWheelUntilClicked && GUIUtility.keyboardControl != id)
                         break;
 
@@ -725,6 +731,24 @@ public void HandleZoomAndPanEvents(Rect area)
             GUILayout.EndArea();
         }
 
+        void HandleScrolling(Rect area)
+        {
+            if (m_MinimalGUI)
+                return;
+            if (m_VSlider && new Rect(area.x + area.width, area.y + GUI.skin.verticalScrollbarUpButton.fixedHeight, vSliderWidth, area.height - (GUI.skin.verticalScrollbarDownButton.fixedHeight + hSliderHeight)).Contains(Event.current.mousePosition))
+            {
+                SetTransform(new Vector2(m_Translation.x, m_Translation.y - (Event.current.delta.y * k_ScrollStepSize)), m_Scale);
+                Event.current.Use();
+                return;
+            }
+
+            if (m_HSlider && new Rect(area.x + GUI.skin.horizontalScrollbarLeftButton.fixedWidth, area.y + area.height, area.width - (GUI.skin.horizontalScrollbarRightButton.fixedWidth + vSliderWidth), hSliderHeight).Contains(Event.current.mousePosition))
+            {
+                SetTransform(new Vector2(m_Translation.x + (Event.current.delta.y * k_ScrollStepSize), m_Translation.y), m_Scale);
+                Event.current.Use();
+            }
+        }
+
         public void EndViewGUI()
         {
             if (m_MinimalGUI && Event.current.type == EventType.Repaint)

Editor/Mono/Annotation/AnnotationWindow.cs

@@ -9,6 +9,14 @@ namespace UnityEditor
 {
     internal class AnnotationWindow : EditorWindow
     {
+        private static SavedBool s_ShowTerrainDebugWarnings = new SavedBool("Terrain.ShowDebugWarnings", true);
+
+        public static bool ShowTerrainDebugWarnings
+        {
+            get => s_ShowTerrainDebugWarnings.value;
+            set => s_ShowTerrainDebugWarnings.value = value;
+        }
+
         class Styles
         {
             public GUIStyle toggle = "Toggle";
@@ -45,6 +53,7 @@ private enum EnabledState
         }
 
         const float kWindowWidth = 270;
+        const float kLabelWidth = 150;
         const float scrollBarWidth = 14;
         const float listElementHeight = 18;
         float iconSize = 16;
@@ -70,6 +79,7 @@ private enum EnabledState
         GUIContent iconToggleContent = EditorGUIUtility.TrTextContent("", "Show/Hide Icon");
         GUIContent iconSelectContent = EditorGUIUtility.TrTextContent("", "Select Icon");
         GUIContent icon3dGizmoContent = EditorGUIUtility.TrTextContent("3D Icons");
+        GUIContent terrainDebugWarnings = EditorGUIUtility.TrTextContent("Terrain Debug Warnings");
         GUIContent showOutlineContent = EditorGUIUtility.TrTextContent("Selection Outline");
         GUIContent showWireframeContent = EditorGUIUtility.TrTextContent("Selection Wire");
         GUIContent fadeGizmosContent = EditorGUIUtility.TrTextContent("Fade Gizmos", "Fade out and stop rendering gizmos that are small on screen");
@@ -118,7 +128,7 @@ static public void IconChanged()
 
         float GetTopSectionHeight()
         {
-            const int numberOfControls = 4;
+            const int numberOfControls = 5;
             return EditorGUI.kSingleLineHeight * numberOfControls + EditorGUI.kControlVerticalSpacing * (numberOfControls - 1) + EditorStyles.inspectorBig.padding.bottom;
         }
 
@@ -298,8 +308,7 @@ void DrawTopSection(float topSectionHeight)
             float margin = 11;
             float curY = topmargin;
 
-
-            float labelWidth = m_Styles.listHeaderStyle.CalcSize(showOutlineContent).x + GUI.skin.toggle.CalcSize(GUIContent.none).x + 1;
+            float labelWidth = m_Styles.listHeaderStyle.CalcSize(terrainDebugWarnings).x + GUI.skin.toggle.CalcSize(GUIContent.none).x + 1;
             float rowHeight = 18;
 
             // 3D icons toggle & slider
@@ -337,14 +346,21 @@ void DrawTopSection(float topSectionHeight)
             }
             curY += rowHeight;
 
-            // Selection outline/wire
             using (new EditorGUI.DisabledScope(m_IsGameView))
             {
+                // Selection outline/wire
                 toggleRect = new Rect(margin, curY, labelWidth, rowHeight);
                 AnnotationUtility.showSelectionOutline = GUI.Toggle(toggleRect, AnnotationUtility.showSelectionOutline, showOutlineContent);
 
                 toggleRect.y += rowHeight;
                 AnnotationUtility.showSelectionWire = GUI.Toggle(toggleRect, AnnotationUtility.showSelectionWire, showWireframeContent);
+
+                // TODO: Change to Debug Errors & Debug Warnings
+                toggleRect.y += rowHeight;
+                EditorGUI.BeginChangeCheck();
+                s_ShowTerrainDebugWarnings.value = GUI.Toggle(toggleRect, s_ShowTerrainDebugWarnings.value, terrainDebugWarnings);
+                if (EditorGUI.EndChangeCheck())
+                    SceneView.RepaintAll();
             }
         }
 

Editor/Mono/AssetPipeline/TextureImporter.bindings.cs

@@ -432,5 +432,8 @@ public void SetTextureSettings(TextureImporterSettings src)
 
         public extern bool ignorePngGamma { get; set; }
         internal static readonly int MaxTextureSizeAllowedForReadable = 8192; //keep in sync with TextureImporter.h
+
+        // This is for remapping Sprite that are renamed.
+        extern internal bool GetNameFromInternalIDMap(long id, ref string name);
     }
 }

Editor/Mono/AssetsMenuUtility.bindings.cs

@@ -8,7 +8,8 @@ namespace UnityEditor
 {
     internal enum ScriptTemplate
     {
-        CSharp_NewBehaviourScript = 0,
+        CSharp_NewSceneTemplatePipelineScript = 0,
+        CSharp_NewBehaviourScript,
         CSharp_NewTestScript,
         Shader_NewSurfaceShader,
         Shader_NewUnlitShader,

Editor/Mono/BuildPipeline.bindings.cs

@@ -230,7 +230,7 @@ public class BuildPipeline
         internal static extern string GetBuildTargetGroupDisplayName(BuildTargetGroup targetPlatformGroup);
 
         [FreeFunction("GetBuildTargetUniqueName", IsThreadSafe = true)]
-        internal static extern string GetBuildTargetName(BuildTarget targetPlatform);
+        public static extern string GetBuildTargetName(BuildTarget targetPlatform);
 
         [FreeFunction(IsThreadSafe = true)]
         internal static extern string GetEditorTargetName();

Editor/Mono/BuildPipeline/DesktopStandaloneBuildWindowExtension.cs

@@ -59,14 +59,14 @@ internal static BuildTarget GetBestStandaloneTarget(BuildTarget selectedTarget)
         if (ModuleManager.IsPlatformSupportLoadedByBuildTarget(selectedTarget))
             return selectedTarget;
         if (RuntimePlatform.WindowsEditor == Application.platform && ModuleManager.IsPlatformSupportLoadedByBuildTarget(BuildTarget.StandaloneWindows))
-            return BuildTarget.StandaloneWindows;
+            return BuildTarget.StandaloneWindows64;
         if (RuntimePlatform.OSXEditor == Application.platform && ModuleManager.IsPlatformSupportLoadedByBuildTarget(BuildTarget.StandaloneOSX))
             return BuildTarget.StandaloneOSX;
         if (ModuleManager.IsPlatformSupportLoadedByBuildTarget(BuildTarget.StandaloneOSX))
             return BuildTarget.StandaloneOSX;
         if (ModuleManager.IsPlatformSupportLoadedByBuildTarget(BuildTarget.StandaloneLinux64))
             return BuildTarget.StandaloneLinux64;
-        return BuildTarget.StandaloneWindows;
+        return BuildTarget.StandaloneWindows64;
     }
 
     private static Dictionary<GUIContent, BuildTarget> GetArchitecturesForPlatform(BuildTarget target)
@@ -77,8 +77,8 @@ private static Dictionary<GUIContent, BuildTarget> GetArchitecturesForPlatform(B
             case BuildTarget.StandaloneWindows64:
                 return new Dictionary<GUIContent, BuildTarget>()
                 {
-                    { EditorGUIUtility.TrTextContent("x86"), BuildTarget.StandaloneWindows },
                     { EditorGUIUtility.TrTextContent("x86_64"), BuildTarget.StandaloneWindows64 },
+                    { EditorGUIUtility.TrTextContent("x86"), BuildTarget.StandaloneWindows },
                 };
             case BuildTarget.StandaloneLinux64:
                 return new Dictionary<GUIContent, BuildTarget>()
@@ -96,7 +96,7 @@ private static BuildTarget DefaultTargetForPlatform(BuildTarget target)
         {
             case BuildTarget.StandaloneWindows:
             case BuildTarget.StandaloneWindows64:
-                return BuildTarget.StandaloneWindows;
+                return BuildTarget.StandaloneWindows64;
                 // Deprecated
 #pragma warning disable 612, 618
             case BuildTarget.StandaloneLinux:

Editor/Mono/ContainerWindow.cs

@@ -38,6 +38,7 @@ internal partial class ContainerWindow : ScriptableObject
         static internal bool linuxEditor => Application.platform == RuntimePlatform.LinuxEditor;
 
         static internal bool s_Modal = false;
+        private static bool hasMainWindow = false;
 
         private static class Styles
         {
@@ -111,6 +112,9 @@ internal void ShowTooltip()
 
         internal void ShowPopupWithMode(ShowMode mode, bool giveFocus)
         {
+            if (mode == ShowMode.MainWindow)
+                throw new ArgumentException("Cannot create more than one main window.");
+
             m_ShowMode = (int)mode;
             Internal_Show(m_PixelRect, m_ShowMode, m_MinSize, m_MaxSize);
             if (m_RootView)
@@ -133,6 +137,9 @@ internal void ShowPopupWithMode(ShowMode mode, bool giveFocus)
         // Show the editor window.
         public void Show(ShowMode showMode, bool loadPosition, bool displayImmediately, bool setFocus)
         {
+            if (hasMainWindow && showMode == ShowMode.MainWindow)
+                throw new InvalidOperationException("Trying to create a second main window from layout when one already exists.");
+
             bool useMousePos = showMode == ShowMode.AuxWindow;
             if (showMode == ShowMode.AuxWindow)
                 showMode = ShowMode.Utility;
@@ -150,7 +157,6 @@ public void Show(ShowMode showMode, bool loadPosition, bool displayImmediately,
 
             var initialMaximizedState = m_Maximized;
 
-
             Internal_Show(m_PixelRect, m_ShowMode, m_MinSize, m_MaxSize);
 
             // Tell the main view its now in this window (quick hack to get platform-specific code to move its views to the right window)
@@ -166,6 +172,9 @@ public void Show(ShowMode showMode, bool loadPosition, bool displayImmediately,
             if (!this)
                 return;
 
+            if (showMode == ShowMode.MainWindow)
+                hasMainWindow = true;
+
             // Fit window to screen - needs to be done after bringing the window live
             position = FitWindowRectToScreen(m_PixelRect, true, useMousePos);
             rootView.position = new Rect(0, 0, GUIUtility.RoundToPixelGrid(m_PixelRect.width), GUIUtility.RoundToPixelGrid(m_PixelRect.height));
@@ -280,6 +289,10 @@ private bool PrivateRequestClose(List<EditorWindow> allUnsaved)
         internal void InternalCloseWindow()
         {
             Save();
+
+            if (m_ShowMode == (int)ShowMode.MainWindow)
+                hasMainWindow = false;
+
             if (m_RootView)
             {
                 DestroyImmediate(m_RootView, true);

Editor/Mono/GUI/AboutWindow.cs

@@ -17,8 +17,8 @@ internal class AboutWindow : EditorWindow
     {
         static void ShowAboutWindow()
         {
-            AboutWindow w = EditorWindow.GetWindowWithRect<AboutWindow>(new Rect(100, 100, 570, 360), true, "About Unity");
-            w.position = new Rect(100, 100, 570, 360);
+            AboutWindow w = EditorWindow.GetWindowWithRect<AboutWindow>(new Rect(100, 100, 600, 360), true, "About Unity");
+            w.position = new Rect(100, 100, 600, 360);
             w.m_Parent.window.m_DontSaveToLayout = true;
         }
 
@@ -151,9 +151,9 @@ public void OnGUI()
 
             GUILayout.BeginHorizontal();
             GUILayout.Label(s_MonoLogo);
-            GUILayout.Label("Scripting powered by The Mono Project.\n\n(c) 2011 Novell, Inc.", "MiniLabel", GUILayout.Width(210));
+            GUILayout.Label("Scripting powered by The Mono Project.\n\n(c) 2011 Novell, Inc.", "MiniLabel", GUILayout.Width(220));
             GUILayout.Label(s_AgeiaLogo);
-            GUILayout.Label("Physics powered by PhysX.\n\n(c) 2019 NVIDIA Corporation.", "MiniLabel", GUILayout.Width(200));
+            GUILayout.Label("Physics powered by PhysX.\n\n(c) 2019 NVIDIA Corporation.", "MiniLabel", GUILayout.Width(205));
             GUILayout.EndHorizontal();
             GUILayout.FlexibleSpace();
             GUILayout.BeginHorizontal();

Editor/Mono/GameView/GameView.cs

@@ -82,6 +82,8 @@ float maxScale
         [SerializeField] RenderTexture m_RenderTexture;
 
         int m_SizeChangeID = int.MinValue;
+        [System.NonSerialized]
+        bool m_IsRepaintDelegateRegistered = false;
 
         List<XRDisplaySubsystem> m_DisplaySubsystems = new List<XRDisplaySubsystem>();
 
@@ -291,6 +293,7 @@ public void OnEnable()
 
         public void OnDisable()
         {
+            RemoveRepaintDelegate();
             ModeService.modeChanged -= OnEditorModeChanged;
             EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
             if (m_RenderTexture)
@@ -758,13 +761,50 @@ private void OnPlayModeStateChanged(PlayModeStateChange state)
             {
                 // Enable vsync in play mode to get as much as possible frame rate consistency
                 m_Parent.EnableVSync(m_VSyncEnabled);
+                RemoveRepaintDelegate();
             }
             else if (state == PlayModeStateChange.ExitingPlayMode)
             {
                 m_Parent.EnableVSync(false);
+                AddRepaintDelegate();
             }
         }
 
+        void OnBecameVisible()
+        {
+            AddRepaintDelegate();
+        }
+
+        void OnBecameInvisible()
+        {
+            RemoveRepaintDelegate();
+        }
+
+        void AddRepaintDelegate()
+        {
+            if (!m_IsRepaintDelegateRegistered && !EditorApplication.isPlaying)
+            {
+                EditorApplication.update += RepaintIfNeeded;
+                m_IsRepaintDelegateRegistered = true;
+            }
+        }
+
+        void RemoveRepaintDelegate()
+        {
+            if (m_IsRepaintDelegateRegistered)
+            {
+                EditorApplication.update -= RepaintIfNeeded;
+                m_IsRepaintDelegateRegistered = false;
+            }
+        }
+
+        void RepaintIfNeeded()
+        {
+            UnityEngine.VFX.VFXManager.RequestRepaint();
+            if (LODUtility.IsLODAnimating(null))
+                Repaint();
+        }
+
         private void OnEditorModeChanged(ModeService.ModeChangedArgs args)
         {
             showToolbar = ModeService.HasCapability(ModeCapability.GameViewToolbar, true);