Fixed arcs on the OS X backend too. Woo!

This commit is contained in:
Pietro Gagliardi 2015-10-10 11:04:15 -04:00
parent 0566c3fa7a
commit 3a932d281b
1 changed files with 4 additions and 5 deletions

View File

@ -40,7 +40,7 @@ void uiDrawPathNewFigureWithArc(uiDrawPath *p, double xCenter, double yCenter, d
sinStart = sin(startAngle); sinStart = sin(startAngle);
cosStart = cos(startAngle); cosStart = cos(startAngle);
startx = xCenter + radius * cosStart; startx = xCenter + radius * cosStart;
starty = yCenter + radius * sinStart; starty = yCenter - radius * sinStart;
CGPathMoveToPoint(p->path, NULL, startx, starty); CGPathMoveToPoint(p->path, NULL, startx, starty);
uiDrawPathArcTo(p, xCenter, yCenter, radius, startAngle, sweep); uiDrawPathArcTo(p, xCenter, yCenter, radius, startAngle, sweep);
} }
@ -58,12 +58,11 @@ void uiDrawPathArcTo(uiDrawPath *p, double xCenter, double yCenter, double radiu
complain("attempt to add arc to ended path in uiDrawPathArcTo()"); complain("attempt to add arc to ended path in uiDrawPathArcTo()");
if (sweep > 2 * M_PI) if (sweep > 2 * M_PI)
sweep = 2 * M_PI; sweep = 2 * M_PI;
// TODO wasn't there a relative function? CGPathAddRelativeArc(p->path, NULL,
CGPathAddArc(p->path, NULL,
xCenter, yCenter, xCenter, yCenter,
radius, radius,
startAngle, startAngle + sweep, // TODO explain this
NO); -startAngle, -sweep);
} }
void uiDrawPathBezierTo(uiDrawPath *p, double c1x, double c1y, double c2x, double c2y, double endX, double endY) void uiDrawPathBezierTo(uiDrawPath *p, double c1x, double c1y, double c2x, double c2y, double endX, double endY)