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

Fix: Shadows of individual character glyphs could be drawn over other characters (#12115)

Browse Source 
(cherry picked from commit 555a37930b)
This commit is contained in:
frosch
2024-02-18 16:30:54 +01:00
committed by Jonathan G Rennison
parent d3bbb4fb1c
commit 89b6773c93
1 changed files with 33 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gfx.cpp
View File

@@ -610,8 +610,9 @@ static int DrawLayoutLine(const ParagraphLayouter::Line &line, int y, int left,
const uint shadow_offset = ScaleGUITrad(1); const uint shadow_offset = ScaleGUITrad(1);
/* Draw shadow, then foreground */
for (bool do_shadow : { true, false }) {
TextColour colour = TC_BLACK; TextColour colour = TC_BLACK;
bool draw_shadow = false;
for (int run_index = 0; run_index < line.CountRuns(); run_index++) { for (int run_index = 0; run_index < line.CountRuns(); run_index++) {
const ParagraphLayouter::VisualRun &run = line.GetVisualRun(run_index); const ParagraphLayouter::VisualRun &run = line.GetVisualRun(run_index);
const auto &glyphs = run.GetGlyphs(); const auto &glyphs = run.GetGlyphs();
@@ -620,14 +621,13 @@ static int DrawLayoutLine(const ParagraphLayouter::Line &line, int y, int left,
FontCache *fc = f->fc; FontCache *fc = f->fc;
colour = f->colour; colour = f->colour;
ctx.SetColourRemap(colour); if (do_shadow && (!fc->GetDrawGlyphShadow() || (colour & TC_NO_SHADE) != 0 || (colour & ~TC_FORCED) == TC_BLACK)) continue;
ctx.SetColourRemap(do_shadow ? TC_BLACK : colour);
DrawPixelInfo *dpi = _cur_dpi; DrawPixelInfo *dpi = _cur_dpi;
int dpi_left = dpi->left; int dpi_left = dpi->left;
int dpi_right = dpi->left + dpi->width - 1; int dpi_right = dpi->left + dpi->width - 1;
draw_shadow = fc->GetDrawGlyphShadow() && (colour & TC_NO_SHADE) == 0 && (colour & ~TC_FORCED) != TC_BLACK;
for (int i = 0; i < run.GetGlyphCount(); i++) { for (int i = 0; i < run.GetGlyphCount(); i++) {
GlyphID glyph = glyphs[i]; GlyphID glyph = glyphs[i];
@@ -645,24 +645,17 @@ static int DrawLayoutLine(const ParagraphLayouter::Line &line, int y, int left,
/* Check clipping (the "+ 1" is for the shadow). */ /* Check clipping (the "+ 1" is for the shadow). */
if (begin_x + sprite->x_offs > dpi_right || begin_x + sprite->x_offs + sprite->width /* - 1 + 1 */ < dpi_left) continue; if (begin_x + sprite->x_offs > dpi_right || begin_x + sprite->x_offs + sprite->width /* - 1 + 1 */ < dpi_left) continue;
if (draw_shadow && (glyph & SPRITE_GLYPH) == 0) { if (do_shadow && (glyph & SPRITE_GLYPH) != 0) continue;
ctx.SetColourRemap(TC_BLACK);
GfxMainBlitter(ctx, sprite, begin_x + shadow_offset, top + shadow_offset, BM_COLOUR_REMAP); GfxMainBlitter(ctx, sprite, begin_x + (do_shadow ? shadow_offset : 0), top + (do_shadow ? shadow_offset : 0), BM_COLOUR_REMAP);
ctx.SetColourRemap(colour);
}
GfxMainBlitter(ctx, sprite, begin_x, top, BM_COLOUR_REMAP);
} }
} }
if (truncation) { if (truncation) {
int x = (_current_text_dir == TD_RTL) ? left : (right - 3 * dot_width); int x = (_current_text_dir == TD_RTL) ? left : (right - 3 * dot_width);
for (int i = 0; i < 3; i++, x += dot_width) { for (int i = 0; i < 3; i++, x += dot_width) {
if (draw_shadow) { GfxMainBlitter(ctx, dot_sprite, x + (do_shadow ? shadow_offset : 0), y + (do_shadow ? shadow_offset : 0), BM_COLOUR_REMAP);
ctx.SetColourRemap(TC_BLACK);
GfxMainBlitter(ctx, dot_sprite, x + shadow_offset, y + shadow_offset, BM_COLOUR_REMAP);
ctx.SetColourRemap(colour);
} }
GfxMainBlitter(ctx, dot_sprite, x, y, BM_COLOUR_REMAP);
} }
} }