Unity 2020.2.0a9 C# reference source code

Author: Unity Technologies

Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyGUI.cs

@@ -832,24 +832,28 @@ override protected void SyncFakeItem()
 
         override protected void RenameEnded()
         {
-            string newName = GetRenameOverlay().name;
-            string oldName = GetRenameOverlay().originalName;
-
-            if (newName != oldName)
+            var renameOverlay = GetRenameOverlay();
+            if (renameOverlay.userAcceptedRename)
             {
-                Undo.RecordObject(state.activeAnimationClip, "Rename Curve");
+                string newName = renameOverlay.name;
+                string oldName = renameOverlay.originalName;
 
-                foreach (AnimationWindowCurve curve in m_RenamedNode.curves)
+                if (newName != oldName)
                 {
-                    EditorCurveBinding newBinding = AnimationWindowUtility.GetRenamedBinding(curve.binding, newName);
+                    Undo.RecordObject(state.activeAnimationClip, "Rename Curve");
 
-                    if (AnimationWindowUtility.CurveExists(newBinding, state.allCurves.ToArray()))
+                    foreach (AnimationWindowCurve curve in m_RenamedNode.curves)
                     {
-                        Debug.LogWarning("Curve already exists, renaming cancelled.");
-                        continue;
-                    }
+                        EditorCurveBinding newBinding = AnimationWindowUtility.GetRenamedBinding(curve.binding, newName);
+
+                        if (AnimationWindowUtility.CurveExists(newBinding, state.allCurves.ToArray()))
+                        {
+                            Debug.LogWarning("Curve already exists, renaming cancelled.");
+                            continue;
+                        }
 
-                    AnimationWindowUtility.RenameCurvePath(curve, newBinding, curve.clip);
+                        AnimationWindowUtility.RenameCurvePath(curve, newBinding, curve.clip);
+                    }
                 }
             }
 

Editor/Mono/Annotation/SceneFXWindow.cs

@@ -71,9 +71,6 @@ private void Draw(Rect rect)
 
             var state = m_SceneView.sceneViewState;
 
-            //
-            // scene view effect options
-
             DrawListElement(drawPos, "Skybox", state.showSkybox, value => state.showSkybox = value);
             drawPos.y += EditorGUI.kSingleLineHeight;
 
@@ -83,10 +80,10 @@ private void Draw(Rect rect)
             DrawListElement(drawPos, "Flares", state.showFlares, value => state.showFlares = value);
             drawPos.y += EditorGUI.kSingleLineHeight;
 
-            DrawListElement(drawPos, "Animated Materials", state.showMaterialUpdate, value => state.showMaterialUpdate = value);
+            DrawListElement(drawPos, "Always Refresh", state.alwaysRefresh, value => state.alwaysRefresh = value);
             drawPos.y += EditorGUI.kSingleLineHeight;
 
-            DrawListElement(drawPos, "Post Processings", state.showImageEffects, value => state.showImageEffects = value);
+            DrawListElement(drawPos, "Post Processing", state.showImageEffects, value => state.showImageEffects = value);
             drawPos.y += EditorGUI.kSingleLineHeight;
 
             DrawListElement(drawPos, "Particle Systems", state.showParticleSystems, value => state.showParticleSystems = value);

Editor/Mono/AssetPostprocessor.cs

@@ -16,6 +16,7 @@
 using UnityEditor.Experimental.AssetImporters;
 using UnityEditorInternal;
 using Unity.CodeEditor;
+using UnityEditor.Profiling;
 
 namespace UnityEditor
 {
@@ -673,32 +674,24 @@ static void CallPostProcessMethods(string methodName, object[] args)
 
         static object InvokeMethod(MethodInfo method, object[] args)
         {
-            bool profile = Profiler.enabled;
-            if (profile)
-                Profiler.BeginSample(method.DeclaringType.FullName + "." + method.Name);
-
-            var res = method.Invoke(null, args);
-
-            if (profile)
-                Profiler.EndSample();
+            object res = null;
+            using (new EditorPerformanceTracker(method.DeclaringType.FullName + "." + method.Name))
+            {
+                res = method.Invoke(null, args);
+            }
 
             return res;
         }
 
         static bool InvokeMethodIfAvailable(object target, string methodName, object[] args)
         {
-            bool profile = Profiler.enabled;
-
             MethodInfo method = target.GetType().GetMethod(methodName, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
             if (method != null)
             {
-                if (profile)
-                    Profiler.BeginSample(target.GetType().FullName + "." + methodName);
-
-                method.Invoke(target, args);
-
-                if (profile)
-                    Profiler.EndSample();
+                using (new EditorPerformanceTracker(target.GetType().FullName + "." + methodName))
+                {
+                    method.Invoke(target, args);
+                }
 
                 return true;
             }
@@ -707,18 +700,13 @@ static bool InvokeMethodIfAvailable(object target, string methodName, object[] a
 
         static bool InvokeMethodIfAvailable<T>(object target, string methodName, object[] args, ref T returnedObject) where T : class
         {
-            bool profile = Profiler.enabled;
-
             MethodInfo method = target.GetType().GetMethod(methodName, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
             if (method != null)
             {
-                if (profile)
-                    Profiler.BeginSample(target.GetType().FullName + "." + methodName);
-
-                returnedObject = method.Invoke(target, args) as T;
-
-                if (profile)
-                    Profiler.EndSample();
+                using (new EditorPerformanceTracker(target.GetType().FullName + "." + methodName))
+                {
+                    returnedObject = method.Invoke(target, args) as T;
+                }
 
                 return true;
             }

Editor/Mono/AsyncHTTPClient.cs

@@ -112,6 +112,8 @@ public Dictionary<string, string> responseHeader
                 Dictionary<string, string> ret = new Dictionary<string, string>();
                 foreach (var curr in headerFlattened)
                 {
+                    if (string.IsNullOrEmpty(curr))
+                        continue;
                     string[] line = curr.Split(new string[] { ": " }, StringSplitOptions.None);
                     if (line.Length > 1)
                         ret.Add(line[0], string.Concat(line.Skip(1).ToArray()));

Editor/Mono/EditorApplication.bindings.cs

@@ -246,6 +246,15 @@ internal static extern string windowTitle
 
         internal static extern void RequestCloseAndRelaunchWithCurrentArguments();
 
+        // Triggers the editor to restart, after which all scripts will be recompiled.
+        internal static void RestartEditorAndRecompileScripts()
+        {
+            // Clear the script assemblies so we compile after the restart.
+            EditorCompilationInterface.Instance.CleanScriptAssemblies();
+
+            RequestCloseAndRelaunchWithCurrentArguments();
+        }
+
         [StaticAccessor("GetApplication()", StaticAccessorType.Dot)]
         private static extern void FileMenuNewScene();
 

Editor/Mono/EditorHandles/Disc.cs

@@ -129,18 +129,7 @@ public static Quaternion Do(int id, Quaternion rotation, Vector3 position, Vecto
                     break;
 
                 case EventType.Repaint:
-                    Color temp = Color.white;
-
-                    if (id == GUIUtility.hotControl)
-                    {
-                        temp = Handles.color;
-                        Handles.color = Handles.selectedColor;
-                    }
-                    else if (id == HandleUtility.nearestControl && GUIUtility.hotControl == 0 && !evt.alt)
-                    {
-                        temp = Handles.color;
-                        Handles.color = Handles.preselectionColor;
-                    }
+                    Handles.SetupHandleColor(id, evt, out var prevColor, out var thickness);
 
                     // If we're dragging it, we'll go a bit further and draw a selection pie
                     if (GUIUtility.hotControl == id)
@@ -168,15 +157,14 @@ public static Quaternion Do(int id, Quaternion rotation, Vector3 position, Vecto
                     }
 
                     if (showHotArc && GUIUtility.hotControl == id || GUIUtility.hotControl != id && !cutoffPlane)
-                        Handles.DrawWireDisc(position, axis, size);
+                        Handles.DrawWireDisc(position, axis, size, thickness);
                     else if (GUIUtility.hotControl != id && cutoffPlane)
                     {
                         Vector3 from = Vector3.Cross(axis, cam).normalized;
-                        Handles.DrawWireArc(position, axis, from, 180, size);
+                        Handles.DrawWireArc(position, axis, from, 180, size, thickness);
                     }
 
-                    if (id == GUIUtility.hotControl || id == HandleUtility.nearestControl && GUIUtility.hotControl == 0)
-                        Handles.color = temp;
+                    Handles.color = prevColor;
                     break;
             }
 

Editor/Mono/EditorHandles/FreeMove.cs

@@ -24,6 +24,7 @@ public static Vector3 Do(int id, Vector3 position, Quaternion rotation, float si
             Event evt = Event.current;
             switch (evt.GetTypeForControl(id))
             {
+                case EventType.MouseMove:
                 case EventType.Layout:
                     // We only want the position to be affected by the Handles.matrix.
                     Handles.matrix = Matrix4x4.identity;
@@ -116,32 +117,13 @@ public static Vector3 Do(int id, Vector3 position, Quaternion rotation, float si
                     }
                     break;
 
-                case EventType.MouseMove:
-                    if (id == HandleUtility.nearestControl)
-                        HandleUtility.Repaint();
-                    break;
-
                 case EventType.Repaint:
-                    Color temp = Color.white;
-
-                    if (id == GUIUtility.hotControl)
-                    {
-                        temp = Handles.color;
-                        Handles.color = Handles.selectedColor;
-                    }
-                    else if (id == HandleUtility.nearestControl && GUIUtility.hotControl == 0)
-                    {
-                        temp = Handles.color;
-                        Handles.color = Handles.preselectionColor;
-                    }
-
+                    Handles.SetupHandleColor(id, evt, out var prevColor, out var thickness);
                     // We only want the position to be affected by the Handles.matrix.
                     Handles.matrix = Matrix4x4.identity;
                     handleFunction(id, worldPosition, Camera.current.transform.rotation, size, EventType.Repaint);
                     Handles.matrix = origMatrix;
-
-                    if (id == GUIUtility.hotControl || id == HandleUtility.nearestControl && GUIUtility.hotControl == 0)
-                        Handles.color = temp;
+                    Handles.color = prevColor;
                     break;
             }
             return position;

Editor/Mono/EditorHandles/FreeRotate.cs

@@ -99,34 +99,21 @@ internal static Quaternion Do(int id, Quaternion rotation, Vector3 position, flo
                     }
                     break;
                 case EventType.Repaint:
-                    Color temp = Color.white;
+                    Handles.SetupHandleColor(id, evt, out var prevColor, out var thickness);
                     var isHot = id == GUIUtility.hotControl;
-                    var isPreselected = id == HandleUtility.nearestControl && GUIUtility.hotControl == 0 && !evt.alt;
-
-                    if (isHot)
-                    {
-                        temp = Handles.color;
-                        Handles.color = Handles.selectedColor;
-                    }
-                    else if (isPreselected)
-                    {
-                        temp = Handles.color;
-                        Handles.color = Handles.preselectionColor;
-                    }
+                    var isHover = Handles.IsHovering(id, evt);
 
                     // We only want the position to be affected by the Handles.matrix.
                     Handles.matrix = Matrix4x4.identity;
                     if (drawCircle)
-                        Handles.DrawWireDisc(worldPosition, Camera.current.transform.forward, size);
-                    if (isPreselected || isHot)
+                        Handles.DrawWireDisc(worldPosition, Camera.current.transform.forward, size, thickness);
+                    if (isHover || isHot)
                     {
                         Handles.color = s_DimmingColor;
                         Handles.DrawSolidDisc(worldPosition, Camera.current.transform.forward, size);
                     }
                     Handles.matrix = origMatrix;
-
-                    if (isHot || isPreselected)
-                        Handles.color = temp;
+                    Handles.color = prevColor;
                     break;
             }
             return rotation;

Editor/Mono/EditorHandles/PositionHandle.cs

@@ -3,7 +3,6 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
-using UnityEditor.Snap;
 using UnityEngine;
 
 namespace UnityEditor
@@ -222,6 +221,8 @@ internal static Vector3 DoPositionHandle(PositionHandleIds ids, Vector3 position
         static int[] s_DoPositionHandle_Internal_NextIndex = { 1, 2, 0 };
         static int[] s_DoPositionHandle_Internal_PrevIndex = { 2, 0, 1 };
         static int[] s_DoPositionHandle_Internal_PrevPlaneIndex = { 5, 3, 4 };
+        static int[] s_DoPositionHandle_Internal_AxisDrawOrder = { 0, 1, 2 };
+
         static Vector3 DoPositionHandle_Internal(PositionHandleIds ids, Vector3 position, Quaternion rotation, PositionHandleParam param)
         {
             Color temp = color;
@@ -271,8 +272,11 @@ static Vector3 DoPositionHandle_Internal(PositionHandleIds ids, Vector3 position
             }
 
             // Draw axis sliders last to have priority over the planes
-            for (var i = 0; i < 3; ++i)
+            CalcDrawOrder(viewVectorDrawSpace, s_DoPositionHandle_Internal_AxisDrawOrder);
+            for (var ii = 0; ii < 3; ++ii)
             {
+                int i = s_DoPositionHandle_Internal_AxisDrawOrder[ii];
+
                 if (!param.ShouldShow(i))
                     continue;
 
@@ -300,7 +304,7 @@ static Vector3 DoPositionHandle_Internal(PositionHandleIds ids, Vector3 position
 
                 if (cameraLerp <= kCameraViewThreshold)
                 {
-                    color = Color.Lerp(color, Color.clear, cameraLerp);
+                    color = GetFadedAxisColor(color, cameraLerp, ids[i]);
                     var axisVector = GetAxisVector(i);
                     var dir = rotation * axisVector;
                     var offset = dir * axisOffset[i] * size;
@@ -362,15 +366,15 @@ static Vector3 DoPlanarHandle(
 
             bool isDisabled = !GUI.enabled;
             color = isDisabled ? staticColor : GetColorByAxis(axisNormalIndex);
-            color = Color.Lerp(color, Color.clear, cameraLerp);
+            color = GetFadedAxisColor(color, cameraLerp, id);
 
-            var updateOpacityFillColor = false;
+            float faceOpacity = 0.8f;
             if (GUIUtility.hotControl == id)
                 color = selectedColor;
-            else if (HandleUtility.nearestControl == id && !Event.current.alt)
-                color = preselectionColor;
+            else if (IsHovering(id, Event.current))
+                faceOpacity = 0.4f;
             else
-                updateOpacityFillColor = true;
+                faceOpacity = 0.1f;
 
             color = ToActiveColorSpace(color);
 
@@ -427,8 +431,7 @@ static Vector3 DoPlanarHandle(
             verts[1] = position + positionOffset + handleOffset + (-axis1 + axis2) * handleSize * 0.5f;
             verts[2] = position + positionOffset + handleOffset + (-axis1 - axis2) * handleSize * 0.5f;
             verts[3] = position + positionOffset + handleOffset + (axis1 - axis2) * handleSize * 0.5f;
-            Color faceColor = updateOpacityFillColor ? new Color(color.r, color.g, color.b, 0.1f) : color;
-            faceColor = ToActiveColorSpace(faceColor);
+            Color faceColor = new Color(color.r, color.g, color.b, color.a * faceOpacity);
             Handles.DrawSolidRectangleWithOutline(verts, faceColor, Color.clear);
 
             // And then render the handle itself (this is the colored outline)