diff options
| author |  jvanverth <jvanverth@google.com> | 2015-11-06 16:10:34 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-11-06 16:10:34 -0800 |
| commit | d75ccc6a0a2eb166234d919ffd3f62ed39dd3a6e (patch) | |
| tree | 20c86bdd01504bf32ba87157bc87513d1d57481b /samplecode/SampleShip.cpp | |
| parent | 3b484a40b3be7f0262afadeaf6b741ba5cedcfe1 (diff) | |
Revert of Add text animation sample; tweak DrawShip sample (patchset #3 id:40001 of https://codereview.chromium.org/1410663005/ )
Reason for revert:
CrOS bots failing.
Original issue's description:
> Add text animation sample; tweak DrawShip sample
>
> Committed: https://skia.googlesource.com/skia/+/3b484a40b3be7f0262afadeaf6b741ba5cedcfe1
TBR=robertphillips@google.com,bsalomon@google.com,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1408063015
Diffstat (limited to 'samplecode/SampleShip.cpp')
| -rw-r--r-- | samplecode/SampleShip.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/samplecode/SampleShip.cpp b/samplecode/SampleShip.cpp index fddf0235ba..caaad046d9 100644 --- a/samplecode/SampleShip.cpp +++ b/samplecode/SampleShip.cpp @@ -70,7 +70,7 @@ public: fTex[currIndex] = SkRect::MakeLTRB(0.0f, 0.0f, SkIntToScalar(fAtlas->width()), SkIntToScalar(fAtlas->height())); - fXform[currIndex] = SkRSXform::MakeFromRadians(0.1f, SK_ScalarPI*0.5f, + fXform[currIndex] = SkRSXform::MakeFromRadians(2.0f, SK_ScalarPI*0.5f, xPos, yPos, anchorX, anchorY); currIndex++; } @@ -78,7 +78,7 @@ public: fTex[currIndex] = SkRect::MakeLTRB(0.0f, 0.0f, SkIntToScalar(fAtlas->width()), SkIntToScalar(fAtlas->height())); - fXform[currIndex] = SkRSXform::MakeFromRadians(0.5f, SK_ScalarPI*0.5f, + fXform[currIndex] = SkRSXform::MakeFromRadians(2.0f, SK_ScalarPI*0.5f, kWidth*0.5f, kHeight*0.5f, anchorX, anchorY); fCurrentTime = 0; @@ -147,10 +147,7 @@ protected: } fProc(canvas, fAtlas, fXform, fTex, nullptr, kGrid*kGrid+1, nullptr, &paint); - paint.setColor(SK_ColorBLACK); - canvas->drawRect(SkRect::MakeXYWH(0, 0, 200, 24), paint); - paint.setColor(SK_ColorWHITE); - canvas->drawText(outString.c_str(), outString.size(), 5, 15, paint); + canvas->drawText(outString.c_str(), outString.size(), 100.f, 100.f, paint); this->inval(nullptr); } |