Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(956)

Side by Side Diff: gm/patch.cpp

Issue 463493002: SkCanvas::drawPatch param SkPoint[12] (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2014 Google Inc. 3 * Copyright 2014 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 // This test only works with the GPU backend. 9 // This test only works with the GPU backend.
10 10
11 #include "gm.h" 11 #include "gm.h"
12 12
13 #if SK_SUPPORT_GPU 13 #if SK_SUPPORT_GPU
14 14
15 #include "GrContext.h" 15 #include "GrContext.h"
16 #include "GrTest.h" 16 #include "GrTest.h"
17 #include "SkGradientShader.h"
17 #include "SkPatch.h" 18 #include "SkPatch.h"
19 #include "SkPatchUtils.h"
18 20
19 static void draw_control_points(SkCanvas* canvas, const SkPatch& patch) { 21 static SkShader* make_shader() {
22 const SkColor colors[] = {
23 SK_ColorRED, SK_ColorCYAN, SK_ColorGREEN, SK_ColorWHITE, SK_ColorMAGENTA , SK_ColorBLUE,
24 SK_ColorYELLOW,
25 };
26 const SkPoint pts[] = { { 100.f / 4.f, 0.f }, { 3.f * 100.f / 4.f, 100.f } } ;
27
28 return SkGradientShader::CreateLinear(pts, colors, NULL, SK_ARRAY_COUNT(colo rs),
29 SkShader::kMirror_TileMode);
30 }
31
32 static void draw_control_points(SkCanvas* canvas, const SkPoint cubics[12]) {
20 //draw control points 33 //draw control points
21 SkPaint paint; 34 SkPaint paint;
22 SkPoint bottom[SkPatch::kNumPtsCubic]; 35 SkPoint bottom[SkPatch::kNumPtsCubic];
23 patch.getBottomPoints(bottom); 36 SkPatchUtils::getBottomCubic(cubics, bottom);
24 SkPoint top[SkPatch::kNumPtsCubic]; 37 SkPoint top[SkPatch::kNumPtsCubic];
25 patch.getTopPoints(top); 38 SkPatchUtils::getTopCubic(cubics, top);
26 SkPoint left[SkPatch::kNumPtsCubic]; 39 SkPoint left[SkPatch::kNumPtsCubic];
27 patch.getLeftPoints(left); 40 SkPatchUtils::getLeftCubic(cubics, left);
28 SkPoint right[SkPatch::kNumPtsCubic]; 41 SkPoint right[SkPatch::kNumPtsCubic];
29 patch.getRightPoints(right); 42 SkPatchUtils::getRightCubic(cubics, right);
30 43
31 paint.setColor(SK_ColorBLACK); 44 paint.setColor(SK_ColorBLACK);
32 paint.setStrokeWidth(0.5); 45 paint.setStrokeWidth(0.5);
33 SkPoint corners[4] = { bottom[0], bottom[3], top[0], top[3] }; 46 SkPoint corners[4] = { bottom[0], bottom[3], top[0], top[3] };
34 canvas->drawPoints(SkCanvas::kLines_PointMode, 4, bottom, paint); 47 canvas->drawPoints(SkCanvas::kLines_PointMode, 4, bottom, paint);
35 canvas->drawPoints(SkCanvas::kLines_PointMode, 2, bottom+1, paint); 48 canvas->drawPoints(SkCanvas::kLines_PointMode, 2, bottom + 1, paint);
36 canvas->drawPoints(SkCanvas::kLines_PointMode, 4, top, paint); 49 canvas->drawPoints(SkCanvas::kLines_PointMode, 4, top, paint);
37 canvas->drawPoints(SkCanvas::kLines_PointMode, 4, left, paint); 50 canvas->drawPoints(SkCanvas::kLines_PointMode, 4, left, paint);
38 canvas->drawPoints(SkCanvas::kLines_PointMode, 4, right, paint); 51 canvas->drawPoints(SkCanvas::kLines_PointMode, 4, right, paint);
39 52
40 canvas->drawPoints(SkCanvas::kLines_PointMode, 2, top+1, paint); 53 canvas->drawPoints(SkCanvas::kLines_PointMode, 2, top + 1, paint);
41 canvas->drawPoints(SkCanvas::kLines_PointMode, 2, left+1, paint); 54 canvas->drawPoints(SkCanvas::kLines_PointMode, 2, left + 1, paint);
42 canvas->drawPoints(SkCanvas::kLines_PointMode, 2, right+1, paint); 55 canvas->drawPoints(SkCanvas::kLines_PointMode, 2, right + 1, paint);
43 56
44 paint.setStrokeWidth(2); 57 paint.setStrokeWidth(2);
45 58
46 paint.setColor(SK_ColorRED); 59 paint.setColor(SK_ColorRED);
47 canvas->drawPoints(SkCanvas::kPoints_PointMode, 4, corners, paint); 60 canvas->drawPoints(SkCanvas::kPoints_PointMode, 4, corners, paint);
48 61
49 paint.setColor(SK_ColorBLUE); 62 paint.setColor(SK_ColorBLUE);
50 canvas->drawPoints(SkCanvas::kPoints_PointMode, 2, bottom+1, paint); 63 canvas->drawPoints(SkCanvas::kPoints_PointMode, 2, bottom + 1, paint);
51 64
52 paint.setColor(SK_ColorCYAN); 65 paint.setColor(SK_ColorCYAN);
53 canvas->drawPoints(SkCanvas::kPoints_PointMode, 2, top+1, paint); 66 canvas->drawPoints(SkCanvas::kPoints_PointMode, 2, top + 1, paint);
54 67
55 paint.setColor(SK_ColorYELLOW); 68 paint.setColor(SK_ColorYELLOW);
56 canvas->drawPoints(SkCanvas::kPoints_PointMode, 2, left+1, paint); 69 canvas->drawPoints(SkCanvas::kPoints_PointMode, 2, left + 1, paint);
57 70
58 paint.setColor(SK_ColorGREEN); 71 paint.setColor(SK_ColorGREEN);
59 canvas->drawPoints(SkCanvas::kPoints_PointMode, 2, right+1, paint); 72 canvas->drawPoints(SkCanvas::kPoints_PointMode, 2, right + 1, paint);
60 } 73 }
61 74
62 namespace skiagm { 75 namespace skiagm {
63 /** 76 /**
64 * This GM draws a SkPatch. 77 * This GM draws a SkPatch.
65 */ 78 */
66 class SkPatchGM : public GM { 79 class SkPatchGM : public GM {
67 80
68 public: 81 public:
69 SkPatchGM() { 82 SkPatchGM() {
(...skipping 11 matching lines...) Expand all
81 94
82 virtual uint32_t onGetFlags() const SK_OVERRIDE { 95 virtual uint32_t onGetFlags() const SK_OVERRIDE {
83 return kSkipTiled_Flag; 96 return kSkipTiled_Flag;
84 } 97 }
85 98
86 virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { 99 virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
87 100
88 SkPaint paint; 101 SkPaint paint;
89 102
90 // The order of the colors and points is clockwise starting at upper-lef t corner. 103 // The order of the colors and points is clockwise starting at upper-lef t corner.
91 SkColor colors[SkPatch::kNumColors] = { 104 const SkPoint cubics[SkPatch::kNumCtrlPts] = {
105 //top points
106 {100,100},{150,50},{250,150}, {300,100},
107 //right points
108 {250, 150},{350,250},
109 //bottom points
110 {300,300},{250,250},{150,350},{100,300},
111 //left points
112 {50,250},{150,150}
113 };
114
115 const SkColor colors[SkPatch::kNumCorners] = {
92 SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorCYAN 116 SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorCYAN
93 }; 117 };
94 SkPoint points[SkPatch::kNumCtrlPts] = { 118 const SkPoint texCoords[SkPatch::kNumCorners] = {
95 //top points 119 {0.0f, 0.0f}, {100.0f, 0.0f}, {100.0f,100.0f}, {0.0f, 100.0f}}
96 {50,50},{75,20},{125,80}, {150,50}, 120 ;
97 //right points 121
98 {120,75},{180,125}, 122 const SkXfermode::Mode modes[] = {
99 //bottom points 123 SkXfermode::kSrc_Mode,
100 {150,150},{125,120},{75,180},{50,150}, 124 SkXfermode::kDst_Mode,
101 //left points 125 SkXfermode::kModulate_Mode,
102 {20,125},{80,75}
103 }; 126 };
104 127
105 SkPatch patch(points, colors); 128 SkAutoTUnref<SkShader> shader(make_shader());
106 static const SkScalar kScale = 0.5f; 129
107 canvas->translate(100, 100);
108 canvas->save(); 130 canvas->save();
109 for (SkScalar x = 0; x < 4; x++) { 131 for (int y = 0; y < 3; y++) {
110 canvas->save(); 132 SkAutoTUnref<SkXfermode> xfer(SkXfermode::Create(modes[y]));
111 canvas->scale(kScale * (x + 1), kScale * (x + 1)); 133
112 canvas->translate(x * 100, 0); 134 for (int x = 0; x < 4; x++) {
113 canvas->drawPatch(patch, paint); 135 canvas->save();
114 draw_control_points(canvas, patch); 136 canvas->translate(x * 350, y * 350);
115 canvas->restore(); 137 switch (x) {
116 } 138 case 0:
117 139 canvas->drawPatch(cubics, NULL, NULL, xfer, paint);
118 canvas->translate(0, 270); 140 break;
119 141 case 1:
120 static const SkScalar kSkew = 0.2f; 142 canvas->drawPatch(cubics, colors, NULL, xfer, paint);
121 for (SkScalar x = 0; x < 4; x++) { 143 break;
122 canvas->save(); 144 case 2:
123 canvas->scale(kScale * (x + 1), kScale * (x + 1)); 145 paint.setShader(shader);
124 canvas->translate(x * 100, 0); 146 canvas->drawPatch(cubics, NULL, texCoords, xfer, paint);
125 canvas->skew(kSkew * (x + 1), kSkew * (x + 1)); 147 paint.setShader(NULL);
126 canvas->drawPatch(patch, paint); 148 break;
127 draw_control_points(canvas, patch); 149 case 3:
128 canvas->restore(); 150 paint.setShader(shader);
151 canvas->drawPatch(cubics, colors, texCoords, xfer, paint );
152 paint.setShader(NULL);
153 break;
154 default:
155 break;
156 }
157
158 draw_control_points(canvas, cubics);
159 canvas->restore();
160 }
129 } 161 }
130 canvas->restore(); 162 canvas->restore();
131 } 163 }
132 164
133 private: 165 private:
134 typedef GM INHERITED; 166 typedef GM INHERITED;
135 }; 167 };
136 168
137 DEF_GM(return SkNEW(SkPatchGM); ) 169 DEF_GM(return SkNEW(SkPatchGM); )
138 170
139 } 171 }
140 172
141 #endif 173 #endif
OLDNEW
« no previous file with comments | « bench/PatchBench.cpp ('k') | gyp/bench.gypi » ('j') | include/core/SkCanvas.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698