Intersection work in progress
Review URL: https://codereview.appspot.com/5576043
git-svn-id: http://skia.googlecode.com/svn/trunk@3087 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Intersection/QuadraticParameterization_Test.cpp b/experimental/Intersection/QuadraticParameterization_Test.cpp
index c796685..ddf73b4 100644
--- a/experimental/Intersection/QuadraticParameterization_Test.cpp
+++ b/experimental/Intersection/QuadraticParameterization_Test.cpp
@@ -1,5 +1,5 @@
#include "CubicIntersection.h"
-#include "CubicIntersection_Tests.h"
+#include "Intersection_Tests.h"
const Quadratic quadratics[] = {
{{0, 0}, {1, 0}, {1, 1}},
@@ -18,20 +18,23 @@
chop_at(test, split, 0.5);
Quadratic midThird;
sub_divide(test, 1.0/3, 2.0/3, midThird);
- if (!implicit_matches(test, split.first())) {
- printf("%s-1 %d", __FUNCTION__, (int)index);
- }
- if (!implicit_matches(test, split.second())) {
- printf("%s-2 %d", __FUNCTION__, (int)index);
- }
- if (!implicit_matches(midThird, split.first())) {
- printf("%s-3 %d", __FUNCTION__, (int)index);
- }
- if (!implicit_matches(midThird, split.second())) {
- printf("%s-4 %d", __FUNCTION__, (int)index);
- }
- if (!implicit_matches(split.first(), split.second())) {
- printf("%s-5 %d", __FUNCTION__, (int)index);
+ const Quadratic* quads[] = {
+ &test, &midThird, &split.first(), &split.second()
+ };
+ size_t quadsCount = sizeof(quads) / sizeof(quads[0]);
+ for (size_t one = 0; one < quadsCount; ++one) {
+ for (size_t two = 0; two < quadsCount; ++two) {
+ for (size_t inner = 0; inner < 3; inner += 2) {
+ if (!point_on_parameterized_curve(*quads[one], (*quads[two])[inner])) {
+ printf("%s %zu [%zu,%zu] %zu parameterization failed\n",
+ __FUNCTION__, index, one, two, inner);
+ }
+ }
+ if (!implicit_matches(*quads[one], *quads[two])) {
+ printf("%s %zu [%zu,%zu] coincidence failed\n", __FUNCTION__,
+ index, one, two);
+ }
+ }
}
}
}