Unity 6000.1.0b4 C# reference source code

Author: Unity Technologies

Editor/Mono/Annotation/AnnotationWindow.cs

@@ -56,7 +56,6 @@ private enum EnabledState
  const float k_WindowWidth = 270;
  const float k_ScrollBarWidth = 14;
  const float k_ListElementHeight = 18;
- const float k_JustClosedPeriod = 200;
  const float k_FrameWidth = 1f;
  float iconSize = 16;
  float gizmoRightAlign;
@@ -66,6 +65,8 @@ private enum EnabledState
 
  static AnnotationWindow s_AnnotationWindow = null;
  static long s_LastClosedTime;
+ const long k_JustClosedPeriod = 400;
+
  static Styles m_Styles;
  List<GizmoInfo> m_RecentAnnotations;
  List<GizmoInfo> m_BuiltinAnnotations;

Editor/Mono/Annotation/LayerVisibilityWindow.cs

@@ -39,14 +39,14 @@ public Styles()
  const float k_FrameWidth = 1f;
  const float k_ToggleSize = 17;
  const float k_SeparatorHeight = 6;
- const float k_JustClosedPeriod = 200;
  const string k_LayerVisible = "Show/Hide Layer";
  const string k_LayerPickable = "Toggle Pickable status this Layer. Non-Pickable items cannot be selected in the Scene View.";
 
  private static LayerVisibilityWindow s_LayerVisibilityWindow;
  private static long s_LastClosedTime;
- private static Styles s_Styles;
+ const long k_JustClosedPeriod = 400;
 
+ private static Styles s_Styles;
  private List<string> s_LayerNames;
  private List<int> s_LayerMasks;
  private int m_AllLayersMask;

Editor/Mono/GUI/ColorPicker.cs

@@ -12,6 +12,7 @@ namespace UnityEditor
  internal class ColorPicker : EditorWindow
  {
  private const string k_HeightPrefKey = "CPickerHeight";
+ private const string k_ShowDefaultsPrefKey = "CPDefaultsShow";
  private const string k_ShowPresetsPrefKey = "CPPresetsShow";
  // HDR and LDR have different slider mode pref keys because they have different defaults for the sake of discoverability
  private const string k_SliderModePrefKey = "CPSliderMode";
@@ -40,6 +41,8 @@ internal class ColorPicker : EditorWindow
  Texture2D m_ColorBox;
  static int s_Slider2Dhash = "Slider2D".GetHashCode();
  [SerializeField]
+ bool m_ShowDefaults = true;
+ [SerializeField]
  bool m_ShowPresets = true;
 
  [SerializeField]
@@ -482,6 +485,7 @@ static class Styles
  public static readonly GUIContent exposureValue = EditorGUIUtility.TrTextContent("Intensity", "Number of stops to over- or under-expose the color. The intensity calculates each time based on the predefined max color component of 191 (0.749) when Color Picker opens.");
  public static readonly GUIContent hexLabel = EditorGUIUtility.TrTextContent("Hexadecimal");
  public static readonly GUIContent presetsToggle = EditorGUIUtility.TrTextContent("Swatches");
+ public static readonly GUIContent defaultsToggle = EditorGUIUtility.TrTextContent("Defaults");
 
  public static readonly ScalableGUIContent originalColorSwatchFill =
  new ScalableGUIContent(string.Empty, "The original color. Click this swatch to reset the color picker to this value.", "ColorPicker-OriginalColor");
@@ -877,6 +881,218 @@ void DoExposureSwatches()
  GUI.contentColor = contentColor;
  }
 
+ // used in TestColorPicker.OpeningColorPicker_InitialisesCorrectDefaultColors
+ internal static (Color, string)[] TESTdefaultColors => instance?.m_DefaultColors;
+ readonly (Color, string)[] m_DefaultColors = new (Color, string)[]
+ {
+ (Color.red, nameof(Color.red)),
+ (Color.green, nameof(Color.green)),
+ (Color.blue, nameof(Color.blue)),
+ (Color.yellow, nameof(Color.yellow)),
+ (Color.cyan, nameof(Color.cyan)),
+ (Color.magenta, nameof(Color.magenta)),
+ (Color.gray1, nameof(Color.gray1)),
+ (Color.gray2, nameof(Color.gray2)),
+ (Color.gray3, nameof(Color.gray3)),
+ (Color.gray4, nameof(Color.gray4)),
+ (Color.gray5, nameof(Color.gray5)),
+ (Color.gray6, nameof(Color.gray6)),
+ (Color.gray7, nameof(Color.gray7)),
+ (Color.gray8, nameof(Color.gray8)),
+ (Color.gray9, nameof(Color.gray9)),
+ (Color.white, nameof(Color.white)),
+ (Color.whiteSmoke, nameof(Color.whiteSmoke)),
+ (Color.gainsboro, nameof(Color.gainsboro)),
+ (Color.lightGray, nameof(Color.lightGray)),
+ (Color.silver, nameof(Color.silver)),
+ (Color.darkGray, nameof(Color.darkGray)),
+ (Color.dimGray, nameof(Color.dimGray)),
+ (Color.black, nameof(Color.black)),
+ (Color.darkRed, nameof(Color.darkRed)),
+ (Color.brown, nameof(Color.brown)),
+ (Color.firebrick, nameof(Color.firebrick)),
+ (Color.crimson, nameof(Color.crimson)),
+ (Color.softRed, nameof(Color.softRed)),
+ (Color.indianRed, nameof(Color.indianRed)),
+ (Color.violetRed, nameof(Color.violetRed)),
+ (Color.mediumVioletRed, nameof(Color.mediumVioletRed)),
+ (Color.deepPink, nameof(Color.deepPink)),
+ (Color.hotPink, nameof(Color.hotPink)),
+ (Color.lightPink, nameof(Color.lightPink)),
+ (Color.pink, nameof(Color.pink)),
+ (Color.paleVioletRed, nameof(Color.paleVioletRed)),
+ (Color.maroon, nameof(Color.maroon)),
+ (Color.rosyBrown, nameof(Color.rosyBrown)),
+ (Color.lightCoral, nameof(Color.lightCoral)),
+ (Color.salmon, nameof(Color.salmon)),
+ (Color.tomato, nameof(Color.tomato)),
+ (Color.darkSalmon, nameof(Color.darkSalmon)),
+ (Color.coral, nameof(Color.coral)),
+ (Color.orangeRed, nameof(Color.orangeRed)),
+ (Color.lightSalmon, nameof(Color.lightSalmon)),
+ (Color.sienna, nameof(Color.sienna)),
+ (Color.saddleBrown, nameof(Color.saddleBrown)),
+ (Color.chocolate, nameof(Color.chocolate)),
+ (Color.sandyBrown, nameof(Color.sandyBrown)),
+ (Color.peru, nameof(Color.peru)),
+ (Color.darkOrange, nameof(Color.darkOrange)),
+ (Color.burlywood, nameof(Color.burlywood)),
+ (Color.tan, nameof(Color.tan)),
+ (Color.moccasin, nameof(Color.moccasin)),
+ (Color.peachPuff, nameof(Color.peachPuff)),
+ (Color.bisque, nameof(Color.bisque)),
+ (Color.navajoWhite, nameof(Color.navajoWhite)),
+ (Color.wheat, nameof(Color.wheat)),
+ (Color.orange, nameof(Color.orange)),
+ (Color.darkGoldenRod, nameof(Color.darkGoldenRod)),
+ (Color.goldenRod, nameof(Color.goldenRod)),
+ (Color.lightGoldenRod, nameof(Color.lightGoldenRod)),
+ (Color.gold, nameof(Color.gold)),
+ (Color.softYellow, nameof(Color.softYellow)),
+ (Color.lightGoldenRodYellow, nameof(Color.lightGoldenRodYellow)),
+ (Color.beige, nameof(Color.beige)),
+ (Color.lemonChiffon, nameof(Color.lemonChiffon)),
+ (Color.lightYellow, nameof(Color.lightYellow)),
+ (Color.yellowNice, nameof(Color.yellowNice)),
+ (Color.khaki, nameof(Color.khaki)),
+ (Color.paleGoldenRod, nameof(Color.paleGoldenRod)),
+ (Color.darkKhaki, nameof(Color.darkKhaki)),
+ (Color.olive, nameof(Color.olive)),
+ (Color.oliveDrab, nameof(Color.oliveDrab)),
+ (Color.yellowGreen, nameof(Color.yellowGreen)),
+ (Color.darkOliveGreen, nameof(Color.darkOliveGreen)),
+ (Color.softGreen, nameof(Color.softGreen)),
+ (Color.greenYellow, nameof(Color.greenYellow)),
+ (Color.chartreuse, nameof(Color.chartreuse)),
+ (Color.lawnGreen, nameof(Color.lawnGreen)),
+ (Color.darkGreen, nameof(Color.darkGreen)),
+ (Color.forestGreen, nameof(Color.forestGreen)),
+ (Color.limeGreen, nameof(Color.limeGreen)),
+ (Color.darkSeaGreen, nameof(Color.darkSeaGreen)),
+ (Color.lightGreen, nameof(Color.lightGreen)),
+ (Color.paleGreen, nameof(Color.paleGreen)),
+ (Color.seaGreen, nameof(Color.seaGreen)),
+ (Color.mediumSeaGreen, nameof(Color.mediumSeaGreen)),
+ (Color.springGreen, nameof(Color.springGreen)),
+ (Color.mediumSpringGreen, nameof(Color.mediumSpringGreen)),
+ (Color.aquamarine, nameof(Color.aquamarine)),
+ (Color.mediumAquamarine, nameof(Color.mediumAquamarine)),
+ (Color.turquoise, nameof(Color.turquoise)),
+ (Color.mediumTurquoise, nameof(Color.mediumTurquoise)),
+ (Color.lightSeaGreen, nameof(Color.lightSeaGreen)),
+ (Color.lightSlateGray, nameof(Color.lightSlateGray)),
+ (Color.slateGray, nameof(Color.slateGray)),
+ (Color.darkSlateGray, nameof(Color.darkSlateGray)),
+ (Color.teal, nameof(Color.teal)),
+ (Color.darkCyan, nameof(Color.darkCyan)),
+ (Color.lightCyan, nameof(Color.lightCyan)),
+ (Color.mintCream, nameof(Color.mintCream)),
+ (Color.honeydew, nameof(Color.honeydew)),
+ (Color.azure, nameof(Color.azure)),
+ (Color.paleTurquoise, nameof(Color.paleTurquoise)),
+ (Color.darkTurquoise, nameof(Color.darkTurquoise)),
+ (Color.cadetBlue, nameof(Color.cadetBlue)),
+ (Color.powderBlue, nameof(Color.powderBlue)),
+ (Color.softBlue, nameof(Color.softBlue)),
+ (Color.lightBlue, nameof(Color.lightBlue)),
+ (Color.deepSkyBlue, nameof(Color.deepSkyBlue)),
+ (Color.skyBlue, nameof(Color.skyBlue)),
+ (Color.lightSkyBlue, nameof(Color.lightSkyBlue)),
+ (Color.steelBlue, nameof(Color.steelBlue)),
+ (Color.dodgerBlue, nameof(Color.dodgerBlue)),
+ (Color.lightSteelBlue, nameof(Color.lightSteelBlue)),
+ (Color.ghostWhite, nameof(Color.ghostWhite)),
+ (Color.aliceBlue, nameof(Color.aliceBlue)),
+ (Color.lavender, nameof(Color.lavender)),
+ (Color.cornflowerBlue, nameof(Color.cornflowerBlue)),
+ (Color.royalBlue, nameof(Color.royalBlue)),
+ (Color.navyBlue, nameof(Color.navyBlue)),
+ (Color.midnightBlue, nameof(Color.midnightBlue)),
+ (Color.darkBlue, nameof(Color.darkBlue)),
+ (Color.mediumBlue, nameof(Color.mediumBlue)),
+ (Color.slateBlue, nameof(Color.slateBlue)),
+ (Color.lightSlateBlue, nameof(Color.lightSlateBlue)),
+ (Color.mediumSlateBlue, nameof(Color.mediumSlateBlue)),
+ (Color.darkSlateBlue, nameof(Color.darkSlateBlue)),
+ (Color.mediumPurple, nameof(Color.mediumPurple)),
+ (Color.rebeccaPurple, nameof(Color.rebeccaPurple)),
+ (Color.blueViolet, nameof(Color.blueViolet)),
+ (Color.indigo, nameof(Color.indigo)),
+ (Color.purple, nameof(Color.purple)),
+ (Color.darkOrchid, nameof(Color.darkOrchid)),
+ (Color.darkViolet, nameof(Color.darkViolet)),
+ (Color.mediumOrchid, nameof(Color.mediumOrchid)),
+ (Color.darkMagenta, nameof(Color.darkMagenta)),
+ (Color.violet, nameof(Color.violet)),
+ (Color.plum, nameof(Color.plum)),
+ (Color.thistle, nameof(Color.thistle)),
+ (Color.orchid, nameof(Color.orchid)),
+ (Color.lavenderBlush, nameof(Color.lavenderBlush)),
+ (Color.seashell, nameof(Color.seashell)),
+ (Color.blanchedAlmond, nameof(Color.blanchedAlmond)),
+ (Color.papayaWhip, nameof(Color.papayaWhip)),
+ (Color.cornsilk, nameof(Color.cornsilk)),
+ (Color.ivory, nameof(Color.ivory)),
+ (Color.linen, nameof(Color.linen)),
+ (Color.floralWhite, nameof(Color.floralWhite)),
+ (Color.antiqueWhite, nameof(Color.antiqueWhite)),
+ (Color.oldLace, nameof(Color.oldLace)),
+ (Color.mistyRose, nameof(Color.mistyRose)),
+ (Color.snow, nameof(Color.snow)),
+ };
+
+ Texture2D m_SwatchTex;
+ void DoDefaultsGUI()
+ {
+ if (m_SwatchTex == null) m_SwatchTex = ColorPresetLibrary.CreateColorSwatchWithBorder(14, 14, false);
+
+ m_ShowDefaults = EditorGUILayout.Foldout(m_ShowDefaults, Styles.defaultsToggle, true);
+
+ if (m_ShowDefaults)
+ {
+ using (new EditorGUILayout.VerticalScope())
+ {
+ EditorGUILayout.BeginHorizontal();
+ for (int i = 0; i < m_DefaultColors.Length; ++i)
+ {
+ var (color, name) = m_DefaultColors[i];
+ if (i != 0 && i % 15 == 0)
+ {
+ GUILayout.FlexibleSpace();
+ EditorGUILayout.EndHorizontal();
+ EditorGUILayout.BeginHorizontal();
+ }
+
+ using (new GUI.ColorScope(color))
+ {
+ string tooltip;
+ if (m_SliderMode == SliderMode.HSV)
+ {
+ Color.RGBToHSV(color, out var h, out var s, out var v);
+ tooltip = $"{name} HSVA({Mathf.RoundToInt(h * 360)}, {Mathf.RoundToInt(s * 100)}, {Mathf.RoundToInt(v * 100)}, {Mathf.RoundToInt(color.a * 100)})";
+ }
+ else if (m_SliderMode == SliderMode.RGB)
+ {
+ tooltip = $"{name} {(Color32)color}";;
+ }
+ else
+ tooltip = $"{name} {color}";
+
+ var clicked = GUILayout.Button(
+ new GUIContent(m_SwatchTex, tooltip),
+ GUIStyle.none,
+ new GUILayoutOption(GUILayoutOption.Type.fixedWidth, 14f));
+
+ if (clicked)
+ SetColor(color);
+ }
+ }
+ GUILayout.FlexibleSpace();
+ EditorGUILayout.EndHorizontal();
+ }
+ }
+ }
+
  void DoPresetsGUI()
  {
  var foldoutRect = GUILayoutUtility.GetRect(Styles.presetsToggle, EditorStyles.foldout);
@@ -953,6 +1169,8 @@ void OnGUI()
  GUILayout.Space(Styles.extraVerticalSpacing);
  }
 
+ DoDefaultsGUI();
+
  DoPresetsGUI();
 
  // Call last to ensure we only use the copy paste events if no
@@ -1177,11 +1395,13 @@ void OnEnable()
 
  m_SliderMode = (SliderMode)EditorPrefs.GetInt(k_SliderModePrefKey, (int)SliderMode.RGB);
  m_ShowPresets = EditorPrefs.GetInt(k_ShowPresetsPrefKey, 1) != 0;
+ m_ShowDefaults = EditorPrefs.GetInt(k_ShowDefaultsPrefKey, 1) != 0;
  }
 
  void OnDisable()
  {
  EditorPrefs.SetInt(m_HDR ? k_SliderModeHDRPrefKey : k_SliderModePrefKey, (int)m_SliderMode);
+ EditorPrefs.SetInt(k_ShowDefaultsPrefKey, m_ShowDefaults ? 1 : 0);
  EditorPrefs.SetInt(k_ShowPresetsPrefKey, m_ShowPresets ? 1 : 0);
  EditorPrefs.SetInt(k_HeightPrefKey, (int)position.height);
  }
@@ -1208,6 +1428,8 @@ public void OnDestroy()
  DestroyImmediate(m_ValTexture);
  if (m_AlphaTexture)
  DestroyImmediate(m_AlphaTexture);
+ if (m_SwatchTex)
+ DestroyImmediate(m_SwatchTex);
  s_Instance = null;
 
  if (m_ColorLibraryEditorState != null)

Editor/Mono/PresetLibraries/ColorPresetLibrary.cs

@@ -161,7 +161,7 @@ public void CreateDebugColors()
  m_Presets.Add(new ColorPreset(new Color(Random.Range(0.2f, 1f), Random.Range(0.2f, 1f), Random.Range(0.2f, 1f), 1f), "Preset Color " + i));
  }
 
- private static Texture2D CreateColorSwatchWithBorder(int width, int height, bool triangular)
+ internal static Texture2D CreateColorSwatchWithBorder(int width, int height, bool triangular)
  {
  Texture2D texture = new Texture2D(width, height, TextureFormat.RGBA32, false);
  texture.hideFlags = HideFlags.HideAndDontSave;

Editor/Mono/SceneModeWindows/DefaultLightingExplorerExtension.cs

@@ -471,7 +471,9 @@ protected virtual LightingExplorerTableColumn[] GetEmissivesColumns()
  if (EditorGUI.EndChangeCheck())
  {
  Material material = (Material)prop.serializedObject.targetObject;
+ Undo.RecordObject(material, $"Modify Emission Flags of {material.name}");
  material.globalIlluminationFlags = giFlags;
+ EditorUtility.SetDirty(material);
 
  prop.serializedObject.Update();
  }
@@ -495,7 +497,9 @@ protected virtual LightingExplorerTableColumn[] GetEmissivesColumns()
 
  if (EditorGUI.EndChangeCheck())
  {
+ Undo.RecordObject(material, $"Modify Emission Flags of {material.name}");
  material.SetColor("_EmissionColor", newValue);
+ EditorUtility.SetDirty(material);
  }
  EditorGUI.EndProperty();
  }
@@ -511,7 +515,9 @@ protected virtual LightingExplorerTableColumn[] GetEmissivesColumns()
  Color color = sourceMaterial.GetColor("_EmissionColor");
 
  Material targetMaterial = (Material)target.serializedObject.targetObject;
+ Undo.RecordObject(targetMaterial, $"Modify Emission Flags of {targetMaterial.name}");
  targetMaterial.SetColor("_EmissionColor", color);
+ EditorUtility.SetDirty(targetMaterial);
  }) // 3: Color
  };
  }

Modules/BuildReportingEditor/Managed/BuildFile.cs

@@ -7,13 +7,19 @@
 
 namespace UnityEditor.Build.Reporting
 {
+ ///<summary>Contains information about a single file produced by the build process.</summary>
  [NativeType(Header = "Modules/BuildReportingEditor/Public/BuildReport.h")]
  public struct BuildFile
  {
+ ///<summary>The unique indentifier of the build file.</summary>
  public uint id { get; }
+ ///<summary>The absolute path of the file produced by the build process.</summary>
  public string path { get; }
+ ///<summary>The role the file plays in the build output.</summary>
+ ///<remarks>Use this field to understand what purpose a file serves within the built player. Common roles for files are captured by the members of the <see cref="CommonRoles" /> class.</remarks>
  public string role { get; }
 
+ ///<summary>The total size of the file, in bytes.</summary>
  [NativeName("totalSize")]
  public ulong size { get; }