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

Merge pull request #6325 from Laserlicht/image_from_Def

Browse Source 
image from def also for ImageLocator
This commit is contained in:
Ivan Savenko
2025-11-17 20:22:58 +02:00
committed by GitHub
parent ce95236123 cad21dd627
commit f99b98c26b
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/renderSDL/RenderHandler.cpp
View File

@@ -349,6 +349,20 @@ std::shared_ptr<IImage> RenderHandler::loadImage(const ImageLocator & locator)
{ {
ImageLocator adjustedLocator = locator; ImageLocator adjustedLocator = locator;
if(locator.image)
{
std::vector<std::string> splitted;
boost::split(splitted, (*locator.image).getOriginalName(), boost::is_any_of(":"));
if(splitted.size() == 3)
{
// allows image from def file with following filename (first group, then frame): "deffile.def:0:5"
adjustedLocator.defFile = AnimationPath::builtin(splitted[0]);
adjustedLocator.defGroup = std::stoi(splitted[1]);
adjustedLocator.defFrame = std::stoi(splitted[2]);
adjustedLocator.image = std::nullopt;
}
}
std::shared_ptr<ScalableImageInstance> result; std::shared_ptr<ScalableImageInstance> result;
if (adjustedLocator.scalingFactor == 0) if (adjustedLocator.scalingFactor == 0)
@@ -389,6 +403,7 @@ std::shared_ptr<IImage> RenderHandler::loadImage(const ImagePath & path, EImageB
boost::split(splitted, name, boost::is_any_of(":")); boost::split(splitted, name, boost::is_any_of(":"));
if(splitted.size() == 3) if(splitted.size() == 3)
{ {
// allows image from def file with following filename (first group, then frame): "deffile.def:0:5"
ImageLocator locator = getLocatorForAnimationFrame(AnimationPath::builtin(splitted[0]), std::stoi(splitted[2]), std::stoi(splitted[1]), 1, mode); ImageLocator locator = getLocatorForAnimationFrame(AnimationPath::builtin(splitted[0]), std::stoi(splitted[2]), std::stoi(splitted[1]), 1, mode);
return loadImage(locator); return loadImage(locator);
} }