diff options
author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-02-27 10:51:33 +0000 |
---|---|---|
committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-02-27 10:51:33 +0000 |
commit | 254c3db4a39aa35274fd7cd4ec2cccde5b92d71b (patch) | |
tree | 01c1b5ad71794c02b03d9c45f2c4b5043bc03163 /src/video.h | |
parent | 81e4f170d8ba4ccbcfa1e6c07bd0522dfc3b6e08 (diff) | |
download | mana-254c3db4a39aa35274fd7cd4ec2cccde5b92d71b.tar.gz mana-254c3db4a39aa35274fd7cd4ec2cccde5b92d71b.tar.bz2 mana-254c3db4a39aa35274fd7cd4ec2cccde5b92d71b.tar.xz mana-254c3db4a39aa35274fd7cd4ec2cccde5b92d71b.zip |
Added VSync and windowed fullscreen options
The configuration and setup UI were adjusted to the new options.
This also fixes issues in applying new video settings.
Default resolution was changed from 800x600 to 1280x720. VSync is
enabled by default while FPS limit was disabled.
Display aspect ratio for the resolution options.
I had to work around some macOS issues:
* Don't change window size when it appears to be "maximized", since it
just changes the rendering area while leaving the window maximized.
* Unset fullscreen display mode temporarily to allow changing resolutions,
otherwise the rendering area no longer matches the screen and mouse
input is also off.
* Removed SDL_WINDOW_ALLOW_HIGHDPI for now because it causes issues on
macOS, since we're not actually handling the scaling factor.
A Video class and an SDLGraphics subclass were split off from Graphics.
This setup has Less duplication and leaves the OpenGLGraphics and
SDLGraphics better separated.
Fixes #57
Fixes #58
Diffstat (limited to 'src/video.h')
-rw-r--r-- | src/video.h | 106 |
1 files changed, 106 insertions, 0 deletions
diff --git a/src/video.h b/src/video.h new file mode 100644 index 00000000..df9cd518 --- /dev/null +++ b/src/video.h @@ -0,0 +1,106 @@ +/* + * The Mana Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2012 The Mana Developers + * + * This file is part of The Mana Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef VIDEO_H +#define VIDEO_H + +#include "graphics.h" + +#include <memory> +#include <vector> + +static constexpr int defaultScreenWidth = 1280; +static constexpr int defaultScreenHeight = 720; + +enum class WindowMode +{ + Windowed = 0, + WindowedFullscreen = 1, + Fullscreen = 2, +}; + +struct DisplayMode +{ + int width = 0; + int height = 0; +}; + +struct VideoSettings +{ + WindowMode windowMode = WindowMode::Windowed; + int width = defaultScreenWidth; + int height = defaultScreenHeight; + int display = 0; + bool vsync = true; + bool openGL = false; + + bool operator==(const VideoSettings &other) const + { + return width == other.width && + height == other.height && + windowMode == other.windowMode && + display == other.display && + vsync == other.vsync && + openGL == other.openGL; + } +}; + +class Video +{ +public: + Video() = default; + ~Video(); + + const VideoSettings &settings() const { return mSettings; } + SDL_Window *window() const { return mWindow; } + Graphics *graphics() const { return mGraphics.get(); } + + /** + * Try to create a window with the given settings. + */ + Graphics *initialize(const VideoSettings &settings); + + /** + * Try to apply the given video settings. + */ + bool apply(const VideoSettings &settings); + + const DisplayMode &desktopDisplayMode() const + { + return mDesktopDisplayMode; + } + + const std::vector<DisplayMode> &displayModes() const + { + return mDisplayModes; + } + +private: + bool initDisplayModes(); + + VideoSettings mSettings; + DisplayMode mDesktopDisplayMode; + std::vector<DisplayMode> mDisplayModes; + std::unique_ptr<Graphics> mGraphics; + SDL_Window *mWindow = nullptr; +}; + +#endif // VIDEO_H |