OLD | NEW |
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 |
11 SkPatchGrid::SkPatchGrid(int rows, int cols, VertexType flags, SkXfermode* xfer) | 11 SkPatchGrid::SkPatchGrid(int rows, int cols, VertexType flags, SkXfermode* xfer) |
12 : fRows(0) | 12 : fRows(0) |
13 , fCols(0) | 13 , fCols(0) |
14 , fModeFlags(kNone_VertexType) | 14 , fModeFlags(kNone_VertexType) |
15 , fCornerPts(NULL) | 15 , fCornerPts(NULL) |
16 , fCornerColors(NULL) | 16 , fCornerColors(NULL) |
17 , fTexCoords(NULL) | 17 , fTexCoords(NULL) |
18 , fHrzCtrlPts(NULL) | 18 , fHrzCtrlPts(NULL) |
19 , fVrtCtrlPts(NULL) | 19 , fVrtCtrlPts(NULL) |
20 , fXferMode(NULL) { | 20 , fXferMode(NULL) { |
21 this->reset(rows, cols, flags, xfer); | 21 this->reset(rows, cols, flags, xfer); |
22 } | 22 } |
23 | 23 |
24 SkPatchGrid::~SkPatchGrid() { | 24 SkPatchGrid::~SkPatchGrid() { |
25 SkDELETE_ARRAY(fCornerPts); | 25 delete[] fCornerPts; |
26 SkDELETE_ARRAY(fCornerColors); | 26 delete[] fCornerColors; |
27 SkDELETE_ARRAY(fTexCoords); | 27 delete[] fTexCoords; |
28 SkDELETE_ARRAY(fHrzCtrlPts); | 28 delete[] fHrzCtrlPts; |
29 SkDELETE_ARRAY(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 || NULL == cubics) { | 36 if (x < 0 || y < 0 || x > fCols - 1 || y > fRows - 1 || NULL == cubics) { |
37 return false; | 37 return false; |
38 } | 38 } |
39 | 39 |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 SkDELETE_ARRAY(fCornerPts); | 123 delete[] fCornerPts; |
124 SkDELETE_ARRAY(fCornerColors); | 124 delete[] fCornerColors; |
125 SkDELETE_ARRAY(fTexCoords); | 125 delete[] fTexCoords; |
126 SkDELETE_ARRAY(fHrzCtrlPts); | 126 delete[] fHrzCtrlPts; |
127 SkDELETE_ARRAY(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 = SkNEW_ARRAY(SkPoint, (fRows + 1) * (fCols + 1)); | 134 fCornerPts = new SkPoint[(fRows + 1) * (fCols + 1)]; |
135 fHrzCtrlPts = SkNEW_ARRAY(SkPoint, (fRows + 1) * fCols * 2); | 135 fHrzCtrlPts = new SkPoint[(fRows + 1) * fCols * 2]; |
136 fVrtCtrlPts = SkNEW_ARRAY(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 = SkNEW_ARRAY(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 = SkNEW_ARRAY(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 = SkNEW_ARRAY(int, fCols); | 153 int* maxCols = new int[fCols]; |
154 int* maxRows = SkNEW_ARRAY(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, NULL, NULL); | 162 this->getPatch(x, y, cubics, NULL, NULL); |
163 SkMatrix matrix = canvas->getTotalMatrix(); | 163 SkMatrix matrix = canvas->getTotalMatrix(); |
164 SkISize lod = SkPatchUtils::GetLevelOfDetail(cubics, &matrix); | 164 SkISize lod = SkPatchUtils::GetLevelOfDetail(cubics, &matrix); |
(...skipping 12 matching lines...) Expand all Loading... |
177 if (SkPatchUtils::getVertexData(&data, cubics, | 177 if (SkPatchUtils::getVertexData(&data, cubics, |
178 fModeFlags & kColors_VertexType ? co
lors : NULL, | 178 fModeFlags & kColors_VertexType ? co
lors : NULL, |
179 fModeFlags & kTexs_VertexType ? texC
oords : NULL, | 179 fModeFlags & kTexs_VertexType ? texC
oords : NULL, |
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 SkDELETE_ARRAY(maxCols); | 187 delete[] maxCols; |
188 SkDELETE_ARRAY(maxRows); | 188 delete[] maxRows; |
189 } | 189 } |
OLD | NEW |