games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00
Code Issues Releases Activity

Merge pull request #2289 from IvanSavenko/resolution_fixes

Browse Source 
Fix issues with changing game resolution
This commit is contained in:
Ivan Savenko 2023-07-11 14:35:07 +03:00 committed by GitHub
commit 78415c573b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 117 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/CMT.cpp
View File

@ -449,19 +449,6 @@ void playIntro()
static void mainLoop()
{
SettingsListener resChanged = settings.listen["video"]["resolution"];
SettingsListener fsChanged = settings.listen["video"]["fullscreen"];
auto functor = [](const JsonNode &newState){
GH.dispatchMainThread([](){
boost::unique_lock<boost::recursive_mutex> lock(*CPlayerInterface::pim);
GH.onScreenResize();
});
};
resChanged(functor);
fsChanged(functor);
inGuiThread.reset(new bool(true));
while(1) //main SDL events loop

3
client/CMT.h
View File

@ -10,13 +10,10 @@
#pragma once
struct SDL_Texture;
struct SDL_Window;
struct SDL_Renderer;
struct SDL_Surface;
extern SDL_Texture * screenTexture;
extern SDL_Window * mainWindow;
extern SDL_Renderer * mainRenderer;
extern SDL_Surface *screen; // main screen surface

2
client/eventsSDL/InputHandler.cpp
View File

@ -121,6 +121,8 @@ void InputHandler::preprocessEvent(const SDL_Event & ev)
{
Settings full = settings.write["video"]["fullscreen"];
full->Bool() = !full->Bool();
GH.onScreenResize();
return;
}
else if(ev.type == SDL_USEREVENT)

30
client/eventsSDL/InputSourceText.cpp
View File

@ -14,20 +14,17 @@
#include "../CMT.h"
#include "../gui/CGuiHandler.h"
#include "../gui/EventDispatcher.h"
#include "../render/IScreenHandler.h"
#include "../renderSDL/SDL_Extensions.h"
#include "../../lib/Rect.h"
#include <SDL_events.h>
#include <SDL_render.h>
#ifdef VCMI_APPLE
# include <dispatch/dispatch.h>
#endif
#ifdef VCMI_IOS
# include "ios/utils.h"
#endif
void InputSourceText::handleEventTextInput(const SDL_TextInputEvent & text)
{
GH.events().dispatchTextInput(text.text);
@ -40,30 +37,15 @@ void InputSourceText::handleEventTextEditing(const SDL_TextEditingEvent & text)
void InputSourceText::startTextInput(const Rect & whereInput)
{
#ifdef VCMI_APPLE
dispatch_async(dispatch_get_main_queue(), ^{
#endif
// TODO ios: looks like SDL bug actually, try fixing there
auto renderer = SDL_GetRenderer(mainWindow);
float scaleX, scaleY;
SDL_Rect viewport;
SDL_RenderGetScale(renderer, &scaleX, &scaleY);
SDL_RenderGetViewport(renderer, &viewport);
Rect rectInScreenCoordinates = GH.screenHandler().convertLogicalPointsToWindow(whereInput);
SDL_Rect textInputRect = CSDL_Ext::toSDL(rectInScreenCoordinates);
#ifdef VCMI_IOS
const auto nativeScale = iOS_utils::screenScale();
scaleX /= nativeScale;
scaleY /= nativeScale;
#endif
SDL_Rect rectInScreenCoordinates;
rectInScreenCoordinates.x = (viewport.x + whereInput.x) * scaleX;
rectInScreenCoordinates.y = (viewport.y + whereInput.y) * scaleY;
rectInScreenCoordinates.w = whereInput.w * scaleX;
rectInScreenCoordinates.h = whereInput.h * scaleY;
SDL_SetTextInputRect(&rectInScreenCoordinates);
SDL_SetTextInputRect(&textInputRect);
if (SDL_IsTextInputActive() == SDL_FALSE)
{

4
client/render/IScreenHandler.h
View File

@ -12,6 +12,7 @@
VCMI_LIB_NAMESPACE_BEGIN
class Point;
class Rect;
VCMI_LIB_NAMESPACE_END
class IScreenHandler
@ -33,4 +34,7 @@ public:
/// Returns <min, max> range of possible values for screen scaling percentage
virtual std::tuple<int, int> getSupportedScalingRange() const = 0;
/// Converts provided rect from logical coordinates into coordinates within window, accounting for scaling and viewport
virtual Rect convertLogicalPointsToWindow(const Rect & input) const = 0;
};

73
client/renderSDL/ScreenHandler.cpp
View File

@ -22,10 +22,14 @@
#include "../lib/CAndroidVMHelper.h"
#endif
#ifdef VCMI_IOS
# include "ios/utils.h"
#endif
#include <SDL.h>
// TODO: should be made into a private members of ScreenHandler
SDL_Window * mainWindow = nullptr;
static SDL_Window * mainWindow = nullptr;
SDL_Renderer * mainRenderer = nullptr;
SDL_Texture * screenTexture = nullptr;
SDL_Surface * screen = nullptr; //main screen surface
@ -42,28 +46,70 @@ std::tuple<int, int> ScreenHandler::getSupportedScalingRange() const
// 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;
Point renderResolution = getPreferredRenderingResolution();
double maximalScalingWidth = 100.0 * renderResolution.x / minResolution.x;
double maximalScalingHeight = 100.0 * renderResolution.y / minResolution.y;
Point renderResolution = getActualRenderResolution();
double reservedAreaWidth = settings["video"]["reservedWidth"].Float();
Point availableResolution = Point(renderResolution.x * (1 - reservedAreaWidth), renderResolution.y);
double maximalScalingWidth = 100.0 * availableResolution.x / minResolution.x;
double maximalScalingHeight = 100.0 * availableResolution.y / minResolution.y;
double maximalScaling = std::min(maximalScalingWidth, maximalScalingHeight);
return { minimalScaling, maximalScaling };
}
Rect ScreenHandler::convertLogicalPointsToWindow(const Rect & input) const
{
Rect result;
// FIXME: use SDL_RenderLogicalToWindow instead? Needs to be tested on ios
float scaleX, scaleY;
SDL_Rect viewport;
SDL_RenderGetScale(mainRenderer, &scaleX, &scaleY);
SDL_RenderGetViewport(mainRenderer, &viewport);
#ifdef VCMI_IOS
// TODO ios: looks like SDL bug actually, try fixing there
const auto nativeScale = iOS_utils::screenScale();
scaleX /= nativeScale;
scaleY /= nativeScale;
#endif
result.x = (viewport.x + input.x) * scaleX;
result.y = (viewport.y + input.y) * scaleY;
result.w = input.w * scaleX;
result.h = input.h * scaleY;
return result;
}
Point ScreenHandler::getPreferredLogicalResolution() const
{
Point renderResolution = getPreferredRenderingResolution();
Point renderResolution = getActualRenderResolution();
double reservedAreaWidth = settings["video"]["reservedWidth"].Float();
Point availableResolution = Point(renderResolution.x * (1 - reservedAreaWidth), renderResolution.y);
auto [minimalScaling, maximalScaling] = getSupportedScalingRange();
int userScaling = settings["video"]["resolution"]["scaling"].Integer();
int scaling = std::clamp(userScaling, minimalScaling, maximalScaling);
Point logicalResolution = renderResolution * 100.0 / scaling;
Point logicalResolution = availableResolution * 100.0 / scaling;
return logicalResolution;
}
Point ScreenHandler::getPreferredRenderingResolution() const
Point ScreenHandler::getActualRenderResolution() const
{
assert(mainRenderer != nullptr);
Point result;
SDL_GetRendererOutputSize(mainRenderer, &result.x, &result.y);
return result;
}
Point ScreenHandler::getPreferredWindowResolution() const
{
if (getPreferredWindowMode() == EWindowMode::FULLSCREEN_BORDERLESS_WINDOWED)
{
@ -178,11 +224,14 @@ void ScreenHandler::updateWindowState()
{
case EWindowMode::FULLSCREEN_EXCLUSIVE:
{
// for some reason, VCMI fails to switch from FULLSCREEN_BORDERLESS_WINDOWED to FULLSCREEN_EXCLUSIVE directly
// Switch to windowed mode first to avoid this bug
SDL_SetWindowFullscreen(mainWindow, 0);
SDL_SetWindowFullscreen(mainWindow, SDL_WINDOW_FULLSCREEN);
SDL_DisplayMode mode;
SDL_GetDesktopDisplayMode(displayIndex, &mode);
Point resolution = getPreferredRenderingResolution();
Point resolution = getPreferredWindowResolution();
mode.w = resolution.x;
mode.h = resolution.y;
@ -200,7 +249,7 @@ void ScreenHandler::updateWindowState()
}
case EWindowMode::WINDOWED:
{
Point resolution = getPreferredRenderingResolution();
Point resolution = getPreferredWindowResolution();
SDL_SetWindowFullscreen(mainWindow, 0);
SDL_SetWindowSize(mainWindow, resolution.x, resolution.y);
SDL_SetWindowPosition(mainWindow, SDL_WINDOWPOS_CENTERED_DISPLAY(displayIndex), SDL_WINDOWPOS_CENTERED_DISPLAY(displayIndex));
@ -290,7 +339,7 @@ SDL_Window * ScreenHandler::createWindowImpl(Point dimensions, int flags, bool c
SDL_Window * ScreenHandler::createWindow()
{
#ifndef VCMI_MOBILE
Point dimensions = getPreferredRenderingResolution();
Point dimensions = getPreferredWindowResolution();
switch(getPreferredWindowMode())
{
@ -350,7 +399,7 @@ void ScreenHandler::validateSettings()
{
//we only check that our desired window size fits on screen
int displayIndex = getPreferredDisplayIndex();
Point resolution = getPreferredRenderingResolution();
Point resolution = getPreferredWindowResolution();
SDL_DisplayMode mode;
@ -368,7 +417,7 @@ void ScreenHandler::validateSettings()
if (getPreferredWindowMode() == EWindowMode::FULLSCREEN_EXCLUSIVE)
{
auto legalOptions = getSupportedResolutions();
Point selectedResolution = getPreferredRenderingResolution();
Point selectedResolution = getPreferredWindowResolution();
if(!vstd::contains(legalOptions, selectedResolution))
{

8
client/renderSDL/ScreenHandler.h
View File

@ -30,14 +30,17 @@ enum class EWindowMode
};
/// This class is responsible for management of game window and its main rendering surface
class ScreenHandler : public IScreenHandler
class ScreenHandler final : public IScreenHandler
{
/// Dimensions of target surfaces/textures, this value is what game logic views as screen size
Point getPreferredLogicalResolution() const;
/// Dimensions of output window, if different from logicalResolution SDL will perform scaling
/// This value is what player views as window size
Point getPreferredRenderingResolution() const;
Point getPreferredWindowResolution() const;
/// Dimensions of render output, usually same as window size except for high-DPI screens on macOS / iOS
Point getActualRenderResolution() const;
EWindowMode getPreferredWindowMode() const;
@ -86,4 +89,5 @@ public:
std::vector<Point> getSupportedResolutions() const final;
std::vector<Point> getSupportedResolutions(int displayIndex) const;
std::tuple<int, int> getSupportedScalingRange() const final;
Rect convertLogicalPointsToWindow(const Rect & input) const final;
};

9
client/widgets/Buttons.cpp
View File

@ -331,11 +331,16 @@ void CToggleBase::setEnabled(bool enabled)
// for overrides
}
void CToggleBase::setSelectedSilent(bool on)
{
selected = on;
doSelect(on);
}
void CToggleBase::setSelected(bool on)
{
bool changed = (on != selected);
selected = on;
doSelect(on);
setSelectedSilent(on);
if (changed)
callback(on);
}

3
client/widgets/Buttons.h
View File

@ -136,6 +136,9 @@ public:
/// Changes selection to "on", and calls callback
void setSelected(bool on);
/// Changes selection to "on" without calling callback
void setSelectedSilent(bool on);
void addCallback(std::function<void(bool)> callback);
/// Set whether the toggle is currently enabled for user to use, this is only inplemented in ToggleButton, not for other toggles yet.

17
client/windows/settings/GeneralOptionsTab.cpp
View File

@ -277,10 +277,18 @@ void GeneralOptionsTab::setGameResolution(int index)
gameRes["height"].Float() = resolution.y;
widget<CLabel>("resolutionLabel")->setText(resolutionToLabelString(resolution.x, resolution.y));
GH.dispatchMainThread([](){
boost::unique_lock<boost::recursive_mutex> lock(*CPlayerInterface::pim);
GH.onScreenResize();
});
}
void GeneralOptionsTab::setFullscreenMode(bool on, bool exclusive)
{
if (on == settings["video"]["fullscreen"].Bool() && exclusive == settings["video"]["realFullscreen"].Bool())
return;
setBoolSetting("video", "realFullscreen", exclusive);
setBoolSetting("video", "fullscreen", on);
@ -288,12 +296,17 @@ void GeneralOptionsTab::setFullscreenMode(bool on, bool exclusive)
std::shared_ptr<CToggleButton> fullscreenBorderlessCheckbox = widget<CToggleButton>("fullscreenBorderlessCheckbox");
if (fullscreenBorderlessCheckbox)
fullscreenBorderlessCheckbox->setSelected(on && !exclusive);
fullscreenBorderlessCheckbox->setSelectedSilent(on && !exclusive);
if (fullscreenExclusiveCheckbox)
fullscreenExclusiveCheckbox->setSelected(on && exclusive);
fullscreenExclusiveCheckbox->setSelectedSilent(on && exclusive);
updateResolutionSelector();
GH.dispatchMainThread([](){
boost::unique_lock<boost::recursive_mutex> lock(*CPlayerInterface::pim);
GH.onScreenResize();
});
}
void GeneralOptionsTab::selectGameScaling()

20
config/schemas/settings.json
View File

@ -109,13 +109,14 @@
"additionalProperties" : false,
"default" : {},
"required" : [
"resolution",
"fullscreen",
"realFullscreen",
"cursor",
"showIntro",
"spellbookAnimation",
"driver",
"resolution",
"reservedWidth",
"fullscreen",
"realFullscreen",
"cursor",
"showIntro",
"spellbookAnimation",
"driver",
"displayIndex",
"showfps",
"targetfps"
@ -134,6 +135,11 @@
"defaultAndroid" : {"width" : 800, "height" : 600, "scaling" : 200 },
"default" : {"width" : 800, "height" : 600, "scaling" : 100 }
},
"reservedWidth" : {
"type" : "number",
"defaultIOS" : 0.1, // iOS camera cutout / notch is excluded from available area by SDL
"default" : 0
},
"fullscreen" : {
"type" : "boolean",
"default" : false