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

Side by Side Diff: src/utils/SkPatchGrid.cpp

Issue 1842753002: Style bikeshed - remove extraneous whitespace (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « src/utils/SkPatchGrid.h ('k') | src/utils/SkPatchUtils.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2014 Google Inc. 2 * Copyright 2014 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkPatchGrid.h" 8 #include "SkPatchGrid.h"
9 #include "SkPatchUtils.h" 9 #include "SkPatchUtils.h"
10 10
(...skipping 18 matching lines...) Expand all
29 delete[] fVrtCtrlPts; 29 delete[] fVrtCtrlPts;
30 } 30 }
31 31
32 bool SkPatchGrid::setPatch(int x, int y, const SkPoint cubics[12], const SkColor colors[4], 32 bool SkPatchGrid::setPatch(int x, int y, const SkPoint cubics[12], const SkColor colors[4],
33 const SkPoint texCoords[4]) { 33 const SkPoint texCoords[4]) {
34 // Check for the passed paramaters to be within the range of the grid dimens ions and a valid 34 // Check for the passed paramaters to be within the range of the grid dimens ions and a valid
35 // pointer for the cubics' control points. 35 // pointer for the cubics' control points.
36 if (x < 0 || y < 0 || x > fCols - 1 || y > fRows - 1 || nullptr == cubics) { 36 if (x < 0 || y < 0 || x > fCols - 1 || y > fRows - 1 || nullptr == cubics) {
37 return false; 37 return false;
38 } 38 }
39 39
40 // setup corners and colors 40 // setup corners and colors
41 int cornerPos = y * (fCols + 1) + x; 41 int cornerPos = y * (fCols + 1) + x;
42 fCornerPts[cornerPos] = cubics[SkPatchUtils::kTopP0_CubicCtrlPts]; 42 fCornerPts[cornerPos] = cubics[SkPatchUtils::kTopP0_CubicCtrlPts];
43 fCornerPts[cornerPos + 1] = cubics[SkPatchUtils::kTopP3_CubicCtrlPts]; 43 fCornerPts[cornerPos + 1] = cubics[SkPatchUtils::kTopP3_CubicCtrlPts];
44 fCornerPts[cornerPos + (fCols + 1)] = cubics[SkPatchUtils::kBottomP0_CubicCt rlPts]; 44 fCornerPts[cornerPos + (fCols + 1)] = cubics[SkPatchUtils::kBottomP0_CubicCt rlPts];
45 fCornerPts[cornerPos + (fCols + 1) + 1] = cubics[SkPatchUtils::kBottomP3_Cub icCtrlPts]; 45 fCornerPts[cornerPos + (fCols + 1) + 1] = cubics[SkPatchUtils::kBottomP3_Cub icCtrlPts];
46 46
47 // set horizontal control points 47 // set horizontal control points
48 int hrzPos = y * (fCols * 2) + (x * 2); 48 int hrzPos = y * (fCols * 2) + (x * 2);
49 fHrzCtrlPts[hrzPos] = cubics[SkPatchUtils::kTopP1_CubicCtrlPts]; 49 fHrzCtrlPts[hrzPos] = cubics[SkPatchUtils::kTopP1_CubicCtrlPts];
50 fHrzCtrlPts[hrzPos + 1] = cubics[SkPatchUtils::kTopP2_CubicCtrlPts]; 50 fHrzCtrlPts[hrzPos + 1] = cubics[SkPatchUtils::kTopP2_CubicCtrlPts];
51 fHrzCtrlPts[hrzPos + (fCols * 2)] = cubics[SkPatchUtils::kBottomP1_CubicCtrl Pts]; 51 fHrzCtrlPts[hrzPos + (fCols * 2)] = cubics[SkPatchUtils::kBottomP1_CubicCtrl Pts];
52 fHrzCtrlPts[hrzPos + (fCols * 2) + 1] = cubics[SkPatchUtils::kBottomP2_Cubic CtrlPts]; 52 fHrzCtrlPts[hrzPos + (fCols * 2) + 1] = cubics[SkPatchUtils::kBottomP2_Cubic CtrlPts];
53 53
54 // set vertical control points 54 // set vertical control points
55 int vrtPos = (y*2) * (fCols + 1) + x; 55 int vrtPos = (y*2) * (fCols + 1) + x;
56 fVrtCtrlPts[vrtPos] = cubics[SkPatchUtils::kLeftP1_CubicCtrlPts]; 56 fVrtCtrlPts[vrtPos] = cubics[SkPatchUtils::kLeftP1_CubicCtrlPts];
57 fVrtCtrlPts[vrtPos + 1] = cubics[SkPatchUtils::kRightP1_CubicCtrlPts]; 57 fVrtCtrlPts[vrtPos + 1] = cubics[SkPatchUtils::kRightP1_CubicCtrlPts];
58 fVrtCtrlPts[vrtPos + (fCols + 1)] = cubics[SkPatchUtils::kLeftP2_CubicCtrlPt s]; 58 fVrtCtrlPts[vrtPos + (fCols + 1)] = cubics[SkPatchUtils::kLeftP2_CubicCtrlPt s];
59 fVrtCtrlPts[vrtPos + (fCols + 1) + 1] = cubics[SkPatchUtils::kRightP2_CubicC trlPts]; 59 fVrtCtrlPts[vrtPos + (fCols + 1) + 1] = cubics[SkPatchUtils::kRightP2_CubicC trlPts];
60 60
61 // set optional values (colors and texture coordinates) 61 // set optional values (colors and texture coordinates)
62 if ((fModeFlags & kColors_VertexType) && colors) { 62 if ((fModeFlags & kColors_VertexType) && colors) {
63 fCornerColors[cornerPos] = colors[0]; 63 fCornerColors[cornerPos] = colors[0];
64 fCornerColors[cornerPos + 1] = colors[1]; 64 fCornerColors[cornerPos + 1] = colors[1];
65 fCornerColors[cornerPos + (fCols + 1)] = colors[3]; 65 fCornerColors[cornerPos + (fCols + 1)] = colors[3];
66 fCornerColors[cornerPos + (fCols + 1) + 1] = colors[2]; 66 fCornerColors[cornerPos + (fCols + 1) + 1] = colors[2];
67 } 67 }
68 68
69 if ((fModeFlags & kTexs_VertexType) && texCoords) { 69 if ((fModeFlags & kTexs_VertexType) && texCoords) {
70 fTexCoords[cornerPos] = texCoords[0]; 70 fTexCoords[cornerPos] = texCoords[0];
71 fTexCoords[cornerPos + 1] = texCoords[1]; 71 fTexCoords[cornerPos + 1] = texCoords[1];
72 fTexCoords[cornerPos + (fCols + 1)] = texCoords[3]; 72 fTexCoords[cornerPos + (fCols + 1)] = texCoords[3];
73 fTexCoords[cornerPos + (fCols + 1) + 1] = texCoords[2]; 73 fTexCoords[cornerPos + (fCols + 1) + 1] = texCoords[2];
74 } 74 }
75 75
76 return true; 76 return true;
77 } 77 }
78 78
79 bool SkPatchGrid::getPatch(int x, int y, SkPoint cubics[12], SkColor colors[4], 79 bool SkPatchGrid::getPatch(int x, int y, SkPoint cubics[12], SkColor colors[4],
80 SkPoint texCoords[4]) const { 80 SkPoint texCoords[4]) const {
81 81
82 if (x < 0 || y < 0 || x > fCols - 1 || y > fRows - 1 || nullptr == cubics) { 82 if (x < 0 || y < 0 || x > fCols - 1 || y > fRows - 1 || nullptr == cubics) {
83 return false; 83 return false;
84 } 84 }
85 85
86 // set the patch by building the array of points and colors with the corresp onding values. 86 // set the patch by building the array of points and colors with the corresp onding values.
87 int cornerPos = y * (fCols + 1) + x; 87 int cornerPos = y * (fCols + 1) + x;
88 cubics[SkPatchUtils::kTopP0_CubicCtrlPts] = fCornerPts[cornerPos]; 88 cubics[SkPatchUtils::kTopP0_CubicCtrlPts] = fCornerPts[cornerPos];
89 cubics[SkPatchUtils::kTopP3_CubicCtrlPts] = fCornerPts[cornerPos + 1]; 89 cubics[SkPatchUtils::kTopP3_CubicCtrlPts] = fCornerPts[cornerPos + 1];
90 cubics[SkPatchUtils::kBottomP0_CubicCtrlPts] = fCornerPts[cornerPos + (fCols + 1)]; 90 cubics[SkPatchUtils::kBottomP0_CubicCtrlPts] = fCornerPts[cornerPos + (fCols + 1)];
91 cubics[SkPatchUtils::kBottomP3_CubicCtrlPts] = fCornerPts[cornerPos + (fCols + 1) + 1]; 91 cubics[SkPatchUtils::kBottomP3_CubicCtrlPts] = fCornerPts[cornerPos + (fCols + 1) + 1];
92 92
93 int hrzPos = y * (fCols * 2) + (x * 2); 93 int hrzPos = y * (fCols * 2) + (x * 2);
94 cubics[SkPatchUtils::kTopP1_CubicCtrlPts] = fHrzCtrlPts[hrzPos]; 94 cubics[SkPatchUtils::kTopP1_CubicCtrlPts] = fHrzCtrlPts[hrzPos];
95 cubics[SkPatchUtils::kTopP2_CubicCtrlPts] = fHrzCtrlPts[hrzPos + 1]; 95 cubics[SkPatchUtils::kTopP2_CubicCtrlPts] = fHrzCtrlPts[hrzPos + 1];
96 cubics[SkPatchUtils::kBottomP1_CubicCtrlPts] = fHrzCtrlPts[hrzPos + (fCols * 2)]; 96 cubics[SkPatchUtils::kBottomP1_CubicCtrlPts] = fHrzCtrlPts[hrzPos + (fCols * 2)];
97 cubics[SkPatchUtils::kBottomP2_CubicCtrlPts] = fHrzCtrlPts[hrzPos + (fCols * 2) + 1]; 97 cubics[SkPatchUtils::kBottomP2_CubicCtrlPts] = fHrzCtrlPts[hrzPos + (fCols * 2) + 1];
98 98
99 int vrtPos = (y*2) * (fCols + 1) + x; 99 int vrtPos = (y*2) * (fCols + 1) + x;
100 cubics[SkPatchUtils::kLeftP1_CubicCtrlPts] = fVrtCtrlPts[vrtPos]; 100 cubics[SkPatchUtils::kLeftP1_CubicCtrlPts] = fVrtCtrlPts[vrtPos];
101 cubics[SkPatchUtils::kRightP1_CubicCtrlPts] = fVrtCtrlPts[vrtPos + 1]; 101 cubics[SkPatchUtils::kRightP1_CubicCtrlPts] = fVrtCtrlPts[vrtPos + 1];
102 cubics[SkPatchUtils::kLeftP2_CubicCtrlPts] = fVrtCtrlPts[vrtPos + (fCols + 1 )]; 102 cubics[SkPatchUtils::kLeftP2_CubicCtrlPts] = fVrtCtrlPts[vrtPos + (fCols + 1 )];
103 cubics[SkPatchUtils::kRightP2_CubicCtrlPts] = fVrtCtrlPts[vrtPos + (fCols + 1) + 1]; 103 cubics[SkPatchUtils::kRightP2_CubicCtrlPts] = fVrtCtrlPts[vrtPos + (fCols + 1) + 1];
104 104
105 if ((fModeFlags & kColors_VertexType) && colors) { 105 if ((fModeFlags & kColors_VertexType) && colors) {
106 colors[0] = fCornerColors[cornerPos]; 106 colors[0] = fCornerColors[cornerPos];
107 colors[1] = fCornerColors[cornerPos + 1]; 107 colors[1] = fCornerColors[cornerPos + 1];
108 colors[3] = fCornerColors[cornerPos + (fCols + 1)]; 108 colors[3] = fCornerColors[cornerPos + (fCols + 1)];
109 colors[2] = fCornerColors[cornerPos + (fCols + 1) + 1]; 109 colors[2] = fCornerColors[cornerPos + (fCols + 1) + 1];
110 } 110 }
111 111
112 if ((fModeFlags & kTexs_VertexType) && texCoords) { 112 if ((fModeFlags & kTexs_VertexType) && texCoords) {
113 texCoords[0] = fTexCoords[cornerPos]; 113 texCoords[0] = fTexCoords[cornerPos];
114 texCoords[1] = fTexCoords[cornerPos + 1]; 114 texCoords[1] = fTexCoords[cornerPos + 1];
115 texCoords[3] = fTexCoords[cornerPos + (fCols + 1)]; 115 texCoords[3] = fTexCoords[cornerPos + (fCols + 1)];
116 texCoords[2] = fTexCoords[cornerPos + (fCols + 1) + 1]; 116 texCoords[2] = fTexCoords[cornerPos + (fCols + 1) + 1];
117 } 117 }
118 118
119 return true; 119 return true;
120 } 120 }
121 121
122 void SkPatchGrid::reset(int rows, int cols, VertexType flags, SkXfermode* xMode) { 122 void SkPatchGrid::reset(int rows, int cols, VertexType flags, SkXfermode* xMode) {
123 delete[] fCornerPts; 123 delete[] fCornerPts;
124 delete[] fCornerColors; 124 delete[] fCornerColors;
125 delete[] fTexCoords; 125 delete[] fTexCoords;
126 delete[] fHrzCtrlPts; 126 delete[] fHrzCtrlPts;
127 delete[] fVrtCtrlPts; 127 delete[] fVrtCtrlPts;
128 128
129 fCols = cols; 129 fCols = cols;
130 fRows = rows; 130 fRows = rows;
131 fModeFlags = flags; 131 fModeFlags = flags;
132 fXferMode = xMode; 132 fXferMode = xMode;
133 133
134 fCornerPts = new SkPoint[(fRows + 1) * (fCols + 1)]; 134 fCornerPts = new SkPoint[(fRows + 1) * (fCols + 1)];
135 fHrzCtrlPts = new SkPoint[(fRows + 1) * fCols * 2]; 135 fHrzCtrlPts = new SkPoint[(fRows + 1) * fCols * 2];
136 fVrtCtrlPts = new SkPoint[fRows * 2 * (fCols + 1)]; 136 fVrtCtrlPts = new SkPoint[fRows * 2 * (fCols + 1)];
137 memset(fCornerPts, 0, (fRows + 1) * (fCols + 1) * sizeof(SkPoint)); 137 memset(fCornerPts, 0, (fRows + 1) * (fCols + 1) * sizeof(SkPoint));
138 memset(fHrzCtrlPts, 0, (fRows + 1) * fCols * 2 * sizeof(SkPoint)); 138 memset(fHrzCtrlPts, 0, (fRows + 1) * fCols * 2 * sizeof(SkPoint));
139 memset(fVrtCtrlPts, 0, fRows * 2 * (fCols + 1) * sizeof(SkPoint)); 139 memset(fVrtCtrlPts, 0, fRows * 2 * (fCols + 1) * sizeof(SkPoint));
140 140
141 if (fModeFlags & kColors_VertexType) { 141 if (fModeFlags & kColors_VertexType) {
142 fCornerColors = new SkColor[(fRows + 1) * (fCols + 1)]; 142 fCornerColors = new SkColor[(fRows + 1) * (fCols + 1)];
143 memset(fCornerColors, 0, (fRows + 1) * (fCols + 1) * sizeof(SkColor)); 143 memset(fCornerColors, 0, (fRows + 1) * (fCols + 1) * sizeof(SkColor));
144 } 144 }
145 145
146 if (fModeFlags & kTexs_VertexType) { 146 if (fModeFlags & kTexs_VertexType) {
147 fTexCoords = new SkPoint[(fRows + 1) * (fCols + 1)]; 147 fTexCoords = new SkPoint[(fRows + 1) * (fCols + 1)];
148 memset(fTexCoords, 0, (fRows + 1) * (fCols + 1) * sizeof(SkPoint)); 148 memset(fTexCoords, 0, (fRows + 1) * (fCols + 1) * sizeof(SkPoint));
149 } 149 }
150 } 150 }
151 151
152 void SkPatchGrid::draw(SkCanvas* canvas, SkPaint& paint) { 152 void SkPatchGrid::draw(SkCanvas* canvas, SkPaint& paint) {
153 int* maxCols = new int[fCols]; 153 int* maxCols = new int[fCols];
154 int* maxRows = new int[fRows]; 154 int* maxRows = new int[fRows];
155 memset(maxCols, 0, fCols * sizeof(int)); 155 memset(maxCols, 0, fCols * sizeof(int));
156 memset(maxRows, 0, fRows * sizeof(int)); 156 memset(maxRows, 0, fRows * sizeof(int));
157 157
158 // Get the maximum level of detail per axis for each row and column 158 // Get the maximum level of detail per axis for each row and column
159 for (int y = 0; y < fRows; y++) { 159 for (int y = 0; y < fRows; y++) {
160 for (int x = 0; x < fCols; x++) { 160 for (int x = 0; x < fCols; x++) {
161 SkPoint cubics[12]; 161 SkPoint cubics[12];
162 this->getPatch(x, y, cubics, nullptr, nullptr); 162 this->getPatch(x, y, cubics, nullptr, nullptr);
163 SkMatrix matrix = canvas->getTotalMatrix(); 163 SkMatrix matrix = canvas->getTotalMatrix();
164 SkISize lod = SkPatchUtils::GetLevelOfDetail(cubics, &matrix); 164 SkISize lod = SkPatchUtils::GetLevelOfDetail(cubics, &matrix);
165 maxCols[x] = SkMax32(maxCols[x], lod.width()); 165 maxCols[x] = SkMax32(maxCols[x], lod.width());
166 maxRows[y] = SkMax32(maxRows[y], lod.height()); 166 maxRows[y] = SkMax32(maxRows[y], lod.height());
167 } 167 }
(...skipping 12 matching lines...) Expand all
180 maxCols[x], maxRows[y])) { 180 maxCols[x], maxRows[y])) {
181 canvas->drawVertices(SkCanvas::kTriangles_VertexMode, data.fVert exCount, 181 canvas->drawVertices(SkCanvas::kTriangles_VertexMode, data.fVert exCount,
182 data.fPoints, data.fTexCoords, data.fColors , fXferMode, 182 data.fPoints, data.fTexCoords, data.fColors , fXferMode,
183 data.fIndices, data.fIndexCount, paint); 183 data.fIndices, data.fIndexCount, paint);
184 } 184 }
185 } 185 }
186 } 186 }
187 delete[] maxCols; 187 delete[] maxCols;
188 delete[] maxRows; 188 delete[] maxRows;
189 } 189 }
OLDNEW
« no previous file with comments | « src/utils/SkPatchGrid.h ('k') | src/utils/SkPatchUtils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698