gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 22:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r10142) -Fix r10132: do something useful with the alpha channel instead of ignoring it

Browse Source
This commit is contained in:
truelight 2007-06-13 16:04:35 +00:00
parent 5f1791bfb1
commit 4185c4afcd
2 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/blitter/32bpp_simple.cpp
View File

@ -16,6 +16,39 @@ static inline uint ComposeColor(uint r, uint g, uint b)
return (r & 0xFF) << 16 | (g & 0xFF) << 8 | (b & 0xFF) << 0; return (r & 0xFF) << 16 | (g & 0xFF) << 8 | (b & 0xFF) << 0;
} }
/**
* Compose a color based on RGBA values and the current pixel value.
*/
static inline uint ComposeColorRGBA(uint r, uint g, uint b, uint a, uint current)
{
uint cr, cg, cb;
cr = GB(current, 16, 8);
cg = GB(current, 8, 8);
cb = GB(current, 0, 8);
return ComposeColor((r * a + cr * (255 - a)) / 255,
(g * a + cg * (255 - a)) / 255,
(b * a + cb * (255 - a)) / 255);
}
/**
* Compose a color based on Pixel value, alpha value, and the current pixel value.
*/
static inline uint ComposeColorPA(uint color, uint a, uint current)
{
uint r, g, b, cr, cg, cb;
r = GB(color, 16, 8);
g = GB(color, 8, 8);
b = GB(color, 0, 8);
cr = GB(current, 16, 8);
cg = GB(current, 8, 8);
cb = GB(current, 0, 8);
return ComposeColor((r * a + cr * (255 - a)) / 255,
(g * a + cg * (255 - a)) / 255,
(b * a + cb * (255 - a)) / 255);
}
/** /**
* Make a pixel looks like it is transparent. * Make a pixel looks like it is transparent.
* @param color the color already on the screen. * @param color the color already on the screen.
@ -69,14 +102,13 @@ void Blitter_32bppSimple::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Zoo
src_line += bp->sprite_width * ScaleByZoom(1, zoom); src_line += bp->sprite_width * ScaleByZoom(1, zoom);
for (int x = 0; x < bp->width; x++) { for (int x = 0; x < bp->width; x++) {
switch (mode) { switch (mode) {
case BM_COLOUR_REMAP: case BM_COLOUR_REMAP:
/* In case the m-channel is zero, do not remap this pixel in any way */ /* In case the m-channel is zero, do not remap this pixel in any way */
if (src->m == 0) { if (src->m == 0) {
if (src->a != 0) *dst = ComposeColor(src->r, src->g, src->b); if (src->a != 0) *dst = ComposeColorRGBA(src->r, src->g, src->b, src->a, *dst);
} else { } else {
if (bp->remap[src->m] != 0) *dst = Renderer_32bpp::LookupColourInPalette(bp->remap[src->m]); if (bp->remap[src->m] != 0) *dst = ComposeColorPA(Renderer_32bpp::LookupColourInPalette(bp->remap[src->m]), src->a, *dst);
} }
break; break;
@ -90,7 +122,7 @@ void Blitter_32bppSimple::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Zoo
break; break;
default: default:
if (src->a != 0) *dst = ComposeColor(src->r, src->g, src->b); if (src->a != 0) *dst = ComposeColorRGBA(src->r, src->g, src->b, src->a, *dst);
break; break;
} }
dst++; dst++;

2
src/fontcache.cpp
View File

@ -419,6 +419,7 @@ const Sprite *GetGlyph(FontSize size, WChar key)
for (x = 0; x < slot->bitmap.width; x++) { for (x = 0; x < slot->bitmap.width; x++) {
if (HASBIT(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { if (HASBIT(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) {
sprite.data[1 + x + (1 + y) * sprite.width].m = SHADOW_COLOUR; sprite.data[1 + x + (1 + y) * sprite.width].m = SHADOW_COLOUR;
sprite.data[1 + x + (1 + y) * sprite.width].a = 0xFF;
} }
} }
} }
@ -428,6 +429,7 @@ const Sprite *GetGlyph(FontSize size, WChar key)
for (x = 0; x < slot->bitmap.width; x++) { for (x = 0; x < slot->bitmap.width; x++) {
if (HASBIT(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { if (HASBIT(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) {
sprite.data[x + y * sprite.width].m = FACE_COLOUR; sprite.data[x + y * sprite.width].m = FACE_COLOUR;
sprite.data[x + y * sprite.width].a = 0xFF;
} }
} }
} }