mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Code Issues Releases Wiki Activity

Part of #12097: Use ScreenRect in gfx_fill_rect_inset (#12284)

Browse Source
This commit is contained in:
frutiemax
2020-07-31 23:51:29 -04:00
committed by GitHub
parent f7f5124c07
commit 2c350fa416
2 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/openrct2/drawing/Drawing.h
View File

@@ -608,6 +608,7 @@ void gfx_draw_dashed_line(
void gfx_fill_rect(rct_drawpixelinfo* dpi, const ScreenRect& rect, int32_t colour);
void gfx_fill_rect_inset(
rct_drawpixelinfo* dpi, int16_t left, int16_t top, int16_t right, int16_t bottom, int32_t colour, uint8_t flags);
void gfx_fill_rect_inset(rct_drawpixelinfo* dpi, const ScreenRect& rect, int32_t colour, uint8_t flags);
void gfx_filter_rect(
rct_drawpixelinfo* dpi, int32_t left, int32_t top, int32_t right, int32_t bottom, FILTER_PALETTE_ID palette);
void gfx_filter_rect(rct_drawpixelinfo* dpi, const ScreenRect& rect, FILTER_PALETTE_ID palette);

58
src/openrct2/drawing/Rect.cpp
View File

@@ -24,9 +24,12 @@
* colour (ebp)
* flags (si)
*/
void gfx_fill_rect_inset(
rct_drawpixelinfo* dpi, int16_t left, int16_t top, int16_t right, int16_t bottom, int32_t colour, uint8_t flags)
void gfx_fill_rect_inset(rct_drawpixelinfo* dpi, const ScreenRect& rect, int32_t colour, uint8_t flags)
{
const auto leftTop = ScreenCoordsXY{ rect.GetLeft(), rect.GetTop() };
const auto leftBottom = ScreenCoordsXY{ rect.GetLeft(), rect.GetBottom() };
const auto rightTop = ScreenCoordsXY{ rect.GetRight(), rect.GetTop() };
const auto rightBottom = ScreenCoordsXY{ rect.GetRight(), rect.GetBottom() };
if (colour & (COLOUR_FLAG_TRANSLUCENT | COLOUR_FLAG_8))
{
translucent_window_palette palette;
@@ -44,32 +47,33 @@ void gfx_fill_rect_inset(
if (flags & INSET_RECT_FLAG_BORDER_NONE)
{
gfx_filter_rect(dpi, { { left, top }, { right, bottom } }, palette.base);
gfx_filter_rect(dpi, rect, palette.base);
}
else if (flags & INSET_RECT_FLAG_BORDER_INSET)
{
// Draw outline of box
gfx_filter_rect(dpi, { { left, top }, { left, bottom } }, palette.highlight);
gfx_filter_rect(dpi, { { left, top }, { right, top } }, palette.highlight);
gfx_filter_rect(dpi, { { right, top }, { right, bottom } }, palette.shadow);
gfx_filter_rect(dpi, { { left, bottom }, { right, bottom } }, palette.shadow);
gfx_filter_rect(dpi, { leftTop, leftBottom }, palette.highlight);
gfx_filter_rect(dpi, { leftTop, rightTop }, palette.highlight);
gfx_filter_rect(dpi, { rightTop, rightBottom }, palette.shadow);
gfx_filter_rect(dpi, { leftBottom, rightBottom }, palette.shadow);
if (!(flags & INSET_RECT_FLAG_FILL_NONE))
{
gfx_filter_rect(dpi, { { left + 1, top + 1 }, { right - 1, bottom - 1 } }, palette.base);
gfx_filter_rect(dpi, { leftTop + ScreenCoordsXY{ 1, 1 }, rightBottom - ScreenCoordsXY{ 1, 1 } }, palette.base);
}
}
else
{
// Draw outline of box
gfx_filter_rect(dpi, { { left, top }, { left, bottom } }, palette.shadow);
gfx_filter_rect(dpi, { { left, top }, { right, top } }, palette.shadow);
gfx_filter_rect(dpi, { { right, top }, { right, bottom } }, palette.highlight);
gfx_filter_rect(dpi, { { left, bottom }, { right, bottom } }, palette.highlight);
gfx_filter_rect(dpi, { leftTop, leftBottom }, palette.shadow);
gfx_filter_rect(dpi, { leftTop, rightTop }, palette.shadow);
gfx_filter_rect(dpi, { rightTop, rightBottom }, palette.highlight);
gfx_filter_rect(dpi, { leftBottom, rightBottom }, palette.highlight);
if (!(flags & INSET_RECT_FLAG_FILL_NONE))
{
gfx_filter_rect(dpi, { { left + 1, top + 1 }, { right - 1, bottom - 1 } }, palette.base);
gfx_filter_rect(
dpi, { leftTop + ScreenCoordsXY{ 1, 1 }, { rightBottom - ScreenCoordsXY{ 1, 1 } } }, palette.base);
}
}
}
@@ -91,15 +95,15 @@ void gfx_fill_rect_inset(
if (flags & INSET_RECT_FLAG_BORDER_NONE)
{
gfx_fill_rect(dpi, { { left, top }, { right, bottom } }, fill);
gfx_fill_rect(dpi, rect, fill);
}
else if (flags & INSET_RECT_FLAG_BORDER_INSET)
{
// Draw outline of box
gfx_fill_rect(dpi, { { left, top }, { left, bottom } }, shadow);
gfx_fill_rect(dpi, { { left + 1, top }, { right, top } }, shadow);
gfx_fill_rect(dpi, { { right, top + 1 }, { right, bottom - 1 } }, hilight);
gfx_fill_rect(dpi, { { left + 1, bottom }, { right, bottom } }, hilight);
gfx_fill_rect(dpi, { leftTop, leftBottom }, shadow);
gfx_fill_rect(dpi, { leftTop + ScreenCoordsXY{ 1, 0 }, rightTop }, shadow);
gfx_fill_rect(dpi, { rightTop + ScreenCoordsXY{ 0, 1 }, rightBottom - ScreenCoordsXY{ 0, 1 } }, hilight);
gfx_fill_rect(dpi, { leftBottom + ScreenCoordsXY{ 1, 0 }, rightBottom }, hilight);
if (!(flags & INSET_RECT_FLAG_FILL_NONE))
{
@@ -114,16 +118,16 @@ void gfx_fill_rect_inset(
fill = ColourMapA[colour].lighter;
}
}
gfx_fill_rect(dpi, { { left + 1, top + 1 }, { right - 1, bottom - 1 } }, fill);
gfx_fill_rect(dpi, { leftTop + ScreenCoordsXY{ 1, 1 }, rightBottom - ScreenCoordsXY{ 1, 1 } }, fill);
}
}
else
{
// Draw outline of box
gfx_fill_rect(dpi, { { left, top }, { left, bottom - 1 } }, hilight);
gfx_fill_rect(dpi, { { left + 1, top }, { right - 1, top } }, hilight);
gfx_fill_rect(dpi, { { right, top }, { right, bottom - 1 } }, shadow);
gfx_fill_rect(dpi, { { left, bottom }, { right, bottom } }, shadow);
gfx_fill_rect(dpi, { leftTop, leftBottom - ScreenCoordsXY{ 0, 1 } }, hilight);
gfx_fill_rect(dpi, { leftTop + ScreenCoordsXY{ 1, 0 }, rightTop - ScreenCoordsXY{ 1, 0 } }, hilight);
gfx_fill_rect(dpi, { rightTop, rightBottom - ScreenCoordsXY{ 0, 1 } }, shadow);
gfx_fill_rect(dpi, { leftBottom, rightBottom }, shadow);
if (!(flags & INSET_RECT_FLAG_FILL_NONE))
{
@@ -131,8 +135,14 @@ void gfx_fill_rect_inset(
{
fill = ColourMapA[COLOUR_BLACK].light;
}
gfx_fill_rect(dpi, { { left + 1, top + 1 }, { right - 1, bottom - 1 } }, fill);
gfx_fill_rect(dpi, { leftTop + ScreenCoordsXY{ 1, 1 }, rightBottom - ScreenCoordsXY{ 1, 1 } }, fill);
}
}
}
}
void gfx_fill_rect_inset(
rct_drawpixelinfo* dpi, int16_t left, int16_t top, int16_t right, int16_t bottom, int32_t colour, uint8_t flags)
{
gfx_fill_rect_inset(dpi, { left, top, right, bottom }, colour, flags);
}