linedraw_internal_t*i = (linedraw_internal_t*)d->internal;
gfxline_t*l = rfx_alloc(sizeof(gfxline_t));
l->type = gfx_moveTo;
+ if((int)((d->x * 5120) == (int)(x * 5120)) &&
+ (int)((d->y * 5120) == (int)(y * 5120))) {
+ /* never mind- we're already there */
+ return;
+
+ }
d->x = l->x = x;
d->y = l->y = y;
l->next = 0;
static double get_spline_len(qspline_abc_t*s)
{
int parts = (int)(sqrt(fabs(s->ax) + fabs(s->ay))*3);
- if(parts < 3) parts = 3;
int i;
double len = 0;
- double r = 1.0/parts;
- double r2 = 1.0/(parts*parts);
+ double r;
+ double r2;
+ if(parts < 3) parts = 3;
+ r = 1.0/parts;
+ r2 = 1.0/(parts*parts);
for(i=0;i<parts;i++)
{
double dx = s->ax*(2*i+1)*r2 + s->bx*r;
double dx = line->x - x;
double dy = line->y - y;
double len = sqrt(dx*dx+dy*dy);
+ double vx;
+ double vy;
+ double lineend = linepos+len;
if(len==0)
continue;
- double vx = dx/len;
- double vy = dy/len;
- double lineend = linepos+len;
+ vx = dx/len;
+ vy = dy/len;
assert(nextpos>=linepos);
//printf("(line) on:%d apos: %d nextpos: %f, line pos: %f, line end: %f\n", on, apos, nextpos, linepos, linepos+len);
while(nextpos<lineend) {
x = line->x; y = line->y;
} else if(line->type == gfx_splineTo) {
qspline_abc_t q;
+ double len, lineend,lastt;
mkspline(&q, x, y, line);
- double len = get_spline_len(&q);
+ len = get_spline_len(&q);
//printf("%f %f -> %f %f, len: %f\n", x, y, line->x, line->y, len);
if(len==0)
continue;
- double lineend = linepos+len;
- double lastt = 0;
+ lineend = linepos+len;
+ lastt = 0;
if(nextpos<linepos)
printf("%f !< %f\n", nextpos, linepos);
assert(nextpos>=linepos);
gfxline_t* gfxtool_dash_line(gfxline_t*line, float*dashes, float phase)
{
gfxdrawer_t d;
+ gfxline_t*result;
gfxdrawer_target_gfxline(&d);
gfxtool_draw_dashed_line(&d, line, dashes, phase);
- gfxline_t*result= (gfxline_t*)d.result(&d);
+ result= (gfxline_t*)d.result(&d);
return result;
}
return bbox;
}
-void gfxline_dump(gfxline_t*line, FILE*fi)
+void gfxline_dump(gfxline_t*line, FILE*fi, char*prefix)
{
while(line) {
if(line->type == gfx_moveTo) {
- fprintf(fi, "moveTo %.2f %.2f\n", line->x, line->y);
+ fprintf(fi, "%smoveTo %.2f %.2f\n", prefix, line->x, line->y);
} else if(line->type == gfx_lineTo) {
- fprintf(fi, "lineTo %.2f %.2f\n", line->x, line->y);
+ fprintf(fi, "%slineTo %.2f %.2f\n", prefix, line->x, line->y);
} else if(line->type == gfx_splineTo) {
- fprintf(fi, "splineTo (%.2f %.2f) %.2f %.2f\n", line->sx, line->sy, line->x, line->y);
+ fprintf(fi, "%ssplineTo (%.2f %.2f) %.2f %.2f\n", prefix, line->sx, line->sy, line->x, line->y);
}
line = line->next;
}