Unity 6000.1.0b2 C# reference source code

Author: Unity Technologies

Editor/Mono/Annotation/AnnotationWindow.cs

@@ -53,16 +53,16 @@ private enum EnabledState
  Mixed = 2
  }
 
- const float kWindowWidth = 270;
- const float kLabelWidth = 150;
- const float scrollBarWidth = 14;
- const float listElementHeight = 18;
+ 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;
  float gizmoTextRightAlign;
  float iconRightAlign;
  float iconTextRightAlign;
- const float frameWidth = 1f;
 
  static AnnotationWindow s_AnnotationWindow = null;
  static long s_LastClosedTime;
@@ -171,7 +171,7 @@ internal static bool ShowAtPosition(Rect buttonRect, bool isGameView)
  {
  // We could not use realtimeSinceStartUp since it is set to 0 when entering/exitting playmode, we assume an increasing time when comparing time.
  long nowMilliSeconds = System.DateTime.Now.Ticks / System.TimeSpan.TicksPerMillisecond;
- bool justClosed = nowMilliSeconds < s_LastClosedTime + 50;
+ bool justClosed = nowMilliSeconds < s_LastClosedTime + k_JustClosedPeriod;
  if (!justClosed)
  {
  Event.current.Use();
@@ -205,9 +205,9 @@ void Init(Rect buttonRect, bool isGameView)
 
  SyncToState();
 
- float windowHeight = 2 * frameWidth + GetTopSectionHeight() + DrawNormalList(false, 100, 0, 10000);
+ float windowHeight = 2 * k_FrameWidth + GetTopSectionHeight() + DrawNormalList(false, 100, 0, 10000);
  windowHeight = Mathf.Min(windowHeight, 900);
- Vector2 windowSize = new Vector2(kWindowWidth, windowHeight);
+ Vector2 windowSize = new Vector2(k_WindowWidth, windowHeight);
 
  ShowAsDropDown(buttonRect, windowSize);
  }
@@ -314,7 +314,7 @@ internal void OnGUI()
  void DrawTopSection(float topSectionHeight)
  {
  // Bg
- GUI.Label(new Rect(frameWidth, 0, position.width - 2 * frameWidth, topSectionHeight), "", EditorStyles.inspectorBig);
+ GUI.Label(new Rect(k_FrameWidth, 0, position.width - 2 * k_FrameWidth, topSectionHeight), "", EditorStyles.inspectorBig);
 
  float topmargin = 7;
  float margin = 11;
@@ -423,18 +423,18 @@ void DrawAnnotationList(float startY, float height)
  Rect scrollViewRect = new Rect(0,
  startY + barHeight,
  position.width - 4,
- height - barHeight - frameWidth);
+ height - barHeight - k_FrameWidth);
  float totalContentHeight = DrawNormalList(false, 0, 0, 100000);
  Rect contentRect = new Rect(0, 0, 1, totalContentHeight);
  bool isScrollbarVisible = totalContentHeight > scrollViewRect.height;
  float listElementWidth = scrollViewRect.width;
  if (isScrollbarVisible)
- listElementWidth -= scrollBarWidth;
+ listElementWidth -= k_ScrollBarWidth;
 
  // Scrollview
  m_ScrollPosition = GUI.BeginScrollView(scrollViewRect, m_ScrollPosition, contentRect, false, false, GUI.skin.horizontalScrollbar, GUI.skin.verticalScrollbar, EditorStyles.scrollViewAlt);
  {
- DrawNormalList(true, listElementWidth, m_ScrollPosition.y - listElementHeight, m_ScrollPosition.y + totalContentHeight);
+ DrawNormalList(true, listElementWidth, m_ScrollPosition.y - k_ListElementHeight, m_ScrollPosition.y + totalContentHeight);
  }
  GUI.EndScrollView();
  }
@@ -514,11 +514,11 @@ float DrawListSection(float y, string sectionHeader, List<GizmoInfo> listElement
  Flip(ref even);
  if (curY > startY && curY < endY)
  {
- Rect rect = new Rect(1, curY, listElementWidth - 2, listElementHeight);
+ Rect rect = new Rect(1, curY, listElementWidth - 2, k_ListElementHeight);
  if (doDraw)
  DrawListElement(rect, even, listElements[i]);
  }
- curY += listElementHeight;
+ curY += k_ListElementHeight;
  }
 
  if (useSeperator)

Editor/Mono/Annotation/LayerVisibilityWindow.cs

@@ -35,12 +35,13 @@ public Styles()
  }
  }
 
- const float kScrollBarWidth = 14;
- const float kFrameWidth = 1f;
- const float kToggleSize = 17;
- const float kSeparatorHeight = 6;
- const string kLayerVisible = "Show/Hide Layer";
- const string kLayerPickable = "Toggle Pickable status this Layer. Non-Pickable items cannot be selected in the Scene View.";
+ const float k_ScrollBarWidth = 14;
+ 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;
@@ -86,7 +87,7 @@ internal static bool ShowAtPosition(Rect buttonRect)
  {
  // We could not use realtimeSinceStartUp since it is set to 0 when entering/exitting playmode, we assume an increasing time when comparing time.
  long nowMilliSeconds = System.DateTime.Now.Ticks / System.TimeSpan.TicksPerMillisecond;
- bool justClosed = nowMilliSeconds < s_LastClosedTime + 50;
+ bool justClosed = nowMilliSeconds < s_LastClosedTime + k_JustClosedPeriod;
  if (!justClosed)
  {
  Event.current.Use();
@@ -107,16 +108,16 @@ private void Init(Rect buttonRect)
 
  var rowCount = (s_LayerNames.Count + 2 + 1 + 1);
 
- var windowHeight = rowCount * EditorGUI.kSingleLineHeight + kSeparatorHeight;
+ var windowHeight = rowCount * EditorGUI.kSingleLineHeight + k_SeparatorHeight;
 
  int sortingLayerCount = InternalEditorUtility.GetSortingLayerCount();
  if (sortingLayerCount > 1)
  {
- windowHeight += kSeparatorHeight + EditorGUI.kSingleLineHeight;
+ windowHeight += k_SeparatorHeight + EditorGUI.kSingleLineHeight;
  windowHeight += sortingLayerCount * EditorGUI.kSingleLineHeight;
  }
  m_ContentHeight = windowHeight;
- windowHeight += 2 * kFrameWidth;
+ windowHeight += 2 * k_FrameWidth;
  windowHeight = Mathf.Min(windowHeight, 600);
 
  var windowSize = new Vector2(180, windowHeight);
@@ -132,12 +133,12 @@ internal void OnGUI()
  if (s_Styles == null)
  s_Styles = new Styles();
 
- var scrollViewRect = new Rect(kFrameWidth, kFrameWidth, position.width - 2 * kFrameWidth, position.height - 2 * kFrameWidth);
+ var scrollViewRect = new Rect(k_FrameWidth, k_FrameWidth, position.width - 2 * k_FrameWidth, position.height - 2 * k_FrameWidth);
  var contentRect = new Rect(0, 0, 1, m_ContentHeight);
  bool isScrollbarVisible = m_ContentHeight > scrollViewRect.height;
  float listElementWidth = scrollViewRect.width;
  if (isScrollbarVisible)
- listElementWidth -= kScrollBarWidth;
+ listElementWidth -= k_ScrollBarWidth;
 
  m_ScrollPosition = GUI.BeginScrollView(scrollViewRect, m_ScrollPosition, contentRect, false, false, GUI.skin.horizontalScrollbar, GUI.skin.verticalScrollbar, EditorStyles.scrollViewAlt);
  Draw(listElementWidth);
@@ -174,9 +175,9 @@ private void DrawHeader(ref Rect rect, string text, ref bool even)
 
  private void DrawSeparator(ref Rect rect, bool even)
  {
- DrawListBackground(new Rect(rect.x + 1, rect.y, rect.width - 2, kSeparatorHeight), even);
+ DrawListBackground(new Rect(rect.x + 1, rect.y, rect.width - 2, k_SeparatorHeight), even);
  GUI.Label(new Rect(rect.x + 5, rect.y + 3, rect.width - 10, 3), GUIContent.none, s_Styles.separator);
- rect.y += kSeparatorHeight;
+ rect.y += k_SeparatorHeight;
  }
 
  private void Draw(float listElementWidth)
@@ -279,16 +280,16 @@ private void DoLayerEntry(Rect rect, string layerName, bool even, bool showVisib
  EditorGUI.BeginChangeCheck();
  // text (works as visibility toggle as well)
  Rect textRect = rect;
- textRect.width -= kToggleSize * 2;
+ textRect.width -= k_ToggleSize * 2;
  visible = GUI.Toggle(textRect, visible, EditorGUIUtility.TempContent(layerName), s_Styles.listTextStyle);
 
  // visible checkbox
- var toggleRect = new Rect(rect.width - kToggleSize * 2, rect.y + (rect.height - kToggleSize) * 0.5f, kToggleSize, kToggleSize);
+ var toggleRect = new Rect(rect.width - k_ToggleSize * 2, rect.y + (rect.height - k_ToggleSize) * 0.5f, k_ToggleSize, k_ToggleSize);
  visibleChanged = false;
  if (showVisible)
  {
  var iconRect = toggleRect;
- var gc = new GUIContent(string.Empty, visible ? s_Styles.visibleOn : s_Styles.visibleOff, kLayerVisible);
+ var gc = new GUIContent(string.Empty, visible ? s_Styles.visibleOn : s_Styles.visibleOff, k_LayerVisible);
  GUI.Toggle(iconRect, visible, gc, GUIStyle.none);
  visibleChanged = EditorGUI.EndChangeCheck();
  }
@@ -297,9 +298,9 @@ private void DoLayerEntry(Rect rect, string layerName, bool even, bool showVisib
  lockedChanged = false;
  if (showLock)
  {
- toggleRect.x += kToggleSize;
+ toggleRect.x += k_ToggleSize;
  EditorGUI.BeginChangeCheck();
- var gc = new GUIContent(string.Empty, picked ? s_Styles.notpickable : s_Styles.pickable, kLayerPickable);
+ var gc = new GUIContent(string.Empty, picked ? s_Styles.notpickable : s_Styles.pickable, k_LayerPickable);
  GUI.Toggle(toggleRect, picked, gc, GUIStyle.none);
  lockedChanged = EditorGUI.EndChangeCheck();
  }

Editor/Mono/AssemblyInfo/AssemblyInfo.cs

@@ -34,9 +34,28 @@
 [assembly: InternalsVisibleTo("UnityEngine.Common")]
 [assembly: InternalsVisibleTo("Unity.PureCSharpTests")]
 [assembly: InternalsVisibleTo("Unity.IntegrationTests")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.Android")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.Animation")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.AssetImporting")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.BuildPipeline")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.Builds")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.CrashReporting")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.DeploymentTargets")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.EditorApplication")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.EditorUI")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.GameCore")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.GameView")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.Lightmapping")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.Metro")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.Misc")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.PackageManager")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.Profiler")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.Rendering")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.SceneVisibility")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.ShortcutManager")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.UIToolkit")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.Framework.PackageManager")]
 [assembly: InternalsVisibleTo("Unity.DeploymentTests.Services")]
-[assembly: InternalsVisibleTo("Unity.IntegrationTests.ExternalVersionControl")]
-[assembly: InternalsVisibleTo("Unity.IntegrationTests.UnityAnalytics")]
 [assembly: InternalsVisibleTo("Unity.PerformanceIntegrationTests")]
 [assembly: InternalsVisibleTo("Unity.Timeline.Editor")]
 [assembly: InternalsVisibleTo("Unity.PackageManagerUI.Develop.Editor")]

Editor/Mono/AssetPipeline/SpeedTree/SpeedTreeImporterCommon.cs

@@ -86,7 +86,7 @@ internal class Styles
  // Meshes labels
  public static GUIContent MeshesHeader = EditorGUIUtility.TrTextContent("Meshes");
  public static GUIContent UnitConversion = EditorGUIUtility.TrTextContent("Unit Conversion", "Select the unit conversion to apply to the imported SpeedTree asset.");
- public static GUIContent ScaleFactor = EditorGUIUtility.TrTextContent("Scale Factor", "How much to scale the tree model, interpreting the exported units as meters");
+ public static GUIContent ScaleFactor = EditorGUIUtility.TrTextContent("Scale Factor", "How much to scale the tree model, interpreting the exported units as meters. Must be positive.");
  public static GUIContent[] UnitConversionNames =
  {
  new GUIContent("Leave As Is")
@@ -181,6 +181,14 @@ static internal void ShowMeshGUI(
  if (bShowCustomScaleFactor)
  {
  EditorGUILayout.PropertyField(scaleFactor, Styles.ScaleFactor);
+ if (scaleFactor.floatValue < 0f)
+ {
+ scaleFactor.floatValue = 0f;
+ }
+ if (scaleFactor.floatValue == 0f)
+ {
+ EditorGUILayout.HelpBox("Scale factor must be positive.", MessageType.Warning);
+ }
  }
  }
 

Editor/Mono/BuildPipeline/DataBuildDirtyTracker.cs

@@ -51,12 +51,15 @@ class BuildData
  BuildOptions.ConnectWithProfiler |
  BuildOptions.UncompressedAssetBundle |
  BuildOptions.CompressWithLz4HC;
+
+ public string[] assemblyNames;
  }
 
  private BuildData buildData;
  private string[] scenes;
  private NPath activeBuildProfilePath;
  public BuildOptions buildOptions;
+ private string[] assemblyNames;
 
  bool CheckAssetDirty(BuildDataInputFile file)
  {
@@ -106,6 +109,12 @@ bool DoCheckDirty()
  return true;
  }
 
+ if (!assemblyNames.SequenceEqual(buildData.assemblyNames))
+ {
+ Console.WriteLine("Rebuilding Data files because the assembly list is dirty");
+ return true;
+ }
+
  if (buildData.inputFiles.Any(CheckAssetDirty))
  return true;
 
@@ -148,7 +157,7 @@ bool DoCheckDirty()
  }
 
  [RequiredByNativeCode]
- static public void WriteBuildData(string buildDataPath, BuildReport report, string[] scenes, string[] prefabs, string activeBuildProfilePath)
+ static public void WriteBuildData(string buildDataPath, BuildReport report, string[] scenes, string[] prefabs, string activeBuildProfilePath, string[] assemblyNames)
  {
  var developmentBuild = report.summary.options.HasFlag(BuildOptions.Development);
  var inputScenes = new List<BuildDataInputFile>();
@@ -178,13 +187,14 @@ static public void WriteBuildData(string buildDataPath, BuildReport report, stri
  resourcePaths = ResourcesAPIInternal.GetAllPaths("").OrderBy(p => p).ToArray(),
  enabledModules = ModuleMetadata.GetModuleNames()
  .Where(m => ModuleMetadata.GetModuleIncludeSettingForModule(m) != ModuleIncludeSetting.ForceExclude)
- .ToArray()
+ .ToArray(),
+ assemblyNames = assemblyNames.OrderBy(p => p).ToArray()
  };
  buildDataPath.ToNPath().WriteAllText(JsonUtility.ToJson(buildData));
  }
 
  [RequiredByNativeCode]
- static public bool CheckDirty(string buildDataPath, BuildOptions buildOptions, string[] scenes, string activeBuildProfilePath)
+ static public bool CheckDirty(string buildDataPath, BuildOptions buildOptions, string[] scenes, string activeBuildProfilePath, string[] assemblyNames)
  {
  NPath buildReportPath = buildDataPath;
  if (!buildReportPath.FileExists())
@@ -197,7 +207,8 @@ static public bool CheckDirty(string buildDataPath, BuildOptions buildOptions, s
  buildData = JsonUtility.FromJson<BuildData>(buildReportPath.ReadAllText()),
  scenes = scenes,
  activeBuildProfilePath = activeBuildProfilePath,
- buildOptions = buildOptions
+ buildOptions = buildOptions,
+ assemblyNames = assemblyNames.OrderBy(p => p).ToArray()
  };
  return tracker.DoCheckDirty();
  }

Editor/Mono/BuildProfile/BuildProfile.cs

@@ -344,7 +344,7 @@ void TryLoadQualitySettings()
 
  void OnDisable()
  {
- if (BuildProfileContext.activeProfile == this)
+ if (IsActiveBuildProfileOrPlatform())
  EditorUserBuildSettings.SetActiveProfileScriptingDefines(m_ScriptingDefines);
 
  var playerSettingsDirty = EditorUtility.IsDirty(m_PlayerSettings);
@@ -371,6 +371,7 @@ static void ContextMenuReset(MenuCommand menuCommand)
 
  targetBuildProfile.platformBuildProfile = null;
  targetBuildProfile.TryCreatePlatformSettings();
+ targetBuildProfile.overrideGlobalScenes = false;
  targetBuildProfile.scenes = Array.Empty<EditorBuildSettingsScene>();
  targetBuildProfile.scriptingDefines = Array.Empty<string>();
 

Editor/Mono/BuildProfile/BuildProfileContext.cs

@@ -106,9 +106,9 @@ internal static BuildProfile activeProfile
 
  EditorUserBuildSettings.activeBuildProfile = value;
 
- activeProfileChanged?.Invoke(prev, value);
  OnActiveProfileChangedForSettingExtension(prev, value);
  value.UpdateGlobalManagerPlayerSettings();
+ activeProfileChanged?.Invoke(prev, value);
  EditorGraphicsSettings.activeProfileHasGraphicsSettings = ActiveProfileHasGraphicsSettings();
  BuildProfileModuleUtil.RequestScriptCompilation(value);
  }

Editor/Mono/ConsoleWindow.cs

@@ -30,6 +30,7 @@ internal class ConsoleWindow : EditorWindow, IHasCustomMenu
  private static int m_DefaultFontSize;
  private static List<MethodInfo> s_MethodsToHideInCallstack = null;
  private static Dictionary<MethodInfo, Regex> s_GenericMethodSignatureRegex = null;
+ private static bool m_ShouldSkipClearingConsoleAfterBuild = false;
 
  //TODO: move this out of here
  internal class Constants
@@ -1202,12 +1203,26 @@ private void AddStackTraceLoggingMenu(GenericMenu menu)
 
  internal static void ClearConsoleOnRecompile()
  {
+ //After building a player, there's a recompilation happening as well
+ //And in order not to lose the log entries, we need to skip clearing the console one time
+ if (BuildPipeline.isBuildingPlayer)
+ {
+ m_ShouldSkipClearingConsoleAfterBuild = true;
+ }
+
  // During build process, there are multiple compilation events that can trigger console clearing
  // We don't want to lose the log entries during build process so we re-enable the flag only when editor is not building
  // For clearing on build we have a separate option
  if (HasFlag(ConsoleFlags.ClearOnRecompile) && !BuildPipeline.isBuildingPlayer)
  {
- LogEntries.Clear();
+ if (!m_ShouldSkipClearingConsoleAfterBuild)
+ {
+ LogEntries.Clear();
+ }
+ else
+ {
+ m_ShouldSkipClearingConsoleAfterBuild = false;
+ }
  }
 
  }