games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-03 13:01:33 +02:00
Code Issues Releases Activity

Use CSDL_Ext blit for paletted sprites, use SDL blit otherwise.

Browse Source 
*  No solution found to blit paletted images with alpha channel with SDL
This commit is contained in:
AlexVinS 2016-10-27 15:07:12 +03:00
parent 3dddbcf2e8
commit f32097339c
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/gui/CAnimation.cpp
View File

@ -269,7 +269,7 @@ void CDefFile::loadFrame(size_t frame, size_t group, ImageLoader &loader) const
if (code==7)//Raw data if (code==7)//Raw data
{ {
loader.Load(length, FDef[currentOffset]); loader.Load(length, FDef + currentOffset);
currentOffset += length; currentOffset += length;
} }
else//RLE else//RLE
@ -631,7 +631,7 @@ SDLImage::SDLImage(std::string filename, bool compressed):
} }
} }
void SDLImage::draw(SDL_Surface *where, int posX, int posY, Rect *src, ui8 rotation) const void SDLImage::draw(SDL_Surface *where, int posX, int posY, Rect *src, ui8 alpha) const
{ {
if (!surf) if (!surf)
return; return;
@ -645,7 +645,19 @@ void SDLImage::draw(SDL_Surface *where, int posX, int posY, Rect *src, ui8 rotat
Rect destRect(posX, posY, surf->w, surf->h); Rect destRect(posX, posY, surf->w, surf->h);
destRect += sourceRect.topLeft(); destRect += sourceRect.topLeft();
sourceRect -= margins; sourceRect -= margins;
CSDL_Ext::blitSurface(surf, &sourceRect, where, &destRect);
if(surf->format->palette)
{
CSDL_Ext::blit8bppAlphaTo24bpp(surf, &sourceRect, where, &destRect);
}
if(surf->format->Amask == 0)
SDL_BlitSurface(surf, &sourceRect, where, &destRect);
else
{
SDL_SetSurfaceBlendMode(surf, SDL_BLENDMODE_BLEND);
SDL_BlitSurface(surf, &sourceRect, where, &destRect);
SDL_SetSurfaceBlendMode(surf, SDL_BLENDMODE_NONE);
}
} }
void SDLImage::playerColored(PlayerColor player) void SDLImage::playerColored(PlayerColor player)

1
client/gui/CAnimation.h
View File

@ -99,6 +99,7 @@ public:
~SDLImage(); ~SDLImage();
void draw(SDL_Surface *where, int posX=0, int posY=0, Rect *src=nullptr, ui8 alpha=255) const override; void draw(SDL_Surface *where, int posX=0, int posY=0, Rect *src=nullptr, ui8 alpha=255) const override;
void playerColored(PlayerColor player) override; void playerColored(PlayerColor player) override;
int width() const override; int width() const override;
int height() const override; int height() const override;