Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed the way the pen location is applied to shapes according to Stephan, removing the slower matrix calculation.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16233 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2006-02-05 11:51:13 +00:00
parent 7213cb626c
commit 739ccb9b2f
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/servers/app/drawing/Painter/Painter.cpp
View File

@ -520,14 +520,14 @@ Painter::DrawShape(const int32& opCount, const uint32* opList,
for (int32 i = 0; i < opCount; i++) { for (int32 i = 0; i < opCount; i++) {
uint32 op = opList[i] & 0xFF000000; uint32 op = opList[i] & 0xFF000000;
if (op & OP_MOVETO) { if (op & OP_MOVETO) {
path.move_to(points->x, points->y); path.move_to(points->x + fPenLocation.x, points->y + fPenLocation.y);
points++; points++;
} }
if (op & OP_LINETO) { if (op & OP_LINETO) {
int32 count = opList[i] & 0x00FFFFFF; int32 count = opList[i] & 0x00FFFFFF;
while (count--) { while (count--) {
path.line_to(points->x, points->y); path.line_to(points->x + fPenLocation.x, points->y + fPenLocation.y);
points++; points++;
} }
} }
@ -535,9 +535,9 @@ Painter::DrawShape(const int32& opCount, const uint32* opList,
if (op & OP_BEZIERTO) { if (op & OP_BEZIERTO) {
int32 count = opList[i] & 0x00FFFFFF; int32 count = opList[i] & 0x00FFFFFF;
while (count) { while (count) {
path.curve4(points[0].x, points[0].y, path.curve4(points[0].x + fPenLocation.x, points[0].y + fPenLocation.y,
points[1].x, points[1].y, points[1].x + fPenLocation.x, points[1].y + fPenLocation.y,
points[2].x, points[2].y); points[2].x + fPenLocation.x, points[2].y + fPenLocation.y);
points += 3; points += 3;
count -= 3; count -= 3;
} }
@ -547,10 +547,7 @@ Painter::DrawShape(const int32& opCount, const uint32* opList,
path.close_polygon(); path.close_polygon();
} }
typedef agg::conv_transform<agg::path_storage, agg::trans_affine> conv_trans_type; agg::conv_curve<agg::path_storage> curve(path);
conv_trans_type transformed(path, agg::trans_affine_translation(fPenLocation.x, fPenLocation.y));
agg::conv_curve<conv_trans_type> curve(transformed);
if (filled) if (filled)
return _FillPath(curve); return _FillPath(curve);
else else