Unity 6000.1.3f1 C# reference source code

Author: Unity Technologies

Editor/Mono/Animation/AnimationWindow/CurveEditorWindow.cs

@@ -30,12 +30,13 @@ public enum NormalizationMode
  }
 
  //const int kToolbarHeight = 17;
- const int kPresetsHeight = 46;
+ const int kPresetsHeight = 50;
 
  static CurveEditorWindow s_SharedCurveEditor;
 
  internal CurveEditor m_CurveEditor;
 
+ Vector2 m_PresetScrollPosition;
  AnimationCurve m_Curve;
  Color m_Color;
 
@@ -469,20 +470,38 @@ void OnGUI()
  m_CurveEditor.OnGUI();
 
  // Preset swatch area
- GUI.Box(new Rect(0, position.height - kPresetsHeight, position.width, kPresetsHeight), "", ms_Styles.curveSwatchArea);
+ var presetRect = new Rect(0, position.height - kPresetsHeight, position.width, kPresetsHeight);
+ GUI.Box(presetRect, "", ms_Styles.curveSwatchArea);
+
  Color curveColor = m_Color;
  curveColor.a *= 0.6f;
- const float margin = 45f;
  const float width = 40f;
  const float height = 25f;
- float yPos = position.height - kPresetsHeight + (kPresetsHeight - height) * 0.5f;
+ const float spaceBetweenSwatches = 5f;
+ const float presetDropdownSize = 16f;
+ const float horizontalScrollbarHeight = 15f;
+ const float presetDropdownCenteringOffset = 2f;
+ float yPos = (kPresetsHeight - height) * 0.5f;
  InitCurvePresets();
  CurvePresetLibrary curveLibrary = m_CurvePresets.GetPresetLibraryEditor().GetCurrentLib();
  if (curveLibrary != null)
  {
- for (int i = 0; i < curveLibrary.Count(); i++)
+ var numPresets = curveLibrary.Count();
+ var presetDropDownRect = new Rect(spaceBetweenSwatches, yPos + presetDropdownCenteringOffset, presetDropdownSize, presetDropdownSize);
+ Rect contentRect = new Rect(0, 0, numPresets * (width + spaceBetweenSwatches) + presetDropDownRect.xMax, presetRect.height - horizontalScrollbarHeight);
+ m_PresetScrollPosition = GUI.BeginScrollView(
+ presetRect, // Rectangle of the visible area
+ m_PresetScrollPosition, // Current scroll position
+ contentRect, // Rectangle containing all content
+ false, // Always show horizontal scrollbar
+ false // Always show vertical scrollbar
+ );
+
+ PresetDropDown(presetDropDownRect);
+
+ Rect swatchRect = new Rect(presetDropDownRect.xMax + spaceBetweenSwatches, yPos, width, height);
+ for (int i = 0; i < numPresets; i++)
  {
- Rect swatchRect = new Rect(margin + (width + 5f) * i, yPos, width, height);
  m_GUIContent.tooltip = curveLibrary.GetName(i);
  if (GUI.Button(swatchRect, m_GUIContent, ms_Styles.curveSwatch))
  {
@@ -496,14 +515,11 @@ void OnGUI()
  if (Event.current.type == EventType.Repaint)
  curveLibrary.Draw(swatchRect, i);
 
- if (swatchRect.xMax > position.width - 2 * margin)
- break;
+ swatchRect.x += width + spaceBetweenSwatches;
  }
+ GUI.EndScrollView();
  }
 
- Rect presetDropDownButtonRect = new Rect(margin - 20f, yPos + 5f, 20, 20);
- PresetDropDown(presetDropDownButtonRect);
-
  // For adding default preset curves
  //if (EditorGUI.DropdownButton(new Rect (position.width -26, yPos, 20, 20), GUIContent.none, FocusType.Passive, "OL Plus"))
  // AddDefaultPresetsToCurrentLib ();

Editor/Mono/BuildProfile/BuildProfile.cs

@@ -403,6 +403,13 @@ void ValidateDataConsistency()
  }
 
  CheckSceneListConsistency();
+
+ // On disk changes to active profile may change platform guid.
+ // Specifically copying the entire YAML of a valid build profile.
+ if (this == BuildProfileContext.activeProfile && platformGuid != EditorUserBuildSettings.activePlatformGuid)
+ {
+ EditorUserBuildSettings.SwitchActiveBuildTargetGuid(this);
+ }
  }
 
  /// <summary>

Editor/Mono/BuildTargetDiscovery.bindings.cs

@@ -256,7 +256,7 @@ public PlatformInfo() {}
 
  static GUID EmptyGuid = new GUID("");
 
- static Dictionary<BuildTarget, GUID> s_PlatformGUIDDataQuickLookup = new Dictionary<BuildTarget, GUID>();
+ static Dictionary<BuildTarget, GUID> s_BuildTargetToPlatformGUID = new Dictionary<BuildTarget, GUID>();
 
  // This list should not be exposed ouside of BuildTargetDiscovery to avoid NDA spillage, provide a access function for data here instead.
  // Changes here should be synced with the usage of
@@ -660,10 +660,7 @@ public static GUID GetGUIDFromBuildTarget(NamedBuildTarget namedBuildTarget, Bui
  /// <returns>The platform GUID. Derived platform GUID when the active platform is a derived platform. Base platform GUID otherwise.</returns>
  public static GUID GetGUIDFromBuildTarget(BuildTarget buildTarget)
  {
- if (buildTarget == BuildTarget.StandaloneWindows) //workaround for win64 and win having the same guid in new Build Target system
- buildTarget = BuildTarget.StandaloneWindows64;
-
- if (s_PlatformGUIDDataQuickLookup.TryGetValue(buildTarget, out GUID value))
+ if (s_BuildTargetToPlatformGUID.TryGetValue(buildTarget, out GUID value))
  {
  var module = ModuleManager.FindPlatformSupportModule(value);
  if (module != null && module is IDerivedBuildTargetProvider)
@@ -702,7 +699,7 @@ internal static GUID GetBasePlatformGUIDFromBuildTarget(NamedBuildTarget namedBu
  if (TryGetServerGUIDFromBuildTarget(namedBuildTarget, buildTarget, out var value))
  return value;
 
- if (s_PlatformGUIDDataQuickLookup.TryGetValue(buildTarget, out GUID guid))
+ if (s_BuildTargetToPlatformGUID.TryGetValue(buildTarget, out GUID guid))
  return guid;
 
  return EmptyGuid;
@@ -721,7 +718,7 @@ internal static GUID GetBasePlatformGUID(GUID platformGuid)
  if (!platformInfo.HasFlag(PlatformAttributes.IsDerivedBuildTarget))
  return platformGuid;
 
- if (s_PlatformGUIDDataQuickLookup.TryGetValue(platformInfo.buildTarget, out GUID basePlatformGuid))
+ if (s_BuildTargetToPlatformGUID.TryGetValue(platformInfo.buildTarget, out GUID basePlatformGuid))
  return basePlatformGuid;
 
  return EmptyGuid;
@@ -739,12 +736,15 @@ static void PreloadBuildPlatformInstalledData()
  {
  foreach (var platform in allPlatforms)
  {
+ // Capture BuildTarget to GUID mapping for all platforms.
+ // Considers that StandaloneWindows and StandaloneWindows64 are the same platform.
  if (platform.Value.buildTarget != BuildTarget.StandaloneWindows
  && platform.Value.subtarget != StandaloneBuildSubtarget.Server
- && !platform.Value.HasFlag(PlatformAttributes.IsDerivedBuildTarget)
- ) //workaround for win64 and win having the same guid in new Build Target system and for derived build targets
+ && !platform.Value.HasFlag(PlatformAttributes.IsDerivedBuildTarget))
  {
- s_PlatformGUIDDataQuickLookup.Add(platform.Value.buildTarget, platform.Key);
+ s_BuildTargetToPlatformGUID.Add(platform.Value.buildTarget, platform.Key);
+ if (platform.Value.buildTarget == BuildTarget.StandaloneWindows64)
+ s_BuildTargetToPlatformGUID.Add(BuildTarget.StandaloneWindows, platform.Key);
  }
 
  var playbackEngineDirectory = BuildPipeline.GetPlaybackEngineDirectory(platform.Value.buildTarget, BuildOptions.None, false);

Editor/Mono/GI/Lightmapping.bindings.cs

@@ -241,12 +241,24 @@ internal static FilterMode filterMode
 
  // Starts an asynchronous bake job.
  [FreeFunction]
- public static extern bool BakeAsync();
+ internal static extern bool BakeAsyncImpl();
 
- // Stars a synchronous bake job.
+ // Starts a synchronous bake job.
  [FreeFunction]
- public static extern bool Bake();
+ internal static extern bool BakeImpl();
+ 
+ public static bool BakeAsync()
+ {
+ RenderPipelineManager.TryPrepareRenderPipeline(GraphicsSettings.currentRenderPipeline);
+ return BakeAsyncImpl();
+ }
 
+ public static bool Bake()
+ {
+ RenderPipelineManager.TryPrepareRenderPipeline(GraphicsSettings.currentRenderPipeline);
+ return BakeImpl();
+ }
+ 
  // Cancels the currently running asynchronous bake job.
  [FreeFunction("CancelLightmapping")]
  public static extern void Cancel();
@@ -716,6 +728,7 @@ public static bool extractAmbientOcclusion
 
  public static bool BakeAsync(Scene targetScene)
  {
+ RenderPipelineManager.TryPrepareRenderPipeline(GraphicsSettings.currentRenderPipeline);
  return BakeSceneAsync(targetScene);
  }
 
@@ -726,6 +739,7 @@ public static bool BakeAsync(Scene targetScene)
 
  public static bool Bake(Scene targetScene)
  {
+ RenderPipelineManager.TryPrepareRenderPipeline(GraphicsSettings.currentRenderPipeline);
  return BakeScene(targetScene);
  }
 

Editor/Mono/GUI/Toolbars/EditorToolbarUtility.cs

@@ -4,6 +4,8 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using UnityEditor.Overlays;
+using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace UnityEditor.Toolbars
@@ -73,5 +75,67 @@ internal static VisualTreeAsset LoadUxml(string name)
  {
  return EditorGUIUtility.Load($"{k_UxmlPath}{name}.uxml") as VisualTreeAsset;
  }
+
+ internal static void UpdateIconContent(
+ string text,
+ string textIcon,
+ Texture2D icon,
+ TextElement textElement,
+ TextElement textIconElement,
+ Image iconElement)
+ {
+ if (text == string.Empty)
+ {
+ textElement.style.display = DisplayStyle.None;
+ textIconElement.style.display = DisplayStyle.None;
+ }
+ else
+ textElement.style.display = StyleKeyword.Null;
+
+ // First priority: image icon, if available
+ if (icon != null)
+ {
+ if (iconElement != null)
+ {
+ iconElement.style.display = DisplayStyle.Flex;
+ iconElement.image = icon;
+ }
+ if (textIconElement != null)
+ textIconElement.style.display = DisplayStyle.None;
+ }
+ else if (iconElement != null && iconElement.resolvedStyle.backgroundImage != null)
+ {
+ if (textIconElement != null)
+ textIconElement.style.display = DisplayStyle.None;
+ iconElement.style.display = DisplayStyle.Flex;
+ }
+ // Second priority: text icon, if available
+ else if (!string.IsNullOrEmpty(textIcon))
+ {
+ if (textIconElement != null)
+ {
+ textIconElement.style.display = DisplayStyle.Flex;
+ textIconElement.text = OverlayUtilities.GetSignificantLettersForIcon(textIcon);
+ }
+ if (iconElement != null)
+ iconElement.style.display = DisplayStyle.None;
+ }
+ // Fall back: abbreviation of text.
+ else if (!string.IsNullOrEmpty(text))
+ {
+ if (textIconElement != null)
+ {
+ textIconElement.style.display = StyleKeyword.Null;
+ textIconElement.text = OverlayUtilities.GetSignificantLettersForIcon(text);
+ }
+ if (iconElement != null)
+ iconElement.style.display = DisplayStyle.None;
+ }
+ else
+ {
+ if (iconElement != null)
+ iconElement.style.display = DisplayStyle.Flex;
+ }
+ }
  }
 }

Editor/Mono/Inspector/Core/ScriptAttributeGUI/Implementations/ExposedReferenceDrawer.cs

@@ -4,6 +4,7 @@
 
 using System;
 using UnityEditor;
+using UnityEditor.UIElements;
 using UnityEngine;
 using UnityEngine.UIElements;
 using ObjectField = UnityEditor.UIElements.ObjectField;
@@ -156,16 +157,23 @@ public override VisualElement CreatePropertyGUI(SerializedProperty prop)
 
  obj.RegisterValueChangedCallback(SetReference);
  obj.AddManipulator(new ContextualMenuManipulator(BuildContextualMenu));
+ obj.AddToClassList(ObjectField.alignedFieldUssClassName);
 
+ // Track for Undo/Redo changes which can come from exposedPropertyTable
  Undo.UndoRedoCallback undoRedoCallback = () =>
  {
  m_Item.UpdateValue();
  obj.SetValueWithoutNotify(m_Item.currentReferenceValue);
  };
 
+ // Track the property for external changed including Undo/Redo
+ obj.TrackPropertyValue(prop, _ => undoRedoCallback());
  obj.RegisterCallback<AttachToPanelEvent>(evt => Undo.undoRedoPerformed += undoRedoCallback);
  obj.RegisterCallback<DetachFromPanelEvent>(evt => Undo.undoRedoPerformed -= undoRedoCallback);
 
+ // Set the serialized property so we can support drag and drop
+ obj.SetProperty(ObjectField.serializedPropertyKey, m_Item.exposedPropertyDefault);
+
  return obj;
  }
 

External/NiceIO/NiceIO.cs

@@ -16,6 +16,8 @@
 using File = NiceIO.Do_Not_Use_File_Directly_Use_FileSystem_Active_Instead;
 using Directory = NiceIO.Do_Not_Use_Directory_Directly_Use_FileSystem_Active_Instead;
 
+#nullable disable
+
 namespace NiceIO
 {
  /// <summary>