Unity 2017.3.0a2 C# reference source code

Author: Unity Technologies

Editor/Mono/Animation/AnimationWindow/AnimEditor.cs

@@ -1032,15 +1032,15 @@ private void SaveChangedCurvesFromCurveEditor()
  if (curvesToUpdate.TryGetValue(curveWrapper.animationClip, out changedCurves))
  {
  changedCurves.bindings.Add(curveWrapper.binding);
- changedCurves.curves.Add(curveWrapper.curve);
+ changedCurves.curves.Add(curveWrapper.curve.length > 0 ? curveWrapper.curve : null);
  }
  else
  {
  changedCurves.bindings = new List<EditorCurveBinding>();
  changedCurves.curves = new List<AnimationCurve>();
 
  changedCurves.bindings.Add(curveWrapper.binding);
- changedCurves.curves.Add(curveWrapper.curve);
+ changedCurves.curves.Add(curveWrapper.curve.length > 0 ? curveWrapper.curve : null);
 
  curvesToUpdate.Add(curveWrapper.animationClip, changedCurves);
  }

Editor/Mono/Animation/AnimationWindow/AnimationRecording.cs

@@ -320,7 +320,12 @@ static private UndoPropertyModification[] ProcessRotationModifications(IAnimatio
  }
  else
  {
- AddRotationKey(state, binding, type, previousValue.eulerAngles, currentValue.eulerAngles);
+ Vector3 eulerAngles = target.GetLocalEulerAngles(RotationOrder.OrderZXY);
+
+ Vector3 previousEulerAngles = AnimationUtility.GetClosestEuler(previousValue, eulerAngles, RotationOrder.OrderZXY);
+ Vector3 currentEulerAngles = AnimationUtility.GetClosestEuler(currentValue, eulerAngles, RotationOrder.OrderZXY);
+
+ AddRotationKey(state, binding, type, previousEulerAngles, currentEulerAngles);
  }
  }
 

Editor/Mono/Animation/AnimationWindow/AnimationWindowCurve.cs

@@ -27,6 +27,7 @@ internal class AnimationWindowCurve : IComparable<AnimationWindowCurve>
 
  public EditorCurveBinding binding { get { return m_Binding; } }
  public bool isPPtrCurve { get { return m_Binding.isPPtrCurve; } }
+ public bool isDiscreteCurve { get { return m_Binding.isDiscreteCurve; } }
  public bool isPhantom { get { return m_Binding.isPhantom; } }
  public string propertyName { get { return m_Binding.propertyName; } }
  public string path { get { return m_Binding.path; } }
@@ -223,7 +224,7 @@ public AnimationWindowKeyframe FindKeyAtTime(AnimationKeyTime keyTime)
  public object Evaluate(float time)
  {
  if (m_Keyframes.Count == 0)
- return null;
+ return isPPtrCurve ? null : (object)0f;
 
  AnimationWindowKeyframe firstKey = m_Keyframes[0];
  if (time <= firstKey.time)
@@ -261,7 +262,7 @@ public object Evaluate(float time)
  }
 
  // Shouldn't happen...
- return null;
+ return isPPtrCurve ? null : (object)0f;
  }
 
  public void AddKeyframe(AnimationWindowKeyframe key, AnimationKeyTime keyTime)

Editor/Mono/Animation/AnimationWindow/AnimationWindowKeyframe.cs

@@ -60,6 +60,7 @@ public AnimationWindowCurve curve
  }
 
  public bool isPPtrCurve { get { return curve.isPPtrCurve; } }
+ public bool isDiscreteCurve { get { return curve.isDiscreteCurve; } }
 
  public AnimationWindowKeyframe()
  {

Editor/Mono/Animation/AnimationWindow/AnimationWindowState.cs

@@ -580,13 +580,13 @@ public CurveWrapper[] activeCurveWrappers
  {
  List<CurveWrapper> activeCurveWrappers = new List<CurveWrapper>();
  foreach (AnimationWindowCurve curve in activeCurves)
- if (!curve.isPPtrCurve)
+ if (!curve.isDiscreteCurve)
  activeCurveWrappers.Add(AnimationWindowUtility.GetCurveWrapper(curve, curve.clip));
 
  // If there are no active curves, we would end up with empty curve editor so we just give all curves insteads
  if (!activeCurveWrappers.Any())
  foreach (AnimationWindowCurve curve in allCurves)
- if (!curve.isPPtrCurve)
+ if (!curve.isDiscreteCurve)
  activeCurveWrappers.Add(AnimationWindowUtility.GetCurveWrapper(curve, curve.clip));
 
  m_ActiveCurveWrappersCache = activeCurveWrappers.ToArray();

Editor/Mono/Animation/AnimationWindow/AnimationWindowUtility.cs

@@ -184,22 +184,29 @@ public static AnimationWindowKeyframe AddKeyframeToCurve(AnimationWindowCurve cu
  keyframe.curve = curve;
  curve.AddKeyframe(keyframe, time);
  }
- else if (type == typeof(bool) || type == typeof(float))
+ else if (type == typeof(bool) || type == typeof(float) || type == typeof(int))
  {
  keyframe = new AnimationWindowKeyframe();
 
  // Create temporary curve for getting proper tangents
  AnimationCurve animationCurve = curve.ToAnimationCurve();
 
  Keyframe tempKey = new Keyframe(time.time, (float)value);
- if (type == typeof(bool))
+ if (type == typeof(bool) || type == typeof(int))
  {
- AnimationUtility.SetKeyLeftTangentMode(ref tempKey, TangentMode.Constant);
- AnimationUtility.SetKeyRightTangentMode(ref tempKey, TangentMode.Constant);
+ if (type == typeof(int) && !curve.isDiscreteCurve)
+ {
+ AnimationUtility.SetKeyLeftTangentMode(ref tempKey, TangentMode.Linear);
+ AnimationUtility.SetKeyRightTangentMode(ref tempKey, TangentMode.Linear);
+ }
+ else
+ {
+ AnimationUtility.SetKeyLeftTangentMode(ref tempKey, TangentMode.Constant);
+ AnimationUtility.SetKeyRightTangentMode(ref tempKey, TangentMode.Constant);
+ }
+
  AnimationUtility.SetKeyBroken(ref tempKey, true);
  keyframe.m_TangentMode = tempKey.tangentMode;
- keyframe.m_InTangent = Mathf.Infinity;
- keyframe.m_OutTangent = Mathf.Infinity;
  }
  else
  {
@@ -486,8 +493,9 @@ public static PropertyModification[] SerializedPropertyToPropertyModifications(S
  var isFloat = propertyIter.propertyType == SerializedPropertyType.Float;
  var isBool = propertyIter.propertyType == SerializedPropertyType.Boolean;
  var isInt = propertyIter.propertyType == SerializedPropertyType.Integer;
+ var isEnum = propertyIter.propertyType == SerializedPropertyType.Enum;
 
- if (isObject || isFloat || isBool || isInt)
+ if (isObject || isFloat || isBool || isInt || isEnum)
  {
  var serializedObject = propertyIter.serializedObject;
  var targetObjects = serializedObject.targetObjects;
@@ -508,6 +516,8 @@ public static PropertyModification[] SerializedPropertyToPropertyModifications(S
  value = singleProperty.floatValue.ToString();
  else if (isInt)
  value = singleProperty.intValue.ToString();
+ else if (isEnum)
+ value = singleProperty.enumValueIndex.ToString();
  else // if (isBool)
  value = singleProperty.boolValue.ToString();
 
@@ -727,7 +737,9 @@ public static string GetPropertyGroupName(string propertyName)
  public static float GetNextKeyframeTime(AnimationWindowCurve[] curves, float currentTime, float frameRate)
  {
  float candidate = float.MaxValue;
- float nextFrame = currentTime + 1f / frameRate;
+ AnimationKeyTime time = AnimationKeyTime.Time(currentTime, frameRate);
+ AnimationKeyTime nextTime = AnimationKeyTime.Frame(time.frame + 1, frameRate);
+
  bool found = false;
 
  foreach (AnimationWindowCurve curve in curves)
@@ -736,20 +748,22 @@ public static float GetNextKeyframeTime(AnimationWindowCurve[] curves, float cur
  {
  float offsetTime = keyframe.time + curve.timeOffset;
 
- if (offsetTime < candidate && offsetTime >= nextFrame)
+ if (offsetTime < candidate && offsetTime >= nextTime.time)
  {
  candidate = offsetTime;
  found = true;
  }
  }
  }
- return found ? candidate : currentTime;
+ return found ? candidate : time.time;
  }
 
  public static float GetPreviousKeyframeTime(AnimationWindowCurve[] curves, float currentTime, float frameRate)
  {
  float candidate = float.MinValue;
- float previousFrame = Mathf.Max(0f, currentTime - 1f / frameRate);
+ AnimationKeyTime time = AnimationKeyTime.Time(currentTime, frameRate);
+ AnimationKeyTime previousTime = AnimationKeyTime.Frame(time.frame - 1, frameRate);
+
  bool found = false;
 
  foreach (AnimationWindowCurve curve in curves)
@@ -758,14 +772,14 @@ public static float GetPreviousKeyframeTime(AnimationWindowCurve[] curves, float
  {
  float offsetTime = keyframe.time + curve.timeOffset;
 
- if (offsetTime > candidate && offsetTime <= previousFrame)
+ if (offsetTime > candidate && offsetTime <= previousTime.time)
  {
  candidate = offsetTime;
  found = true;
  }
  }
  }
- return found ? candidate : currentTime;
+ return found ? candidate : time.time;
  }
 
  // Add animator, controller and clip to gameobject if they are missing to make this gameobject animatable
@@ -1049,10 +1063,47 @@ public static void DrawRect(Rect rect, Color color)
  GL.PopMatrix();
  }
 
+ private static CurveRenderer CreateRendererForCurve(AnimationWindowCurve curve)
+ {
+ CurveRenderer renderer;
+ switch (System.Type.GetTypeCode(curve.valueType))
+ {
+ case TypeCode.Int32:
+ renderer = new IntCurveRenderer(curve.ToAnimationCurve());
+ break;
+ case TypeCode.Boolean:
+ renderer = new BoolCurveRenderer(curve.ToAnimationCurve());
+ break;
+ default:
+ renderer = new NormalCurveRenderer(curve.ToAnimationCurve());
+ break;
+ }
+ return renderer;
+ }
+
+ private static CurveWrapper.PreProcessKeyMovement CreateKeyPreprocessorForCurve(AnimationWindowCurve curve)
+ {
+ CurveWrapper.PreProcessKeyMovement method;
+ switch (System.Type.GetTypeCode(curve.valueType))
+ {
+ case TypeCode.Int32:
+ method = (ref Keyframe key) => { key.value = Mathf.Floor(key.value + 0.5f); };
+ break;
+ case TypeCode.Boolean:
+ method = (ref Keyframe key) => { key.value = key.value > 0.5f ? 1.0f : 0.0f; };
+ break;
+ default:
+ method = null;
+ break;
+ }
+ return method;
+ }
+
  public static CurveWrapper GetCurveWrapper(AnimationWindowCurve curve, AnimationClip clip)
  {
  CurveWrapper curveWrapper = new CurveWrapper();
- curveWrapper.renderer = new NormalCurveRenderer(curve.ToAnimationCurve());
+ curveWrapper.renderer = CreateRendererForCurve(curve);
+ curveWrapper.preProcessKeyMovementDelegate = CreateKeyPreprocessorForCurve(curve);
  curveWrapper.renderer.SetWrap(WrapMode.Clamp, clip.isLooping ? WrapMode.Loop : WrapMode.Clamp);
  curveWrapper.renderer.SetCustomRange(clip.startTime, clip.stopTime);
  curveWrapper.binding = curve.binding;

Editor/Mono/Animation/AnimationWindow/CurveEditor.cs

@@ -2,7 +2,6 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-
 using UnityEngine;
 using UnityEditor;
 using System;
@@ -40,6 +39,7 @@ internal class CurveWrapper
  {
  public delegate Vector2 GetAxisScalarsCallback();
  public delegate void SetAxisScalarsCallback(Vector2 newAxisScalars);
+ public delegate void PreProcessKeyMovement(ref Keyframe key);
 
  public CurveWrapper()
  {
@@ -90,6 +90,8 @@ internal enum SelectionMode
  public GetAxisScalarsCallback getAxisUiScalarsCallback; // Delegate used to fetch values that are multiplied on x and y axis ui values
  public SetAxisScalarsCallback setAxisUiScalarsCallback; // Delegate used to set values back that has been changed by this curve editor
 
+ public PreProcessKeyMovement preProcessKeyMovementDelegate; // Delegate used limit key manipulation to fit curve constraints
+
  // Should be updated by curve editor as appropriate
  public SelectionMode selected;
  public int listIndex; // Index into m_AnimationCurves list
@@ -111,12 +113,29 @@ public bool changed
  }
  }
 
+ public int AddKey(Keyframe key)
+ {
+ PreProcessKey(ref key);
+ return curve.AddKey(key);
+ }
+
+ public void PreProcessKey(ref Keyframe key)
+ {
+ if (preProcessKeyMovementDelegate != null)
+ preProcessKeyMovementDelegate(ref key);
+ }
+
+ public int MoveKey(int index, ref Keyframe key)
+ {
+ PreProcessKey(ref key);
+ return curve.MoveKey(index, key);
+ }
+
  // An additional vertical min / max range clamp when editing multiple curves with different ranges
  public float vRangeMin = -Mathf.Infinity;
  public float vRangeMax = Mathf.Infinity;
  }
 
-
  // Control point collection renderer
  class CurveControlPointRenderer
  {
@@ -568,7 +587,6 @@ private enum AxisLock { None, X, Y }
  private AxisLock m_AxisLock;
 
  CurveControlPointRenderer m_PointRenderer;
-
  CurveEditorRectangleTool m_RectangleTool;
 
  // The square of the maximum pick distance in pixels.
@@ -1248,7 +1266,7 @@ void DragTangents()
  }
  }
 
- dragged.key = curveWrapper.curve.MoveKey(dragged.key, key);
+ dragged.key = curveWrapper.MoveKey(dragged.key, ref key);
  AnimationUtility.UpdateTangentsFromModeSurrounding(curveWrapper.curve, dragged.key);
 
  curveWrapper.changed = true;
@@ -1480,7 +1498,6 @@ internal void TransformSelectedKeys(Matrix4x4 matrix, bool flipX, bool flipY)
 
  return duplicateKeyframe;
  }
-
  return keyframe;
  }
  );
@@ -1582,6 +1599,7 @@ void UpdateCurvesFromPoints(SavedCurve.KeyFrameOperation action)
  if (keyframe.selected == CurveWrapper.SelectionMode.None)
  {
  var newKeyframe = action(keyframe, sc);
+ cw.PreProcessKey(ref newKeyframe.key);
 
  // We might have moved keys around, let's add new key or replace existing key.
  working[newKeyframe.key.time] = newKeyframe;
@@ -1594,7 +1612,7 @@ void UpdateCurvesFromPoints(SavedCurve.KeyFrameOperation action)
  if (keyframe.selected != CurveWrapper.SelectionMode.None)
  {
  var newKeyframe = action(keyframe, sc);
-
+ cw.PreProcessKey(ref newKeyframe.key);
  // We might have moved keys around, let's add new key or replace existing key.
  working[newKeyframe.key.time] = newKeyframe;
  }
@@ -1988,7 +2006,7 @@ CurveSelection AddKeyframeAndSelect(Keyframe key, CurveWrapper cw)
  if (!cw.animationIsEditable)
  return null;
 
- int keyIndex = cw.curve.AddKey(key);
+ int keyIndex = cw.AddKey(key);
  CurveUtility.SetKeyModeFromContext(cw.curve, keyIndex);
  AnimationUtility.UpdateTangentsFromModeSurrounding(cw.curve, keyIndex);
 

Editor/Mono/Animation/AnimationWindow/CurveRenderer/BoolCurveRenderer.cs

@@ -0,0 +1,30 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System.Linq;
+using UnityEngine;
+using UnityEditor;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace UnityEditor
+{
+ internal class BoolCurveRenderer : NormalCurveRenderer
+ {
+ public BoolCurveRenderer(AnimationCurve curve)
+ : base(curve)
+ {
+ }
+
+ public override float ClampedValue(float value)
+ {
+ return value != 0.0f ? 1.0f : 0.0f;
+ }
+
+ public override float EvaluateCurveSlow(float time)
+ {
+ return ClampedValue(GetCurve().Evaluate(time));
+ }
+ }
+} // namespace

Editor/Mono/Animation/AnimationWindow/CurveRenderer/CurveRenderer.cs

@@ -22,6 +22,7 @@ internal interface CurveRenderer
  float EvaluateCurveDeltaSlow(float time);
  Bounds GetBounds();
  Bounds GetBounds(float minTime, float maxTime);
+ float ClampedValue(float value);
  void FlushCache();
  }
 } // namespace

Editor/Mono/Animation/AnimationWindow/CurveRenderer/EulerCurveRenderer.cs

@@ -25,6 +25,11 @@ public AnimationCurve GetCurve()
  return renderer.GetCurveOfComponent(component);
  }
 
+ public float ClampedValue(float value)
+ {
+ return value;
+ }
+
  public float RangeStart() { return renderer.RangeStart(); }
  public float RangeEnd() { return renderer.RangeEnd(); }
  public void SetWrap(WrapMode wrap)