Unity 2018.1.0a3 C# reference source code

Author: Unity Technologies

Editor/Mono/2D/Common/TexturePlatformSettingsFormatHelper.cs

@@ -36,6 +36,11 @@ public void AcquireTextureFormatValuesAndStrings(BuildTarget buildTarget, out in
  formatValues = TextureImportPlatformSettings.kTextureFormatsValueWiiU;
  formatStrings = TextureImporterInspector.s_TextureFormatStringsWiiU;
  }
+ else if (buildTarget == BuildTarget.PSP2)
+ {
+ formatValues = TextureImportPlatformSettings.kTextureFormatsValuePSP2;
+ formatStrings = TextureImporterInspector.s_TextureFormatStringsPSP2;
+ }
  else if (buildTarget == BuildTarget.Switch)
  {
  formatValues = TextureImportPlatformSettings.kTextureFormatsValueSwitch;

Editor/Mono/Animation/AnimationWindow/AddCurvesPopup.cs

@@ -15,7 +15,6 @@ internal class AddCurvesPopup : EditorWindow
  const float k_WindowPadding = 3;
 
  internal static AnimationWindowState s_State;
- internal static AnimationWindowSelection selection { get; set; }
 
  private static AddCurvesPopup s_AddCurvesPopup;
  private static long s_LastClosedTime;
@@ -48,7 +47,7 @@ void OnDisable()
 
  internal static void AddNewCurve(AddCurvesPopupPropertyNode node)
  {
- AnimationWindowUtility.CreateDefaultCurves(s_State, node.selectionItem, node.curveBindings);
+ AnimationWindowUtility.CreateDefaultCurves(s_State, node.curveBindings);
  if (NewCurveAddedCallback != null)
  NewCurveAddedCallback(node);
  }

Editor/Mono/Animation/AnimationWindow/AddCurvesPopupHierarchyDataSource.cs

@@ -31,45 +31,36 @@ private void SetupRootNodeSettings()
 
  public override void FetchData()
  {
- if (AddCurvesPopup.selection == null)
- return;
-
- AnimationWindowSelectionItem[] selectionItems = AddCurvesPopup.selection.ToArray();
- if (selectionItems.Length > 1)
- {
- m_RootItem = new AddCurvesPopupObjectNode(null, "", "");
- }
-
- foreach (AnimationWindowSelectionItem item in selectionItems)
+ if (AddCurvesPopup.s_State.selection.canAddCurves)
  {
- if (!item.canAddCurves)
-  continue;
+ GameObject rootGameObject = AddCurvesPopup.s_State.activeRootGameObject;
+ ScriptableObject scriptableObject = AddCurvesPopup.s_State.activeScriptableObject;
 
- if (item.rootGameObject != null)
+ if (rootGameObject != null)
  {
- AddGameObjectToHierarchy(item.rootGameObject, item, m_RootItem);
+ AddGameObjectToHierarchy(rootGameObject, rootGameObject, AddCurvesPopup.s_State.activeAnimationClip, m_RootItem);
  }
- else if (item.scriptableObject != null)
+ else if (scriptableObject != null)
  {
- AddScriptableObjectToHierarchy(item.scriptableObject, item, m_RootItem);
+ AddScriptableObjectToHierarchy(scriptableObject, AddCurvesPopup.s_State.activeAnimationClip, m_RootItem);
  }
  }
 
  SetupRootNodeSettings();
  m_NeedRefreshRows = true;
  }
 
- private TreeViewItem AddGameObjectToHierarchy(GameObject gameObject, AnimationWindowSelectionItem selectionItem, TreeViewItem parent)
+ private TreeViewItem AddGameObjectToHierarchy(GameObject gameObject, GameObject rootGameObject, AnimationClip animationClip, TreeViewItem parent)
  {
- string path = AnimationUtility.CalculateTransformPath(gameObject.transform, selectionItem.rootGameObject.transform);
+ string path = AnimationUtility.CalculateTransformPath(gameObject.transform, rootGameObject.transform);
  TreeViewItem node = new AddCurvesPopupGameObjectNode(gameObject, parent, gameObject.name);
  List<TreeViewItem> childNodes = new List<TreeViewItem>();
 
  if (m_RootItem == null)
  m_RootItem = node;
 
  // Iterate over all animatable objects
- EditorCurveBinding[] allCurveBindings = AnimationUtility.GetAnimatableBindings(gameObject, selectionItem.rootGameObject);
+ EditorCurveBinding[] allCurveBindings = AnimationUtility.GetAnimatableBindings(gameObject, rootGameObject);
  List<EditorCurveBinding> singleObjectBindings = new List<EditorCurveBinding>();
  for (int i = 0; i < allCurveBindings.Length; i++)
  {
@@ -83,7 +74,7 @@ private TreeViewItem AddGameObjectToHierarchy(GameObject gameObject, AnimationWi
  // Don't show for the root go
  if (curveBinding.path != "")
  {
- TreeViewItem newNode = CreateNode(selectionItem, singleObjectBindings.ToArray(), node);
+ TreeViewItem newNode = CreateNode(singleObjectBindings.ToArray(), node);
  if (newNode != null)
  childNodes.Add(newNode);
  singleObjectBindings.Clear();
@@ -104,7 +95,7 @@ private TreeViewItem AddGameObjectToHierarchy(GameObject gameObject, AnimationWi
  isLastItemOnThisGroup = (allCurveBindings[i + 1].type != curveBinding.type);
 
  // Let's not add those that already have a existing curve.
- if (AnimationWindowUtility.IsCurveCreated(selectionItem.animationClip, curveBinding))
+ if (AnimationWindowUtility.IsCurveCreated(animationClip, curveBinding))
  singleObjectBindings.Remove(curveBinding);
 
  // Remove animator enabled property which shouldn't be animated.
@@ -113,7 +104,7 @@ private TreeViewItem AddGameObjectToHierarchy(GameObject gameObject, AnimationWi
 
  if ((isLastItemOverall || isLastItemOnThisGroup) && singleObjectBindings.Count > 0)
  {
- childNodes.Add(AddAnimatableObjectToHierarchy(selectionItem, singleObjectBindings.ToArray(), node, path));
+ childNodes.Add(AddAnimatableObjectToHierarchy(singleObjectBindings.ToArray(), node, path));
  singleObjectBindings.Clear();
  }
  }
@@ -125,7 +116,7 @@ private TreeViewItem AddGameObjectToHierarchy(GameObject gameObject, AnimationWi
  for (int i = 0; i < gameObject.transform.childCount; i++)
  {
  Transform childTransform = gameObject.transform.GetChild(i);
- TreeViewItem childNode = AddGameObjectToHierarchy(childTransform.gameObject, selectionItem, node);
+ TreeViewItem childNode = AddGameObjectToHierarchy(childTransform.gameObject, rootGameObject, animationClip, node);
  if (childNode != null)
  childNodes.Add(childNode);
  }
@@ -135,14 +126,14 @@ private TreeViewItem AddGameObjectToHierarchy(GameObject gameObject, AnimationWi
  return node;
  }
 
- private TreeViewItem AddScriptableObjectToHierarchy(ScriptableObject scriptableObject, AnimationWindowSelectionItem selectionItem, TreeViewItem parent)
+ private TreeViewItem AddScriptableObjectToHierarchy(ScriptableObject scriptableObject, AnimationClip clip, TreeViewItem parent)
  {
  EditorCurveBinding[] allCurveBindings = AnimationUtility.GetScriptableObjectAnimatableBindings(scriptableObject);
- EditorCurveBinding[] availableBindings = allCurveBindings.Where(c => !AnimationWindowUtility.IsCurveCreated(selectionItem.animationClip, c)).ToArray();
+ EditorCurveBinding[] availableBindings = allCurveBindings.Where(c => !AnimationWindowUtility.IsCurveCreated(clip, c)).ToArray();
 
  TreeViewItem node = null;
  if (availableBindings.Length > 0)
- node = AddAnimatableObjectToHierarchy(selectionItem, availableBindings, parent, "");
+ node = AddAnimatableObjectToHierarchy(availableBindings, parent, "");
  else
  node = new AddCurvesPopupObjectNode(parent, "", scriptableObject.name);
 
@@ -152,36 +143,36 @@ private TreeViewItem AddScriptableObjectToHierarchy(ScriptableObject scriptableO
  return node;
  }
 
- static string GetClassName(AnimationWindowSelectionItem selectionItem, EditorCurveBinding binding)
+ static string GetClassName(EditorCurveBinding binding)
  {
- if (selectionItem.rootGameObject != null)
+ if (AddCurvesPopup.s_State.activeRootGameObject != null)
  {
- Object target = AnimationUtility.GetAnimatedObject(selectionItem.rootGameObject, binding);
+ Object target = AnimationUtility.GetAnimatedObject(AddCurvesPopup.s_State.activeRootGameObject, binding);
  if (target)
  return ObjectNames.GetInspectorTitle(target);
  }
 
  return binding.type.Name;
  }
 
- static Texture2D GetIcon(AnimationWindowSelectionItem selectionItem, EditorCurveBinding binding)
+ static Texture2D GetIcon(EditorCurveBinding binding)
  {
- if (selectionItem.rootGameObject != null)
+ if (AddCurvesPopup.s_State.activeRootGameObject != null)
  {
- return AssetPreview.GetMiniThumbnail(AnimationUtility.GetAnimatedObject(selectionItem.rootGameObject, binding));
+ return AssetPreview.GetMiniThumbnail(AnimationUtility.GetAnimatedObject(AddCurvesPopup.s_State.activeRootGameObject, binding));
  }
- else if (selectionItem.scriptableObject != null)
+ else if (AddCurvesPopup.s_State.activeScriptableObject != null)
  {
- return AssetPreview.GetMiniThumbnail(selectionItem.scriptableObject);
+ return AssetPreview.GetMiniThumbnail(AddCurvesPopup.s_State.activeScriptableObject);
  }
 
  return null;
  }
 
- private TreeViewItem AddAnimatableObjectToHierarchy(AnimationWindowSelectionItem selectionItem, EditorCurveBinding[] curveBindings, TreeViewItem parentNode, string path)
+ private TreeViewItem AddAnimatableObjectToHierarchy(EditorCurveBinding[] curveBindings, TreeViewItem parentNode, string path)
  {
- TreeViewItem node = new AddCurvesPopupObjectNode(parentNode, path, GetClassName(selectionItem, curveBindings[0]));
- node.icon = GetIcon(selectionItem, curveBindings[0]);
+ TreeViewItem node = new AddCurvesPopupObjectNode(parentNode, path, GetClassName(curveBindings[0]));
+ node.icon = GetIcon(curveBindings[0]);
 
  List<TreeViewItem> childNodes = new List<TreeViewItem>();
  List<EditorCurveBinding> singlePropertyBindings = new List<EditorCurveBinding>();
@@ -195,7 +186,7 @@ private TreeViewItem AddAnimatableObjectToHierarchy(AnimationWindowSelectionItem
  // We expect curveBindings to come sorted by propertyname
  if (i == curveBindings.Length - 1 || AnimationWindowUtility.GetPropertyGroupName(curveBindings[i + 1].propertyName) != AnimationWindowUtility.GetPropertyGroupName(curveBinding.propertyName))
  {
- TreeViewItem newNode = CreateNode(selectionItem, singlePropertyBindings.ToArray(), node);
+ TreeViewItem newNode = CreateNode(singlePropertyBindings.ToArray(), node);
  if (newNode != null)
  childNodes.Add(newNode);
  singlePropertyBindings.Clear();
@@ -208,9 +199,9 @@ private TreeViewItem AddAnimatableObjectToHierarchy(AnimationWindowSelectionItem
  return node;
  }
 
- private TreeViewItem CreateNode(AnimationWindowSelectionItem selectionItem, EditorCurveBinding[] curveBindings, TreeViewItem parentNode)
+ private TreeViewItem CreateNode(EditorCurveBinding[] curveBindings, TreeViewItem parentNode)
  {
- var node = new AddCurvesPopupPropertyNode(parentNode, selectionItem, curveBindings);
+ var node = new AddCurvesPopupPropertyNode(parentNode, curveBindings);
 
  // For RectTransform.position we only want .z
  if (AnimationWindowUtility.IsRectTransformPosition(node.curveBindings[0]))
@@ -244,13 +235,11 @@ public AddCurvesPopupObjectNode(TreeViewItem parent, string path, string classNa
 
  internal class AddCurvesPopupPropertyNode : TreeViewItem
  {
- public AnimationWindowSelectionItem selectionItem;
  public EditorCurveBinding[] curveBindings;
 
- public AddCurvesPopupPropertyNode(TreeViewItem parent, AnimationWindowSelectionItem selectionItem, EditorCurveBinding[] curveBindings)
+ public AddCurvesPopupPropertyNode(TreeViewItem parent, EditorCurveBinding[] curveBindings)
  : base(curveBindings[0].GetHashCode(), parent.depth + 1, parent, AnimationWindowUtility.NicifyPropertyGroupName(curveBindings[0].type, AnimationWindowUtility.GetPropertyGroupName(curveBindings[0].propertyName)))
  {
- this.selectionItem = selectionItem;
  this.curveBindings = curveBindings;
  }
 

Editor/Mono/Animation/AnimationWindow/AnimEditor.cs

@@ -102,24 +102,16 @@ static private Color inRangeColor
 
  public AnimationWindowState state { get { return m_State; } }
 
- public AnimationWindowSelection selection
+ public AnimationWindowSelectionItem selection
  {
  get
  {
  return m_State.selection;
  }
- }
-
- public AnimationWindowSelectionItem selectedItem
- {
- get
- {
- return m_State.selectedItem;
- }
 
  set
  {
- m_State.selectedItem = value;
+ m_State.selection = value;
  }
  }
 
@@ -387,7 +379,6 @@ public void OnDestroy()
 
  public void OnSelectionChanged()
  {
- m_State.OnSelectionChanged();
  triggerFraming = true; // Framing of clip can only be done after Layout. Here we just order it to happen later on.
  Repaint();
  }
@@ -458,7 +449,7 @@ private void SetupWizardOnGUI(Rect position)
  if (AnimationWindowUtility.InitializeGameobjectForAnimation(m_State.activeGameObject))
  {
  Component animationPlayer = AnimationWindowUtility.GetClosestAnimationPlayerComponentInParents(m_State.activeGameObject.transform);
- m_State.selection.UpdateClip(m_State.selectedItem, AnimationUtility.GetAnimationClips(animationPlayer.gameObject)[0]);
+ m_State.activeAnimationClip = AnimationUtility.GetAnimationClips(animationPlayer.gameObject)[0];
 
  // Selection has changed, bail out now.
  EditorGUIUtility.ExitGUI();
@@ -483,7 +474,7 @@ private void EventLineOnGUI(Rect eventsRect)
  eventsRect.width -= kSliderThickness;
  GUI.Label(eventsRect, GUIContent.none, AnimationWindowStyles.eventBackground);
 
- using (new EditorGUI.DisabledScope(m_State.selectedItem == null || !m_State.selectedItem.animationIsEditable))
+ using (new EditorGUI.DisabledScope(!selection.animationIsEditable))
  {
  m_Events.EventLineGUI(eventsRect, m_State);
  }
@@ -521,9 +512,7 @@ private void HierarchyOnGUI()
 
  private void FrameRateInputFieldOnGUI()
  {
- var selectedItem = m_State.selectedItem;
-
- using (new EditorGUI.DisabledScope(selectedItem == null || !selectedItem.animationIsEditable))
+ using (new EditorGUI.DisabledScope(!selection.animationIsEditable))
  {
  GUILayout.Label(AnimationWindowStyles.samples, AnimationWindowStyles.toolbarLabel);
 
@@ -637,22 +626,16 @@ private void TimeRulerOnGUI(Rect timeRulerRect)
 
  private void AddEventButtonOnGUI()
  {
- var selectedItem = m_State.selectedItem;
- if (selectedItem != null)
+ using (new EditorGUI.DisabledScope(!selection.animationIsEditable))
  {
- using (new EditorGUI.DisabledScope(!selectedItem.animationIsEditable))
- {
- if (GUILayout.Button(AnimationWindowStyles.addEventContent, EditorStyles.toolbarButton))
- m_Events.AddEvent(m_State.currentTime - selectedItem.timeOffset, selectedItem.rootGameObject, selectedItem.animationClip);
- }
+ if (GUILayout.Button(AnimationWindowStyles.addEventContent, EditorStyles.toolbarButton))
+ m_Events.AddEvent(m_State.currentTime, selection.rootGameObject, selection.animationClip);
  }
  }
 
  private void AddKeyframeButtonOnGUI()
  {
- bool animationIsEditable = m_State.selection.Find(selectedItem => selectedItem.animationIsEditable);
-
- using (new EditorGUI.DisabledScope(!animationIsEditable))
+ using (new EditorGUI.DisabledScope(!selection.animationIsEditable))
  {
  if (GUILayout.Button(AnimationWindowStyles.addKeyframeContent, EditorStyles.toolbarButton))
  {
@@ -733,7 +716,7 @@ private void LinkOptionsOnGUI()
  if (GUILayout.Toggle(true, AnimationWindowStyles.sequencerLinkContent, EditorStyles.toolbarButton) == false)
  {
  m_State.linkedWithSequencer = false;
- m_State.selection.Clear();
+ m_State.selection = null;
 
  // Layout has changed, bail out now.
  EditorGUIUtility.ExitGUI();
@@ -995,9 +978,9 @@ private void SynchronizeLayout()
  m_HorizontalSplitter.realSizes[1] = (int)Mathf.Min(m_Position.width - m_HorizontalSplitter.realSizes[0], m_HorizontalSplitter.realSizes[1]);
 
  // Synchronize frame rate
- if ((selectedItem != null) && (selectedItem.animationClip != null))
+ if (selection.animationClip != null)
  {
- m_State.frameRate = selectedItem.animationClip.frameRate;
+ m_State.frameRate = selection.animationClip.frameRate;
  }
  else
  {
@@ -1262,8 +1245,6 @@ private void InitializeNonserializedValues()
 
  m_State.onStartLiveEdit += OnStartLiveEdit;
  m_State.onEndLiveEdit += OnEndLiveEdit;
-
- m_State.selection.onSelectionChanged += OnSelectionChanged;
  }
  }
 }

Editor/Mono/Animation/AnimationWindow/AnimationClipSelectionItem.cs

@@ -15,12 +15,10 @@ internal class AnimationClipSelectionItem : AnimationWindowSelectionItem
  public static AnimationClipSelectionItem Create(AnimationClip animationClip, Object sourceObject)
  {
  AnimationClipSelectionItem selectionItem = CreateInstance(typeof(AnimationClipSelectionItem)) as AnimationClipSelectionItem;
- selectionItem.hideFlags = HideFlags.HideAndDontSave;
 
  selectionItem.gameObject = sourceObject as GameObject;
  selectionItem.scriptableObject = sourceObject as ScriptableObject;
  selectionItem.animationClip = animationClip;
- selectionItem.timeOffset = 0.0f;
  selectionItem.id = 0; // no need for id since there's only one item in selection.
 
  return selectionItem;