Index: cc/animation_events.h |
diff --git a/cc/animation_events.h b/cc/animation_events.h |
index 69b44bca2652cc43d3b16cd35d94c5e793f3d13e..a7fa8cfa032dd7e188c14baec4991251c921ec8c 100644 |
--- a/cc/animation_events.h |
+++ b/cc/animation_events.h |
@@ -12,14 +12,15 @@ |
namespace cc { |
struct AnimationEvent { |
- enum Type { Started, Finished }; |
+ enum Type { Started, Finished, PropertyUpdate }; |
- AnimationEvent(Type type, int layerId, int groupId, Animation::TargetProperty targetProperty, double monotonicTime) |
+ AnimationEvent(Type type, int layerId, int groupId, Animation::TargetProperty targetProperty, double monotonicTime, float val = 0) |
: type(type) |
, layerId(layerId) |
, groupId(groupId) |
, targetProperty(targetProperty) |
, monotonicTime(monotonicTime) |
+ , value(val) |
Ian Vollick
2013/03/06 01:00:57
nit: Since I'd like to support plumbing back trans
wjmaclean
2013/03/06 17:03:13
Done.
|
{ |
} |
@@ -28,6 +29,7 @@ struct AnimationEvent { |
int groupId; |
Animation::TargetProperty targetProperty; |
double monotonicTime; |
+ float value; |
Ian Vollick
2013/03/06 01:00:57
I know that you're only interested in floats at th
wjmaclean
2013/03/06 17:03:13
Done.
|
}; |
typedef std::vector<AnimationEvent> AnimationEventsVector; |