Unity 2017.3.0a5 C# reference source code

Author: Unity Technologies

Editor/Mono/2D/SpriteAtlas/SpriteAtlasInspector.cs

@@ -53,8 +53,10 @@ class Styles
  public readonly GUIContent bindAsDefaultLabel = EditorGUIUtility.TextContent("Include in Build|Packed textures will be included in the build by default.");
  public readonly GUIContent enableRotationLabel = EditorGUIUtility.TextContent("Allow Rotation|Try rotating the sprite to fit better during packing.");
  public readonly GUIContent enableTightPackingLabel = EditorGUIUtility.TextContent("Tight Packing|Use the mesh outline to fit instead of the whole texture rect during packing.");
+ public readonly GUIContent paddingLabel = EditorGUIUtility.TextContent("Padding|The amount of extra padding between packed sprites.");
 
  public readonly GUIContent generateMipMapLabel = EditorGUIUtility.TextContent("Generate Mip Maps");
+ public readonly GUIContent sRGBLabel = EditorGUIUtility.TextContent("sRGB|Texture content is stored in gamma space.");
  public readonly GUIContent readWrite = EditorGUIUtility.TextContent("Read/Write Enabled|Enable to be able to access the raw pixel data from code.");
  public readonly GUIContent variantMultiplierLabel = EditorGUIUtility.TextContent("Scale|Down scale ratio.");
  public readonly GUIContent copyMasterButton = EditorGUIUtility.TextContent("Copy Master's Settings|Copy all master's settings into this variant.");
@@ -77,10 +79,17 @@ class Styles
  EditorGUIUtility.TextContent("Variant"),
  };
 
+ public readonly int[] paddingValues = { 2, 4, 8 };
+ public readonly GUIContent[] paddingOptions;
+
  public Styles()
  {
  dropzoneStyle.alignment = TextAnchor.MiddleCenter;
  dropzoneStyle.border = new RectOffset(10, 10, 10, 10);
+
+ paddingOptions = new GUIContent[paddingValues.Length];
+ for (var i = 0; i < paddingValues.Length; ++i)
+ paddingOptions[i] = EditorGUIUtility.TextContent(paddingValues[i].ToString());
  }
  }
 
@@ -98,8 +107,10 @@ private enum AtlasType { Undefined = -1, Master = 0, Variant = 1 }
  private SerializedProperty m_AnisoLevel;
  private SerializedProperty m_GenerateMipMaps;
  private SerializedProperty m_Readable;
+ private SerializedProperty m_UseSRGB;
  private SerializedProperty m_EnableTightPacking;
  private SerializedProperty m_EnableRotation;
+ private SerializedProperty m_Padding;
  private SerializedProperty m_BindAsDefault;
  private SerializedProperty m_Packables;
 
@@ -171,9 +182,11 @@ void OnEnable()
  m_AnisoLevel = serializedObject.FindProperty("m_EditorData.textureSettings.anisoLevel");
  m_GenerateMipMaps = serializedObject.FindProperty("m_EditorData.textureSettings.generateMipMaps");
  m_Readable = serializedObject.FindProperty("m_EditorData.textureSettings.readable");
+ m_UseSRGB = serializedObject.FindProperty("m_EditorData.textureSettings.sRGB");
 
  m_EnableTightPacking = serializedObject.FindProperty("m_EditorData.packingParameters.enableTightPacking");
  m_EnableRotation = serializedObject.FindProperty("m_EditorData.packingParameters.enableRotation");
+ m_Padding = serializedObject.FindProperty("m_EditorData.packingParameters.padding");
 
  m_Hash = serializedObject.FindProperty("m_EditorData.hashString").stringValue;
  m_MasterAtlas = serializedObject.FindProperty("m_MasterAtlas");
@@ -389,6 +402,7 @@ private void HandleMasterSettingUI()
 
  HandleBoolToIntPropertyField(m_EnableRotation, s_Styles.enableRotationLabel);
  HandleBoolToIntPropertyField(m_EnableTightPacking, s_Styles.enableTightPackingLabel);
+ EditorGUILayout.IntPopup(m_Padding, s_Styles.paddingOptions, s_Styles.paddingValues, s_Styles.paddingLabel);
 
  GUILayout.Space(EditorGUI.kSpacing);
  }
@@ -399,6 +413,7 @@ private void HandleTextureSettingUI()
 
  HandleBoolToIntPropertyField(m_Readable, s_Styles.readWrite);
  HandleBoolToIntPropertyField(m_GenerateMipMaps, s_Styles.generateMipMapLabel);
+ HandleBoolToIntPropertyField(m_UseSRGB, s_Styles.sRGBLabel);
  EditorGUILayout.PropertyField(m_FilterMode);
 
  var showAniso = !m_FilterMode.hasMultipleDifferentValues && !m_GenerateMipMaps.hasMultipleDifferentValues

Editor/Mono/Animation/AnimationWindow/AnimationContextualPropertyMenu.cs

@@ -60,17 +60,25 @@ void OnPropertyContextMenu(GenericMenu menu, SerializedProperty property)
  }
  }
 
- void OnPropertyContextMenu(GenericMenu menu, MaterialProperty property, Renderer targetObject)
+ void OnPropertyContextMenu(GenericMenu menu, MaterialProperty property, Renderer[] renderers)
  {
  if (m_Responder == null)
  return;
 
  if (property.targets == null || property.targets.Length == 0)
  return;
 
- PropertyModification[] modifications = MaterialAnimationUtility.MaterialPropertyToPropertyModifications(property, targetObject);
- if (m_Responder.IsEditable(targetObject))
- OnPropertyContextMenu(menu, modifications);
+ if (renderers == null || renderers.Length == 0)
+ return;
+
+ var modifications = new List<PropertyModification>();
+ foreach (Renderer renderer in renderers)
+ {
+ modifications.AddRange(MaterialAnimationUtility.MaterialPropertyToPropertyModifications(property, renderer));
+ }
+
+ if (m_Responder.IsEditable(renderers[0]))
+ OnPropertyContextMenu(menu, modifications.ToArray());
  else
  OnDisabledPropertyContextMenu(menu);
  }

Editor/Mono/Animation/AnimationWindow/AnimationWindowClipPopup.cs

@@ -69,15 +69,21 @@ private string[] GetClipMenuContent()
  return content.ToArray();
  }
 
- private string[] GetClipNames()
+ private AnimationClip[] GetOrderedClipList()
  {
- string[] clipNames;
-
  AnimationClip[] clips = new AnimationClip[0];
- if (state.activeRootGameObject != null && state.activeAnimationClip != null)
+ if (state.activeRootGameObject != null)
  clips = AnimationUtility.GetAnimationClips(state.activeRootGameObject);
 
- clipNames = new string[clips.Length];
+ Array.Sort(clips, (AnimationClip clip1, AnimationClip clip2) => CurveUtility.GetClipName(clip1).CompareTo(CurveUtility.GetClipName(clip2)));
+
+ return clips;
+ }
+
+ private string[] GetClipNames()
+ {
+ AnimationClip[] clips = GetOrderedClipList();
+ string[] clipNames = new string[clips.Length];
 
  for (int i = 0; i < clips.Length; i++)
  clipNames[i] = CurveUtility.GetClipName(clips[i]);
@@ -90,9 +96,9 @@ private AnimationClip IndexToClip(int index)
  {
  if (state.activeRootGameObject != null)
  {
- AnimationClip[] clips = AnimationUtility.GetAnimationClips(state.activeRootGameObject);
+ AnimationClip[] clips = GetOrderedClipList();
  if (index >= 0 && index < clips.Length)
- return AnimationUtility.GetAnimationClips(state.activeRootGameObject)[index];
+ return clips[index];
  }
 
  return null;
@@ -104,7 +110,8 @@ private int ClipToIndex(AnimationClip clip)
  if (state.activeRootGameObject != null)
  {
  int index = 0;
- foreach (AnimationClip other in AnimationUtility.GetAnimationClips(state.activeRootGameObject))
+ AnimationClip[] clips = GetOrderedClipList();
+ foreach (AnimationClip other in clips)
  {
  if (clip == other)
  return index;

Editor/Mono/Animation/MecanimUtilities.cs

@@ -19,10 +19,10 @@ public static bool StateMachineRelativePath(AnimatorStateMachine parent, Animato
  hierarchy.Add(parent);
  if (parent == toFind)
  return true;
-
- for (int i = 0; i < parent.stateMachines.Length; i++)
+ var childStateMachines = AnimatorStateMachine.StateMachineCache.GetChildStateMachines(parent);
+ for (int i = 0; i < childStateMachines.Length; i++)
  {
- if (StateMachineRelativePath(parent.stateMachines[i].stateMachine, toFind, ref hierarchy))
+ if (StateMachineRelativePath(childStateMachines[i].stateMachine, toFind, ref hierarchy))
  return true;
  }
  hierarchy.Remove(parent);

Editor/Mono/Animation/StateMachine.cs

@@ -232,7 +232,39 @@ public partial class AnimatorStateMachine : Object
  private PushUndoIfNeeded undoHandler = new PushUndoIfNeeded(true);
  internal bool pushUndo { set { undoHandler.pushUndo = value; } }
 
+ internal class StateMachineCache
+ {
+ static Dictionary<AnimatorStateMachine, ChildAnimatorStateMachine[]> m_ChildStateMachines;
+ static bool m_Initialized;
+
+ static void Init()
+ {
+ if (!m_Initialized)
+ {
+ m_ChildStateMachines = new Dictionary<AnimatorStateMachine, ChildAnimatorStateMachine[]>();
+ m_Initialized = true;
+ }
+ }
+
+ static public void Clear()
+ {
+ Init();
+ m_ChildStateMachines.Clear();
+ }
+
+ static public ChildAnimatorStateMachine[] GetChildStateMachines(AnimatorStateMachine parent)
+ {
+ Init();
 
+ ChildAnimatorStateMachine[] children;
+ if (m_ChildStateMachines.TryGetValue(parent, out children) == false)
+ {
+ children = parent.stateMachines;
+ m_ChildStateMachines.Add(parent, children);
+ }
+ return children;
+ }
+ }
  internal List<ChildAnimatorState> statesRecursive
  {
  get
@@ -253,11 +285,12 @@ internal List<ChildAnimatorStateMachine> stateMachinesRecursive
  get
  {
  List<ChildAnimatorStateMachine> ret = new List<ChildAnimatorStateMachine>();
- ret.AddRange(stateMachines);
+ var childStateMachines = AnimatorStateMachine.StateMachineCache.GetChildStateMachines(this);
+ ret.AddRange(childStateMachines);
 
- for (int j = 0; j < stateMachines.Length; j++)
+ for (int j = 0; j < childStateMachines.Length; j++)
  {
- ret.AddRange(stateMachines[j].stateMachine.stateMachinesRecursive);
+ ret.AddRange(childStateMachines[j].stateMachine.stateMachinesRecursive);
  }
  return ret;
  }
@@ -636,10 +669,11 @@ internal AnimatorStateMachine FindStateMachine(string path)
  // first element is always Root statemachine 'this'
  AnimatorStateMachine currentSM = this;
  // last element is state name, we don't care
+ var childStateMachines = AnimatorStateMachine.StateMachineCache.GetChildStateMachines(currentSM);
  for (int i = 1; i < smNames.Length - 1 && currentSM != null; ++i)
  {
- int index = System.Array.FindIndex(currentSM.stateMachines, t => t.stateMachine.name == smNames[i]);
- currentSM = index >= 0 ? currentSM.stateMachines[index].stateMachine : null;
+ int index = System.Array.FindIndex(childStateMachines, t => t.stateMachine.name == smNames[i]);
+ currentSM = index >= 0 ? childStateMachines[index].stateMachine : null;
  }
 
  return (currentSM == null) ? this : currentSM;

Editor/Mono/AssetPipeline/LocalCacheServer.cs

@@ -109,11 +109,13 @@ public static bool PingHost(string host, int port, int timeout)
 
  public static bool WaitForServerToComeAlive(int port)
  {
- for (int i = 0; i < 500; i++)
+ DateTime start = DateTime.Now;
+ DateTime maximum = start.AddSeconds(5);
+ while (DateTime.Now < maximum)
  {
  if (PingHost("localhost", port, 10))
  {
- System.Console.WriteLine("Server Came alive after " + (i * 10) + "ms");
+ System.Console.WriteLine("Server Came alive after {0} ms", (DateTime.Now - start).TotalMilliseconds);
  return true;
  }
  }

Editor/Mono/AssetPipeline/ModelImporter.bindings.cs

@@ -262,6 +262,13 @@ public enum ModelImporterMeshCompression
  High = 3,
  }
 
+ public enum ModelImporterIndexFormat
+ {
+ Auto = 0,
+ UInt16 = 1,
+ UInt32 = 2,
+ }
+
  [NativeType(Header = "Editor/Src/AssetPipeline/ModelImporting/ModelImporter.h")]
  public enum ModelImporterAnimationCompression
  {
@@ -480,6 +487,12 @@ public extern bool keepQuads
  set;
  }
 
+ public extern ModelImporterIndexFormat indexFormat
+ {
+ get;
+ set;
+ }
+
  public extern bool preserveHierarchy
  {
  get;