Make 'rotate' animate in SampleApp.

samplecode/SampleApp.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SampleApp.h"
 
 #include "SkData.h"
 #include "SkCanvas.h"
@@ skipping 764 matching lines @@
     fDeviceType = kGPU_DeviceType;
 #endif
 #if SK_ANGLE && DEFAULT_TO_ANGLE
     fDeviceType = kANGLE_DeviceType;
 #endif
 
     fUseClip = false;
     fNClip = false;
     fAnimating = false;
     fRotate = false;
+    fRotateAnimTime = 0;
     fPerspAnim = false;
     fPerspAnimTime = 0;
     fRequestGrabImage = false;
     fPipeState = SkOSMenu::kOffState;
     fTilingState = SkOSMenu::kOffState;
     fTileCount.set(1, 1);
     fMeasureFPS = false;
     fLCDState = SkOSMenu::kMixedState;
     fAAState = SkOSMenu::kMixedState;
     fFilterState = SkOSMenu::kMixedState;
@@ skipping 607 matching lines @@
         SkRegion inval;
 
         r.set(50, 50, 50+100, 50+100);
         bm.scrollRect(&r, dx, dy, &inval);
         paint_rgn(bm, r, inval);
     }
 }
 
 void SampleWindow::beforeChild(SkView* child, SkCanvas* canvas) {
     if (fRotate) {
+        fRotateAnimTime += SampleCode::GetAnimSecondsDelta();
+
         SkScalar cx = this->width() / 2;
         SkScalar cy = this->height() / 2;
         canvas->translate(cx, cy);
-        canvas->rotate(SkIntToScalar(30));
+        canvas->rotate(fRotateAnimTime * 10);
         canvas->translate(-cx, -cy);
     }
+
     if (fPerspAnim) {
         fPerspAnimTime += SampleCode::GetAnimSecondsDelta();
 
         static const SkScalar gAnimPeriod = 10 * SK_Scalar1;
         static const SkScalar gAnimMag = SK_Scalar1 / 1000;
         SkScalar t = SkScalarMod(fPerspAnimTime, gAnimPeriod);
         if (SkScalarFloorToInt(SkScalarDiv(fPerspAnimTime, gAnimPeriod)) & 0x1) {
             t = gAnimPeriod - t;
         }
         t = 2 * t - gAnimPeriod;
         t = SkScalarMul(SkScalarDiv(t, gAnimPeriod), gAnimMag);
         SkMatrix m;
         m.reset();
         m.setPerspY(t);
         canvas->concat(m);
     }
 
     this->installDrawFilter(canvas);
 
     if (fMeasureFPS) {
         if (SampleView::SetRepeatDraw(child, FPS_REPEAT_COUNT)) {
             fMeasureFPS_StartTime = SkTime::GetMSecs();
         }
     } else {
         (void)SampleView::SetRepeatDraw(child, 1);
     }
-    if (fPerspAnim) {
+    if (fPerspAnim || fRotate) {
         this->inval(NULL);
     }
 }
 
 void SampleWindow::afterChild(SkView* child, SkCanvas* canvas) {
     canvas->setDrawFilter(NULL);
 }
 
 static SkBitmap::Config gConfigCycle[] = {
     SkBitmap::kNo_Config,           // none -> none
@@ skipping 302 matching lines @@
             this->inval(NULL);
             break;
         case 'i':
             this->zoomIn();
             break;
         case 'o':
             this->zoomOut();
             break;
         case 'r':
             fRotate = !fRotate;
+            fRotateAnimTime = 0;
             this->inval(NULL);
             this->updateTitle();
             return true;
         case 'k':
             fPerspAnim = !fPerspAnim;
             this->inval(NULL);
             this->updateTitle();
             return true;
 #if SK_SUPPORT_GPU
         case '\\':
@@ skipping 691 matching lines @@
     SkGraphics::Init();
     SkEvent::Init();
 }
 
 // FIXME: this should be in a header
 void application_term();
 void application_term() {
     SkEvent::Term();
     SkGraphics::Term();
 }