Quent42340/OpenMiner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SettingsMenuState] Added 'Resolution' setting.

Browse Source
This commit is contained in:
Quentin Bazin 2020-02-15 22:25:29 +09:00
parent 56338f1f79
commit e798541304
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/source/core/ClientApplication.cpp
View File

@ -80,6 +80,10 @@ void ClientApplication::handleEvents() {
|| (!Config::isFullscreenModeEnabled && m_window.getWindowMode() != gk::Window::Mode::Windowed)) {
m_window.setWindowMode(Config::isFullscreenModeEnabled ? gk::Window::Mode::Fullscreen : gk::Window::Mode::Windowed);
}
if (SCREEN_WIDTH != m_window.getSize().x || SCREEN_HEIGHT != m_window.getSize().y) {
m_window.resize(SCREEN_WIDTH, SCREEN_HEIGHT);
}
}
void ClientApplication::initOpenGL() {

25
client/source/states/SettingsMenuState.cpp
View File

@ -113,7 +113,7 @@ void SettingsMenuState::addGameplayButtons() {
}
void SettingsMenuState::addGraphicsButtons() {
m_menuWidget.reset(1, 8);
m_menuWidget.reset(2, 8);
m_menuWidget.addButton("Render Distance: " + std::to_string(Config::renderDistance), [] (TextButton &button) {
Config::renderDistance = std::max(4, (Config::renderDistance + 2) % 16);
@ -121,10 +121,11 @@ void SettingsMenuState::addGraphicsButtons() {
World::isReloadRequested = true;
});
addToggleButton("Wireframe Mode", Config::isWireframeModeEnabled, false);
addToggleButton("Torch Smooth Lighting", Config::isTorchSmoothLightingEnabled, true);
addToggleButton("Sun Smooth Lighting", Config::isSunSmoothLightingEnabled, true);
addToggleButton("Ambient Occlusion", Config::isAmbientOcclusionEnabled, false);
addToggleButton("Wireframe Mode", Config::isWireframeModeEnabled, false);
m_menuWidget.addButton("GUI Scale: " + std::to_string(GUI_SCALE), [] (TextButton &button) {
GUI_SCALE = 1 + (GUI_SCALE + 1) % 3;
@ -132,6 +133,26 @@ void SettingsMenuState::addGraphicsButtons() {
});
addToggleButton("Fullscreen", Config::isFullscreenModeEnabled, false);
m_menuWidget.addButton("Resolution: " + std::to_string((int)SCREEN_WIDTH) + "x" + std::to_string((int)SCREEN_HEIGHT), [] (TextButton &button) {
if (Config::isFullscreenModeEnabled) return;
// FIXME: Find a better way to do this
if (SCREEN_WIDTH == 1600 && SCREEN_HEIGHT == 1050) {
SCREEN_WIDTH = 1280;
SCREEN_HEIGHT = 720;
}
else if (SCREEN_WIDTH == 1280 && SCREEN_HEIGHT == 720) {
SCREEN_WIDTH = 1920;
SCREEN_HEIGHT = 1080;
}
else {
SCREEN_WIDTH = 1600;
SCREEN_HEIGHT = 1050;
}
button.setText("Resolution: " + std::to_string((int)SCREEN_WIDTH) + "x" + std::to_string((int)SCREEN_HEIGHT));
});
m_menuWidget.addButton("Use VSync: ON", [] (TextButton &) {}).setEnabled(false);
}