From b2d41daabcea8a5d0a57c4afdf654c0bd5859fcb Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Wed, 6 Jan 2021 23:24:00 +0000 Subject: [PATCH] GUI: Add improved scaler selection to the Options dialog --- base/commandLine.cpp | 15 ++- base/main.cpp | 1 + engines/engine.cpp | 3 + gui/ThemeEngine.h | 2 +- gui/editgamedialog.cpp | 2 + gui/options.cpp | 112 ++++++++++++++++++ gui/options.h | 3 + gui/themes/default.inc | 22 ++++ gui/themes/residualvm.zip | Bin 53254 -> 53290 bytes gui/themes/residualvm/THEMERC | 2 +- gui/themes/residualvm/residualvm_layout.stx | 11 ++ .../residualvm/residualvm_layout_lowres.stx | 11 ++ gui/themes/scummclassic.zip | Bin 26150 -> 26187 bytes gui/themes/scummclassic/THEMERC | 2 +- gui/themes/scummclassic/classic_layout.stx | 11 ++ .../scummclassic/classic_layout_lowres.stx | 11 ++ gui/themes/scummmodern.zip | Bin 73604 -> 73640 bytes gui/themes/scummmodern/THEMERC | 2 +- gui/themes/scummmodern/scummmodern_layout.stx | 11 ++ .../scummmodern/scummmodern_layout_lowres.stx | 11 ++ gui/themes/scummremastered.zip | Bin 93504 -> 93540 bytes gui/themes/scummremastered/THEMERC | 2 +- .../scummremastered/remastered_layout.stx | 11 ++ .../remastered_layout_lowres.stx | 11 ++ 24 files changed, 248 insertions(+), 8 deletions(-) diff --git a/base/commandLine.cpp b/base/commandLine.cpp index 1fe8bb6af4c..553dccb7cac 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -103,10 +103,11 @@ static const char HELP_STRING[] = " -x, --save-slot[=NUM] Save game slot to load (default: autosave)\n" " -f, --fullscreen Force full-screen mode\n" " -F, --no-fullscreen Force windowed mode\n" - " -g, --gfx-mode=MODE Select graphics scaler (1x,2x,3x,2xsai,super2xsai,\n" - " supereagle,advmame2x,advmame3x,hq2x,hq3x,tv2x,\n" - " dotmatrix)\n" + " -g, --gfx-mode=MODE Select graphics mode\n" " --stretch-mode=MODE Select stretch mode (center, integral, fit, stretch)\n" + " --scaler=MODE Select graphics scaler (normal,hq,edge,advmame,sai,\n" + " supersai,supereagle,pm,dotmatrix,tv2x)\n" + " --scale-factor=FACTOR Factor to scale the graphics by\n" " --filtering Force filtered graphics mode\n" " --no-filtering Force unfiltered graphics mode\n" #ifdef USE_OPENGL @@ -248,6 +249,8 @@ void registerDefaults() { ConfMan.registerDefault("render_mode", "default"); ConfMan.registerDefault("desired_screen_aspect_ratio", "auto"); ConfMan.registerDefault("stretch_mode", "default"); + ConfMan.registerDefault("scaler", "default"); + ConfMan.registerDefault("scale_factor", -1); ConfMan.registerDefault("shader", "default"); ConfMan.registerDefault("show_fps", false); ConfMan.registerDefault("dirtyrects", true); @@ -663,6 +666,12 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, const cha DO_LONG_OPTION("stretch-mode") END_OPTION + DO_LONG_OPTION("scaler") + END_OPTION + + DO_LONG_OPTION_INT("scale-factor") + END_OPTION + DO_LONG_OPTION("shader") END_OPTION diff --git a/base/main.cpp b/base/main.cpp index 6229c5ae85f..cb466f969f2 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -343,6 +343,7 @@ static void setupGraphics(OSystem &system) { system.setGraphicsMode(ConfMan.get("gfx_mode").c_str()); system.setStretchMode(ConfMan.get("stretch_mode").c_str()); system.setShader(ConfMan.get("shader").c_str()); + system.setScaler(ConfMan.get("scaler").c_str(), ConfMan.getInt("scale_factor")); system.initSize(320, 200); diff --git a/engines/engine.cpp b/engines/engine.cpp index a279734dcec..45d69a40127 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -215,6 +215,9 @@ void initCommonGFX() { if (gameDomain->contains("stretch_mode")) g_system->setStretchMode(ConfMan.get("stretch_mode").c_str()); + if (gameDomain->contains("scaler") || gameDomain->contains("scale_factor")) + g_system->setScaler(ConfMan.get("scaler").c_str(), ConfMan.getInt("scale_factor")); + if (gameDomain->contains("shader")) g_system->setShader(ConfMan.get("shader").c_str()); } diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h index 2db54cb9b5e..38cd57b98c8 100644 --- a/gui/ThemeEngine.h +++ b/gui/ThemeEngine.h @@ -37,7 +37,7 @@ #include "graphics/pixelformat.h" -#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.46" +#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.47" class OSystem; diff --git a/gui/editgamedialog.cpp b/gui/editgamedialog.cpp index 304a701c105..9df5c3579e7 100644 --- a/gui/editgamedialog.cpp +++ b/gui/editgamedialog.cpp @@ -411,6 +411,8 @@ void EditGameDialog::open() { e = ConfMan.hasKey("gfx_mode", _domain) || ConfMan.hasKey("render_mode", _domain) || ConfMan.hasKey("stretch_mode", _domain) || + ConfMan.hasKey("scaler", _domain) || + ConfMan.hasKey("scale_factor", _domain) || ConfMan.hasKey("aspect_ratio", _domain) || ConfMan.hasKey("fullscreen", _domain) || ConfMan.hasKey("vsync", _domain) || diff --git a/gui/options.cpp b/gui/options.cpp index 482b45c0600..3c84708ba7d 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -64,6 +64,7 @@ #endif #include "graphics/renderer.h" +#include "graphics/scalerplugin.h" namespace GUI { @@ -90,6 +91,7 @@ enum { kKbdMouseSpeedChanged = 'kmsc', kJoystickDeadzoneChanged= 'jodc', kGraphicsTabContainerReflowCmd = 'gtcr', + kScalerPopUpCmd = 'scPU', kFullscreenToggled = 'oful' }; @@ -185,6 +187,9 @@ void OptionsDialog::init() { _renderModePopUpDesc = nullptr; _stretchPopUp = nullptr; _stretchPopUpDesc = nullptr; + _scalerPopUp = nullptr; + _scalerPopUpDesc = nullptr; + _scaleFactorPopUp = nullptr; _fullscreenCheckbox = nullptr; _filteringCheckbox = nullptr; _aspectCheckbox = nullptr; @@ -350,6 +355,37 @@ void OptionsDialog::build() { _stretchPopUp->setVisible(false); } + _scalerPopUp->setSelected(0); + _scaleFactorPopUp->setSelected(0); + + if (g_system->hasFeature(OSystem::kFeatureScalers)) { + if (ConfMan.hasKey("scaler", _domain)) { + const PluginList &scalerPlugins = ScalerMan.getPlugins(); + Common::String scaler(ConfMan.get("scaler", _domain)); + + for (uint scalerIndex = 0; scalerIndex < scalerPlugins.size(); scalerIndex++) { + if (scumm_stricmp(scalerPlugins[scalerIndex]->get().getName(), scaler.c_str()) != 0) + continue; + + _scalerPopUp->setSelectedTag(scalerIndex); + updateScaleFactors(scalerIndex); + + if (ConfMan.hasKey("scale_factor", _domain)) { + int scaleFactor = ConfMan.getInt("scale_factor", _domain); + if (scalerPlugins[scalerIndex]->get().hasFactor(scaleFactor)) + _scaleFactorPopUp->setSelectedTag(scaleFactor); + } + + break; + } + + } + } else { + _scalerPopUpDesc->setVisible(false); + _scalerPopUp->setVisible(false); + _scaleFactorPopUp->setVisible(false); + } + // Fullscreen setting if (g_system->hasFeature(OSystem::kFeatureFullscreenMode)) { _fullscreenCheckbox->setState(ConfMan.getBool("fullscreen", _domain)); @@ -587,6 +623,31 @@ void OptionsDialog::apply() { graphicsModeChanged = true; } + isSet = false; + const PluginList &scalerPlugins = ScalerMan.getPlugins(); + if ((int32)_scalerPopUp->getSelectedTag() >= 0) { + const char *name = scalerPlugins[_scalerPopUp->getSelectedTag()]->get().getName(); + if (ConfMan.get("scaler", _domain) != name) + graphicsModeChanged = true; + ConfMan.set("scaler", name, _domain); + + int factor = _scaleFactorPopUp->getSelectedTag(); + if (ConfMan.getInt("scale_factor", _domain) != factor) + graphicsModeChanged = true; + ConfMan.setInt("scale_factor", factor, _domain); + isSet = true; + } + if (!isSet) { + ConfMan.removeKey("scaler", _domain); + ConfMan.removeKey("scale_factor", _domain); + + uint defaultScaler = g_system->getDefaultScaler(); + if (g_system->getScaler() != defaultScaler) + graphicsModeChanged = true; + else if (scalerPlugins[defaultScaler]->get().getFactor() != g_system->getDefaultScaleFactor()) + graphicsModeChanged = true; + } + if (_rendererTypePopUp->getSelectedTag() > 0) { Graphics::RendererType selected = (Graphics::RendererType) _rendererTypePopUp->getSelectedTag(); ConfMan.set("renderer", Graphics::getRendererTypeCode(selected), _domain); @@ -607,6 +668,8 @@ void OptionsDialog::apply() { ConfMan.removeKey("aspect_ratio", _domain); ConfMan.removeKey("gfx_mode", _domain); ConfMan.removeKey("stretch_mode", _domain); + ConfMan.removeKey("scaler", _domain); + ConfMan.removeKey("scale_factor", _domain); ConfMan.removeKey("render_mode", _domain); ConfMan.removeKey("renderer", _domain); ConfMan.removeKey("antialiasing", _domain); @@ -647,6 +710,7 @@ void OptionsDialog::apply() { g_system->beginGFXTransaction(); g_system->setGraphicsMode(ConfMan.get("gfx_mode", _domain).c_str()); g_system->setStretchMode(ConfMan.get("stretch_mode", _domain).c_str()); + g_system->setScaler(ConfMan.get("scaler", _domain).c_str(), ConfMan.getInt("scale_factor", _domain)); if (ConfMan.hasKey("aspect_ratio")) g_system->setFeatureState(OSystem::kFeatureAspectRatioCorrection, ConfMan.getBool("aspect_ratio", _domain)); @@ -967,6 +1031,10 @@ void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data case kGraphicsTabContainerReflowCmd: setupGraphicsTab(); break; + case kScalerPopUpCmd: + updateScaleFactors(data); + g_gui.scheduleTopDialogRedraw(); + break; case kApplyCmd: apply(); break; @@ -1007,6 +1075,9 @@ void OptionsDialog::setGraphicSettingsState(bool enabled) { _renderModePopUp->setEnabled(enabled); _stretchPopUpDesc->setEnabled(enabled); _stretchPopUp->setEnabled(enabled); + _scalerPopUpDesc->setEnabled(enabled); + _scalerPopUp->setEnabled(enabled); + _scaleFactorPopUp->setEnabled(enabled); _vsyncCheckbox->setEnabled(enabled); _filteringCheckbox->setEnabled(enabled); _rendererTypePopUpDesc->setEnabled(enabled); @@ -1353,6 +1424,20 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr sm++; } + // The Scaler popup + const PluginList &scalerPlugins = ScalerMan.getPlugins(); + _scalerPopUpDesc = new StaticTextWidget(boss, prefix + "grScalerPopupDesc", _("Scaler:")); + _scalerPopUp = new PopUpWidget(boss, prefix + "grScalerPopup", Common::U32String(), kScalerPopUpCmd); + + _scalerPopUp->appendEntry(_("")); + _scalerPopUp->appendEntry(Common::U32String()); + for (uint scalerIndex = 0; scalerIndex < scalerPlugins.size(); scalerIndex++) { + _scalerPopUp->appendEntry(_c(scalerPlugins[scalerIndex]->get().getPrettyName(), context), scalerIndex); + } + + _scaleFactorPopUp = new PopUpWidget(boss, prefix + "grScaleFactorPopup"); + updateScaleFactors(_scalerPopUp->getSelectedTag()); + // Fullscreen checkbox _fullscreenCheckbox = new CheckboxWidget(boss, prefix + "grFullscreenCheckbox", _("Fullscreen mode"), Common::U32String(), kFullscreenToggled); @@ -1722,6 +1807,33 @@ void OptionsDialog::setupGraphicsTab() { _aspectCheckbox->setVisible(true); _renderModePopUpDesc->setVisible(true); _renderModePopUp->setVisible(true); + + if (g_system->hasFeature(OSystem::kFeatureScalers)) { + _scalerPopUpDesc->setVisible(true); + _scalerPopUp->setVisible(true); + _scaleFactorPopUp->setVisible(true); + } else { + _scalerPopUpDesc->setVisible(false); + _scalerPopUp->setVisible(false); + _scaleFactorPopUp->setVisible(false); + } +} + +void OptionsDialog::updateScaleFactors(uint32 tag) { + if ((int32)tag >= 0) { + const PluginList &scalerPlugins = ScalerMan.getPlugins(); + const Common::Array &factors = scalerPlugins[tag]->get().getFactors(); + + _scaleFactorPopUp->clearEntries(); + for (Common::Array::const_iterator it = factors.begin(); it != factors.end(); it++) { + _scaleFactorPopUp->appendEntry(Common::U32String::format("%dx", (*it)), (*it)); + } + _scaleFactorPopUp->setSelectedTag(scalerPlugins[tag]->get().getFactor()); + } else { + _scaleFactorPopUp->clearEntries(); + _scaleFactorPopUp->appendEntry(_("")); + _scaleFactorPopUp->setSelected(0); + } } #pragma mark - diff --git a/gui/options.h b/gui/options.h index a2af96d97cb..156a8c762f6 100644 --- a/gui/options.h +++ b/gui/options.h @@ -112,6 +112,7 @@ protected: void setSubtitleSettingsState(bool enabled); virtual void setupGraphicsTab(); + void updateScaleFactors(uint32 tag); bool loadMusicDeviceSetting(PopUpWidget *popup, Common::String setting, MusicType preferredType = MT_AUTO); void saveMusicDeviceSetting(PopUpWidget *popup, Common::String setting); @@ -152,6 +153,8 @@ private: PopUpWidget *_gfxPopUp; StaticTextWidget *_stretchPopUpDesc; PopUpWidget *_stretchPopUp; + StaticTextWidget *_scalerPopUpDesc; + PopUpWidget *_scalerPopUp, *_scaleFactorPopUp; CheckboxWidget *_fullscreenCheckbox; CheckboxWidget *_filteringCheckbox; CheckboxWidget *_aspectCheckbox; diff --git a/gui/themes/default.inc b/gui/themes/default.inc index ce339e96577..99ca9239d1f 100644 --- a/gui/themes/default.inc +++ b/gui/themes/default.inc @@ -1703,6 +1703,17 @@ const char *defaultXML1 = "" "type='PopUp' " "/>" "" +"" +"" +"" +"" +"" "" @@ -3532,6 +3543,17 @@ const char *defaultXML1 = "" "type='PopUp' " "/>" "" +"" +"" +"" +"" +"" "" diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip index 3a147828a6b46d6ff3f9aaf0089c23de32277a8c..1373f4463654635fffc4c96099b7677db1219260 100644 GIT binary patch delta 8833 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 + + + + + diff --git a/gui/themes/residualvm/residualvm_layout_lowres.stx b/gui/themes/residualvm/residualvm_layout_lowres.stx index 672ca184a16..c41d1f86702 100644 --- a/gui/themes/residualvm/residualvm_layout_lowres.stx +++ b/gui/themes/residualvm/residualvm_layout_lowres.stx @@ -329,6 +329,17 @@ type = 'PopUp' /> + + + + + diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip index eeba51f236aa9bda616f62f8fdfdc372fa815eb9..1c042b5757748dddca3274ea01a802f33650fcd4 100644 GIT binary patch delta 9265 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 RC#GazJUcv;1?zvx{y&lY<4OPk delta 9203 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 aT>ynx5dSNKTN8lKf{3i?Vd~BQ3Hcw9l%=5n diff --git a/gui/themes/scummclassic/THEMERC b/gui/themes/scummclassic/THEMERC index effd352ba93..1168571bad6 100644 --- a/gui/themes/scummclassic/THEMERC +++ b/gui/themes/scummclassic/THEMERC @@ -1 +1 @@ -[SCUMMVM_STX0.8.46:ScummVM Classic Theme:No Author] +[SCUMMVM_STX0.8.47:ScummVM Classic Theme:No Author] diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx index 341ece40368..44951a4338c 100644 --- a/gui/themes/scummclassic/classic_layout.stx +++ b/gui/themes/scummclassic/classic_layout.stx @@ -333,6 +333,17 @@ type = 'PopUp' /> + + + + + diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx index beb7e3ef41d..c889eb1f72f 100644 --- a/gui/themes/scummclassic/classic_layout_lowres.stx +++ b/gui/themes/scummclassic/classic_layout_lowres.stx @@ -329,6 +329,17 @@ type = 'PopUp' /> + + + + + diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip index 63641955b3c234d0c76412c012da3ce295528c23..1f54ab59fa29c7eae4cc2a200ceb1727642d9cae 100644 GIT binary patch delta 8929 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 diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC index cca3a45e7bc..e9b67c543b3 100644 --- a/gui/themes/scummmodern/THEMERC +++ b/gui/themes/scummmodern/THEMERC @@ -1 +1 @@ -[SCUMMVM_STX0.8.46:ScummVM Modern Theme:No Author] +[SCUMMVM_STX0.8.47:ScummVM Modern Theme:No Author] diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx index 5ae7adc21cc..c93237e8c12 100644 --- a/gui/themes/scummmodern/scummmodern_layout.stx +++ b/gui/themes/scummmodern/scummmodern_layout.stx @@ -347,6 +347,17 @@ type = 'PopUp' /> + + + + + diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx index 672ca184a16..c41d1f86702 100644 --- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx +++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx @@ -329,6 +329,17 @@ type = 'PopUp' /> + + + + + diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip index 35b7048e7226538f1fe91eedb0a68ae769f92664..90cc62a86e25bf7a982aec244c198fd5f7a7d32b 100644 GIT binary patch delta 12228 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 Cz)PV3 delta 12178 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 w6F&IWdRcI?C1^UZ9Gn8tYx}LJJ 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 diff --git a/gui/themes/scummremastered/THEMERC b/gui/themes/scummremastered/THEMERC index c3e5b418a44..1272ed64dee 100644 --- a/gui/themes/scummremastered/THEMERC +++ b/gui/themes/scummremastered/THEMERC @@ -1 +1 @@ -[SCUMMVM_STX0.8.46:ScummVM Modern Theme Remastered:No Author] +[SCUMMVM_STX0.8.47:ScummVM Modern Theme Remastered:No Author] diff --git a/gui/themes/scummremastered/remastered_layout.stx b/gui/themes/scummremastered/remastered_layout.stx index 0694882ff88..277dd6f3c31 100644 --- a/gui/themes/scummremastered/remastered_layout.stx +++ b/gui/themes/scummremastered/remastered_layout.stx @@ -349,6 +349,17 @@ type = 'PopUp' /> + + + + + diff --git a/gui/themes/scummremastered/remastered_layout_lowres.stx b/gui/themes/scummremastered/remastered_layout_lowres.stx index c05368635d1..4292b8b7ecb 100644 --- a/gui/themes/scummremastered/remastered_layout_lowres.stx +++ b/gui/themes/scummremastered/remastered_layout_lowres.stx @@ -331,6 +331,17 @@ type = 'PopUp' /> + + + + +