Page MenuHomeWildfire Games
Differential D1925

High-DPI screen support
AbandonedPublic
Actions

Authored by wraitii on May 27 2019, 2:28 PM.

Details

Reviewers
None
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Trac Tickets
#2349
#2845
Summary

This is a refactoring of our logic for handling screen and GUI scaling. It introduces a ScreenSize class, and removes various width/height stored elsewhere.
This lets us switch to High-DPI mode while easily keeping the GUI scaled correctly.

Since the game uses SDL_WINDOW_FULLSCREEN_DESKTOP, we can't actually resize when in fullscreen, so don't pretend we do. Using
SDL_WINDOW_FULLSCREEN would be doable now, but probably for another patch.
If we ever scale the game view target (which would be nice to have a high-DPI GUI and a fast-enough renderer), this will also let us do it somewhat cleanly.

Probable TODO: fix screenshots, fix atlas, fix the cinematic. g_GuiScale should probably be added back. Also names are probably not perfect.

Test Plan

Test on various platforms.

Diff Detail

Repository
rP 0 A.D. Public Repository
Branch
D1925_high_dpi
Lint
Lint OK
Unit
No Unit Test Coverage
Build Status
Buildable 7650
Build 12475: Vulcan BuildJenkins
Build 12474: arc lint + arc unit

Event Timeline

wraitii created this revision.May 27 2019, 2:28 PM
Owners added subscribers: Restricted Owners Package, Restricted Owners Package.May 27 2019, 2:28 PM
vladislavbelov added a subscriber: vladislavbelov.May 27 2019, 2:39 PM

Yeah, I think it'd be good in future to have an option like a follow the platform scale (of course after UI scale fix).

What do you mean by TODO for cinematics?

Stan added a subscriber: Stan.May 27 2019, 2:45 PM

Some cc comments.

source/graphics/CinemaManager.cpp
208

static_cast<float>() * 2

source/graphics/TextRenderer.cpp
40–41

static_cast<float>() here and below or maybe use ints ?

source/gui/CGUI.cpp
94–95

static_cast<float>() here and below.

121–122

static_cast<float>() here and below.

source/gui/CTooltip.cpp
128–129

static_cast<float>() here and below.

source/ps/CConsole.cpp
88

0.f, 0.f, static_cast<float>() ,

source/ps/GameSetup/GameSetup.cpp
276

null → nullptr.

294

static_cast<float>()

source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp
176–177

Should be rebased after vladislav's patch.

Harbormaster failed remote builds in B7632: Diff 8169!May 27 2019, 2:59 PM
Vulcan added a comment.May 27 2019, 2:59 PM

Build failure - The Moirai have given mortals hearts that can endure.

Linter detected issues:
Executing section Source...

source/simulation2/scripting/JSInterface_Simulation.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/gui/CDropDown.cpp
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/ps/VideoMode.h
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/ps/GameSetup/GameSetup.h
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/ps/GameSetup/Config.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/lib/sysdep/arch/x86_x64/topology.cpp
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/gui/scripting/GuiScriptConversions.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/ps/VideoMode.cpp
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/lib/res/graphics/cursor.h
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/gui/MiniMap.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/gui/CGUI.cpp
|1674| »   m_ScrollBarStyles[name]·=·scrollbar;
|    | [MAJOR] CPPCheckBear (uninitStructMember):
|    | Uninitialized struct member: scrollbar.m_ScrollWheel

source/gui/CGUI.cpp
|1674| »   m_ScrollBarStyles[name]·=·scrollbar;
|    | [MAJOR] CPPCheckBear (uninitStructMember):
|    | Uninitialized struct member: scrollbar.m_ScrollSpeed

source/gui/CGUI.cpp
|1674| »   m_ScrollBarStyles[name]·=·scrollbar;
|    | [MAJOR] CPPCheckBear (uninitStructMember):
|    | Uninitialized struct member: scrollbar.m_ScrollButtons

source/ps/Util.cpp
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/ps/CConsole.h
|   1| /*·Copyright·(C)·2015·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2015"

source/ps/ProfileViewer.cpp
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/gui/CTooltip.cpp
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/graphics/CinemaManager.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/gui/CInput.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/gui/IGUIObject.cpp
|   1| /*·Copyright·(C)·2016·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2016"

source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
| 213| The line belonging to the following result cannot be printed because it refers to a line that doesn't seem to exist in the given file.
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Invalid number of character '{' when these macros are defined: 'MESSAGESSETUP_NOTFIRST'.

source/gui/GUIutil.cpp
|   1| /*·Copyright·(C)·2016·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2016"

source/ps/TouchInput.cpp
|   1| /*·Copyright·(C)·2015·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2015"

source/renderer/SilhouetteRenderer.cpp
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/graphics/TextRenderer.cpp
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/ps/GameSetup/Config.h
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp
| 213| }
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Invalid number of character '{' when these macros are defined: 'MESSAGESSETUP_NOTFIRST'.

source/ps/CConsole.cpp
|   1| /*·Copyright·(C)·2016·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2016"

source/tools/atlas/GameInterface/View.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/tools/atlas/GameInterface/View.cpp
| 213| »   //·Cinematic·motion·should·be·independent·of·simulation·update,·so·we·can
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Invalid number of character '{' when these macros are defined: 'MESSAGESSETUP_NOTFIRST'.
Executing section JS...
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/differential/1519/display/redirect

wraitii added a comment.May 27 2019, 4:29 PM
In D1925#79528, @vladislavbelov wrote:

Yeah, I think it'd be good in future to have an option like a follow the platform scale (of course after UI scale fix).

What do you mean by TODO for cinematics?

I mean they're probably broken by the current version of the diff because I've been too lazy to check.

Stan added a comment.May 27 2019, 4:31 PM

TODO: Finding motivation, and actually checking before breaking :P

wraitii updated this revision to Diff 8186.May 28 2019, 2:36 PM

Just for fun, this introduces renderer scaling when the post-processor is enabled (since then we render to an FBO).
Code is a bit of a mess, this probably needs a refactoring first, but that probably could use D1929 first.

This lets us do fun stuff such as play in glorious Retina or in 0.1x the expected resolution.

Vulcan added a comment.May 28 2019, 2:39 PM

Build failure - The Moirai have given mortals hearts that can endure.

Linter detected issues:
Executing section Source...

source/ps/GameSetup/Config.h
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/lib/sysdep/arch/x86_x64/topology.cpp
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/ps/CConsole.h
|   1| /*·Copyright·(C)·2015·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2015"

source/renderer/PostprocManager.cpp
|   1| /*·Copyright·(C)·2015·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2015"

source/simulation2/scripting/JSInterface_Simulation.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/renderer/SilhouetteRenderer.cpp
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/gui/IGUIObject.cpp
|   1| /*·Copyright·(C)·2016·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2016"

source/ps/ProfileViewer.cpp
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/ps/CConsole.cpp
|   1| /*·Copyright·(C)·2016·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2016"

source/gui/MiniMap.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/graphics/CinemaManager.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/ps/VideoMode.cpp
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/ps/VideoMode.h
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/gui/CInput.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/gui/GUIutil.cpp
|   1| /*·Copyright·(C)·2016·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2016"

source/gui/CDropDown.cpp
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/graphics/TextRenderer.cpp
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/gui/GUIManager.cpp
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/tools/atlas/GameInterface/View.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/tools/atlas/GameInterface/View.cpp
| 213| »   //·Cinematic·motion·should·be·independent·of·simulation·update,·so·we·can
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Invalid number of character '{' when these macros are defined: 'MESSAGESSETUP_NOTFIRST'.

source/gui/CGUI.cpp
|1674| »   m_ScrollBarStyles[name]·=·scrollbar;
|    | [MAJOR] CPPCheckBear (uninitStructMember):
|    | Uninitialized struct member: scrollbar.m_ScrollWheel

source/gui/CGUI.cpp
|1674| »   m_ScrollBarStyles[name]·=·scrollbar;
|    | [MAJOR] CPPCheckBear (uninitStructMember):
|    | Uninitialized struct member: scrollbar.m_ScrollSpeed

source/gui/CGUI.cpp
|1674| »   m_ScrollBarStyles[name]·=·scrollbar;
|    | [MAJOR] CPPCheckBear (uninitStructMember):
|    | Uninitialized struct member: scrollbar.m_ScrollButtons

source/ps/GameSetup/GameSetup.h
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/lib/res/graphics/cursor.h
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/ps/TouchInput.cpp
|   1| /*·Copyright·(C)·2015·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2015"

source/ps/GameSetup/Config.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/ps/Util.cpp
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/renderer/ShadowMap.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/gui/scripting/GuiScriptConversions.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp
| 213| }
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Invalid number of character '{' when these macros are defined: 'MESSAGESSETUP_NOTFIRST'.

source/gui/CTooltip.cpp
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/renderer/scripting/JSInterface_Renderer.cpp
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
| 213| The line belonging to the following result cannot be printed because it refers to a line that doesn't seem to exist in the given file.
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Invalid number of character '{' when these macros are defined: 'MESSAGESSETUP_NOTFIRST'.
Executing section JS...
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/differential/1530/display/redirect

Harbormaster failed remote builds in B7650: Diff 8186!May 28 2019, 2:39 PM
Stan added a comment.May 28 2019, 2:43 PM

So you introduced sub sampling and super sampling :) might want to split it in anothe

Stan mentioned this in rP22327: Fix the smoothing group issue reported by @vladislavbelov on the chat today….May 31 2019, 3:22 PM
wraitii added a comment.Jun 15 2019, 6:56 PM

GUI with no high-dpi support:

GUI with high-dpi support:

They are subtly different but the high-dpi scaled up looks sharper to me.

Stan added a comment.Jun 15 2019, 11:43 PM

The bars are somewhat brighter also.

historic_bruno added a subscriber: historic_bruno.Jul 11 2019, 4:28 AM
Krinkle added a subscriber: Krinkle.Sep 15 2019, 1:38 AM
user1 added a subscriber: user1.Nov 3 2019, 12:12 AM
wraitii abandoned this revision.Jan 19 2023, 11:13 AM

irrelevant now, too many related & unrelated changes since.

Revision Contents
Changeset List

PathSize
binaries/
data/
config/
10 lines
source/
graphics/
9 lines
20 lines
12 lines
6 lines
gui/
5 lines
20 lines
12 lines
7 lines
3 lines
8 lines
4 lines
16 lines
scripting/
1 line
lib/
res/
graphics/
2 lines
sysdep/
arch/
x86_x64/
8 lines
ps/
2 lines
7 lines
GameSetup/
2 lines
9 lines
2 lines
19 lines
3 lines
55 lines
102 lines
9 lines
10 lines
7 lines
129 lines
renderer/
11 lines
3 lines
9 lines
scripting/
18 lines
simulation2/
scripting/
6 lines
tools/
atlas/
GameInterface/
Handlers/
7 lines
14 lines
11 lines

Diff 8186

View Options

binaries/data/config/default.cfg

Loading...
View Options

source/graphics/Camera.cpp

Loading...
View Options

source/graphics/CinemaManager.cpp

Loading...
View Options

source/graphics/GameView.cpp

Loading...
View Options

source/graphics/TextRenderer.cpp

Loading...
View Options

source/gui/CDropDown.cpp

Loading...
View Options

source/gui/CGUI.cpp

Loading...
View Options

source/gui/CInput.cpp

Loading...
View Options

source/gui/CTooltip.cpp

Loading...
View Options

source/gui/GUIManager.cpp

Loading...
View Options

source/gui/GUIutil.cpp

Loading...
View Options

source/gui/IGUIObject.cpp

Loading...
View Options

source/gui/MiniMap.cpp

Loading...
View Options

source/gui/scripting/GuiScriptConversions.cpp

Loading...
View Options

source/lib/res/graphics/cursor.h

Loading...
View Options

source/lib/sysdep/arch/x86_x64/topology.cpp

Loading...
View Options

source/ps/CConsole.h

Loading...
View Options

source/ps/CConsole.cpp

Loading...
View Options

source/ps/GameSetup/Config.h

Loading...
View Options

source/ps/GameSetup/Config.cpp

Loading...
View Options

source/ps/GameSetup/GameSetup.h

Loading...
View Options

source/ps/GameSetup/GameSetup.cpp

Loading...
View Options

source/ps/ProfileViewer.cpp

Loading...
View Options

source/ps/ScreenSize.h

Loading...
View Options

source/ps/ScreenSize.cpp

Loading...
View Options

source/ps/TouchInput.cpp

Loading...
View Options

source/ps/Util.cpp

Loading...
View Options

source/ps/VideoMode.h

Loading...
View Options

source/ps/VideoMode.cpp

Loading...
View Options

source/renderer/PostprocManager.cpp

Loading...
View Options

source/renderer/ShadowMap.cpp

Loading...
View Options

source/renderer/SilhouetteRenderer.cpp

Loading...
View Options

source/renderer/scripting/JSInterface_Renderer.cpp

Loading...
View Options

source/simulation2/scripting/JSInterface_Simulation.cpp

Loading...
View Options

source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp

Loading...
View Options

source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp

Loading...
View Options

source/tools/atlas/GameInterface/View.cpp

Loading...
Wildfire Games · Phabricator