Revert of Add text animation sample; tweak DrawShip sample

samplecode/SampleShip.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SampleCode.h"
 #include "Resources.h"
 #include "SkAnimTimer.h"
@@ skipping 52 matching lines @@
         SkScalar anchorY = fAtlas->height()*0.5f;
         int currIndex = 0;
         for (int x = 0; x < kGrid; x++) {
             for (int y = 0; y < kGrid; y++) {
                 float xPos = (x / (kGrid - 1.0f)) * kWidth;
                 float yPos = (y / (kGrid - 1.0f)) * kWidth;
                 
                 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++;
             }
         }
         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;
         fTimer.start();
     }
 
     ~DrawShipView() override {}
     
 protected:
     // overrides from SkEventSink
@@ skipping 48 matching lines @@
             fXform[i].fSCos = kCosDiff*c - kSinDiff*s;
             fXform[i].fSSin = kSinDiff*c + kCosDiff*s;
             
             dx -= fXform[i].fSCos*anchorX - fXform[i].fSSin*anchorY;
             dy -= fXform[i].fSSin*anchorX + fXform[i].fSCos*anchorY;
             fXform[i].fTx += dx;
             fXform[i].fTy += dy;
         }
         
         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);
     }
 
 #if 0
     // TODO: switch over to use this for our animation
     bool onAnimate(const SkAnimTimer& timer) override {
         SkScalar angle = SkDoubleToScalar(fmod(timer.secs() * 360 / 24, 360));
         fAnimatingDrawable->setSweep(angle);
         return true;
@@ skipping 12 matching lines @@
     int         fCurrentTime;
     
     
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_SAMPLE( return new DrawShipView("DrawShip", draw_atlas); )
 DEF_SAMPLE( return new DrawShipView("DrawShipSim", draw_atlas_sim); )