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

Created separate classes for shared, unchangeable image and image

Browse Source 
manipulators owned by UI elements
This commit is contained in:
Ivan Savenko
2024-06-04 11:46:45 +00:00
parent 2b3e4e01ca
commit 47de9a62dc
19 changed files with 312 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/renderSDL/RenderHandler.cpp
View File

@@ -134,13 +134,13 @@ std::shared_ptr<IImage> RenderHandler::loadImage(const AnimationPath & path, int
auto it = animationFrames.find(locator);
if (it != animationFrames.end())
return it->second;
return it->second->createImageReference();
auto defFile = getAnimationFile(path);
auto result = std::make_shared<SDLImage>(defFile.get(), frame, group);
auto result = std::make_shared<SDLImageConst>(defFile.get(), frame, group);
animationFrames[locator] = result;
return result;
return result->createImageReference();
}
//std::vector<std::shared_ptr<IImage>> RenderHandler::loadImageGroup(const AnimationPath & path, int group)
@@ -165,16 +165,16 @@ std::shared_ptr<IImage> RenderHandler::loadImage(const ImagePath & path, EImageB
{
auto it = imageFiles.find(path);
if (it != imageFiles.end())
return it->second;
return it->second->createImageReference();
auto result = std::make_shared<SDLImage>(path, mode);
auto result = std::make_shared<SDLImageConst>(path, mode);
imageFiles[path] = result;
return result;
return result->createImageReference();
}
std::shared_ptr<IImage> RenderHandler::createImage(SDL_Surface * source)
{
return std::make_shared<SDLImage>(source, EImageBlitMode::ALPHA);
return std::make_shared<SDLImageConst>(source, EImageBlitMode::ALPHA)->createImageReference();
}
std::shared_ptr<CAnimation> RenderHandler::loadAnimation(const AnimationPath & path)