| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 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 "PathOpsCubicIntersectionTestData.h" | 7 #include "PathOpsCubicIntersectionTestData.h" |
| 8 #include "PathOpsTestCommon.h" | 8 #include "PathOpsTestCommon.h" |
| 9 #include "SkIntersections.h" | 9 #include "SkIntersections.h" |
| 10 #include "SkPathOpsRect.h" | 10 #include "SkPathOpsRect.h" |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 | 157 |
| 158 {{{18.1312339, 31.6473732}, {95.5711034, 63.5350219}, {92.3283165, 62.0158945}, | 158 {{{18.1312339, 31.6473732}, {95.5711034, 63.5350219}, {92.3283165, 62.0158945}, |
| 159 {18.5656052, 32.1268808}}}, | 159 {18.5656052, 32.1268808}}}, |
| 160 {{{97.402018, 35.7169972}, {33.1127443, 25.8935163}, {1.13970027, 54.9424981}, | 160 {{{97.402018, 35.7169972}, {33.1127443, 25.8935163}, {1.13970027, 54.9424981}, |
| 161 {56.4860195, 60.529264}}}, | 161 {56.4860195, 60.529264}}}, |
| 162 }; | 162 }; |
| 163 | 163 |
| 164 const size_t testSetCount = SK_ARRAY_COUNT(testSet); | 164 const size_t testSetCount = SK_ARRAY_COUNT(testSet); |
| 165 | 165 |
| 166 static const SkDCubic newTestSet[] = { | 166 static const SkDCubic newTestSet[] = { |
| 167 {{{275,532}, {277.209137,532}, {279,530.209106}, {279,528}}}, |
| 168 {{{278,529}, {278,530.65686}, {276.65686,532}, {275,532}}}, |
| 169 |
| 167 #if 0 // FIXME: asserts coincidence, not working yet | 170 #if 0 // FIXME: asserts coincidence, not working yet |
| 168 {{{195, 785}, {124.30755615234375, 785}, {67, 841.85986328125}, {67, 912}}}, | 171 {{{195, 785}, {124.30755615234375, 785}, {67, 841.85986328125}, {67, 912}}}, |
| 169 {{{67, 913}, {67, 842.30755615234375}, {123.85984039306641, 785}, {194, 785}}}, | 172 {{{67, 913}, {67, 842.30755615234375}, {123.85984039306641, 785}, {194, 785}}}, |
| 170 #endif | 173 #endif |
| 171 | 174 |
| 175 {{{149,710.001465}, {149.000809,712.209961}, {150.791367,714}, {153,714}}}, |
| 176 {{{154,715}, {151.238571,715}, {149,712.761414}, {149,710}}}, |
| 177 |
| 178 {{{1,2}, {1,2}, {2,0}, {6,0}}}, |
| 179 {{{0,2}, {0,6}, {2,1}, {2,1}}}, |
| 180 |
| 181 {{{0,1}, {2,3}, {5,1}, {4,3}}}, |
| 182 {{{1,5}, {3,4}, {1,0}, {3,2}}}, |
| 183 |
| 172 {{{399,657}, {399,661.970581}, {403.029449,666}, {408,666}}}, | 184 {{{399,657}, {399,661.970581}, {403.029449,666}, {408,666}}}, |
| 173 {{{406,666}, {402.686279,666}, {400,663.313721}, {400,660}}}, | 185 {{{406,666}, {402.686279,666}, {400,663.313721}, {400,660}}}, |
| 174 | 186 |
| 175 {{{0,5}, {3,5}, {3,0}, {3,2}}}, | 187 {{{0,5}, {3,5}, {3,0}, {3,2}}}, |
| 176 {{{0,3}, {2,3}, {5,0}, {5,3}}}, | 188 {{{0,3}, {2,3}, {5,0}, {5,3}}}, |
| 177 | 189 |
| 178 {{{132, 11419}, {130.89543151855469, 11419}, {130, 11418.1044921875}, {130, 1141
7}}}, | 190 {{{132, 11419}, {130.89543151855469, 11419}, {130, 11418.1044921875}, {130, 1141
7}}}, |
| 179 | 191 |
| 180 {{{3, 4}, {1, 5}, {4, 3}, {6, 4}}}, | 192 {{{3, 4}, {1, 5}, {4, 3}, {6, 4}}}, |
| 181 {{{3, 4}, {4, 6}, {4, 3}, {5, 1}}}, | 193 {{{3, 4}, {4, 6}, {4, 3}, {5, 1}}}, |
| (...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 630 } | 642 } |
| 631 | 643 |
| 632 #include "TestClassDef.h" | 644 #include "TestClassDef.h" |
| 633 DEFINE_TESTCLASS_SHORT(PathOpsCubicIntersectionTest) | 645 DEFINE_TESTCLASS_SHORT(PathOpsCubicIntersectionTest) |
| 634 | 646 |
| 635 DEFINE_TESTCLASS_SHORT(PathOpsCubicIntersectionOneOffTest) | 647 DEFINE_TESTCLASS_SHORT(PathOpsCubicIntersectionOneOffTest) |
| 636 | 648 |
| 637 DEFINE_TESTCLASS_SHORT(PathOpsCubicSelfOneOffTest) | 649 DEFINE_TESTCLASS_SHORT(PathOpsCubicSelfOneOffTest) |
| 638 | 650 |
| 639 DEFINE_TESTCLASS_SHORT(PathOpsCubicCoinOneOffTest) | 651 DEFINE_TESTCLASS_SHORT(PathOpsCubicCoinOneOffTest) |
| OLD | NEW |