Unity 2023.3.0a7 C# reference source code

Author: Unity Technologies

Editor/Mono/Annotation/SceneRenderModeWindow.cs

@@ -83,11 +83,13 @@ internal class SceneRenderModeWindow : PopupWindowContent
     {
         static class Styles
         {
-            private static GUIStyle s_MenuItem;
-            private static GUIStyle s_Separator;
+            private static GUIStyle menuItem;
+            private static GUIStyle separator;
+            private static GUIContent debuggerLabel;
 
-            public static GUIStyle sMenuItem => s_MenuItem ?? (s_MenuItem = "MenuItem");
-            public static GUIStyle sSeparator => s_Separator ?? (s_Separator = "sv_iconselector_sep");
+            public static GUIStyle s_MenuItem => menuItem ?? (menuItem = "MenuItem");
+            public static GUIStyle s_Separator => separator ?? (separator = "sv_iconselector_sep");
+            public static GUIContent s_DebuggerLabel => debuggerLabel ??= EditorGUIUtility.TrTextContent("Rendering Debugger...");
 
             private static readonly string kShadingMode = "Shading Mode";
             private static readonly string kMiscellaneous = "Miscellaneous";
@@ -220,27 +222,27 @@ private void DrawSeparator(ref Rect rect)
             labelRect.width -= kHeaderHorizontalPadding * 2;
             labelRect.height = kSeparatorHeight;
 
-            GUI.Label(labelRect, GUIContent.none, Styles.sSeparator);
+            GUI.Label(labelRect, GUIContent.none, Styles.s_Separator);
             rect.y += kSeparatorHeight;
         }
 
         //Opens render debugger window located at \newSRP\unity\Packages\com.unity.render-pipelines.core\Editor\Debugging\DebugWindow.cs
         private void DrawRenderingDebuggerShortCut(Rect rect)
         {
-            GUIContent label = new GUIContent("Rendering Debugger...");
             var labelRect = rect;
-            labelRect.y += (kHeaderVerticalPadding * 2f);
-            labelRect.x += kHeaderHorizontalPadding + 15f;
-            labelRect.width = EditorStyles.foldout.CalcSize(label).x;
-            labelRect.height = EditorStyles.foldout.CalcSize(label).y;
+            labelRect.y += kHeaderVerticalPadding;
+            EditorGUI.LabelField(labelRect,string.Empty, Styles.s_MenuItem);
+            labelRect.x -= kHeaderHorizontalPadding;
+            var debuggerLabelSize = EditorStyles.foldout.CalcSize(Styles.s_DebuggerLabel);
+            labelRect.height = debuggerLabelSize.y;
 
-            if (GUI.Button(labelRect, label, EditorStyles.label))
+            if (GUI.Button(labelRect, Styles.s_DebuggerLabel,  Styles.s_MenuItem))
             {
                 EditorApplication.ExecuteMenuItem("Window/Analysis/Rendering Debugger");
                 editorWindow.Close();
             }
+            rect.y += labelRect.height;
 
-            rect.y += EditorGUI.kSingleLineHeight;
         }
 
         private void Draw(float listElementWidth)
@@ -268,10 +270,11 @@ private void Draw(float listElementWidth)
                     }
 
                     bool previousState = foldoutStates[lastSection];
-                    foldoutStates[lastSection] = EditorGUI.Foldout(
-                        new Rect(drawPos.x + kHeaderHorizontalPadding, drawPos.y, drawPos.width,
-                            EditorGUI.kSingleLineHeight), foldoutStates[lastSection],
-                        EditorGUIUtility.TextContent(lastSection), true);
+                    Rect foldoutRect = new Rect(drawPos.x, drawPos.y, drawPos.width, EditorGUI.kSingleLineHeight);
+
+                    EditorGUI.LabelField(foldoutRect,string.Empty, Styles.s_MenuItem);
+                    foldoutStates[lastSection] = EditorGUI.Foldout(foldoutRect, foldoutStates[lastSection], EditorGUIUtility.TextContent(lastSection), true);
+
                     drawPos.y += EditorGUI.kSingleLineHeight;
 
                     if (previousState != foldoutStates[lastSection])
@@ -358,7 +361,7 @@ void DoBuiltinMode(ref Rect rect, SceneView.CameraMode mode)
                 EditorGUI.BeginChangeCheck();
 
                 GUI.Toggle(rect, m_SceneView.cameraMode == mode, EditorGUIUtility.TextContent(mode.name),
-                    Styles.sMenuItem);
+                    Styles.s_MenuItem);
                 if (EditorGUI.EndChangeCheck())
                 {
                     m_SceneView.cameraMode = mode;

Editor/Mono/AssetPipeline/LocalCacheServer.cs

@@ -2,27 +2,13 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using System.Diagnostics;
 using System.IO;
-using System;
-using System.Net;
-using System.Net.Sockets;
-using UnityEditor.Scripting;
 using UnityEditor.Utils;
-using UnityEngine;
-using UnityEngine.Scripting;
 
 namespace UnityEditor
 {
-    internal class LocalCacheServer : ScriptableSingleton<LocalCacheServer>
+    internal class LocalCacheServer
     {
-        [SerializeField] public string path;
-        [SerializeField] public int port;
-        [SerializeField] public ulong size;
-        [SerializeField] public int pid = -1;
-        [SerializeField] public string time;
-
-        public const string SizeKey = "LocalCacheServerSize";
         public const string PathKey = "LocalCacheServerPath";
         public const string CustomPathKey = "LocalCacheServerCustomPath";
 
@@ -36,195 +22,21 @@ public static string GetCacheLocation()
             return result;
         }
 
-        public static void CreateCacheDirectory()
-        {
-            string cacheDirectoryPath = GetCacheLocation();
-            if (Directory.Exists(cacheDirectoryPath) == false)
-                Directory.CreateDirectory(cacheDirectoryPath);
-        }
-
-        void Create(int _port, ulong _size)
-        {
-            var nodeExecutable = Paths.Combine(EditorApplication.applicationContentsPath, "Tools", "nodejs");
-            if (Application.platform == RuntimePlatform.WindowsEditor)
-                nodeExecutable = Paths.Combine(nodeExecutable, "node.exe");
-            else
-                nodeExecutable = Paths.Combine(nodeExecutable, "bin", "node");
-
-            CreateCacheDirectory();
-            path = GetCacheLocation();
-            var cacheServerJs = Paths.Combine(EditorApplication.applicationContentsPath, "Tools", "CacheServer", "main.js");
-            var processStartInfo = new ProcessStartInfo(nodeExecutable)
-            {
-                Arguments = "\"" + cacheServerJs + "\""
-                    + " --port " + _port
-                    + " --path \"" + path
-                    + "\" --nolegacy"
-                    + " --monitor-parent-process " + Process.GetCurrentProcess().Id
-                    // node.js has issues running on windows with stdout not redirected.
-                    // so we silence logging to avoid that. And also to avoid CacheServer
-                    // spamming the editor logs on OS X.
-                    + " --silent"
-                    + " --size " + _size,
-                UseShellExecute = false,
-                CreateNoWindow = true
-            };
-
-            var p = new Process();
-            p.StartInfo = processStartInfo;
-            p.Start();
-
-            port = _port;
-            pid = p.Id;
-            size = _size;
-            time = p.StartTime.ToString();
-            Save(true);
-        }
-
-        public static int GetRandomUnusedPort()
-        {
-            var listener = new TcpListener(IPAddress.Any, 0);
-            listener.Start();
-            var port = ((IPEndPoint)listener.LocalEndpoint).Port;
-            listener.Stop();
-            return port;
-        }
-
-        public static bool PingHost(string host, int port, int timeout)
-        {
-            try
-            {
-                using (var client = new TcpClient())
-                {
-                    var result = client.BeginConnect(host, port, null, null);
-                    result.AsyncWaitHandle.WaitOne(TimeSpan.FromMilliseconds(timeout));
-                    return client.Connected;
-                }
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        public static bool WaitForServerToComeAlive(int port)
-        {
-            DateTime start = DateTime.Now;
-            DateTime maximum = start.AddSeconds(5);
-            while (DateTime.Now < maximum)
-            {
-                if (PingHost("localhost", port, 10))
-                {
-                    System.Console.WriteLine("Server Came alive after {0} ms", (DateTime.Now - start).TotalMilliseconds);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        public static void Kill()
-        {
-            if (instance.pid == -1)
-                return;
-
-            Process p = null;
-            try
-            {
-                p = Process.GetProcessById(instance.pid);
-                p.Kill();
-                instance.pid = -1;
-            }
-            catch
-            {
-                // if we could not get a process, there is non alive. continue.
-            }
-        }
-
-        public static void CreateIfNeeded()
-        {
-            // See if we can get an existing process with the PID we remembered.
-            Process p = null;
-            try
-            {
-                p = Process.GetProcessById(instance.pid);
-            }
-            catch
-            {
-                // if we could not get a process, there is non alive. continue.
-            }
-
-            ulong size = (ulong)EditorPrefs.GetInt(SizeKey, 10) * 1024 * 1024 * 1024;
-            // Check if this process is really the one we used (and not another one reusing the PID).
-            if (p != null && p.StartTime.ToString() == instance.time)
-            {
-                if (instance.size == size && instance.path == GetCacheLocation())
-                {
-                    // We have a server running for this setup, which we can reuse, but make sure that the cache server directory exists in case it was cleaned earlier
-                    CreateCacheDirectory();
-                    return;
-                }
-                else
-                {
-                    // This server does not match our setup. Kill it, so we can start a new one.
-                    Kill();
-                }
-            }
-
-            // No existing server we can use. Start a new one.
-            instance.Create(GetRandomUnusedPort(), size);
-            WaitForServerToComeAlive(instance.port);
-        }
-
         public static void Setup()
         {
             var mode = (AssetPipelinePreferences.CacheServerMode)EditorPrefs.GetInt("CacheServerMode");
 
             if (mode == AssetPipelinePreferences.CacheServerMode.Local)
-                CreateIfNeeded();
-            else
-                Kill();
-        }
-
-        [UsedByNativeCode]
-        public static int GetLocalCacheServerPort()
-        {
-            Setup();
-            return instance.port;
+            {
+                EditorGUILayout.HelpBox("Local CacheServer is no longer supported", MessageType.Info, true);
+            }
         }
 
         public static void Clear()
         {
-            Kill();
             string cacheDirectoryPath = GetCacheLocation();
             if (Directory.Exists(cacheDirectoryPath))
                 Directory.Delete(cacheDirectoryPath, true);
         }
-
-        public static bool CheckCacheLocationExists()
-        {
-            return Directory.Exists(GetCacheLocation());
-        }
-
-        public static bool CheckValidCacheLocation(string path)
-        {
-            if (Directory.Exists(path))
-            {
-                var contents = Directory.GetFileSystemEntries(path);
-                foreach (var dir in contents)
-                {
-                    var name = Path.GetFileName(dir).ToLower();
-                    if (name.Length == 2)
-                        continue;
-                    if (name == "temp")
-                        continue;
-                    if (name == ".ds_store")
-                        continue;
-                    if (name == "desktop.ini")
-                        continue;
-                    return false;
-                }
-            }
-            return true;
-        }
     }
 }

Editor/Mono/Audio/AudioContainerListDragAndDropManipulator.cs

@@ -28,11 +28,11 @@ protected override void RegisterCallbacksOnTarget()
 
     protected override void UnregisterCallbacksFromTarget()
     {
-        target.UnregisterCallback<DragUpdatedEvent>(OnDragUpdate);
-        target.UnregisterCallback<DragPerformEvent>(OnDragPerform);
+        target?.UnregisterCallback<DragUpdatedEvent>(OnDragUpdate);
+        target?.UnregisterCallback<DragPerformEvent>(OnDragPerform);
     }
 
-    void OnDragUpdate(DragUpdatedEvent _)
+    static void OnDragUpdate(DragUpdatedEvent _)
     {
         DragAndDrop.visualMode = DragAndDropVisualMode.Generic;
     }
@@ -44,13 +44,15 @@ void OnDragPerform(DragPerformEvent evt)
         foreach (var path in DragAndDrop.paths)
         {
             var audioClip = AssetDatabase.LoadAssetAtPath<AudioClip>(path);
-            if (audioClip != null) audioClips.Add(audioClip);
+
+            if (audioClip != null)
+                audioClips.Add(audioClip);
         }
 
         if (audioClips.Count > 0)
         {
             DragAndDrop.AcceptDrag();
-            addAudioClipsDelegate(audioClips);
+            addAudioClipsDelegate?.Invoke(audioClips);
         }
     }
 }