commit e2463ed91ede5e6b38cf3f93205a59f8bc3f3b44
author hstern <hstern@google.com> Thu Jun 30 10:04:21 2016 -0700
committer Commit bot <commit-bot@chromium.org> Thu Jun 30 10:04:21 2016 -0700
tree fef2f422f8c5cc09e910c7013660490fda1676f8
parent ee0c555797608ce60716549cb4aa9d37d5c09745

Add cubic example and draw original path

- Add cubic example
- Draw original path
- Also added dumpHex to stderr option on 'D'

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2106063004

Review-Url: https://codereview.chromium.org/2106063004

samplecode/SamplePathOverstroke.cpp

diff --git a/samplecode/SamplePathOverstroke.cpp b/samplecode/SamplePathOverstroke.cpp
index 8219065..a2d1b89 100644
--- a/samplecode/SamplePathOverstroke.cpp
+++ b/samplecode/SamplePathOverstroke.cpp
@@ -9,6 +9,7 @@
 #include "SkCanvas.h"
 #include "SkPath.h"
 
+#include <iostream>
 #include <cmath>
 
 #define PI SK_ScalarPI
@@ -21,11 +22,13 @@
     int fPathType;  // super lazy enum
     bool fClosePath;
     bool fDrawFillPath;
+    bool fDumpHex;
     OverstrokeView() {
         fStroke = 5;
         fPathType = 0;
         fClosePath = false;
         fDrawFillPath = false;
+        fDumpHex = false;
         this->setBGColor(0xFFFFFFFF);
     }
 
@@ -47,7 +50,7 @@
                     this->inval(nullptr);
                     return true;
                 case 'x':
-                    fPathType = (fPathType + 1) % 3;
+                    fPathType = (fPathType + 1) % 4;
                     this->inval(nullptr);
                     return true;
                 case 'c':
@@ -58,6 +61,10 @@
                     fDrawFillPath = !fDrawFillPath;
                     this->inval(nullptr);
                     return true;
+                case 'D':
+                    fDumpHex = !fDumpHex;
+                    this->inval(nullptr);
+                    return true;
                 default:
                     break;
             }
@@ -79,6 +86,20 @@
         return path;
     }
 
+    SkPath cubicPath(SkPoint p1, SkPoint p2) {
+        SkASSERT(p1.y() == p2.y());
+
+        SkPath path;
+        path.moveTo(p1);
+
+        SkPoint p3 = SkPoint::Make((p1.x() + p2.x()) / 3.0f, p1.y() * 0.7f);
+        SkPoint p4 = SkPoint::Make(2.0f*(p1.x() + p2.x()) / 3.0f, p1.y() * 1.5f);
+
+        path.cubicTo(p3, p4, p2);
+
+        return path;
+    }
+
     SkPath linSemicirclePath(SkPoint p1, SkPoint p2) {
         SkASSERT(p1.y() == p2.y());
 
@@ -123,11 +144,14 @@
                 path = quadPath(p1, p2);
                 break;
             case 1:
-                path = linSemicirclePath(p1, p2);
+                path = cubicPath(p1, p2);
                 break;
             case 2:
                 path = rectPath(p1);
                 break;
+            case 3:
+                path = linSemicirclePath(p1, p2);
+                break;
             default:
                 path = quadPath(p1, p2);
                 break;
@@ -145,17 +169,37 @@
 
         canvas->drawPath(path, p);
 
+        if (fDumpHex) {
+            std::cerr << "path dumpHex" << std::endl;
+            path.dumpHex();
+        }
+
+        SkPaint hairp;
+        hairp.setColor(SK_ColorBLACK);
+        hairp.setAntiAlias(true);
+        hairp.setStyle(SkPaint::kStroke_Style);
+
         if (fDrawFillPath) {
             SkPath fillpath;
             p.getFillPath(path, &fillpath);
 
-            SkPaint fillp;
-            fillp.setColor(SK_ColorBLACK);
-            fillp.setAntiAlias(true);
-            fillp.setStyle(SkPaint::kStroke_Style);
+            canvas->drawPath(fillpath, hairp);
 
-            canvas->drawPath(fillpath, fillp);
+            if (fDumpHex) {
+                std::cerr << "fillpath dumpHex" << std::endl;
+                fillpath.dumpHex();
+            }
         }
+
+        if (fDumpHex) {
+            std::cerr << std::endl;
+
+            fDumpHex = false;
+        }
+
+        // draw original path with green hairline
+        hairp.setColor(SK_ColorGREEN);
+        canvas->drawPath(path, hairp);
     }
 
    private: