games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

Implemented per-surface alpha for images that have palettes with alpha

Browse Source
This commit is contained in:
Ivan Savenko
2024-07-19 12:03:29 +00:00
parent c40eea6e10
commit b256919dab
3 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/renderSDL/SDLImage.cpp
View File

@@ -119,9 +119,9 @@ void SDLImageConst::draw(SDL_Surface * where, SDL_Palette * palette, const Point
if (palette && surf->format->palette) if (palette && surf->format->palette)
SDL_SetSurfacePalette(surf, palette); SDL_SetSurfacePalette(surf, palette);
if(surf->format->palette && alpha == SDL_ALPHA_OPAQUE && mode == EImageBlitMode::ALPHA) if(surf->format->palette && mode == EImageBlitMode::ALPHA)
{ {
CSDL_Ext::blit8bppAlphaTo24bpp(surf, sourceRect, where, destShift); CSDL_Ext::blit8bppAlphaTo24bpp(surf, sourceRect, where, destShift, alpha);
} }
else else
{ {

35
client/renderSDL/SDL_Extensions.cpp
View File

@@ -210,8 +210,8 @@ uint32_t CSDL_Ext::getPixel(SDL_Surface *surface, const int & x, const int & y,
} }
} }
template<int bpp> template<int bpp, bool useAlpha>
int CSDL_Ext::blit8bppAlphaTo24bppT(const SDL_Surface * src, const Rect & srcRectInput, SDL_Surface * dst, const Point & dstPointInput) int CSDL_Ext::blit8bppAlphaTo24bppT(const SDL_Surface * src, const Rect & srcRectInput, SDL_Surface * dst, const Point & dstPointInput, uint8_t alpha)
{ {
SDL_Rect srcRectInstance = CSDL_Ext::toSDL(srcRectInput); SDL_Rect srcRectInstance = CSDL_Ext::toSDL(srcRectInput);
SDL_Rect dstRectInstance = CSDL_Ext::toSDL(Rect(dstPointInput, srcRectInput.dimensions())); SDL_Rect dstRectInstance = CSDL_Ext::toSDL(Rect(dstPointInput, srcRectInput.dimensions()));
@@ -334,7 +334,11 @@ int CSDL_Ext::blit8bppAlphaTo24bppT(const SDL_Surface * src, const Rect & srcRec
for(int x = 0; x < w; ++x) for(int x = 0; x < w; ++x)
{ {
const SDL_Color &tbc = colors[*color++]; //color to blit const SDL_Color &tbc = colors[*color++]; //color to blit
ColorPutter<bpp>::PutColorAlphaSwitch(p, tbc.r, tbc.g, tbc.b, tbc.a); if constexpr (useAlpha)
ColorPutter<bpp>::PutColorAlphaSwitch(p, tbc.r, tbc.g, tbc.b, int(alpha) * tbc.a / 255 );
else
ColorPutter<bpp>::PutColorAlphaSwitch(p, tbc.r, tbc.g, tbc.b, tbc.a);
p += bpp; p += bpp;
} }
} }
@@ -344,16 +348,27 @@ int CSDL_Ext::blit8bppAlphaTo24bppT(const SDL_Surface * src, const Rect & srcRec
return 0; return 0;
} }
int CSDL_Ext::blit8bppAlphaTo24bpp(const SDL_Surface * src, const Rect & srcRect, SDL_Surface * dst, const Point & dstPoint) int CSDL_Ext::blit8bppAlphaTo24bpp(const SDL_Surface * src, const Rect & srcRect, SDL_Surface * dst, const Point & dstPoint, uint8_t alpha)
{ {
switch(dst->format->BytesPerPixel) if (alpha == SDL_ALPHA_OPAQUE)
{ {
case 3: return blit8bppAlphaTo24bppT<3>(src, srcRect, dst, dstPoint); switch(dst->format->BytesPerPixel)
case 4: return blit8bppAlphaTo24bppT<4>(src, srcRect, dst, dstPoint); {
default: case 3: return blit8bppAlphaTo24bppT<3, false>(src, srcRect, dst, dstPoint, alpha);
logGlobal->error("%d bpp is not supported!", (int)dst->format->BitsPerPixel); case 4: return blit8bppAlphaTo24bppT<4, false>(src, srcRect, dst, dstPoint, alpha);
return -1; }
} }
else
{
switch(dst->format->BytesPerPixel)
{
case 3: return blit8bppAlphaTo24bppT<3, true>(src, srcRect, dst, dstPoint, alpha);
case 4: return blit8bppAlphaTo24bppT<4, true>(src, srcRect, dst, dstPoint, alpha);
}
}
logGlobal->error("%d bpp is not supported!", (int)dst->format->BitsPerPixel);
return -1;
} }
uint32_t CSDL_Ext::colorTouint32_t(const SDL_Color * color) uint32_t CSDL_Ext::colorTouint32_t(const SDL_Color * color)

6
client/renderSDL/SDL_Extensions.h
View File

@@ -73,9 +73,9 @@ using TColorPutterAlpha = void (*)(uint8_t *&, const uint8_t &, const uint8_t &,
uint8_t * getPxPtr(const SDL_Surface * const & srf, const int x, const int y); uint8_t * getPxPtr(const SDL_Surface * const & srf, const int x, const int y);
TColorPutter getPutterFor(SDL_Surface * const & dest); TColorPutter getPutterFor(SDL_Surface * const & dest);
template<int bpp> template<int bpp, bool useAlpha>
int blit8bppAlphaTo24bppT(const SDL_Surface * src, const Rect & srcRect, SDL_Surface * dst, const Point & dstPoint); //blits 8 bpp surface with alpha channel to 24 bpp surface int blit8bppAlphaTo24bppT(const SDL_Surface * src, const Rect & srcRect, SDL_Surface * dst, const Point & dstPoint, uint8_t alpha); //blits 8 bpp surface with alpha channel to 24 bpp surface
int blit8bppAlphaTo24bpp(const SDL_Surface * src, const Rect & srcRect, SDL_Surface * dst, const Point & dstPoint); //blits 8 bpp surface with alpha channel to 24 bpp surface int blit8bppAlphaTo24bpp(const SDL_Surface * src, const Rect & srcRect, SDL_Surface * dst, const Point & dstPoint, uint8_t alpha); //blits 8 bpp surface with alpha channel to 24 bpp surface
uint32_t colorTouint32_t(const SDL_Color * color); //little endian only uint32_t colorTouint32_t(const SDL_Color * color); //little endian only
void drawLine(SDL_Surface * sur, const Point & from, const Point & dest, const SDL_Color & color1, const SDL_Color & color2); void drawLine(SDL_Surface * sur, const Point & from, const Point & dest, const SDL_Color & color1, const SDL_Color & color2);