diff options
| author |  reed <reed@chromium.org> | 2015-02-01 19:01:04 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-01 19:01:04 -0800 |
| commit | d9adfe6a223955bc69c8c7661ab8e0a078afbc32 (patch) | |
| tree | b3ae977babf890649bce0538e6b6cb766a948219 /samplecode/SampleDegenerateTwoPtRadials.cpp | |
| parent | 47471cf19c1b386212ab0401190ac40cdeb95d1f (diff) | |
allow GMs to animate
BUG=skia:
Review URL: https://codereview.chromium.org/888283002
Diffstat (limited to 'samplecode/SampleDegenerateTwoPtRadials.cpp')
| -rw-r--r-- | samplecode/SampleDegenerateTwoPtRadials.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/samplecode/SampleDegenerateTwoPtRadials.cpp b/samplecode/SampleDegenerateTwoPtRadials.cpp index 4665425934..71c03b016a 100644 --- a/samplecode/SampleDegenerateTwoPtRadials.cpp +++ b/samplecode/SampleDegenerateTwoPtRadials.cpp @@ -37,7 +37,6 @@ static void draw_gradient2(SkCanvas* canvas, const SkRect& rect, SkScalar delta) class DegenerateTwoPtRadialsView : public SampleView { - public: DegenerateTwoPtRadialsView() { fTime = 0; @@ -45,8 +44,7 @@ public: } protected: - // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "DegenerateTwoPtRadials"); return true; @@ -54,8 +52,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawContent(SkCanvas* canvas) { - fTime += SampleCode::GetAnimSecondsDelta(); + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { SkScalar delta = fTime / 15.f; int intPart = SkScalarFloorToInt(delta); delta = delta - SK_Scalar1 * intPart; @@ -77,7 +74,11 @@ protected: paint.setAntiAlias(true); paint.setColor(SK_ColorBLACK); canvas->drawText(txt.c_str(), txt.size(), l + w/2 + w*DELTA_SCALE*delta, t + h + SK_Scalar1 * 10, paint); - this->inval(NULL); + } + + bool onAnimatePulse(SkMSec curr, SkMSec prev) SK_OVERRIDE { + fTime += (curr - prev) * 0.001f; + return true; } private: |