dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a functor fill mode to GfxFillPolygon

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-05-19 00:12:17 +01:00
parent 9fddfdeccf
commit 981104e308
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gfx.cpp
View File

@@ -226,8 +226,9 @@ static std::vector<LineSegment> MakePolygonSegments(const std::vector<Point> &sh
* FILLRECT_OPAQUE: Fill the polygon with the specified colour. * FILLRECT_OPAQUE: Fill the polygon with the specified colour.
* FILLRECT_CHECKER: Fill every other pixel with the specified colour, in a checkerboard pattern. * FILLRECT_CHECKER: Fill every other pixel with the specified colour, in a checkerboard pattern.
* FILLRECT_RECOLOUR: Apply a recolour sprite to every pixel in the polygon. * FILLRECT_RECOLOUR: Apply a recolour sprite to every pixel in the polygon.
* FILLRECT_FUNCTOR: Apply a functor to a line of pixels.
*/ */
void GfxFillPolygon(const std::vector<Point> &shape, int colour, FillRectMode mode) void GfxFillPolygon(const std::vector<Point> &shape, int colour, FillRectMode mode, GfxFillRectModeFunctor *fill_functor)
{ {
Blitter *blitter = BlitterFactory::GetCurrentBlitter(); Blitter *blitter = BlitterFactory::GetCurrentBlitter();
const DrawPixelInfo *dpi = _cur_dpi; const DrawPixelInfo *dpi = _cur_dpi;
@@ -308,6 +309,10 @@ void GfxFillPolygon(const std::vector<Point> &shape, int colour, FillRectMode mo
blitter->SetPixel(dst, x, 0, (uint8)colour); blitter->SetPixel(dst, x, 0, (uint8)colour);
} }
break; break;
case FILLRECT_FUNCTOR:
/* Call the provided fill functor. */
fill_functor(dst, x2 - x1);
break;
} }
} }

2
src/gfx_func.h
View File

@@ -104,7 +104,7 @@ int DrawStringMultiLine(int left, int right, int top, int bottom, StringID str,
void DrawCharCentered(WChar c, const Rect &r, TextColour colour); void DrawCharCentered(WChar c, const Rect &r, TextColour colour);
void GfxFillRect(int left, int top, int right, int bottom, int colour, FillRectMode mode = FILLRECT_OPAQUE); void GfxFillRect(int left, int top, int right, int bottom, int colour, FillRectMode mode = FILLRECT_OPAQUE);
void GfxFillPolygon(const std::vector<Point> &shape, int colour, FillRectMode mode = FILLRECT_OPAQUE); void GfxFillPolygon(const std::vector<Point> &shape, int colour, FillRectMode mode = FILLRECT_OPAQUE, GfxFillRectModeFunctor *fill_functor = nullptr);
void GfxDrawLine(int left, int top, int right, int bottom, int colour, int width = 1, int dash = 0); void GfxDrawLine(int left, int top, int right, int bottom, int colour, int width = 1, int dash = 0);
void DrawBox(int x, int y, int dx1, int dy1, int dx2, int dy2, int dx3, int dy3); void DrawBox(int x, int y, int dx1, int dy1, int dx2, int dy2, int dx3, int dy3);

3
src/gfx_type.h
View File

@@ -288,8 +288,11 @@ enum FillRectMode {
FILLRECT_OPAQUE, ///< Fill rectangle with a single colour FILLRECT_OPAQUE, ///< Fill rectangle with a single colour
FILLRECT_CHECKER, ///< Draw only every second pixel, used for greying-out FILLRECT_CHECKER, ///< Draw only every second pixel, used for greying-out
FILLRECT_RECOLOUR, ///< Apply a recolour sprite to the screen content FILLRECT_RECOLOUR, ///< Apply a recolour sprite to the screen content
FILLRECT_FUNCTOR, ///< Apply a functor to a line of pixels
}; };
typedef void GfxFillRectModeFunctor(void *pixel, int count);
/** Palettes OpenTTD supports. */ /** Palettes OpenTTD supports. */
enum PaletteType { enum PaletteType {
PAL_DOS, ///< Use the DOS palette. PAL_DOS, ///< Use the DOS palette.