games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Added RenderHandler that acts as factory for images and animations

Browse Source
This commit is contained in:
Ivan Savenko
2023-09-04 18:01:44 +03:00
parent 3f921fa771
commit 1d0e696db6
38 changed files with 246 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/widgets/Images.cpp
View File

@@ -15,6 +15,7 @@
#include "../gui/CGuiHandler.h"
#include "../renderSDL/SDL_Extensions.h"
#include "../render/IImage.h"
#include "../render/IRenderHandler.h"
#include "../render/CAnimation.h"
#include "../render/Canvas.h"
#include "../render/ColorFilter.h"
@@ -51,7 +52,7 @@ CPicture::CPicture( const ImagePath & bmpname )
{}
CPicture::CPicture( const ImagePath & bmpname, const Point & position )
: bg(IImage::createFromFile(bmpname))
: bg(GH.renderHandler().loadImage(bmpname))
, visible(true)
, needRefresh(false)
{
@@ -115,7 +116,7 @@ void CPicture::colorize(PlayerColor player)
CFilledTexture::CFilledTexture(const ImagePath & imageName, Rect position):
CIntObject(0, position.topLeft()),
texture(IImage::createFromFile(imageName))
texture(GH.renderHandler().loadImage(imageName))
{
pos.w = position.w;
pos.h = position.h;
@@ -178,7 +179,7 @@ CAnimImage::CAnimImage(const AnimationPath & name, size_t Frame, size_t Group, i
{
pos.x += x;
pos.y += y;
anim = std::make_shared<CAnimation>(name);
anim = GH.renderHandler().loadAnimation(name);
init();
}
@@ -308,7 +309,7 @@ bool CAnimImage::isPlayerColored() const
}
CShowableAnim::CShowableAnim(int x, int y, const AnimationPath & name, ui8 Flags, ui32 frameTime, size_t Group, uint8_t alpha):
anim(std::make_shared<CAnimation>(name)),
anim(GH.renderHandler().loadAnimation(name)),
group(Group),
frame(0),
first(0),