mirror of
https://github.com/vcmi/vcmi.git
synced 2025-10-08 23:22:25 +02:00
revert algoritm on optimized
This commit is contained in:
@@ -295,7 +295,7 @@ std::shared_ptr<SDLImageShared> RenderHandler::loadScaledImage(const ImageLocato
|
||||
bool generateOverlay = locator.generateOverlay && (*locator.generateOverlay) != SharedImageLocator::OverlayMode::OVERLAY_NONE;
|
||||
bool isShadow = locator.layer == EImageBlitMode::ONLY_SHADOW_HIDE_SELECTION || locator.layer == EImageBlitMode::ONLY_SHADOW_HIDE_FLAG_COLOR;
|
||||
bool isOverlay = locator.layer == EImageBlitMode::ONLY_FLAG_COLOR || locator.layer == EImageBlitMode::ONLY_SELECTION;
|
||||
int requiredBorderAfterOptimize = (isShadow && generateShadow) || (isOverlay && generateOverlay) ? 50 * locator.scalingFactor : 0;
|
||||
bool optimizeImage = !(isShadow && generateShadow) && !(isOverlay && generateOverlay); // images needs to expanded
|
||||
|
||||
if(isOverlay && !generateOverlay)
|
||||
imagePathString += "-OVERLAY";
|
||||
@@ -313,11 +313,11 @@ std::shared_ptr<SDLImageShared> RenderHandler::loadScaledImage(const ImageLocato
|
||||
std::shared_ptr<SDLImageShared> img = nullptr;
|
||||
|
||||
if(CResourceHandler::get()->existsResource(imagePathSprites))
|
||||
img = std::make_shared<SDLImageShared>(imagePathSprites, requiredBorderAfterOptimize);
|
||||
img = std::make_shared<SDLImageShared>(imagePathSprites, optimizeImage);
|
||||
else if(CResourceHandler::get()->existsResource(imagePathData))
|
||||
img = std::make_shared<SDLImageShared>(imagePathData, requiredBorderAfterOptimize);
|
||||
img = std::make_shared<SDLImageShared>(imagePathData, optimizeImage);
|
||||
else if(CResourceHandler::get()->existsResource(imagePath))
|
||||
img = std::make_shared<SDLImageShared>(imagePath, requiredBorderAfterOptimize);
|
||||
img = std::make_shared<SDLImageShared>(imagePath, optimizeImage);
|
||||
|
||||
if(img)
|
||||
{
|
||||
|
Reference in New Issue
Block a user