games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

- vcmi will not crash if building selection area is smaller than def

Browse Source 
- detection of transparency on selection area is closer to H3
This commit is contained in:
Ivan Savenko 2013-04-03 16:28:50 +00:00
parent 52e56693ea
commit 655ade9a00
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/CCastleInterface.cpp
View File

@ -223,7 +223,7 @@ void CBuildingRect::mouseMoved (const SDL_MouseMotionEvent & sEvent)
{ {
if(area && isItIn(&pos,sEvent.x, sEvent.y)) if(area && isItIn(&pos,sEvent.x, sEvent.y))
{ {
if(CSDL_Ext::SDL_GetPixel(area,sEvent.x-pos.x,sEvent.y-pos.y) == 0) //hovered pixel is inside this building if(CSDL_Ext::isTransparent(area, GH.current->motion.x-pos.x, GH.current->motion.y-pos.y)) //hovered pixel is inside this building
{ {
if(parent->selectedBuilding == this) if(parent->selectedBuilding == this)
{ {

18
client/UIFramework/SDL_Extensions.cpp
View File

@ -652,15 +652,17 @@ bool CSDL_Ext::isTransparent( SDL_Surface * srf, int x, int y )
if (x < 0 || y < 0 || x >= srf->w || y >= srf->h) if (x < 0 || y < 0 || x >= srf->w || y >= srf->h)
return true; return true;
if(srf->format->BytesPerPixel == 1) SDL_Color color;
{
return ((ui8*)srf->pixels)[x + srf->pitch * y] == 0; SDL_GetRGBA(SDL_GetPixel(srf, x, y), srf->format, &color.r, &color.g, &color.b, &color.unused);
}
// color is considered transparent here if
// a) image has aplha: less than 50% transparency
// b) no alpha: color is cyan
if (srf->format->Amask)
return color.unused < 128; // almost transparent
else else
{ return (color.r == 0 && color.g == 255 && color.b == 255);
assert(!"isTransparent called with non-8bpp surface!");
}
return false;
} }
void CSDL_Ext::VflipSurf(SDL_Surface * surf) void CSDL_Ext::VflipSurf(SDL_Surface * surf)

1
client/UIFramework/SDL_Extensions.h
View File

@ -143,7 +143,6 @@ namespace CSDL_Ext
SDL_Surface * rotate03(SDL_Surface * toRot); //rotate 180 degrees SDL_Surface * rotate03(SDL_Surface * toRot); //rotate 180 degrees
SDL_Cursor * SurfaceToCursor(SDL_Surface *image, int hx, int hy); //creates cursor from bitmap SDL_Cursor * SurfaceToCursor(SDL_Surface *image, int hx, int hy); //creates cursor from bitmap
Uint32 SDL_GetPixel(SDL_Surface *surface, const int & x, const int & y, bool colorByte = false); Uint32 SDL_GetPixel(SDL_Surface *surface, const int & x, const int & y, bool colorByte = false);
SDL_Color SDL_GetPixelColor(SDL_Surface *surface, int x, int y); //returns color of pixel at given position
void alphaTransform(SDL_Surface * src); //adds transparency and shadows (partial handling only; see examples of using for details) void alphaTransform(SDL_Surface * src); //adds transparency and shadows (partial handling only; see examples of using for details)
bool isTransparent(SDL_Surface * srf, int x, int y); //checks if surface is transparent at given position bool isTransparent(SDL_Surface * srf, int x, int y); //checks if surface is transparent at given position