fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-06 12:48:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix combined transforms, fix caps/joins under transform

Browse source
This commit is contained in:
Keith Packard 2002-08-15 16:48:16 +00:00
parent 91f09687e5
commit ba6c497130
8 changed files with 144 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/xrgstate.c
View file

@ -201,7 +201,7 @@ XrGStateScale(XrGState *gstate, double sx, double sy)
XrTransformInitScale(&tmp, sx, sy);
XrTransformMultiplyIntoRight(&tmp, &gstate->ctm);
XrTransformInitScale(&tmp, -sx, -sy);
XrTransformInitScale(&tmp, 1/sx, 1/sy);
XrTransformMultiplyIntoLeft(&gstate->ctm_inverse, &tmp);
}

2
src/xrpath.c
View file

@ -412,6 +412,8 @@ XrPathInterpret(XrPath *path, XrPathDirection dir, XrPathCallbacks *cb, void *cl
}
}
}
if (has_edge)
(*cb->DoneSubPath) (closure, XrSubPathDoneCap);
return XrErrorSuccess;
}

75
src/xrstroker.c
View file

@ -59,12 +59,12 @@ _TranslatePoint(XPointFixed *pt, XPointFixed *offset)
static int
_XrStrokerFaceClockwise(XrStrokeFace *in, XrStrokeFace *out)
{
XPointFixed d_in, d_out;
XPointDouble d_in, d_out;
d_in.x = in->cw.x - in->pt.x;
d_in.y = in->cw.y - in->pt.y;
d_out.x = out->cw.x - in->pt.x;
d_out.y = out->cw.y - in->pt.y;
d_in.x = XFixedToDouble(in->cw.x - in->pt.x);
d_in.y = XFixedToDouble(in->cw.y - in->pt.y);
d_out.x = XFixedToDouble(out->cw.x - out->pt.x);
d_out.y = XFixedToDouble(out->cw.y - out->pt.y);
return d_out.y * d_in.x > d_in.y * d_out.x;
}
@ -95,22 +95,27 @@ _XrStrokerJoin(XrStroker *stroker, XrStrokeFace *in, XrStrokeFace *out)
case XrLineJoinMiter: {
XDouble c = in->vector.x * out->vector.x + in->vector.y * out->vector.y;
double ml = gstate->stroke_style.miter_limit;
if (2 <= ml * ml * (1 + c))
if (2 <= ml * ml * (1 - c))
{
XDouble x1, y1, x2, y2;
XDouble mx, my;
XDouble dx1, dx2, dy1, dy2;
XPointFixed outer;
XPointDouble v1, v2;
x1 = XFixedToDouble(inpt->x);
y1 = XFixedToDouble(inpt->y);
dx1 = XFixedToDouble(inpt->y - in->pt.y);
dy1 = -XFixedToDouble(inpt->x - in->pt.x);
v1 = in->vector;
XrTransformPointWithoutTranslate(&gstate->ctm, &v1);
dx1 = v1.x;
dy1 = v1.y;
x2 = XFixedToDouble(outpt->x);
y2 = XFixedToDouble(outpt->y);
dx2 = -XFixedToDouble(outpt->y - out->pt.y);
dy2 = XFixedToDouble(outpt->x - out->pt.x);
v2 = out->vector;
XrTransformPointWithoutTranslate(&gstate->ctm, &v2);
dx2 = v2.x;
dy2 = v2.y;
my = (((x2 - x1) * dy1 * dy2 - y2 * dx2 * dy1 + y1 * dx1 * dy2) /
(dx1 * dy2 - dx2 * dy1));
@ -143,9 +148,50 @@ _XrStrokerJoin(XrStroker *stroker, XrStrokeFace *in, XrStrokeFace *out)
return err;
}
static void
static XrError
_XrStrokerCap(XrStroker *stroker, XrStrokeFace *f)
{
XrError err;
XrGState *gstate = stroker->gstate;
XrPolygon polygon;
if (gstate->stroke_style.line_cap == XrLineCapButt)
return XrErrorSuccess;
XrPolygonInit (&polygon);
switch (gstate->stroke_style.line_cap) {
case XrLineCapRound: {
break;
}
case XrLineCapSquare: {
XPointDouble vector = f->vector;
XPointFixed fvector;
XPointFixed outer, occw, ocw;
vector.x *= gstate->stroke_style.line_width / 2.0;
vector.y *= gstate->stroke_style.line_width / 2.0;
XrTransformPointWithoutTranslate(&gstate->ctm, &vector);
fvector.x = XDoubleToFixed(vector.x);
fvector.y = XDoubleToFixed(vector.y);
occw.x = f->ccw.x + fvector.x;
occw.y = f->ccw.y + fvector.y;
ocw.x = f->cw.x + fvector.x;
ocw.y = f->cw.y + fvector.y;
XrPolygonAddEdge (&polygon, &f->cw, &ocw);
XrPolygonAddEdge (&polygon, &ocw, &occw);
XrPolygonAddEdge (&polygon, &occw, &f->ccw);
XrPolygonAddEdge (&polygon, &f->ccw, &f->cw);
break;
}
case XrLineCapButt: {
break;
}
}
err = XrTrapsTessellatePolygon (stroker->traps, &polygon, 1);
XrPolygonDeinit (&polygon);
return err;
}
XrError
@ -179,8 +225,8 @@ XrStrokerAddEdge(void *closure, XPointFixed *p1, XPointFixed *p2)
user_vector = vector;
tmp = vector.x;
vector.x = vector.y * (style->line_width / 2.0);
vector.y = - tmp * (style->line_width / 2.0);
vector.x = - vector.y * (style->line_width / 2.0);
vector.y = tmp * (style->line_width / 2.0);
XrTransformPointWithoutTranslate(&gstate->ctm, &vector);
@ -204,7 +250,8 @@ XrStrokerAddEdge(void *closure, XPointFixed *p1, XPointFixed *p2)
face.cw = quad[0];
face.pt = *p1;
face.ccw = quad[1];
face.vector = user_vector;
face.vector.x = -user_vector.x;
face.vector.y = -user_vector.y;
if (stroker->have_prev) {
err = _XrStrokerJoin (stroker, &stroker->prev, &face);

12
src/xrtransform.c
View file

@ -120,15 +120,19 @@ XrTransformMultiplyIntoRight(const XrTransform *t1, XrTransform *t2)
void
XrTransformMultiply(const XrTransform *t1, const XrTransform *t2, XrTransform *new)
{
int row, col, n;
*new = XR_TRANSFORM_ZERO;
int row, col, n;
double t;
for (row = 0; row < 3; row++) {
for (col = 0; col < 2; col++) {
if (row == 2)
t = t2->m[2][col];
else
t = 0;
for (n = 0; n < 2; n++) {
new->m[row][col] += t1->m[row][n] * t2->m[n][col];
t += t1->m[row][n] * t2->m[n][col];
}
new->m[row][col] = t;
}
}
}

2
xrgstate.c
View file

@ -201,7 +201,7 @@ XrGStateScale(XrGState *gstate, double sx, double sy)
XrTransformInitScale(&tmp, sx, sy);
XrTransformMultiplyIntoRight(&tmp, &gstate->ctm);
XrTransformInitScale(&tmp, -sx, -sy);
XrTransformInitScale(&tmp, 1/sx, 1/sy);
XrTransformMultiplyIntoLeft(&gstate->ctm_inverse, &tmp);
}

2
xrpath.c
View file

@ -412,6 +412,8 @@ XrPathInterpret(XrPath *path, XrPathDirection dir, XrPathCallbacks *cb, void *cl
}
}
}
if (has_edge)
(*cb->DoneSubPath) (closure, XrSubPathDoneCap);
return XrErrorSuccess;
}

75
xrstroker.c
View file

@ -59,12 +59,12 @@ _TranslatePoint(XPointFixed *pt, XPointFixed *offset)
static int
_XrStrokerFaceClockwise(XrStrokeFace *in, XrStrokeFace *out)
{
XPointFixed d_in, d_out;
XPointDouble d_in, d_out;
d_in.x = in->cw.x - in->pt.x;
d_in.y = in->cw.y - in->pt.y;
d_out.x = out->cw.x - in->pt.x;
d_out.y = out->cw.y - in->pt.y;
d_in.x = XFixedToDouble(in->cw.x - in->pt.x);
d_in.y = XFixedToDouble(in->cw.y - in->pt.y);
d_out.x = XFixedToDouble(out->cw.x - out->pt.x);
d_out.y = XFixedToDouble(out->cw.y - out->pt.y);
return d_out.y * d_in.x > d_in.y * d_out.x;
}
@ -95,22 +95,27 @@ _XrStrokerJoin(XrStroker *stroker, XrStrokeFace *in, XrStrokeFace *out)
case XrLineJoinMiter: {
XDouble c = in->vector.x * out->vector.x + in->vector.y * out->vector.y;
double ml = gstate->stroke_style.miter_limit;
if (2 <= ml * ml * (1 + c))
if (2 <= ml * ml * (1 - c))
{
XDouble x1, y1, x2, y2;
XDouble mx, my;
XDouble dx1, dx2, dy1, dy2;
XPointFixed outer;
XPointDouble v1, v2;
x1 = XFixedToDouble(inpt->x);
y1 = XFixedToDouble(inpt->y);
dx1 = XFixedToDouble(inpt->y - in->pt.y);
dy1 = -XFixedToDouble(inpt->x - in->pt.x);
v1 = in->vector;
XrTransformPointWithoutTranslate(&gstate->ctm, &v1);
dx1 = v1.x;
dy1 = v1.y;
x2 = XFixedToDouble(outpt->x);
y2 = XFixedToDouble(outpt->y);
dx2 = -XFixedToDouble(outpt->y - out->pt.y);
dy2 = XFixedToDouble(outpt->x - out->pt.x);
v2 = out->vector;
XrTransformPointWithoutTranslate(&gstate->ctm, &v2);
dx2 = v2.x;
dy2 = v2.y;
my = (((x2 - x1) * dy1 * dy2 - y2 * dx2 * dy1 + y1 * dx1 * dy2) /
(dx1 * dy2 - dx2 * dy1));
@ -143,9 +148,50 @@ _XrStrokerJoin(XrStroker *stroker, XrStrokeFace *in, XrStrokeFace *out)
return err;
}
static void
static XrError
_XrStrokerCap(XrStroker *stroker, XrStrokeFace *f)
{
XrError err;
XrGState *gstate = stroker->gstate;
XrPolygon polygon;
if (gstate->stroke_style.line_cap == XrLineCapButt)
return XrErrorSuccess;
XrPolygonInit (&polygon);
switch (gstate->stroke_style.line_cap) {
case XrLineCapRound: {
break;
}
case XrLineCapSquare: {
XPointDouble vector = f->vector;
XPointFixed fvector;
XPointFixed outer, occw, ocw;
vector.x *= gstate->stroke_style.line_width / 2.0;
vector.y *= gstate->stroke_style.line_width / 2.0;
XrTransformPointWithoutTranslate(&gstate->ctm, &vector);
fvector.x = XDoubleToFixed(vector.x);
fvector.y = XDoubleToFixed(vector.y);
occw.x = f->ccw.x + fvector.x;
occw.y = f->ccw.y + fvector.y;
ocw.x = f->cw.x + fvector.x;
ocw.y = f->cw.y + fvector.y;
XrPolygonAddEdge (&polygon, &f->cw, &ocw);
XrPolygonAddEdge (&polygon, &ocw, &occw);
XrPolygonAddEdge (&polygon, &occw, &f->ccw);
XrPolygonAddEdge (&polygon, &f->ccw, &f->cw);
break;
}
case XrLineCapButt: {
break;
}
}
err = XrTrapsTessellatePolygon (stroker->traps, &polygon, 1);
XrPolygonDeinit (&polygon);
return err;
}
XrError
@ -179,8 +225,8 @@ XrStrokerAddEdge(void *closure, XPointFixed *p1, XPointFixed *p2)
user_vector = vector;
tmp = vector.x;
vector.x = vector.y * (style->line_width / 2.0);
vector.y = - tmp * (style->line_width / 2.0);
vector.x = - vector.y * (style->line_width / 2.0);
vector.y = tmp * (style->line_width / 2.0);
XrTransformPointWithoutTranslate(&gstate->ctm, &vector);
@ -204,7 +250,8 @@ XrStrokerAddEdge(void *closure, XPointFixed *p1, XPointFixed *p2)
face.cw = quad[0];
face.pt = *p1;
face.ccw = quad[1];
face.vector = user_vector;
face.vector.x = -user_vector.x;
face.vector.y = -user_vector.y;
if (stroker->have_prev) {
err = _XrStrokerJoin (stroker, &stroker->prev, &face);

12
xrtransform.c
View file

@ -120,15 +120,19 @@ XrTransformMultiplyIntoRight(const XrTransform *t1, XrTransform *t2)
void
XrTransformMultiply(const XrTransform *t1, const XrTransform *t2, XrTransform *new)
{
int row, col, n;
*new = XR_TRANSFORM_ZERO;
int row, col, n;
double t;
for (row = 0; row < 3; row++) {
for (col = 0; col < 2; col++) {
if (row == 2)
t = t2->m[2][col];
else
t = 0;
for (n = 0; n < 2; n++) {
new->m[row][col] += t1->m[row][n] * t2->m[n][col];
t += t1->m[row][n] * t2->m[n][col];
}
new->m[row][col] = t;
}
}
}