Updated sources to remove Pattern parameter from DisplayDriver function calls
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6384 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm
parent
c57a2cdc69
commit
dfd2e47c90
@ -336,8 +336,7 @@ void DisplayDriver::FillArc(const BRect &r, const float &angle, const float &spa
|
||||
{
|
||||
}
|
||||
|
||||
void DisplayDriver::FillArc(const BRect &r, const float &angle, const float &span,
|
||||
const DrawData *d, const Pattern& pattern)
|
||||
void DisplayDriver::FillArc(const BRect &r, const float &angle, const float &span, const DrawData *d)
|
||||
{
|
||||
}
|
||||
|
||||
@ -721,7 +720,7 @@ void DisplayDriver::FillBezier(BPoint *pts, RGBColor &color)
|
||||
{
|
||||
}
|
||||
|
||||
void DisplayDriver::FillBezier(BPoint *pts, const DrawData *d, const Pattern &pattern)
|
||||
void DisplayDriver::FillBezier(BPoint *pts, const DrawData *d)
|
||||
{
|
||||
}
|
||||
|
||||
@ -809,7 +808,7 @@ void DisplayDriver::FillEllipse(const BRect &r, RGBColor &color)
|
||||
{
|
||||
}
|
||||
|
||||
void DisplayDriver::FillEllipse(const BRect &r, const DrawData *d, const Pattern &pattern)
|
||||
void DisplayDriver::FillEllipse(const BRect &r, const DrawData *d)
|
||||
{
|
||||
}
|
||||
|
||||
@ -883,7 +882,7 @@ void DisplayDriver::FillPolygon(BPoint *ptlist, int32 numpts, RGBColor &color)
|
||||
{
|
||||
}
|
||||
|
||||
void DisplayDriver::FillPolygon(BPoint *ptlist, int32 numpts, const DrawData *d, const Pattern &pattern)
|
||||
void DisplayDriver::FillPolygon(BPoint *ptlist, int32 numpts, const DrawData *d)
|
||||
{
|
||||
}
|
||||
|
||||
@ -1022,6 +1021,9 @@ void DisplayDriver::FillPolygon(BPoint *ptlist, int32 numpts, DisplayDriver* dri
|
||||
*/
|
||||
void DisplayDriver::FillRect(const BRect &r, RGBColor &color)
|
||||
{
|
||||
Lock();
|
||||
FillSolidRect(r,color);
|
||||
Unlock();
|
||||
}
|
||||
|
||||
/*!
|
||||
@ -1031,8 +1033,11 @@ void DisplayDriver::FillRect(const BRect &r, RGBColor &color)
|
||||
\param high_color The high color of the pattern
|
||||
\param low_color The low color of the pattern
|
||||
*/
|
||||
void DisplayDriver::FillRect(const BRect &r, const DrawData *d, const Pattern &pattern)
|
||||
void DisplayDriver::FillRect(const BRect &r, const DrawData *d)
|
||||
{
|
||||
Lock();
|
||||
FillPatternRect(r,d);
|
||||
Unlock();
|
||||
}
|
||||
|
||||
/*!
|
||||
@ -1057,7 +1062,7 @@ void DisplayDriver::FillRegion(BRegion& r, RGBColor &color)
|
||||
\param high_color The high color of the pattern
|
||||
\param low_color The low color of the pattern
|
||||
*/
|
||||
void DisplayDriver::FillRegion(BRegion& r, const DrawData *d, const Pattern &pattern)
|
||||
void DisplayDriver::FillRegion(BRegion& r, const DrawData *d)
|
||||
{
|
||||
if(!d)
|
||||
return;
|
||||
@ -1065,7 +1070,7 @@ void DisplayDriver::FillRegion(BRegion& r, const DrawData *d, const Pattern &pat
|
||||
Lock();
|
||||
|
||||
for(int32 i=0; i<r.CountRects();i++)
|
||||
FillRect(r.RectAt(i),d, pattern);
|
||||
FillRect(r.RectAt(i),d);
|
||||
|
||||
Unlock();
|
||||
}
|
||||
@ -1074,7 +1079,7 @@ void DisplayDriver::FillRoundRect(const BRect &r, const float &xrad, const float
|
||||
{
|
||||
}
|
||||
|
||||
void DisplayDriver::FillRoundRect(const BRect &r, const float &xrad, const float &yrad, const DrawData *d, const Pattern &pattern)
|
||||
void DisplayDriver::FillRoundRect(const BRect &r, const float &xrad, const float &yrad, const DrawData *d)
|
||||
{
|
||||
}
|
||||
|
||||
@ -1111,7 +1116,7 @@ void DisplayDriver::FillTriangle(BPoint *pts, RGBColor &color)
|
||||
{
|
||||
}
|
||||
|
||||
void DisplayDriver::FillTriangle(BPoint *pts, const DrawData *d, const Pattern &pattern)
|
||||
void DisplayDriver::FillTriangle(BPoint *pts, const DrawData *d)
|
||||
{
|
||||
}
|
||||
|
||||
@ -1383,7 +1388,7 @@ void DisplayDriver::StrokeArc(const BRect &r, const float &angle, const float &s
|
||||
{
|
||||
}
|
||||
|
||||
void DisplayDriver::StrokeArc(const BRect &r, const float &angle, const float &span, const DrawData *d, const Pattern &pattern)
|
||||
void DisplayDriver::StrokeArc(const BRect &r, const float &angle, const float &span, const DrawData *d)
|
||||
{
|
||||
}
|
||||
|
||||
@ -1549,7 +1554,7 @@ void DisplayDriver::StrokeBezier(BPoint *pts, RGBColor &color)
|
||||
{
|
||||
}
|
||||
|
||||
void DisplayDriver::StrokeBezier(BPoint *pts, const DrawData *d, const Pattern &pattern)
|
||||
void DisplayDriver::StrokeBezier(BPoint *pts, const DrawData *d)
|
||||
{
|
||||
}
|
||||
|
||||
@ -1616,7 +1621,7 @@ void DisplayDriver::StrokeEllipse(const BRect &r, RGBColor &color)
|
||||
{
|
||||
}
|
||||
|
||||
void DisplayDriver::StrokeEllipse(const BRect &r, const DrawData *d, const Pattern &pattern)
|
||||
void DisplayDriver::StrokeEllipse(const BRect &r, const DrawData *d)
|
||||
{
|
||||
}
|
||||
|
||||
@ -1689,9 +1694,12 @@ void DisplayDriver::StrokeEllipse(const BRect &r, DisplayDriver* driver, SetPixe
|
||||
|
||||
void DisplayDriver::StrokeLine(const BPoint &start, const BPoint &end, RGBColor &color)
|
||||
{
|
||||
Lock();
|
||||
StrokeSolidLine(start,end,color);
|
||||
Unlock();
|
||||
}
|
||||
|
||||
void DisplayDriver::StrokeLine(const BPoint &start, const BPoint &end, const DrawData *d, const Pattern &pattern)
|
||||
void DisplayDriver::StrokeLine(const BPoint &start, const BPoint &end, const DrawData *d)
|
||||
{
|
||||
}
|
||||
|
||||
@ -1736,10 +1744,28 @@ void DisplayDriver::StrokePoint(BPoint& pt, RGBColor &color)
|
||||
|
||||
void DisplayDriver::StrokePolygon(BPoint *ptlist, int32 numpts, RGBColor &color, bool is_closed)
|
||||
{
|
||||
if(!ptlist)
|
||||
return;
|
||||
|
||||
Lock();
|
||||
for(int32 i=0; i<(numpts-1); i++)
|
||||
StrokeSolidLine(ptlist[i],ptlist[i+1],color);
|
||||
if(is_closed)
|
||||
StrokeSolidLine(ptlist[numpts-1],ptlist[0],color);
|
||||
Unlock();
|
||||
}
|
||||
|
||||
void DisplayDriver::StrokePolygon(BPoint *ptlist, int32 numpts, const DrawData *d, const Pattern& pattern, bool is_closed)
|
||||
void DisplayDriver::StrokePolygon(BPoint *ptlist, int32 numpts, const DrawData *d, bool is_closed)
|
||||
{
|
||||
if(!ptlist)
|
||||
return;
|
||||
|
||||
Lock();
|
||||
for(int32 i=0; i<(numpts-1); i++)
|
||||
StrokePatternLine(ptlist[i],ptlist[i+1],d);
|
||||
if(is_closed)
|
||||
StrokePatternLine(ptlist[numpts-1],ptlist[0],d);
|
||||
Unlock();
|
||||
}
|
||||
|
||||
/*!
|
||||
@ -1766,7 +1792,7 @@ void DisplayDriver::StrokeRect(const BRect &r, RGBColor &color)
|
||||
{
|
||||
}
|
||||
|
||||
void DisplayDriver::StrokeRect(const BRect &r, const DrawData *d, const Pattern &pattern)
|
||||
void DisplayDriver::StrokeRect(const BRect &r, const DrawData *d)
|
||||
{
|
||||
}
|
||||
|
||||
@ -1795,12 +1821,12 @@ void DisplayDriver::StrokeRegion(BRegion& r, RGBColor &color)
|
||||
Unlock();
|
||||
}
|
||||
|
||||
void DisplayDriver::StrokeRegion(BRegion& r, const DrawData *d, const Pattern &pattern)
|
||||
void DisplayDriver::StrokeRegion(BRegion& r, const DrawData *d)
|
||||
{
|
||||
Lock();
|
||||
|
||||
for(int32 i=0; i<r.CountRects();i++)
|
||||
StrokeRect(r.RectAt(i),d,pattern);
|
||||
StrokeRect(r.RectAt(i),d);
|
||||
|
||||
Unlock();
|
||||
}
|
||||
@ -1809,7 +1835,7 @@ void DisplayDriver::StrokeRoundRect(const BRect &r, const float &xrad, const flo
|
||||
{
|
||||
}
|
||||
|
||||
void DisplayDriver::StrokeRoundRect(const BRect &r, const float &xrad, const float &yrad, const DrawData *d, const Pattern &pattern)
|
||||
void DisplayDriver::StrokeRoundRect(const BRect &r, const float &xrad, const float &yrad, const DrawData *d)
|
||||
{
|
||||
}
|
||||
|
||||
@ -1868,12 +1894,12 @@ void DisplayDriver::StrokeTriangle(BPoint *pts, RGBColor &color)
|
||||
Unlock();
|
||||
}
|
||||
|
||||
void DisplayDriver::StrokeTriangle(BPoint *pts, const DrawData *d, const Pattern &pattern)
|
||||
void DisplayDriver::StrokeTriangle(BPoint *pts, const DrawData *d)
|
||||
{
|
||||
Lock();
|
||||
StrokeLine(pts[0],pts[1],d,pattern);
|
||||
StrokeLine(pts[1],pts[2],d,pattern);
|
||||
StrokeLine(pts[2],pts[0],d,pattern);
|
||||
StrokePatternLine(pts[0],pts[1],d);
|
||||
StrokePatternLine(pts[1],pts[2],d);
|
||||
StrokePatternLine(pts[2],pts[0],d);
|
||||
Unlock();
|
||||
}
|
||||
|
||||
@ -2328,7 +2354,7 @@ void DisplayDriver::HLinePatternThick(int32 x1, int32 x2, int32 y)
|
||||
void DisplayDriver::VLinePatternThick(int32 x1, int32 x2, int32 y)
|
||||
{
|
||||
}
|
||||
|
||||
/*
|
||||
void DisplayDriver::FillSolidRect(int32 left, int32 top, int32 right, int32 bottom)
|
||||
{
|
||||
}
|
||||
@ -2336,7 +2362,7 @@ void DisplayDriver::FillSolidRect(int32 left, int32 top, int32 right, int32 bott
|
||||
void DisplayDriver::FillPatternRect(int32 left, int32 top, int32 right, int32 bottom)
|
||||
{
|
||||
}
|
||||
|
||||
*/
|
||||
void DisplayDriver::Blit(const BRect &src, const BRect &dest, const DrawData *d)
|
||||
{
|
||||
}
|
||||
@ -2353,6 +2379,10 @@ void DisplayDriver::StrokeSolidLine(const BPoint &start, const BPoint &end, RGBC
|
||||
{
|
||||
}
|
||||
|
||||
void DisplayDriver::StrokePatternLine(const BPoint &start, const BPoint &end, const DrawData *d)
|
||||
{
|
||||
}
|
||||
|
||||
void DisplayDriver::StrokeSolidRect(const BRect &rect, RGBColor &color)
|
||||
{
|
||||
}
|
||||
|
||||
@ -153,47 +153,47 @@ status_t PicturePlayer::Play(int32 tableEntries,void *userData, LayerData *d)
|
||||
{
|
||||
BPoint start = GetCoord();
|
||||
BPoint end = GetCoord();
|
||||
fdriver->StrokeLine(start,end,&fldata,stipplepat);
|
||||
fdriver->StrokeLine(start,end,&fldata);
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_RECT:
|
||||
{
|
||||
BRect rect = GetRect();
|
||||
fdriver->StrokeRect(rect,&fldata,stipplepat);
|
||||
fdriver->StrokeRect(rect,&fldata);
|
||||
break;
|
||||
}
|
||||
case B_PIC_FILL_RECT:
|
||||
{
|
||||
BRect rect = GetRect();
|
||||
fdriver->FillRect(rect,&fldata,stipplepat);
|
||||
fdriver->FillRect(rect,&fldata);
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_ROUND_RECT:
|
||||
{
|
||||
BRect rect = GetRect();
|
||||
BPoint radii = GetCoord();
|
||||
fdriver->StrokeRoundRect(rect,radii.x,radii.y,&fldata,stipplepat);
|
||||
fdriver->StrokeRoundRect(rect,radii.x,radii.y,&fldata);
|
||||
break;
|
||||
}
|
||||
case B_PIC_FILL_ROUND_RECT:
|
||||
{
|
||||
BRect rect = GetRect();
|
||||
BPoint radii = GetCoord();
|
||||
fdriver->FillRoundRect(rect,radii.x,radii.y,&fldata,stipplepat);
|
||||
fdriver->FillRoundRect(rect,radii.x,radii.y,&fldata);
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_BEZIER:
|
||||
{
|
||||
BPoint control[4];
|
||||
GetData(control, sizeof(control));
|
||||
fdriver->StrokeBezier(control,&fldata,stipplepat);
|
||||
fdriver->StrokeBezier(control,&fldata);
|
||||
break;
|
||||
}
|
||||
case B_PIC_FILL_BEZIER:
|
||||
{
|
||||
BPoint control[4];
|
||||
GetData(control, sizeof(control));
|
||||
fdriver->FillBezier(control,&fldata,stipplepat);
|
||||
fdriver->FillBezier(control,&fldata);
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_POLYGON:
|
||||
@ -202,7 +202,7 @@ status_t PicturePlayer::Play(int32 tableEntries,void *userData, LayerData *d)
|
||||
BPoint *points = new BPoint[numPoints];
|
||||
GetData(points, numPoints * sizeof(BPoint));
|
||||
bool isClosed = GetBool();
|
||||
fdriver->StrokePolygon(points,numPoints,&fldata,stipplepat,isClosed);
|
||||
fdriver->StrokePolygon(points,numPoints,&fldata,isClosed);
|
||||
delete points;
|
||||
break;
|
||||
}
|
||||
@ -211,7 +211,7 @@ status_t PicturePlayer::Play(int32 tableEntries,void *userData, LayerData *d)
|
||||
int32 numPoints = GetInt32();
|
||||
BPoint *points = new BPoint[numPoints];
|
||||
GetData(points, numPoints * sizeof(BPoint));
|
||||
fdriver->FillPolygon(points,numPoints,&fldata,stipplepat);
|
||||
fdriver->FillPolygon(points,numPoints,&fldata);
|
||||
delete points;
|
||||
break;
|
||||
}
|
||||
@ -268,7 +268,7 @@ status_t PicturePlayer::Play(int32 tableEntries,void *userData, LayerData *d)
|
||||
float startTheta = GetFloat();
|
||||
float arcTheta = GetFloat();
|
||||
fdriver->StrokeArc(BRect(center.x-radii.x,center.y-radii.y,center.x+radii.x,
|
||||
center.y+radii.y),startTheta, arcTheta, &fldata,stipplepat);
|
||||
center.y+radii.y),startTheta, arcTheta, &fldata);
|
||||
break;
|
||||
}
|
||||
case B_PIC_FILL_ARC:
|
||||
@ -278,7 +278,7 @@ status_t PicturePlayer::Play(int32 tableEntries,void *userData, LayerData *d)
|
||||
float startTheta = GetFloat();
|
||||
float arcTheta = GetFloat();
|
||||
fdriver->FillArc(BRect(center.x-radii.x,center.y-radii.y,center.x+radii.x,
|
||||
center.y+radii.y),startTheta, arcTheta, &fldata, stipplepat);
|
||||
center.y+radii.y),startTheta, arcTheta, &fldata);
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_ELLIPSE:
|
||||
@ -287,7 +287,7 @@ status_t PicturePlayer::Play(int32 tableEntries,void *userData, LayerData *d)
|
||||
BPoint center;
|
||||
BPoint radii((rect.Width() + 1) / 2.0f, (rect.Height() + 1) / 2.0f);
|
||||
center = rect.LeftTop() + radii;
|
||||
fdriver->StrokeEllipse(rect,&fldata,stipplepat);
|
||||
fdriver->StrokeEllipse(rect,&fldata);
|
||||
break;
|
||||
}
|
||||
case B_PIC_FILL_ELLIPSE:
|
||||
@ -296,7 +296,7 @@ status_t PicturePlayer::Play(int32 tableEntries,void *userData, LayerData *d)
|
||||
BPoint center;
|
||||
BPoint radii((rect.Width() + 1) / 2.0f, (rect.Height() + 1) / 2.0f);
|
||||
center = rect.LeftTop() + radii;
|
||||
fdriver->FillEllipse(rect,&fldata,stipplepat);
|
||||
fdriver->FillEllipse(rect,&fldata);
|
||||
break;
|
||||
}
|
||||
case B_PIC_ENTER_STATE_CHANGE:
|
||||
|
||||
@ -110,7 +110,6 @@ public:
|
||||
|
||||
void InvertRect(const BRect &r);
|
||||
|
||||
|
||||
virtual void StrokeLineArray(BPoint *pts, const int32 &numlines, const DrawData *d, RGBColor *colors);
|
||||
|
||||
void SetMode(const int32 &mode);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user