aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-09-08 20:14:23 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-09-08 20:14:23 +0000
commit8d8847521e9a077d1c317c622dd76d7e8087d3bd (patch)
treeb0234a1bae2edc0a2cec49c037bd42d5d8b6184c /samplecode
parentb567178eaff1c0c8d964be08b27da759e3842ed8 (diff)
change duration of transition animation to 1, effectively removing it (for now)
git-svn-id: http://skia.googlecode.com/svn/trunk@5450 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode')
-rw-r--r--samplecode/TransitionView.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/samplecode/TransitionView.cpp b/samplecode/TransitionView.cpp
index 95938ef8d0..19cb24d4c3 100644
--- a/samplecode/TransitionView.cpp
+++ b/samplecode/TransitionView.cpp
@@ -21,6 +21,10 @@ static bool is_transition(SkView* view) {
}
class TransitionView : public SampleView {
+ enum {
+// kDurationMS = 500
+ kDurationMS = 1
+ };
public:
TransitionView(SkView* prev, SkView* next, int direction) : fInterp(4, 2){
fAnimationDirection = (Direction)(1 << (direction % 8));
@@ -149,7 +153,7 @@ protected:
SkScalar blend[] = { SkFloatToScalar(0.8f), SkFloatToScalar(0.0f),
SkFloatToScalar(0.0f), SK_Scalar1 };
fInterp.setKeyFrame(0, SkTime::GetMSecs(), fBegin, blend);
- fInterp.setKeyFrame(1, SkTime::GetMSecs()+500, fEnd, blend);
+ fInterp.setKeyFrame(1, SkTime::GetMSecs()+kDurationMS, fEnd, blend);
}
private: