commit 961ddb04a0a7aba843032d829ab867518e52559e
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu May 05 14:03:48 2011 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu May 05 14:03:48 2011 +0000
tree acab8fac9ac1f56650b3b2ef9ab7aff5384466ed
parent 2ba4abbb3171e058b7f9b1d7c7954ee6989a21e6

update to SampleView



git-svn-id: http://skia.googlecode.com/svn/trunk@1252 2bbb7eff-a529-9590-31e7-b0007b416f81

samplecode/SampleCull.cpp

diff --git a/samplecode/SampleCull.cpp b/samplecode/SampleCull.cpp
index fb6231d..7b4eab6 100644
--- a/samplecode/SampleCull.cpp
+++ b/samplecode/SampleCull.cpp
@@ -10,8 +10,7 @@
 #include "SkUtils.h"
 #include "SkRandom.h"
 
-static void addbump(SkPath* path, const SkPoint pts[2], SkScalar bump)
-{
+static void addbump(SkPath* path, const SkPoint pts[2], SkScalar bump) {
     SkVector    tang;
     
     tang.setLength(pts[1].fX - pts[0].fX, pts[1].fY - pts[0].fY, bump);
@@ -21,8 +20,7 @@
     path->lineTo(pts[1]);
 }
 
-static void subdivide(SkPath* path, SkScalar bump)
-{
+static void subdivide(SkPath* path, SkScalar bump) {
     SkPath::Iter    iter(*path, false);
     SkPoint         pts[4];
     SkPath          tmp;
@@ -46,8 +44,7 @@
     path->swap(tmp);
 }
 
-static SkIPoint* getpts(const SkPath& path, int* count)
-{
+static SkIPoint* getpts(const SkPath& path, int* count) {
     SkPoint     pts[4];
     int         n = 1;
     SkIPoint*   array;
@@ -92,15 +89,13 @@
     return array;
 }
 
-static SkScalar nextScalarRange(SkRandom& rand, SkScalar min, SkScalar max)
-{
+static SkScalar nextScalarRange(SkRandom& rand, SkScalar min, SkScalar max) {
     return min + SkScalarMul(rand.nextUScalar1(), max - min);
 }
 
-class CullView : public SkView {
+class CullView : public SampleView {
 public:
-	CullView()
-    {
+	CullView() {
         fClip.set(0, 0, SkIntToScalar(160), SkIntToScalar(160));
         
         SkRandom    rand;
@@ -119,51 +114,25 @@
         subdivide(&fPath, bump);
         subdivide(&fPath, bump);
         fPoints = getpts(fPath, &fPtCount);
+        
+        this->setBGColor(0xFFDDDDDD);
     }
     
-    virtual ~CullView()
-    {
+    virtual ~CullView() {
         delete[] fPoints;
     }
 
 protected:
     // overrides from SkEventSink
-    virtual bool onQuery(SkEvent* evt)
-    {
-        if (SampleCode::TitleQ(*evt))
-        {
+    virtual bool onQuery(SkEvent* evt) {
+        if (SampleCode::TitleQ(*evt)) {
             SampleCode::TitleR(evt, "Culling");
             return true;
         }
         return this->INHERITED::onQuery(evt);
     }
     
-    void drawBG(SkCanvas* canvas)
-    {
-        canvas->drawColor(0xFFDDDDDD);
-        
-    #if 0
-        SkPaint paint;
-        
-        paint.setAntiAliasOn(true);
-        paint.setTextSize(SkIntToScalar(20));
-        paint.setTypeface(SkTypeface::Create("serif", SkTypeface::kBoldItalic))->unref();
-
-        uint16_t    text[20];
-        
-        text[0] = 'H';
-        text[1] = 'i';
-        text[2] = ' ';
-        for (int i = 3; i < 20; i++)
-            text[i] = 0x3040 + i;
-        canvas->drawText16(text, 20, SkIntToScalar(20), SkIntToScalar(20), paint);
-    #endif
-    }
-    
-    virtual void onDraw(SkCanvas* canvas)
-    {
-        this->drawBG(canvas);
-        
+    virtual void onDrawContent(SkCanvas* canvas) {
         SkAutoCanvasRestore ar(canvas, true);
 
         canvas->translate(  SkScalarHalf(this->width() - fClip.width()),
@@ -204,23 +173,13 @@
         this->inval(NULL);
     }
     
-    virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y) 
-    {
-        return this->INHERITED::onFindClickHandler(x, y);
-    }
-    
-    virtual bool onClick(Click* click) 
-    {
-        return this->INHERITED::onClick(click);
-    }
-    
 private:
     SkRect      fClip;
     SkIPoint*   fPoints;
     SkPath      fPath;
     int         fPtCount;
 
-    typedef SkView INHERITED;
+    typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////