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

Implement selection of upscaling filter in launcher

Browse Source
This commit is contained in:
Ivan Savenko
2024-08-03 20:14:51 +00:00
parent f29a687234
commit d6059b044d
11 changed files with 173 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
client/renderSDL/ScreenHandler.cpp
View File

@@ -38,15 +38,14 @@ SDL_Surface * screen2 = nullptr; //and hlp surface (used to store not-active int
SDL_Surface * screenBuf = screen; //points to screen (if only advmapint is present) or screen2 (else) - should be used when updating controls which are not regularly redrawed
static const std::string NAME = GameConstants::VCMI_VERSION; //application name
static constexpr Point heroes3Resolution = Point(800, 600);
std::tuple<int, int> ScreenHandler::getSupportedScalingRange() const
{
// Renderer upscaling factor. TODO: make configurable
static const int scalingFactor = 2;
// H3 resolution, any resolution smaller than that is not correctly supported
static const Point minResolution = Point(800, 600) * scalingFactor;
static constexpr Point minResolution = heroes3Resolution;
// arbitrary limit on *downscaling*. Allow some downscaling, if requested by user. Should be generally limited to 100+ for all but few devices
static const double minimalScaling = 50;
static constexpr double minimalScaling = 50;
Point renderResolution = getRenderResolution();
double reservedAreaWidth = settings["video"]["reservedWidth"].Float();
@@ -103,7 +102,15 @@ Point ScreenHandler::getPreferredLogicalResolution() const
int ScreenHandler::getScalingFactor() const
{
return 2;
switch (upscalingFilter)
{
case EUpscalingFilter::NONE: return 1;
case EUpscalingFilter::XBRZ_2: return 2;
case EUpscalingFilter::XBRZ_3: return 3;
case EUpscalingFilter::XBRZ_4: return 4;
}
throw std::runtime_error("invalid upscaling filter");
}
Point ScreenHandler::getLogicalResolution() const
@@ -303,12 +310,61 @@ void ScreenHandler::initializeWindow()
handleFatalError(message, true);
}
selectUpscalingFilter();
selectDownscalingFilter();
SDL_RendererInfo info;
SDL_GetRendererInfo(mainRenderer, &info);
SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, settings["video"]["scalingMode"].String().c_str());
logGlobal->info("Created renderer %s", info.name);
}
EUpscalingFilter ScreenHandler::loadUpscalingFilter() const
{
static const std::map<std::string, EUpscalingFilter> upscalingFilterTypes =
{
{"auto", EUpscalingFilter::AUTO },
{"none", EUpscalingFilter::NONE },
{"xbrz2", EUpscalingFilter::XBRZ_2 },
{"xbrz3", EUpscalingFilter::XBRZ_3 },
{"xbrz4", EUpscalingFilter::XBRZ_4 }
};
auto filterName = settings["video"]["upscalingFilter"].String();
auto filter = upscalingFilterTypes.at(filterName);
if (filter != EUpscalingFilter::AUTO)
return filter;
// else - autoselect
Point outputResolution = getRenderResolution();
Point logicalResolution = getPreferredLogicalResolution();
float scaleX = static_cast<float>(outputResolution.x) / logicalResolution.x;
float scaleY = static_cast<float>(outputResolution.x) / logicalResolution.x;
float scaling = std::min(scaleX, scaleY);
if (scaling <= 1.0f)
return EUpscalingFilter::NONE;
if (scaling <= 2.0f)
return EUpscalingFilter::XBRZ_2;
if (scaling <= 3.0f)
return EUpscalingFilter::XBRZ_3;
return EUpscalingFilter::XBRZ_4;
}
void ScreenHandler::selectUpscalingFilter()
{
upscalingFilter = loadUpscalingFilter();
logGlobal->debug("Selected upscaling filter %d", static_cast<int>(upscalingFilter));
}
void ScreenHandler::selectDownscalingFilter()
{
SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, settings["video"]["downscalingFilter"].String().c_str());
logGlobal->debug("Selected downscaling filter %s", settings["video"]["downscalingFilter"].String());
}
void ScreenHandler::initializeScreenBuffers()
{
#ifdef VCMI_ENDIAN_BIG
@@ -323,7 +379,7 @@ void ScreenHandler::initializeScreenBuffers()
int amask = 0xFF000000;
#endif
auto logicalSize = getPreferredLogicalResolution();
auto logicalSize = getPreferredLogicalResolution() * getScalingFactor();
SDL_RenderSetLogicalSize(mainRenderer, logicalSize.x, logicalSize.y);
screen = SDL_CreateRGBSurface(0, logicalSize.x, logicalSize.y, 32, rmask, gmask, bmask, amask);