Unity 2023.1.0b1 C# reference source code

Author: Unity Technologies

Editor/Mono/Annotation/SceneFXWindow.cs

@@ -4,6 +4,7 @@
 
 using System;
 using UnityEngine;
+using UnityEngine.Rendering;
 
 namespace UnityEditor
 {
@@ -74,6 +75,12 @@ private void Draw(Rect rect)
             DrawListElement(drawPos, "Skybox", state.showSkybox, value => state.showSkybox = value);
             drawPos.y += EditorGUI.kSingleLineHeight;
 
+            if(SupportedRenderingFeatures.active.supportsClouds)
+            {
+                DrawListElement(drawPos, "Clouds", state.showClouds, value => state.showClouds = value);
+                drawPos.y += EditorGUI.kSingleLineHeight;
+            }
+
             DrawListElement(drawPos, "Fog", state.showFog, value => state.showFog = value);
             drawPos.y += EditorGUI.kSingleLineHeight;
 

Editor/Mono/ContainerWindow.cs

@@ -38,36 +38,23 @@ internal partial class ContainerWindow : ScriptableObject
         internal const float kButtonWidth = 16f, kButtonHeight = 16f;
 
         static internal bool macEditor => Application.platform == RuntimePlatform.OSXEditor;
-        static internal bool linuxEditor => Application.platform == RuntimePlatform.LinuxEditor;
 
         static internal bool s_Modal = false;
         private static ContainerWindow s_MainWindow;
         static internal ContainerWindow mainWindow { get => s_MainWindow; }
 
         private static class Styles
         {
-            // Title Bar Buttons (Non)
-            public static GUIStyle buttonMin = "WinBtnMinMac";
-            public static GUIStyle buttonClose = macEditor ? "WinBtnCloseMac" : "WinBtnClose";
-            public static GUIStyle buttonMax = macEditor ? "WinBtnMaxMac" : "WinBtnMax";
-            public static GUIStyle buttonRestore = macEditor ? "WinBtnRestoreMac" : "WinBtnRestore";
-
             public static float borderSize => macEditor ? osxBorderSize : winBorderSize;
             public static float buttonMargin => macEditor ? osxBorderMargin : winBorderMargin;
 
-            public static SVC<float> buttonTop = new SVC<float>("--container-window-button-top-margin");
-
             private static SVC<float> winBorderSize = new SVC<float>("--container-window-buttons-right-margin-win");
             private static SVC<float> osxBorderSize = new SVC<float>("--container-window-buttons-right-margin-osx");
             private static SVC<float> winBorderMargin = new SVC<float>("--container-window-button-left-right-margin-win");
             private static SVC<float> osxBorderMargin = new SVC<float>("--container-window-button-left-right-margin-osx");
         }
-
-        private const float kButtonCountOSX = 0;
-        private const float kButtonCountWin = 2;
         static internal float buttonHorizontalSpace => (kButtonWidth + Styles.buttonMargin * 2f);
-        static internal float buttonStackWidth => buttonHorizontalSpace * (macEditor || linuxEditor ? kButtonCountOSX : kButtonCountWin) + Styles.borderSize;
-
+        static internal float buttonStackWidth => Styles.borderSize;
         public ContainerWindow()
         {
             m_PixelRect = new Rect(0, 0, 400, 300);
@@ -656,142 +643,5 @@ internal Rect GetDropDownRect(Rect buttonRect, Vector2 minSize, Vector2 maxSize)
             return PopupLocationHelper.GetDropDownRect(buttonRect, minSize, maxSize, this);
         }
 
-        public void HandleWindowDecorationEnd(Rect windowPosition)
-        {
-            // No Op
-        }
-
-        public void HandleWindowDecorationStart(Rect windowPosition)
-        {
-            if (!macEditor && !linuxEditor)
-            {
-                bool hasTitleBar = (windowPosition.y == 0 && (showMode != ShowMode.Utility && showMode != ShowMode.MainWindow) && !isPopup);
-
-                if (!hasTitleBar)
-                    return;
-
-                bool hasWindowButtons = Mathf.Abs(windowPosition.xMax - position.width) < 2;
-                if (hasWindowButtons)
-                {
-                    GUIStyle min = Styles.buttonMin;
-                    GUIStyle close = Styles.buttonClose;
-                    GUIStyle maxOrRestore = maximized ? Styles.buttonRestore : Styles.buttonMax;
-
-                    BeginTitleBarButtons(windowPosition);
-                    if (TitleBarButton(close))
-                    {
-                        if (InternalRequestClose())
-                        {
-                            Close();
-                            GUIUtility.ExitGUI();
-                        }
-                    }
-
-                    var canMaximize = m_MaxSize.x == 0 || m_MaxSize.y == 0 || m_MaxSize.x >= Screen.currentResolution.width || m_MaxSize.y >= Screen.currentResolution.height;
-                    EditorGUI.BeginDisabled(!canMaximize);
-                    if (TitleBarButton(maxOrRestore))
-                        ToggleMaximize();
-                    EditorGUI.EndDisabled();
-                }
-
-                DragTitleBar(new Rect(0, 0, position.width, kTitleHeight));
-            }
-        }
-
-        private void BeginTitleBarButtons(Rect windowPosition)
-        {
-            m_ButtonCount = 0;
-            m_TitleBarWidth = windowPosition.width;
-        }
-
-        private bool TitleBarButton(GUIStyle style)
-        {
-            var buttonRect = new Rect(m_TitleBarWidth - Styles.borderSize - (buttonHorizontalSpace * ++m_ButtonCount), Styles.buttonTop, kButtonWidth, kButtonHeight);
-            var guiView = rootView as GUIView;
-            if (guiView == null)
-            {
-                var splitView = rootView as SplitView;
-                if (splitView != null)
-                    guiView = splitView.children.Length > 0 ? splitView.children[0] as GUIView : null;
-            }
-            if (guiView != null)
-                guiView.MarkHotRegion(GUIClip.UnclipToWindow(buttonRect));
-
-            return GUI.Button(buttonRect, GUIContent.none, style);
-        }
-
-        // Snapping windows
-        private static Vector2 s_LastDragMousePos;
-        private float startDragDpi;
-
-        // Indicates that we are using the native title bar caption dragging.
-        private bool m_DraggingNativeTitleBarCaption = false;
-
-        private void DragTitleBar(Rect titleBarRect)
-        {
-            int id = GUIUtility.GetControlID(FocusType.Passive);
-            Event evt = Event.current;
-
-            switch (evt.GetTypeForControl(id))
-            {
-                case EventType.Repaint:
-                    if (m_DraggingNativeTitleBarCaption)
-                        m_DraggingNativeTitleBarCaption = false;
-                    EditorGUIUtility.AddCursorRect(titleBarRect, MouseCursor.Arrow);
-                    break;
-                case EventType.MouseDown:
-                    // If the mouse is inside the title bar rect, we say that we're the hot control
-                    if (titleBarRect.Contains(evt.mousePosition) && GUIUtility.hotControl == 0 && evt.button == 0)
-                    {
-                        Event.current.Use();
-                        m_DraggingNativeTitleBarCaption = true;
-                        SendCaptionEvent(m_DraggingNativeTitleBarCaption);
-                    }
-                    break;
-                case EventType.MouseUp:
-                    if (m_DraggingNativeTitleBarCaption)
-                        break;
-
-                    if (GUIUtility.hotControl == id)
-                    {
-                        GUIUtility.hotControl = 0;
-                        Event.current.Use();
-                        Unsupported.SetAllowCursorLock(true, Unsupported.DisallowCursorLockReasons.SizeMove);
-                    }
-                    break;
-                case EventType.MouseDrag:
-                    if (m_DraggingNativeTitleBarCaption)
-                        break;
-
-                    if (GUIUtility.hotControl == id)
-                    {
-                        Vector2 mousePos = evt.mousePosition;
-                        if (startDragDpi != GUIUtility.pixelsPerPoint)
-                        {
-                            // We ignore this mouse event when changing screens in multi monitor setups with
-                            // different dpi scalings as funky things might/will happen
-                            startDragDpi = GUIUtility.pixelsPerPoint;
-                            s_LastDragMousePos = mousePos;
-                        }
-                        else
-                        {
-                            Vector2 movement = mousePos - s_LastDragMousePos;
-
-                            float minimumDelta = 1.0f / GUIUtility.pixelsPerPoint;
-
-                            if (Mathf.Abs(movement.x) >= minimumDelta || Mathf.Abs(movement.y) >= minimumDelta)
-                            {
-                                Rect dragPosition = position;
-                                dragPosition.x += movement.x;
-                                dragPosition.y += movement.y;
-                                position = dragPosition;
-
-                                GUI.changed = true;
-                            }
-                        }
-                    }
-                    break;
-            }
-        }
     }
 } //namespace

Editor/Mono/EditorUtility.bindings.cs

@@ -34,29 +34,49 @@ public static string OpenFilePanelWithFilters(string title, string directory, st
         public static extern void RevealInFinder(string path);
 
         [FreeFunction("DisplayDialog")]
-        static extern bool DoDisplayDialog(string title, string message, string ok, [DefaultValue("\"\"")] string cancel);
+        static extern bool DisplayDialogImpl(string title, string message, string ok, string cancel);
 
         public static bool DisplayDialog(string title, string message, string ok, [DefaultValue("\"\"")] string cancel)
         {
+            // i am not sure how picky should we be about the params
+            // for example, for the buttons we have code that ignores empty strings,
+            //   to allow having "ok"-only dialogs (information panels, so to say)
+            // same with title+message: it sounds like we should allow skipping one of those
+            // hence we make sure that at least one button is present, and some message
+            // we can go more picky if we want in the future
+            if(string.IsNullOrEmpty(ok) && string.IsNullOrEmpty(cancel))
+                throw new ArgumentException("Both 'ok' and 'cancel' strings are null or empty");
+            if(string.IsNullOrEmpty(title) && string.IsNullOrEmpty(message))
+                throw new ArgumentException("Both 'title' and 'message' strings are null or empty");
+
             using (new DisabledGuiViewInputScope(GUIView.current, true))
             {
-                return DoDisplayDialog(title, message, ok, cancel);
+                return DisplayDialogImpl(title, message, ok, cancel);
             }
         }
-
-        [FreeFunction("GetDialogResponse")]
-        internal static extern bool GetDialogResponse(InteractionContext interactionContext, string title, string message, string ok, [DefaultValue("\"\"")] string cancel);
-
         [ExcludeFromDocs]
         public static bool DisplayDialog(string title, string message, string ok)
         {
             return DisplayDialog(title, message, ok, String.Empty);
         }
 
         [FreeFunction("DisplayDialogComplex")]
-        public static extern int DisplayDialogComplex(string title, string message, string ok, string cancel, string alt);
-        [FreeFunction("GetDialogResponseComplex")]
-        internal static extern int GetDialogResponseComplex(InteractionContext interactionContext, string title, string message, string ok, string cancel, string alt);
+        static extern int DisplayDialogComplexImpl(string title, string message, string ok, string cancel, string alt);
+
+        public static int DisplayDialogComplex(string title, string message, string ok, string cancel, string alt)
+        {
+            // see the comment above in DisplayDialog
+            // our implementation allows setting some strings empty (the button will be skipped then)
+            // but we should totally ensure some buttons are set
+
+            if(string.IsNullOrEmpty(ok) && string.IsNullOrEmpty(cancel) && string.IsNullOrEmpty(alt))
+                throw new ArgumentException("All three 'ok', 'cancel' and 'alt' strings are null or empty");
+            if(string.IsNullOrEmpty(title) && string.IsNullOrEmpty(message))
+                throw new ArgumentException("Both 'title' and 'message' strings are null or empty");
+
+            return DisplayDialogComplexImpl(title, message, ok, cancel, alt);
+        }
+
 
 
         [FreeFunction("RunOpenFolderPanel")]

Editor/Mono/EditorUtility.cs

@@ -80,7 +80,7 @@ public static string GetDialogOptOutMessage(DialogOptOutDecisionType dialogOptOu
 
         public static bool LoadWindowLayout(string path)
         {
-            return WindowLayout.LoadWindowLayout(path, false);
+            return WindowLayout.TryLoadWindowLayout(path, false);
         }
 
         public static void CompressTexture(Texture2D texture, TextureFormat format, TextureCompressionQuality quality)

Editor/Mono/GI/InputExtraction.bindings.cs

@@ -16,12 +16,18 @@ internal static class InputExtraction
         public class SourceMap : IDisposable
         {
             internal IntPtr m_Ptr;
+            internal bool m_OwnsPtr;
 
             public SourceMap()
             {
                 m_Ptr = Internal_Create();
+                m_OwnsPtr = true;
+            }
+            public SourceMap(IntPtr ptr)
+            {
+                m_Ptr = ptr;
+                m_OwnsPtr = false;
             }
-
             ~SourceMap()
             {
                 Destroy();
@@ -35,7 +41,7 @@ public void Dispose()
 
             void Destroy()
             {
-                if (m_Ptr != IntPtr.Zero)
+                if (m_OwnsPtr && m_Ptr != IntPtr.Zero)
                 {
                     Internal_Destroy(m_Ptr);
                     m_Ptr = IntPtr.Zero;

Editor/Mono/GI/Lightmapping.bindings.cs

@@ -388,13 +388,17 @@ internal static void Internal_CallOnWroteLightingDataAsset()
         }
 
         // This event is fired when BakeInput has been populated, but before passing it to Bake().
-        // Create a LightBaker.BakeInput by passing the IntPtr but don't access it beyond the call-back.
-        internal static event Action<IntPtr> createdBakeInputForTestingOnly;
+        // Do not store and access BakeInput beyond the call-back.
+        internal static event Action<LightBaker.BakeInput, InputExtraction.SourceMap> createdBakeInput;
 
-        internal static void Internal_CallOnCreatedBakeInputForTestingOnly(IntPtr ptr)
+        internal static void Internal_CallOnCreatedBakeInput(IntPtr p_BakeInput, IntPtr p_SourceMap)
         {
-            if (createdBakeInputForTestingOnly != null)
-                createdBakeInputForTestingOnly(ptr);
+            if (createdBakeInput != null)
+            {
+                using var bakeInput = new LightBaker.BakeInput(p_BakeInput);
+                using var sourceMap = new InputExtraction.SourceMap(p_SourceMap);
+                createdBakeInput(bakeInput, sourceMap);
+            }
         }
 
         [System.Obsolete("OnCompletedFunction.completed is obsolete, please use event bakeCompleted instead. ", false)]

Editor/Mono/GUI/AppStatusBar.cs

@@ -185,7 +185,6 @@ protected override void OldOnGUI()
             }
             GUILayout.EndHorizontal();
 
-            DoWindowDecorationEnd();
             EditorGUI.ShowRepaints();
         }
 

Editor/Mono/GUI/DockArea.cs

@@ -118,20 +118,6 @@ private void RemoveNullWindows()
             s_GUIContents.Clear();
         }
 
-        internal override void DoWindowDecorationStart()
-        {
-            // On windows, we want both close window and side resizes.
-            // Titlebar dragging is done at the end, so we can drag next to tabs.
-            if (window != null)
-                window.HandleWindowDecorationStart(windowPosition);
-        }
-
-        internal override void DoWindowDecorationEnd()
-        {
-            if (window != null)
-                window.HandleWindowDecorationEnd(windowPosition);
-        }
-
         protected override void OnDestroy()
         {
             // Prevents double-destroy that may be indirectly caused if Close() is called by OnLostFocus()