i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplified polygon and bezier drawing methods, made them more efficient

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17311 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2006-05-03 20:34:27 +00:00
parent d96389c199
commit 022cdecc8f
3 changed files with 51 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/drawing/DrawingEngine.cpp
+4 -14
View File
@@ -494,11 +494,11 @@ void
DrawingEngine::DrawBezier(BPoint *pts, const DrawState *d, bool filled)
{
if (Lock()) {
// TODO: figure out bounds and hide cursor depending on that
fGraphicsCard->HideSoftwareCursor();
fPainter->SetDrawState(d);
BRect touched = filled ? fPainter->FillBezier(pts)
: fPainter->StrokeBezier(pts);
BRect touched = fPainter->DrawBezier(pts, filled);
fGraphicsCard->Invalidate(touched);
fGraphicsCard->ShowSoftwareCursor();
@@ -555,10 +555,7 @@ DrawingEngine::DrawPolygon(BPoint* ptlist, int32 numpts,
fGraphicsCard->HideSoftwareCursor(bounds);
fPainter->SetDrawState(d);
if (filled)
fPainter->FillPolygon(ptlist, numpts);
else
fPainter->StrokePolygon(ptlist, numpts, closed);
fPainter->DrawPolygon(ptlist, numpts, filled, closed);
fGraphicsCard->Invalidate(bounds);
fGraphicsCard->ShowSoftwareCursor();
@@ -589,14 +586,7 @@ DrawingEngine::StrokeRect(BRect r, const RGBColor &color)
fPainter->StrokeRect(r, color.GetColor32());
fGraphicsCard->Invalidate(fPainter->ClipRect(BRect(r.left, r.top,
r.right, r.top)));
fGraphicsCard->Invalidate(fPainter->ClipRect(BRect(r.left, r.top + 1,
r.left, r.bottom - 1)));
fGraphicsCard->Invalidate(fPainter->ClipRect(BRect(r.right, r.top + 1,
r.right, r.bottom - 1)));
fGraphicsCard->Invalidate(fPainter->ClipRect(BRect(r.left, r.bottom,
r.right, r.bottom)));
fGraphicsCard->Invalidate(clipped);
fGraphicsCard->ShowSoftwareCursor();
}
src/servers/app/drawing/Painter/Painter.cpp
+42 -85
View File
@@ -432,76 +432,63 @@ Painter::FillTriangle(BPoint pt1, BPoint pt2, BPoint pt3) const
return _DrawTriangle(pt1, pt2, pt3, true);
}
// StrokePolygon
// DrawPolygon
BRect
Painter::StrokePolygon(const BPoint* ptArray, int32 numPts,
bool closed) const
Painter::DrawPolygon(BPoint* p, int32 numPts,
bool filled, bool closed) const
{
return _DrawPolygon(ptArray, numPts, closed, false);
CHECK_CLIPPING
if (numPts > 0) {
agg::path_storage path;
_Transform(p);
path.move_to(p->x, p->y);
for (int32 i = 1; i < numPts; i++) {
p++;
_Transform(p);
path.line_to(p->x, p->y);
}
if (closed)
path.close_polygon();
if (filled)
return _FillPath(path);
else
return _StrokePath(path);
}
return BRect(0.0, 0.0, -1.0, -1.0);
}
// FillPolygon
// DrawBezier
BRect
Painter::FillPolygon(const BPoint* ptArray, int32 numPts,
bool closed) const
{
return _DrawPolygon(ptArray, numPts, closed, true);
}
// StrokeBezier
BRect
Painter::StrokeBezier(const BPoint* controlPoints) const
Painter::DrawBezier(BPoint* p, bool filled) const
{
CHECK_CLIPPING
agg::path_storage curve;
BPoint p1(controlPoints[0]);
BPoint p2(controlPoints[1]);
BPoint p3(controlPoints[2]);
BPoint p4(controlPoints[3]);
_Transform(&p1);
_Transform(&p2);
_Transform(&p3);
_Transform(&p4);
_Transform(&(p[0]));
_Transform(&(p[1]));
_Transform(&(p[2]));
_Transform(&(p[3]));
curve.move_to(p1.x, p1.y);
curve.curve4(p2.x, p2.y,
p3.x, p3.y,
p4.x, p4.y);
curve.move_to(p[0].x, p[0].y);
curve.curve4(p[1].x, p[1].y,
p[2].x, p[2].y,
p[3].x, p[3].y);
agg::conv_curve<agg::path_storage> path(curve);
return _StrokePath(path);
}
// FillBezier
BRect
Painter::FillBezier(const BPoint* controlPoints) const
{
CHECK_CLIPPING
agg::path_storage curve;
BPoint p1(controlPoints[0]);
BPoint p2(controlPoints[1]);
BPoint p3(controlPoints[2]);
BPoint p4(controlPoints[3]);
_Transform(&p1);
_Transform(&p2);
_Transform(&p3);
_Transform(&p4);
curve.move_to(p1.x, p1.y);
curve.curve4(p2.x, p2.y,
p3.x, p3.y,
p4.x, p4.y);
curve.close_polygon();
agg::conv_curve<agg::path_storage> path(curve);
return _FillPath(path);
if (filled) {
curve.close_polygon();
return _FillPath(path);
} else {
return _StrokePath(path);
}
}
// this comes from Shape.cpp
@@ -1256,36 +1243,6 @@ Painter::_DrawEllipse(BPoint center, float xRadius, float yRadius,
}
}
// _DrawPolygon
inline BRect
Painter::_DrawPolygon(const BPoint* ptArray, int32 numPts,
bool closed, bool fill) const
{
CHECK_CLIPPING
if (numPts > 0) {
agg::path_storage path;
BPoint point = _Transform(*ptArray);
path.move_to(point.x, point.y);
for (int32 i = 1; i < numPts; i++) {
ptArray++;
point = _Transform(*ptArray);
path.line_to(point.x, point.y);
}
if (closed)
path.close_polygon();
if (fill)
return _FillPath(path);
else
return _StrokePath(path);
}
return BRect(0.0, 0.0, -1.0, -1.0);
}
// copy_bitmap_row_cmap8_copy
static inline void
copy_bitmap_row_cmap8_copy(uint8* dst, const uint8* src, int32 numPixels,
src/servers/app/drawing/Painter/Painter.h
+5 -13
View File
@@ -105,18 +105,14 @@ class Painter {
BPoint pt3) const;
// polygons
BRect StrokePolygon( const BPoint* ptArray,
BRect DrawPolygon( BPoint* ptArray,
int32 numPts,
bool closed = true) const;
BRect FillPolygon( const BPoint* ptArray,
int32 numPts,
bool closed = true) const;
bool filled,
bool closed) const;
// bezier curves
BRect StrokeBezier( const BPoint* controlPoints) const;
BRect FillBezier( const BPoint* controlPoints) const;
BRect DrawBezier( BPoint* controlPoints,
bool filled) const;
// shapes
BRect DrawShape( const int32& opCount,
@@ -225,10 +221,6 @@ class Painter {
float xRadius,
float yRadius,
bool fill) const;
BRect _DrawPolygon( const BPoint* ptArray,
int32 numPts,
bool closed,
bool fill) const;
void _DrawBitmap( const agg::rendering_buffer& srcBuffer,
color_space format,