Unity 2018.1.0b3 C# reference source code

Author: Unity Technologies

Editor/Mono/Collab/Collab.cs

@@ -17,6 +17,7 @@
 namespace UnityEditor.Collaboration
 {
  internal delegate void StateChangedDelegate(CollabInfo info);
+ internal delegate void ErrorDelegate();
 
  [Flags]
  internal enum CollabOperation : ulong
@@ -51,6 +52,8 @@ internal partial class Collab
  public event StateChangedDelegate StateChanged;
  public event StateChangedDelegate RevisionUpdated;
  public event StateChangedDelegate JobsCompleted;
+ public event ErrorDelegate ErrorOccurred;
+ public event ErrorDelegate ErrorCleared;
 
  private static Collab s_Instance;
  private static bool s_IsFirstStateChange = true;
@@ -269,6 +272,7 @@ private static void OnStateChanged()
  }
  }
 
+ [RequiredByNativeCode]
  private static void OnRevisionUpdated()
  {
  var handler = instance.RevisionUpdated;
@@ -278,6 +282,22 @@ private static void OnRevisionUpdated()
  }
  }
 
+ [RequiredByNativeCode]
+ private static void SetCollabError()
+ {
+ var handler = instance.ErrorOccurred;
+ if (handler != null)
+ handler();
+ }
+
+ [RequiredByNativeCode]
+ private static void ClearCollabError()
+ {
+ var handler = instance.ErrorCleared;
+ if (handler != null)
+ handler();
+ }
+
  private static void OnJobsCompleted()
  {
  var handler = instance.JobsCompleted;

Editor/Mono/Collab/CollabHistoryWindow.cs

@@ -39,7 +39,6 @@ public static bool ValidateShowHistoryWindow()
  VisualElement m_Container;
  PagedListView m_Pager;
  int m_ItemsPerPage = 5;
- string m_ErrMessage;
  string m_InProgressRev;
  bool m_RevisionActionsEnabled;
 
@@ -244,12 +243,6 @@ public int itemsPerPage
  }
  }
 
- public string errMessage
- {
- private get { return m_ErrMessage; }
- set { m_ErrMessage = value; }
- }
-
  public PageChangeAction OnPageChangeAction
  {
  set { m_Pager.OnPageChange = value; }

Editor/Mono/Collab/Presenters/CollabHistoryPresenter.cs

@@ -15,6 +15,7 @@ internal class CollabHistoryPresenter
  IRevisionsService m_Service;
  ConnectInfo m_ConnectState;
  CollabInfo m_CollabState;
+ bool m_IsCollabError;
  int m_TotalRevisions;
  int m_CurrentPage;
  BuildAccess m_BuildAccess;
@@ -36,6 +37,8 @@ public void OnWindowEnabled()
  Collab.instance.StateChanged += OnCollabStateChanged;
  Collab.instance.RevisionUpdated += OnCollabRevisionUpdated;
  Collab.instance.JobsCompleted += OnCollabJobsCompleted;
+ Collab.instance.ErrorOccurred += OnCollabError;
+ Collab.instance.ErrorCleared += OnCollabErrorCleared;
  EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
 
  if (Collab.instance.IsConnected())
@@ -133,6 +136,18 @@ private void OnCollabJobsCompleted(CollabInfo state)
  m_ProgressRevision = null;
  }
 
+ private void OnCollabError()
+ {
+ m_IsCollabError = true;
+ m_Window.UpdateState(RecalculateState(), false);
+ }
+
+ private void OnCollabErrorCleared()
+ {
+ m_IsCollabError = false;
+ m_Window.UpdateState(RecalculateState(), false);
+ }
+
  private void OnPlayModeStateChanged(PlayModeStateChange stateChange)
  {
  // If entering play mode, disable
@@ -151,11 +166,6 @@ private void OnPlayModeStateChanged(PlayModeStateChange stateChange)
 
  private HistoryState RecalculateState()
  {
- if (m_ConnectState.error)
- {
- m_Window.errMessage = m_ConnectState.lastErrorMsg;
- return HistoryState.Error;
- }
  if (!m_ConnectState.online)
  return HistoryState.Offline;
  if (m_ConnectState.maintenance || m_CollabState.maintenance)
@@ -168,6 +178,8 @@ private HistoryState RecalculateState()
  return HistoryState.Disabled;
  if (!Collab.instance.IsConnected() || !m_CollabState.ready)
  return HistoryState.Waiting;
+ if (m_ConnectState.error || m_IsCollabError)
+ return HistoryState.Error;
 
  return HistoryState.Ready;
  }

Editor/Mono/Collab/Views/ICollabHistoryWindow.cs

@@ -69,7 +69,6 @@ internal interface ICollabHistoryWindow
 
  bool revisionActionsEnabled { get; set; }
  int itemsPerPage { set; }
- string errMessage { set; }
  string inProgressRevision { get; set; }
  PageChangeAction OnPageChangeAction { set; }
  RevisionAction OnGoBackAction { set; }

Editor/Mono/ContainerWindow.cs

@@ -187,8 +187,7 @@ internal bool IsNotDocked()
 
  (m_ShowMode == (int)ShowMode.Utility || m_ShowMode == (int)ShowMode.AuxWindow) ||
 
- (rootView as SplitView != null &&
- rootView.children.Length == 1 &&
+ (rootView is SplitView &&
  rootView.children.Length == 1 &&
  rootView.children[0] is DockArea &&
  ((DockArea)rootView.children[0]).m_Panes.Count == 1)

Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs

@@ -46,7 +46,7 @@ static class Styles
  public static readonly GUIContent recordingInfo = EditorGUIUtility.TrTextContent("Reordering the list will switch editor to the first available platform");
  public static readonly GUIContent notApplicableInfo = EditorGUIUtility.TrTextContent("Not applicable for this platform.");
  public static readonly GUIContent sharedBetweenPlatformsInfo = EditorGUIUtility.TrTextContent("* Shared setting between multiple platforms.");
- public static readonly GUIContent VRSupportOverridenInfo = EditorGUIUtility.TrTextContent("This setting is overridden by Virtual Reality Support.");
+ public static readonly GUIContent vrOrientationInfo = EditorGUIUtility.TrTextContent("Virtual Reality Support is enabled. Upon entering VR mode, landscape left orientation will be the default orientation unless only landscape right is available.");
  public static readonly GUIContent IL2CPPAndroidExperimentalInfo = EditorGUIUtility.TrTextContent("IL2CPP on Android is experimental and unsupported");
 
  public static readonly GUIContent cursorHotspot = EditorGUIUtility.TrTextContent("Cursor Hotspot");
@@ -847,42 +847,39 @@ public void ResolutionSectionGUI(BuildTargetGroup targetGroup, ISettingEditorExt
  {
  GUILayout.Label(Styles.orientationTitle, EditorStyles.boldLabel);
 
- using (new EditorGUI.DisabledScope(PlayerSettings.virtualRealitySupported))
- {
- EditorGUILayout.PropertyField(m_DefaultScreenOrientation, Styles.defaultScreenOrientation);
+ EditorGUILayout.PropertyField(m_DefaultScreenOrientation, Styles.defaultScreenOrientation);
 
-  if (PlayerSettings.virtualRealitySupported)
-  {
-  EditorGUILayout.HelpBox(Styles.VRSupportOverridenInfo.text, MessageType.Info);
-  }
+ if (PlayerSettings.virtualRealitySupported)
+ {
+ EditorGUILayout.HelpBox(Styles.vrOrientationInfo.text, MessageType.Warning);
+ }
 
-  if (m_DefaultScreenOrientation.enumValueIndex == 4)
-  {
-  if (targetGroup == BuildTargetGroup.iOS || targetGroup == BuildTargetGroup.Tizen)
-  EditorGUILayout.PropertyField(m_UseOSAutoRotation, Styles.useOSAutoRotation);
+ if (m_DefaultScreenOrientation.enumValueIndex == (int)UIOrientation.AutoRotation)
+ {
+ if (targetGroup == BuildTargetGroup.iOS || targetGroup == BuildTargetGroup.Tizen)
+ EditorGUILayout.PropertyField(m_UseOSAutoRotation, Styles.useOSAutoRotation);
 
-  EditorGUI.indentLevel++;
+ EditorGUI.indentLevel++;
 
-  GUILayout.Label(Styles.allowedOrientationTitle, EditorStyles.boldLabel);
+ GUILayout.Label(Styles.allowedOrientationTitle, EditorStyles.boldLabel);
 
-  bool somethingAllowed = m_AllowedAutoRotateToPortrait.boolValue
-  || m_AllowedAutoRotateToPortraitUpsideDown.boolValue
-  || m_AllowedAutoRotateToLandscapeRight.boolValue
-  || m_AllowedAutoRotateToLandscapeLeft.boolValue;
+ bool somethingAllowed = m_AllowedAutoRotateToPortrait.boolValue
+ || m_AllowedAutoRotateToPortraitUpsideDown.boolValue
+ || m_AllowedAutoRotateToLandscapeRight.boolValue
+ || m_AllowedAutoRotateToLandscapeLeft.boolValue;
 
-  if (!somethingAllowed)
-  {
-  m_AllowedAutoRotateToPortrait.boolValue = true;
-  Debug.LogError("All orientations are disabled. Allowing portrait");
-  }
+ if (!somethingAllowed)
+ {
+ m_AllowedAutoRotateToPortrait.boolValue = true;
+ Debug.LogError("All orientations are disabled. Allowing portrait");
+ }
 
-  EditorGUILayout.PropertyField(m_AllowedAutoRotateToPortrait, Styles.allowedAutoRotateToPortrait);
-  EditorGUILayout.PropertyField(m_AllowedAutoRotateToPortraitUpsideDown, Styles.allowedAutoRotateToPortraitUpsideDown);
-  EditorGUILayout.PropertyField(m_AllowedAutoRotateToLandscapeRight, Styles.allowedAutoRotateToLandscapeRight);
-  EditorGUILayout.PropertyField(m_AllowedAutoRotateToLandscapeLeft, Styles.allowedAutoRotateToLandscapeLeft);
+ EditorGUILayout.PropertyField(m_AllowedAutoRotateToPortrait, Styles.allowedAutoRotateToPortrait);
+ EditorGUILayout.PropertyField(m_AllowedAutoRotateToPortraitUpsideDown, Styles.allowedAutoRotateToPortraitUpsideDown);
+ EditorGUILayout.PropertyField(m_AllowedAutoRotateToLandscapeRight, Styles.allowedAutoRotateToLandscapeRight);
+ EditorGUILayout.PropertyField(m_AllowedAutoRotateToLandscapeLeft, Styles.allowedAutoRotateToLandscapeLeft);
 
- EditorGUI.indentLevel--;
- }
+ EditorGUI.indentLevel--;
  }
  }
 

Editor/Mono/ParticleSystemEditor/ParticleSystemModules/InitialModuleUI.cs

@@ -304,6 +304,9 @@ override public void UpdateCullingSupportedString(ref string text)
 
  if (m_GravityModifier.state != MinMaxCurveState.k_Scalar)
  text += "\nGravity modifier is not constant.";
+
+ if (m_StopAction.intValue != 0)
+ text += "\nStop Action is being used.";
  }
  }
 } // namespace UnityEditor

Editor/Mono/ParticleSystemEditor/ParticleSystemUI.cs

@@ -21,15 +21,6 @@ internal class ParticleSystemUI
  private string m_SupportsCullingText;
  private string m_SupportsCullingTextLabel; // Cached version including bullet points
 
- // Keep in sync with ParticleSystemEditor.h
- public enum DefaultTypes
- {
- Root,
- SubBirth,
- SubCollision,
- SubDeath,
- };
-
  protected class Texts
  {
  public GUIContent addModules = new GUIContent("", "Show/Hide Modules");
@@ -64,7 +55,7 @@ public void Init(ParticleEffectUI owner, ParticleSystem[] systems)
 
  internal ModuleUI GetParticleSystemRendererModuleUI()
  {
- return m_Modules[m_Modules.Length - 1];
+ return m_Modules.Last();
  }
 
  private void InitRendererUI()
@@ -84,10 +75,10 @@ private void InitRendererUI()
  // Create RendererModuleUI
  if (renderers.Count > 0)
  {
- System.Diagnostics.Debug.Assert(m_Modules[m_Modules.Length - 1] == null); // If hitting this assert we have either not cleaned up the previous renderer or hitting another module
+ System.Diagnostics.Debug.Assert(m_Modules.Last() == null); // If hitting this assert we have either not cleaned up the previous renderer or hitting another module
 
  m_RendererSerializedObject = new SerializedObject(renderers.ToArray());
- m_Modules[m_Modules.Length - 1] = new RendererModuleUI(this, m_RendererSerializedObject, s_ModuleNames[s_ModuleNames.Length - 1]);
+ m_Modules[m_Modules.Length - 1] = new RendererModuleUI(this, m_RendererSerializedObject, s_ModuleNames.Last());
  }
  }
 
@@ -465,7 +456,7 @@ void ResetModules()
  }
 
  // Default setup has a renderer
- if (m_Modules[m_Modules.Length - 1] == null)
+ if (m_Modules.Last() == null)
  InitRendererUI();
 
  // Default setup has shape, emission and renderer

Editor/Mono/PlatformSupport/PlayerSettingsPlatformIcons.bindings.cs

@@ -252,10 +252,17 @@ public static PlatformIcon[] GetPlatformIcons(BuildTargetGroup platform, Platfor
  PlatformIconStruct[] serializedIcons = GetPlatformIconsInternal(platformName, kind.kind);
  PlatformIcon[] icons = PlatformIcon.GetRequiredPlatformIconsByType(platformIconProvider, kind);
 
+ if (serializedIcons.Length <= 0)
+ {
+ ImportLegacyIcons(platform, kind, icons);
+ SetPlatformIcons(platform, kind, icons);
+ }
+
  if (serializedIcons.Length <= 0)
  {
  foreach (var icon in icons)
- icon.SetTextures(null);
+ if (icon.IsEmpty())
+ icon.SetTextures(null);
  }
  else
  {
@@ -332,6 +339,13 @@ internal static int GetNonEmptyPlatformIconCount(PlatformIcon[] icons)
  return icons.Count(i => !i.IsEmpty());
  }
 
+ internal static int GetValidPlatformIconCount(PlatformIcon[] icons)
+ {
+ return icons.Count(
+ i => i.GetTextures().Count(t => t != null) >= i.minLayerCount && i.layerCount <= i.maxLayerCount
+ );
+ }
+
  [StaticAccessor("GetPlayerSettings()", StaticAccessorType.Dot)]
  [NativeMethod(Name = "SetIconsForPlatform")]
  extern internal static void SetPlatformIconsInternal(string platform, PlatformIconStruct[] icons, int kind);
@@ -351,8 +365,6 @@ internal static void ClearSetIconsForPlatform(BuildTargetGroup target)
 
  // Old API methods, will be made obsolete when the new API is implemented for all platforms,
  // currently it functions as a wrapper for the new API for all platforms that support it (iOS, Android & tvOS).
-
-
  public static void SetIconsForTargetGroup(BuildTargetGroup platform, Texture2D[] icons, IconKind kind)
  {
  if (platform == BuildTargetGroup.iOS || platform == BuildTargetGroup.tvOS || platform == BuildTargetGroup.Android)
@@ -402,6 +414,37 @@ public static Texture2D[] GetIconsForTargetGroup(BuildTargetGroup platform, Icon
  }
  }
 
+ internal static void ImportLegacyIcons(string platform, PlatformIconKind kind, PlatformIcon[] platformIcons)
+ {
+ if (!Enum.IsDefined(typeof(IconKind), kind.kind))
+ return;
+
+ IconKind iconKind = (IconKind)kind.kind;
+
+ Texture2D[] legacyIcons = GetIconsForPlatform(platform, iconKind);
+ int[] legacyIconWidths = GetIconWidthsForPlatform(platform, iconKind);
+ int[] legacyIconHeights = GetIconHeightsForPlatform(platform, iconKind);
+
+ for (var i = 0; i < legacyIcons.Length; i++)
+ {
+ List<PlatformIcon> selectedIcons = new List<PlatformIcon>();
+ foreach (var icon in platformIcons)
+ {
+ if (icon.width == legacyIconWidths[i] && icon.height == legacyIconHeights[i])
+ {
+ selectedIcons.Add(icon);
+ }
+ }
+ foreach (var selectedIcon in selectedIcons)
+ selectedIcon.SetTextures(legacyIcons[i]);
+ }
+ }
+
+ internal static void ImportLegacyIcons(BuildTargetGroup platform, PlatformIconKind kind, PlatformIcon[] platformIcons)
+ {
+ ImportLegacyIcons(GetPlatformName(platform), kind, platformIcons);
+ }
+
  // Returns the list of assigned icons for the specified platform.
  public static Texture2D[] GetIconsForTargetGroup(BuildTargetGroup platform)
  {