| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2013 Google Inc. | 2 * Copyright 2013 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 #include "PathOpsTestCommon.h" | 7 #include "PathOpsTestCommon.h" |
| 8 #include "SkOpSegment.h" | 8 #include "SkOpSegment.h" |
| 9 #include "SkTArray.h" | 9 #include "SkTArray.h" |
| 10 #include "Test.h" | 10 #include "Test.h" |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 switch(set[idx].ptCount) { | 250 switch(set[idx].ptCount) { |
| 251 case 2: { | 251 case 2: { |
| 252 SkASSERT(ValidPoints(data, 2)); | 252 SkASSERT(ValidPoints(data, 2)); |
| 253 seg->addLine(data, false, false); | 253 seg->addLine(data, false, false); |
| 254 SkDLine dLine; | 254 SkDLine dLine; |
| 255 dLine.set(set[idx].ptData); | 255 dLine.set(set[idx].ptData); |
| 256 SkASSERT(ValidLine(dLine)); | 256 SkASSERT(ValidLine(dLine)); |
| 257 if (useIntersectPt) { | 257 if (useIntersectPt) { |
| 258 break; | 258 break; |
| 259 } | 259 } |
| 260 start = dLine.xyAtT(set[idx].tStart).asSkPoint(); | 260 start = dLine.ptAtT(set[idx].tStart).asSkPoint(); |
| 261 end = dLine.xyAtT(set[idx].tEnd).asSkPoint(); | 261 end = dLine.ptAtT(set[idx].tEnd).asSkPoint(); |
| 262 } break; | 262 } break; |
| 263 case 3: { | 263 case 3: { |
| 264 SkASSERT(ValidPoints(data, 3)); | 264 SkASSERT(ValidPoints(data, 3)); |
| 265 seg->addQuad(data, false, false); | 265 seg->addQuad(data, false, false); |
| 266 SkDQuad dQuad; | 266 SkDQuad dQuad; |
| 267 dQuad.set(set[idx].ptData); | 267 dQuad.set(set[idx].ptData); |
| 268 SkASSERT(ValidQuad(dQuad)); | 268 SkASSERT(ValidQuad(dQuad)); |
| 269 if (useIntersectPt) { | 269 if (useIntersectPt) { |
| 270 break; | 270 break; |
| 271 } | 271 } |
| 272 start = dQuad.xyAtT(set[idx].tStart).asSkPoint(); | 272 start = dQuad.ptAtT(set[idx].tStart).asSkPoint(); |
| 273 end = dQuad.xyAtT(set[idx].tEnd).asSkPoint(); | 273 end = dQuad.ptAtT(set[idx].tEnd).asSkPoint(); |
| 274 } break; | 274 } break; |
| 275 case 4: { | 275 case 4: { |
| 276 SkASSERT(ValidPoints(data, 4)); | 276 SkASSERT(ValidPoints(data, 4)); |
| 277 seg->addCubic(data, false, false); | 277 seg->addCubic(data, false, false); |
| 278 SkDCubic dCubic; | 278 SkDCubic dCubic; |
| 279 dCubic.set(set[idx].ptData); | 279 dCubic.set(set[idx].ptData); |
| 280 SkASSERT(ValidCubic(dCubic)); | 280 SkASSERT(ValidCubic(dCubic)); |
| 281 if (useIntersectPt) { | 281 if (useIntersectPt) { |
| 282 break; | 282 break; |
| 283 } | 283 } |
| 284 start = dCubic.xyAtT(set[idx].tStart).asSkPoint(); | 284 start = dCubic.ptAtT(set[idx].tStart).asSkPoint(); |
| 285 end = dCubic.xyAtT(set[idx].tEnd).asSkPoint(); | 285 end = dCubic.ptAtT(set[idx].tEnd).asSkPoint(); |
| 286 } break; | 286 } break; |
| 287 } | 287 } |
| 288 double tStart = set[idx].tStart; | 288 double tStart = set[idx].tStart; |
| 289 double tEnd = set[idx].tEnd; | 289 double tEnd = set[idx].tEnd; |
| 290 seg->addT(NULL, start, tStart); | 290 seg->addT(NULL, start, tStart); |
| 291 seg->addT(NULL, end, tEnd); | 291 seg->addT(NULL, end, tEnd); |
| 292 if (tStart != 0 && tEnd != 0) { | 292 if (tStart != 0 && tEnd != 0) { |
| 293 seg->addT(NULL, set[idx].ptData[0], 0); | 293 seg->addT(NULL, set[idx].ptData[0], 0); |
| 294 } | 294 } |
| 295 if (tStart != 1 && tEnd != 1) { | 295 if (tStart != 1 && tEnd != 1) { |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 469 } | 469 } |
| 470 } | 470 } |
| 471 #endif | 471 #endif |
| 472 | 472 |
| 473 #include "TestClassDef.h" | 473 #include "TestClassDef.h" |
| 474 DEFINE_TESTCLASS_SHORT(PathOpsAngleTest) | 474 DEFINE_TESTCLASS_SHORT(PathOpsAngleTest) |
| 475 | 475 |
| 476 DEFINE_TESTCLASS_SHORT(PathOpsAngleTestOne) | 476 DEFINE_TESTCLASS_SHORT(PathOpsAngleTestOne) |
| 477 | 477 |
| 478 // DEFINE_TESTCLASS_SHORT(PathOpsAngleFindSlop) | 478 // DEFINE_TESTCLASS_SHORT(PathOpsAngleFindSlop) |
| OLD | NEW |