SkAnimTimer -> AnimTimer
Change-Id: I700b7c0461475062ac66712cc29070f150cf777d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/202315
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
diff --git a/samplecode/PerlinPatch.cpp b/samplecode/PerlinPatch.cpp
index c962e19..8bac913 100644
--- a/samplecode/PerlinPatch.cpp
+++ b/samplecode/PerlinPatch.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
+#include "AnimTimer.h"
#include "Sample.h"
-#include "SkAnimTimer.h"
#include "SkCanvas.h"
#include "SkGradientShader.h"
#include "SkPatchUtils.h"
@@ -125,12 +125,11 @@
return this->INHERITED::onQuery(evt);
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
fSeed += 0.005f;
return true;
}
-
void onDrawContent(SkCanvas* canvas) override {
if (!canvas->getTotalMatrix().invert(&fInvMatrix)) {
return;
diff --git a/samplecode/Sample.h b/samplecode/Sample.h
index e906e31..ecf3189 100644
--- a/samplecode/Sample.h
+++ b/samplecode/Sample.h
@@ -16,7 +16,7 @@
#include "SkRefCnt.h"
#include "SkString.h"
-class SkAnimTimer;
+class AnimTimer;
class SkCanvas;
class Sample;
@@ -81,7 +81,7 @@
static void DoClickUp(Click*, int x, int y, unsigned modi);
void setBGColor(SkColor color) { fBGColor = color; }
- bool animate(const SkAnimTimer& timer) { return this->onAnimate(timer); }
+ bool animate(const AnimTimer& timer) { return this->onAnimate(timer); }
class Event {
public:
@@ -209,7 +209,7 @@
virtual void onDrawBackground(SkCanvas*);
virtual void onDrawContent(SkCanvas*) = 0;
- virtual bool onAnimate(const SkAnimTimer&) { return false; }
+ virtual bool onAnimate(const AnimTimer&) { return false; }
virtual void onOnceBeforeDraw() {}
private:
diff --git a/samplecode/SampleAndroidShadows.cpp b/samplecode/SampleAndroidShadows.cpp
index b367ae9..8449b34 100644
--- a/samplecode/SampleAndroidShadows.cpp
+++ b/samplecode/SampleAndroidShadows.cpp
@@ -5,8 +5,8 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
+#include "AnimTimer.h"
#include "Sample.h"
-#include "SkAnimTimer.h"
#include "SkBlurMask.h"
#include "SkBlurMaskFilter.h"
#include "SkCamera.h"
@@ -341,7 +341,7 @@
lightPos, kLightWidth, .5f);
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
fAnimTranslate = timer.pingPong(30, 0, 125, -125);
fAnimAngle = timer.pingPong(15, 0, 0, 20);
if (fDoAlphaAnimation) {
diff --git a/samplecode/SampleAnimBlur.cpp b/samplecode/SampleAnimBlur.cpp
index 2d433ee..21d886d 100644
--- a/samplecode/SampleAnimBlur.cpp
+++ b/samplecode/SampleAnimBlur.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
+#include "AnimTimer.h"
#include "Sample.h"
-#include "SkAnimTimer.h"
-#include "SkColorPriv.h"
#include "SkCanvas.h"
+#include "SkColorPriv.h"
#include "SkMaskFilter.h"
#include "SkRandom.h"
@@ -55,7 +55,7 @@
}
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
fBlurSigma = get_anim_sin(timer.secs(), 100, 4, 5);
fCircleRadius = 3 + get_anim_sin(timer.secs(), 150, 25, 3);
return true;
diff --git a/samplecode/SampleAnimatedImage.cpp b/samplecode/SampleAnimatedImage.cpp
index 8f73935..9f66f3a 100644
--- a/samplecode/SampleAnimatedImage.cpp
+++ b/samplecode/SampleAnimatedImage.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
+#include "AnimTimer.h"
#include "SkAndroidCodec.h"
#include "SkAnimatedImage.h"
-#include "SkAnimTimer.h"
#include "SkCanvas.h"
#include "SkFont.h"
#include "SkPaint.h"
@@ -56,7 +56,7 @@
canvas->drawDrawable(fDrawable.get(), fImage->getBounds().width(), 0);
}
- bool onAnimate(const SkAnimTimer& animTimer) override {
+ bool onAnimate(const AnimTimer& animTimer) override {
if (!fImage) {
return false;
}
diff --git a/samplecode/SampleAnimatedText.cpp b/samplecode/SampleAnimatedText.cpp
index cfc071a..e927ffc 100644
--- a/samplecode/SampleAnimatedText.cpp
+++ b/samplecode/SampleAnimatedText.cpp
@@ -129,7 +129,7 @@
canvas->drawString(modeString, 768.f, 540.f, font, paint);
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
// We add noise to the scale and rotation animations to
// keep the font atlas from falling into a steady state
fRotation += (1.0f + gRand.nextRangeF(-0.1f, 0.1f));
diff --git a/samplecode/SampleArc.cpp b/samplecode/SampleArc.cpp
index 58e4057..54bada0 100644
--- a/samplecode/SampleArc.cpp
+++ b/samplecode/SampleArc.cpp
@@ -5,8 +5,9 @@
* found in the LICENSE file.
*/
+#include "AnimTimer.h"
#include "Sample.h"
-#include "SkAnimTimer.h"
+#include "Sk1DPathEffect.h"
#include "SkCanvas.h"
#include "SkColorFilter.h"
#include "SkColorPriv.h"
@@ -22,7 +23,6 @@
#include "SkString.h"
#include "SkTextUtils.h"
#include "SkUTF.h"
-#include "Sk1DPathEffect.h"
#include "SkParsePath.h"
static void testparse() {
@@ -187,7 +187,7 @@
canvas->drawDrawable(fRootDrawable.get());
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
SkScalar angle = SkDoubleToScalar(fmod(timer.secs() * 360 / 24, 360));
fAnimatingDrawable->setSweep(angle);
return true;
diff --git a/samplecode/SampleAtlas.cpp b/samplecode/SampleAtlas.cpp
index 5464204..a2ef015 100644
--- a/samplecode/SampleAtlas.cpp
+++ b/samplecode/SampleAtlas.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
+#include "AnimTimer.h"
#include "Sample.h"
-#include "SkAnimTimer.h"
#include "SkCanvas.h"
#include "SkDrawable.h"
#include "SkPath.h"
-#include "SkRandom.h"
#include "SkRSXform.h"
+#include "SkRandom.h"
#include "SkSurface.h"
#include "SkTextUtils.h"
@@ -234,12 +234,10 @@
canvas->drawDrawable(fDrawable.get());
}
- bool onAnimate(const SkAnimTimer&) override {
- return true;
- }
+ bool onAnimate(const AnimTimer&) override { return true; }
#if 0
// TODO: switch over to use this for our animation
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
SkScalar angle = SkDoubleToScalar(fmod(timer.secs() * 360 / 24, 360));
fAnimatingDrawable->setSweep(angle);
return true;
diff --git a/samplecode/SampleBitmapRect.cpp b/samplecode/SampleBitmapRect.cpp
index 9dcf98c..fb8771d 100644
--- a/samplecode/SampleBitmapRect.cpp
+++ b/samplecode/SampleBitmapRect.cpp
@@ -5,21 +5,21 @@
* found in the LICENSE file.
*/
+#include "AnimTimer.h"
#include "Sample.h"
-#include "SkAnimTimer.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
+#include "SkColorFilter.h"
+#include "SkColorPriv.h"
#include "SkFont.h"
#include "SkGradientShader.h"
#include "SkGraphics.h"
#include "SkPath.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUTF.h"
-#include "SkColorPriv.h"
-#include "SkColorFilter.h"
#include "SkTime.h"
#include "SkTypeface.h"
+#include "SkUTF.h"
#include "SkOSFile.h"
#include "SkStream.h"
@@ -136,7 +136,7 @@
}
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
if (timer.isStopped()) {
this->resetBounce();
} else if (timer.isRunning()) {
@@ -232,7 +232,7 @@
}
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
if (timer.isStopped()) {
this->resetBounce();
} else if (timer.isRunning()) {
diff --git a/samplecode/SampleCamera.cpp b/samplecode/SampleCamera.cpp
index 6584867..ec30606 100644
--- a/samplecode/SampleCamera.cpp
+++ b/samplecode/SampleCamera.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
+#include "AnimTimer.h"
#include "DecodeFile.h"
#include "Sample.h"
-#include "SkAnimTimer.h"
-#include "SkCanvas.h"
#include "SkCamera.h"
+#include "SkCanvas.h"
#include "SkEmbossMaskFilter.h"
#include "SkGradientShader.h"
#include "SkPath.h"
@@ -83,7 +83,7 @@
}
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
if (timer.isStopped()) {
fRY = 0;
} else {
diff --git a/samplecode/SampleClock.cpp b/samplecode/SampleClock.cpp
index dc240b3..2bd65e2 100644
--- a/samplecode/SampleClock.cpp
+++ b/samplecode/SampleClock.cpp
@@ -216,9 +216,7 @@
canvas->restore();
}
- bool onAnimate(const SkAnimTimer&) override {
- return true;
- }
+ bool onAnimate(const AnimTimer&) override { return true; }
private:
diff --git a/samplecode/SampleCowboy.cpp b/samplecode/SampleCowboy.cpp
index 06bbf88..e598f87 100644
--- a/samplecode/SampleCowboy.cpp
+++ b/samplecode/SampleCowboy.cpp
@@ -105,7 +105,7 @@
return this->INHERITED::onQuery(evt);
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
if (!fDom) {
return false;
}
diff --git a/samplecode/SampleCusp.cpp b/samplecode/SampleCusp.cpp
index 32ba90d..d978e33 100644
--- a/samplecode/SampleCusp.cpp
+++ b/samplecode/SampleCusp.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
+#include <string>
+#include "AnimTimer.h"
#include "Sample.h"
-#include "SkAnimTimer.h"
#include "SkCanvas.h"
#include "SkFont.h"
#include "SkGeometry.h"
#include "SkPath.h"
-#include <string>
// This draws an animation where every cubic has a cusp, to test drawing a circle
// at the cusp point. Create a unit square. A cubic with its control points
@@ -171,7 +171,7 @@
SkDebugf("");
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
curTime = timer.msec();
if (!start) {
start = curTime;
diff --git a/samplecode/SampleDegenerateTwoPtRadials.cpp b/samplecode/SampleDegenerateTwoPtRadials.cpp
index 7392c66..eb04d22 100644
--- a/samplecode/SampleDegenerateTwoPtRadials.cpp
+++ b/samplecode/SampleDegenerateTwoPtRadials.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
+#include "AnimTimer.h"
#include "Sample.h"
-#include "SkAnimTimer.h"
#include "SkCanvas.h"
#include "SkFont.h"
#include "SkGradientShader.h"
@@ -73,7 +73,7 @@
SkFont(), SkPaint());
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
fTime = SkDoubleToScalar(timer.secs() / 15);
return true;
}
diff --git a/samplecode/SampleFilterQuality.cpp b/samplecode/SampleFilterQuality.cpp
index 69ade73..6d1d465 100644
--- a/samplecode/SampleFilterQuality.cpp
+++ b/samplecode/SampleFilterQuality.cpp
@@ -5,17 +5,17 @@
* found in the LICENSE file.
*/
+#include "AnimTimer.h"
#include "Resources.h"
#include "Sample.h"
-#include "SkAnimTimer.h"
#include "SkCanvas.h"
-#include "SkInterpolator.h"
+#include "SkData.h"
#include "SkFont.h"
#include "SkGradientShader.h"
-#include "SkData.h"
+#include "SkInterpolator.h"
#include "SkPath.h"
-#include "SkSurface.h"
#include "SkRandom.h"
+#include "SkSurface.h"
#include "SkTime.h"
static sk_sp<SkSurface> make_surface(SkCanvas* canvas, const SkImageInfo& info) {
@@ -283,7 +283,7 @@
canvas->drawString(SkStringPrintf("%.8g", trans[1] ), textX, 250, font, paint);
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
fCurrTime = timer.msec();
return true;
}
diff --git a/samplecode/SampleFlutterAnimate.cpp b/samplecode/SampleFlutterAnimate.cpp
index bffee4a..0953fe8 100644
--- a/samplecode/SampleFlutterAnimate.cpp
+++ b/samplecode/SampleFlutterAnimate.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
+#include "AnimTimer.h"
#include "Sample.h"
-#include "SkAnimTimer.h"
#include "SkCanvas.h"
-#include "SkFont.h"
-#include "SkColorPriv.h"
#include "SkColorFilter.h"
+#include "SkColorPriv.h"
+#include "SkFont.h"
#include "SkImage.h"
#include "SkRandom.h"
#include "SkTime.h"
@@ -64,7 +64,7 @@
}
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
fCurrTime = timer.secs() - fResetTime;
if (fCurrTime > kDuration) {
this->initChars();
diff --git a/samplecode/SampleGlyphTransform.cpp b/samplecode/SampleGlyphTransform.cpp
index ecd160c..497a6be 100644
--- a/samplecode/SampleGlyphTransform.cpp
+++ b/samplecode/SampleGlyphTransform.cpp
@@ -7,11 +7,11 @@
#include "Sample.h"
#include "ToolUtils.h"
-#include "SkAnimTimer.h"
+#include "AnimTimer.h"
#include "SkCanvas.h"
#include "SkPath.h"
-#include "SkRandom.h"
#include "SkRRect.h"
+#include "SkRandom.h"
#include "SkTypeface.h"
#include <cmath>
@@ -60,7 +60,7 @@
font, paint);
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
constexpr SkScalar maxt = 100000;
double t = timer.pingPong(20, 0, 0, maxt); // d3 t is in milliseconds
diff --git a/samplecode/SampleHT.cpp b/samplecode/SampleHT.cpp
index b12aa27..05b9aec 100644
--- a/samplecode/SampleHT.cpp
+++ b/samplecode/SampleHT.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
+#include "AnimTimer.h"
#include "Sample.h"
-#include "SkAnimTimer.h"
#include "SkCanvas.h"
#include "SkDrawable.h"
#include "SkInterpolator.h"
@@ -154,7 +154,7 @@
canvas->drawDrawable(fRoot.get());
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
fTime = timer.msec();
for (int i = 0; i < N; ++i) {
fArray[i].fDrawable->setTime(fTime);
diff --git a/samplecode/SampleHairline.cpp b/samplecode/SampleHairline.cpp
index 1ebbc1e..f6ec0ca 100644
--- a/samplecode/SampleHairline.cpp
+++ b/samplecode/SampleHairline.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
+#include "AnimTimer.h"
#include "Sample.h"
-#include "SkAnimTimer.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkColorFilter.h"
@@ -216,7 +216,7 @@
canvas->drawBitmap(bm2, SkIntToScalar(10), SkIntToScalar(10), nullptr);
}
- bool onAnimate(const SkAnimTimer&) override {
+ bool onAnimate(const AnimTimer&) override {
if (fDoAA) {
fProcIndex = cycle_hairproc_index(fProcIndex);
// todo: signal that we want to rebuild our TITLE
diff --git a/samplecode/SampleLayers.cpp b/samplecode/SampleLayers.cpp
index 33cbe4d..6b77e97 100644
--- a/samplecode/SampleLayers.cpp
+++ b/samplecode/SampleLayers.cpp
@@ -184,8 +184,8 @@
#include "SkMatrixConvolutionImageFilter.h"
#include "SkMorphologyImageFilter.h"
+#include "AnimTimer.h"
#include "Resources.h"
-#include "SkAnimTimer.h"
class BackdropView : public Sample {
SkPoint fCenter;
@@ -231,7 +231,7 @@
canvas->restore();
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
fAngle = SkDoubleToScalar(fmod(timer.secs() * 360 / 5, 360));
return true;
}
diff --git a/samplecode/SampleLighting.cpp b/samplecode/SampleLighting.cpp
index ef0694b..28bdea3 100644
--- a/samplecode/SampleLighting.cpp
+++ b/samplecode/SampleLighting.cpp
@@ -81,7 +81,7 @@
return this->INHERITED::onFindClickHandler(x, y, modi);
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
fLightAngle += 0.015f;
fColorFactor += 0.01f;
if (fColorFactor > 1.0f) {
diff --git a/samplecode/SampleLitAtlas.cpp b/samplecode/SampleLitAtlas.cpp
index 13a2656..6a39a53 100644
--- a/samplecode/SampleLitAtlas.cpp
+++ b/samplecode/SampleLitAtlas.cpp
@@ -5,16 +5,16 @@
* found in the LICENSE file.
*/
+#include "AnimTimer.h"
#include "Sample.h"
-#include "SkAnimTimer.h"
#include "SkBitmapProcShader.h"
#include "SkCanvas.h"
#include "SkDrawable.h"
#include "SkLightingShader.h"
#include "SkLights.h"
#include "SkNormalSource.h"
-#include "SkRandom.h"
#include "SkRSXform.h"
+#include "SkRandom.h"
#include "ToolUtils.h"
@@ -482,9 +482,7 @@
canvas->drawDrawable(fDrawable.get());
}
- bool onAnimate(const SkAnimTimer& timer) override {
- return true;
- }
+ bool onAnimate(const AnimTimer& timer) override { return true; }
private:
sk_sp<DrawLitAtlasDrawable> fDrawable;
diff --git a/samplecode/SampleMegaStroke.cpp b/samplecode/SampleMegaStroke.cpp
index a8f349a..3248ab9 100644
--- a/samplecode/SampleMegaStroke.cpp
+++ b/samplecode/SampleMegaStroke.cpp
@@ -78,9 +78,7 @@
fClip.set(0, 0, 950, 600);
}
- bool onAnimate(const SkAnimTimer& ) override {
- return true;
- }
+ bool onAnimate(const AnimTimer&) override { return true; }
private:
SkPath fMegaPath;
diff --git a/samplecode/SampleNima.cpp b/samplecode/SampleNima.cpp
index 6912518..3ecd764 100644
--- a/samplecode/SampleNima.cpp
+++ b/samplecode/SampleNima.cpp
@@ -7,8 +7,8 @@
#include "Sample.h"
+#include "AnimTimer.h"
#include "Resources.h"
-#include "SkAnimTimer.h"
#include "nima/NimaActor.h"
#include <nima/Animation/ActorAnimationInstance.hpp>
@@ -54,7 +54,7 @@
canvas->restore();
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
if (fActor) {
float time = std::fmod(timer.secs(), fActor->duration());
fActor->seek(time);
diff --git a/samplecode/SamplePatch.cpp b/samplecode/SamplePatch.cpp
index af14ac3..5197616 100644
--- a/samplecode/SamplePatch.cpp
+++ b/samplecode/SamplePatch.cpp
@@ -5,21 +5,21 @@
* found in the LICENSE file.
*/
+#include "AnimTimer.h"
#include "DecodeFile.h"
#include "Sample.h"
-#include "SkAnimTimer.h"
#include "SkCanvas.h"
+#include "SkColorFilter.h"
+#include "SkColorPriv.h"
#include "SkGradientShader.h"
#include "SkGraphics.h"
#include "SkPath.h"
#include "SkRandom.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUTF.h"
-#include "SkColorPriv.h"
-#include "SkColorFilter.h"
#include "SkTime.h"
#include "SkTypeface.h"
+#include "SkUTF.h"
#include "SkVertices.h"
#include "SkOSFile.h"
@@ -292,7 +292,7 @@
drawpatches(canvas, paint, nu, nv, &patch);
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
fAngle = timer.scaled(60, 360);
return true;
}
@@ -396,9 +396,7 @@
return this->INHERITED::onQuery(evt);
}
- bool onAnimate(const SkAnimTimer& timer) override {
- return true;
- }
+ bool onAnimate(const AnimTimer& timer) override { return true; }
void onDrawContent(SkCanvas* canvas) override {
if (fDirty) {
diff --git a/samplecode/SamplePath.cpp b/samplecode/SamplePath.cpp
index 74de725..0cd31ab 100644
--- a/samplecode/SamplePath.cpp
+++ b/samplecode/SamplePath.cpp
@@ -5,22 +5,22 @@
* found in the LICENSE file.
*/
+#include "AnimTimer.h"
#include "Sample.h"
-#include "SkAnimTimer.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
+#include "SkColorFilter.h"
+#include "SkColorPriv.h"
+#include "SkFont.h"
#include "SkGradientShader.h"
#include "SkGraphics.h"
-#include "SkFont.h"
+#include "SkParsePath.h"
#include "SkPath.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUTF.h"
-#include "SkColorPriv.h"
-#include "SkColorFilter.h"
-#include "SkParsePath.h"
#include "SkTime.h"
#include "SkTypeface.h"
+#include "SkUTF.h"
#include "SkGeometry.h"
@@ -183,7 +183,7 @@
}
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
SkScalar currSecs = timer.scaled(100);
SkScalar delta = currSecs - fPrevSecs;
fPrevSecs = currSecs;
diff --git a/samplecode/SamplePathEffects.cpp b/samplecode/SamplePathEffects.cpp
index e59b64d..e4a7422 100644
--- a/samplecode/SamplePathEffects.cpp
+++ b/samplecode/SamplePathEffects.cpp
@@ -5,19 +5,19 @@
* found in the LICENSE file.
*/
+#include "AnimTimer.h"
#include "Sample.h"
-#include "SkAnimTimer.h"
+#include "Sk1DPathEffect.h"
#include "SkCanvas.h"
+#include "SkColorPriv.h"
+#include "SkCornerPathEffect.h"
#include "SkGradientShader.h"
#include "SkPath.h"
+#include "SkPathMeasure.h"
+#include "SkRandom.h"
#include "SkRegion.h"
#include "SkShader.h"
#include "SkUTF.h"
-#include "Sk1DPathEffect.h"
-#include "SkCornerPathEffect.h"
-#include "SkPathMeasure.h"
-#include "SkRandom.h"
-#include "SkColorPriv.h"
#define CORNER_RADIUS 12
@@ -138,7 +138,7 @@
canvas->drawPath(fPath, paint);
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
fPhase = timer.scaled(40);
return true;
}
diff --git a/samplecode/SamplePathText.cpp b/samplecode/SamplePathText.cpp
index e9b2be3..57a8268 100644
--- a/samplecode/SamplePathText.cpp
+++ b/samplecode/SamplePathText.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
+#include "AnimTimer.h"
#include "Sample.h"
-#include "SkAnimTimer.h"
#include "SkCanvas.h"
#include "SkPaint.h"
#include "SkPath.h"
@@ -167,7 +167,7 @@
fLastTick = 0;
}
- bool onAnimate(const SkAnimTimer& timer) final {
+ bool onAnimate(const AnimTimer& timer) final {
fBackgroundAnimationTask.wait();
this->swapAnimationBuffers();
diff --git a/samplecode/SampleShadowUtils.cpp b/samplecode/SampleShadowUtils.cpp
index 5389c38..c7ab6de 100644
--- a/samplecode/SampleShadowUtils.cpp
+++ b/samplecode/SampleShadowUtils.cpp
@@ -5,8 +5,8 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
+#include "AnimTimer.h"
#include "Sample.h"
-#include "SkAnimTimer.h"
#include "SkBlurMask.h"
#include "SkBlurMaskFilter.h"
#include "SkCamera.h"
diff --git a/samplecode/SampleShip.cpp b/samplecode/SampleShip.cpp
index 2e95181..7e3cbd4 100644
--- a/samplecode/SampleShip.cpp
+++ b/samplecode/SampleShip.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "Sample.h"
+#include "AnimTimer.h"
#include "Resources.h"
-#include "SkAnimTimer.h"
+#include "Sample.h"
#include "SkCanvas.h"
#include "SkFont.h"
#include "SkRSXform.h"
@@ -156,7 +156,7 @@
#if 0
// TODO: switch over to use this for our animation
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
SkScalar angle = SkDoubleToScalar(fmod(timer.secs() * 360 / 24, 360));
fAnimatingDrawable->setSweep(angle);
return true;
diff --git a/samplecode/SampleThinAA.cpp b/samplecode/SampleThinAA.cpp
index bbb2427..c38f453 100644
--- a/samplecode/SampleThinAA.cpp
+++ b/samplecode/SampleThinAA.cpp
@@ -7,7 +7,7 @@
#include "Sample.h"
-#include "SkAnimTimer.h"
+#include "AnimTimer.h"
#include "SkCanvas.h"
#include "SkColorFilter.h"
#include "SkFont.h"
@@ -316,7 +316,7 @@
this->drawShapes(canvas, "SSx64", 4, fSS16);
}
- bool onAnimate(const SkAnimTimer& timer) override {
+ bool onAnimate(const AnimTimer& timer) override {
SkScalar t = timer.secs();
SkScalar dt = fLastFrameTime < 0.f ? 0.f : t - fLastFrameTime;
fLastFrameTime = t;
diff --git a/samplecode/SampleXfer.cpp b/samplecode/SampleXfer.cpp
index bc6b911..849b585 100644
--- a/samplecode/SampleXfer.cpp
+++ b/samplecode/SampleXfer.cpp
@@ -5,18 +5,17 @@
* found in the LICENSE file.
*/
+#include "AnimTimer.h"
#include "Sample.h"
-#include "SkAnimTimer.h"
-#include "SkDrawable.h"
#include "SkCanvas.h"
#include "SkDrawable.h"
+#include "SkGradientShader.h"
#include "SkPath.h"
-#include "SkRandom.h"
#include "SkRSXform.h"
+#include "SkRandom.h"
#include "SkString.h"
#include "SkSurface.h"
#include "SkTextUtils.h"
-#include "SkGradientShader.h"
const SkBlendMode gModes[] = {
SkBlendMode::kSrcOver,