option to return drawable from recording

samplecode/SampleArc.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 "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
 #include "SkPath.h"
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
 #include "SkComposeShader.h"
 #include "Sk1DPathEffect.h"
 #include "SkCornerPathEffect.h"
 #include "SkPathMeasure.h"
+#include "SkPictureRecorder.h"
 #include "SkRandom.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkLayerRasterizer.h"
 
 #include "SkCanvasDrawable.h"
 
 #include "SkParsePath.h"
 static void testparse() {
     SkRect r;
     r.set(0, 0, 10, 10.5f);
     SkPath p, p2;
     SkString str, str2;
 
     p.addRect(r);
     SkParsePath::ToSVGString(p, &str);
     SkParsePath::FromSVGString(str.c_str(), &p2);
     SkParsePath::ToSVGString(p2, &str2);
 }
 
 class ArcsView : public SampleView {
     class MyDrawable : public SkCanvasDrawable {
         SkRect   fR;
         SkScalar fSweep;
     public:
-        MyDrawable(const SkRect& r) : fR(r), fSweep(0) {
-        }
+        MyDrawable(const SkRect& r) : fR(r), fSweep(0) {}
 
         void setSweep(SkScalar sweep) {
             if (fSweep != sweep) {
                 fSweep = sweep;
                 this->notifyDrawingChanged();
             }
         }
 
         void onDraw(SkCanvas* canvas) SK_OVERRIDE {
             SkPaint paint;
@@ skipping 18 matching lines @@
 
         SkRect onGetBounds() SK_OVERRIDE {
             SkRect r(fR);
             r.outset(2, 2);
             return r;
         }
     };
 
 public:
     SkRect fRect;
-    MyDrawable* fDrawable;
+    MyDrawable* fAnimatingDrawable;
+    SkCanvasDrawable* fRootDrawable;
 
     ArcsView() {
         testparse();
         fSweep = SkIntToScalar(100);
         this->setBGColor(0xFFDDDDDD);
 
         fRect.set(0, 0, SkIntToScalar(200), SkIntToScalar(200));
         fRect.offset(SkIntToScalar(20), SkIntToScalar(20));
-        fDrawable = SkNEW_ARGS(MyDrawable, (fRect));
+        fAnimatingDrawable = SkNEW_ARGS(MyDrawable, (fRect));
+
+        SkPictureRecorder recorder;
+        draw_root(recorder.beginRecording(SkRect::MakeWH(800, 500)));
+        fRootDrawable = recorder.EXPERIMENTAL_endRecordingAsDrawable();
     }
 
     virtual ~ArcsView() SK_OVERRIDE {
-        fDrawable->unref();
+        fAnimatingDrawable->unref();
+        fRootDrawable->unref();
     }
 
 protected:
     // overrides from SkEventSink
     virtual bool onQuery(SkEvent* evt) {
         if (SampleCode::TitleQ(*evt)) {
             SampleCode::TitleR(evt, "Arcs");
             return true;
         }
         return this->INHERITED::onQuery(evt);
     }
 

[robertphillips, 2014/11/24 15:42:02]

DrawRectWithLines ?

[reed1, 2014/11/24 17:10:48]

Done.

     static void drawRectWithLines(SkCanvas* canvas, const SkRect& r, const SkPaint& p) {
         canvas->drawRect(r, p);
         canvas->drawLine(r.fLeft, r.fTop, r.fRight, r.fBottom, p);
         canvas->drawLine(r.fLeft, r.fBottom, r.fRight, r.fTop, p);
         canvas->drawLine(r.fLeft, r.centerY(), r.fRight, r.centerY(), p);
         canvas->drawLine(r.centerX(), r.fTop, r.centerX(), r.fBottom, p);
     }
 

[robertphillips, 2014/11/24 15:42:02]

DrawLabel ?

[reed1, 2014/11/24 17:10:48]

Done.

     static void draw_label(SkCanvas* canvas, const SkRect& rect,
                             int start, int sweep) {
         SkPaint paint;
 
         paint.setAntiAlias(true);
         paint.setTextAlign(SkPaint::kCenter_Align);
 
         SkString    str;
 
         str.appendS32(start);
         str.append(", ");
         str.appendS32(sweep);
         canvas->drawText(str.c_str(), str.size(), rect.centerX(),
                          rect.fBottom + paint.getTextSize() * 5/4, paint);
     }
 

[robertphillips, 2014/11/24 15:42:02]

DrawArcs ?

[reed1, 2014/11/24 17:10:48]

Done.

     static void drawArcs(SkCanvas* canvas) {
         SkPaint paint;
         SkRect  r;
         SkScalar w = SkIntToScalar(75);
         SkScalar h = SkIntToScalar(50);
 
         r.set(0, 0, w, h);
         paint.setAntiAlias(true);
         paint.setStyle(SkPaint::kStroke_Style);
 
@@ skipping 22 matching lines @@
             canvas->drawArc(r, SkIntToScalar(gAngles[i]),
                             SkIntToScalar(gAngles[i+1]), false, paint);
 
             draw_label(canvas, r, gAngles[i], gAngles[i+1]);
 
             canvas->translate(w * 8 / 7, 0);
         }
 
         canvas->restore();
     }
 

[robertphillips, 2014/11/24 15:42:02]

drawRoot due to fRect usage ?

[reed1, 2014/11/24 17:10:48]

Done.

-    virtual void onDrawContent(SkCanvas* canvas) {
-        fDrawable->setSweep(SampleCode::GetAnimScalar(SkIntToScalar(360)/24,
-                                                      SkIntToScalar(360)));
-
+    void draw_root(SkCanvas* canvas) {
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setStrokeWidth(SkIntToScalar(2));
         paint.setStyle(SkPaint::kStroke_Style);
 
         drawRectWithLines(canvas, fRect, paint);
 
-        canvas->EXPERIMENTAL_drawDrawable(fDrawable);
+        canvas->EXPERIMENTAL_drawDrawable(fAnimatingDrawable);
 
         drawArcs(canvas);
+    }
+

[robertphillips, 2014/11/24 15:42:02]

SK_OVERRIDE ?

[reed1, 2014/11/24 17:10:48]

Done.

+    virtual void onDrawContent(SkCanvas* canvas) {
+        fAnimatingDrawable->setSweep(SampleCode::GetAnimScalar(360/24, 360));
+        canvas->EXPERIMENTAL_drawDrawable(fRootDrawable);
         this->inval(NULL);
     }
 
     virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y,
                                               unsigned modi) {
      //   fSweep += SK_Scalar1;
         this->inval(NULL);
         return this->INHERITED::onFindClickHandler(x, y, modi);
     }
 
     virtual bool onClick(Click* click) {
         return this->INHERITED::onClick(click);
     }
 
 private:
     SkScalar fSweep;
 
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new ArcsView; }
 static SkViewRegister reg(MyFactory);