diff --git a/cameo/area.c b/cameo/area.c index 53c58df..baa252b 100644 --- a/cameo/area.c +++ b/cameo/area.c @@ -125,10 +125,9 @@ static int touch(double ax, double ay, double bx, double by, { double dx = cx-ax; double dy = cy-ay; - double a = bx*bx+by*by; + double a = bx*bx+by*by; /* always positive */ double b = -2*bx*dx-2*by*dy; double c = dx*dx+dy*dy-r*r; -// double d, n0, n1; double d, tmp; d = b*b-4*a*c; @@ -140,20 +139,6 @@ static int touch(double ax, double ay, double bx, double by, return 0; *n = tmp; return 1; -#if 0 - n0 = (-b-d)/2/a; - n1 = (-b+d)/2/a; - - if (n0 > 0) { - *n = n0; - return 1; - } - if (n1 > 0) { - *n = n1; - return 1; - } - return 0; -#endif } @@ -165,8 +150,6 @@ static int hit_segment(double fx, double fy, double tx, double ty, double px, py; double na, nb; -printf(" seg (%g,%g)+(%g,%g) -> (%g,%g)-(%g,%g)\n", - fx, fy, tx, ty, a->x, a->y, b->x, b->y); tx -= fx; ty -= fy; @@ -185,7 +168,6 @@ printf(" seg (%g,%g)+(%g,%g) -> (%g,%g)-(%g,%g)\n", if (!intersect(fx, fy, tx, ty, px, py, dx, dy, &na, &nb)) return 0; -printf("\tna %g (%g) nb %g (%g)\n", na, fx+tx*na, nb, fx+tx*nb); if (nb <= 0) { if (!touch(fx, fy, tx, ty, a->x, a->y, r, enter, &na)) return 0; @@ -262,11 +244,9 @@ static void do_line(const struct path *path, const struct path **sub, struct path *new; double x, next; -printf(" y=%g\n", y); if (!hit_path(xa-3*r_tool, y, xb, y, last, 1, 0, r_tool, &x)) return; while (1) { -printf(" x=%g\n", x); next = xb; last = NULL; if (hit_path(x, y, xb, y, path, 1, 1, r_tool, &next)) @@ -318,7 +298,6 @@ static void fill_path(const struct path *paths, const struct path *path, xb -= r_tool; yb -= 3*r_tool-overlap; n = ceil((yb-ya)/(2*r_tool-overlap)); -printf("x[%g:%g] y[%g:%g] n=%d\n", xa, xb, ya, yb, n); for (i = 0; i <= n; i++) do_line(path, sub, xa, xb, ya+(yb-ya)*((double) i/n), r_tool, overlap, res);