1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00

New namespaces: GL2D (low-level OpenGL functions), Gfx (images and animation objects cooperating with the interface GL2D)

This commit is contained in:
paracelsus
2013-03-03 19:03:45 +00:00
parent 51d0af5060
commit 1e0f473761
57 changed files with 2245 additions and 907 deletions

View File

@ -1218,9 +1218,9 @@ CAnimImage::~CAnimImage()
delete anim;
}
void CAnimImage::showAll(SDL_Surface * to)
void CAnimImage::showAll()
{
IImage *img;
/* IImage *img;
if ( flags & CShowableAnim::BASE && frame != 0)
if ((img = anim->getImage(0, group)))
@ -1228,6 +1228,7 @@ void CAnimImage::showAll(SDL_Surface * to)
if ((img = anim->getImage(frame, group)))
img->draw(to, pos.x, pos.y);
*/
}
void CAnimImage::setFrame(size_t Frame, size_t Group)
@ -1345,11 +1346,11 @@ void CShowableAnim::clipRect(int posX, int posY, int width, int height)
pos.h = height;
}
void CShowableAnim::show(SDL_Surface * to)
void CShowableAnim::show()
{
if ( flags & BASE && frame != first)
blitImage(first, group, to);
blitImage(frame, group, to);
//* if ( flags & BASE && frame != first)
//* blitImage(first, group, to);
//* blitImage(frame, group, to);
if ((flags & PLAY_ONCE) && frame + 1 == last)
return;
@ -1362,11 +1363,11 @@ void CShowableAnim::show(SDL_Surface * to)
}
}
void CShowableAnim::showAll(SDL_Surface * to)
void CShowableAnim::showAll()
{
if ( flags & BASE && frame != first)
blitImage(first, group, to);
blitImage(frame, group, to);
//* if ( flags & BASE && frame != first)
//* blitImage(first, group, to);
//* blitImage(frame, group, to);
}
void CShowableAnim::blitImage(size_t frame, size_t group, SDL_Surface *to)