summaryrefslogtreecommitdiff
path: root/src/openglgraphics.h
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-02-27 10:51:33 +0000
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-02-27 10:51:33 +0000
commit254c3db4a39aa35274fd7cd4ec2cccde5b92d71b (patch)
tree01c1b5ad71794c02b03d9c45f2c4b5043bc03163 /src/openglgraphics.h
parent81e4f170d8ba4ccbcfa1e6c07bd0522dfc3b6e08 (diff)
downloadmana-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/openglgraphics.h')
-rw-r--r--src/openglgraphics.h22
1 files changed, 8 insertions, 14 deletions
diff --git a/src/openglgraphics.h b/src/openglgraphics.h
index d300dfd7..0bb07363 100644
--- a/src/openglgraphics.h
+++ b/src/openglgraphics.h
@@ -29,19 +29,14 @@
#include <SDL_opengl.h>
-class OpenGLGraphics : public Graphics
+class OpenGLGraphics final : public Graphics
{
public:
- OpenGLGraphics();
+ OpenGLGraphics(SDL_Window *window, SDL_GLContext glContext);
~OpenGLGraphics() override;
- /**
- * Sets whether vertical refresh syncing is enabled. Takes effect
- * immediately.
- */
- void setSync(bool sync);
- bool getSync() const { return mSync; }
+ void setVSync(bool sync) override;
/**
* Sets whether input lag should be reduced.
@@ -53,8 +48,6 @@ class OpenGLGraphics : public Graphics
void setReduceInputLag(bool reduceInputLag);
bool getReduceInputLag() const { return mReduceInputLag; }
- bool setVideoMode(int w, int h, bool fs) override;
-
void videoResized(int w, int h) override;
bool drawImage(Image *image,
@@ -120,14 +113,15 @@ class OpenGLGraphics : public Graphics
void drawQuadArrayii(int size);
+ SDL_Window *mWindow = nullptr;
SDL_GLContext mContext = nullptr;
GLfloat *mFloatTexArray;
GLint *mIntTexArray;
GLint *mIntVertArray;
- bool mAlpha, mTexture;
- bool mColorAlpha;
- bool mSync;
- bool mReduceInputLag;
+ bool mAlpha = false;
+ bool mTexture = false;
+ bool mColorAlpha = false;
+ bool mReduceInputLag = true;
};
#endif //USE_OPENGL