From 5f74dfa2baadccacda968792d288ed329b4a73a6 Mon Sep 17 00:00:00 2001 From: thecozies <79979276+thecozies@users.noreply.github.com> Date: Wed, 27 Mar 2024 17:43:15 -0500 Subject: [PATCH] added downsampling option --- assets/config_menu/graphics.rml | 39 +++++++++++++++++++++------------ src/game/config.cpp | 4 ++++ src/recomp/rt64_layer.cpp | 8 +++++-- src/ui/ui_config.cpp | 9 ++++++++ ultramodern/config.hpp | 1 + 5 files changed, 45 insertions(+), 16 deletions(-) diff --git a/assets/config_menu/graphics.rml b/assets/config_menu/graphics.rml index 60e8020..9f88780 100644 --- a/assets/config_menu/graphics.rml +++ b/assets/config_menu/graphics.rml @@ -17,12 +17,14 @@
- +
- - - - + + + + + +
@@ -37,16 +39,12 @@
- +
- - - - - - - + + + +
@@ -85,6 +83,19 @@ +
+ +
+ + + + + + + +
+
diff --git a/src/game/config.cpp b/src/game/config.cpp index e1b2df1..3642667 100644 --- a/src/game/config.cpp +++ b/src/game/config.cpp @@ -23,6 +23,7 @@ constexpr auto wm_default = ultramodern::WindowMode::Windowed; constexpr auto ar_default = RT64::UserConfiguration::AspectRatio::Expand; constexpr auto msaa_default = RT64::UserConfiguration::Antialiasing::MSAA2X; constexpr auto rr_default = RT64::UserConfiguration::RefreshRate::Display; +constexpr int ds_default = 1; constexpr int rr_manual_default = 60; constexpr bool developer_mode_default = false; @@ -55,6 +56,7 @@ namespace ultramodern { j = json{ {"res_option", config.res_option}, {"wm_option", config.wm_option}, + {"ds_option", config.ds_option}, {"ar_option", config.ar_option}, {"msaa_option", config.msaa_option}, {"rr_option", config.rr_option}, @@ -66,6 +68,7 @@ namespace ultramodern { void from_json(const json& j, GraphicsConfig& config) { config.res_option = from_or_default(j, "res_option", res_default); config.wm_option = from_or_default(j, "wm_option", wm_default); + config.ds_option = from_or_default(j, "ds_option", ds_default); config.ar_option = from_or_default(j, "ar_option", ar_default); config.msaa_option = from_or_default(j, "msaa_option", msaa_default); config.rr_option = from_or_default(j, "rr_option", rr_default); @@ -171,6 +174,7 @@ void recomp::reset_graphics_options() { ultramodern::GraphicsConfig new_config{}; new_config.res_option = res_default; new_config.wm_option = wm_default; + new_config.ds_option = ds_default; new_config.ar_option = ar_default; new_config.msaa_option = msaa_default; new_config.rr_option = rr_default; diff --git a/src/recomp/rt64_layer.cpp b/src/recomp/rt64_layer.cpp index f6286ac..ec7d87d 100644 --- a/src/recomp/rt64_layer.cpp +++ b/src/recomp/rt64_layer.cpp @@ -234,13 +234,17 @@ void RT64UpdateConfig(RT64::Application* application, const ultramodern::Graphic default: case ultramodern::Resolution::Auto: application->userConfig.resolution = RT64::UserConfiguration::Resolution::WindowIntegerScale; + application->userConfig.downsampleMultiplier = 1; break; case ultramodern::Resolution::Original: - application->userConfig.resolution = RT64::UserConfiguration::Resolution::Original; + application->userConfig.resolution = RT64::UserConfiguration::Resolution::Manual; + application->userConfig.resolutionMultiplier = new_config.ds_option; + application->userConfig.downsampleMultiplier = new_config.ds_option; break; case ultramodern::Resolution::Original2x: application->userConfig.resolution = RT64::UserConfiguration::Resolution::Manual; - application->userConfig.resolutionMultiplier = 2.0; + application->userConfig.resolutionMultiplier = 2.0 * new_config.ds_option; + application->userConfig.downsampleMultiplier = new_config.ds_option; break; } diff --git a/src/ui/ui_config.cpp b/src/ui/ui_config.cpp index 27b9b01..5300379 100644 --- a/src/ui/ui_config.cpp +++ b/src/ui/ui_config.cpp @@ -65,6 +65,7 @@ void bind_atomic(Rml::DataModelConstructor& constructor, Rml::DataModelHandle ha static int scanned_binding_index = -1; static int scanned_input_index = -1; static int focused_input_index = -1; + static bool cont_active = true; static recomp::InputDevice cur_device = recomp::InputDevice::Controller; @@ -305,6 +306,14 @@ public: new_options.rr_manual_value = in.Get(); graphics_model_handle.DirtyVariable("options_changed"); }); + constructor.BindFunc("ds_option", + [](Rml::Variant& out) { + out = new_options.ds_option; + }, + [](const Rml::Variant& in) { + new_options.ds_option = in.Get(); + graphics_model_handle.DirtyVariable("options_changed"); + }); constructor.BindFunc("options_changed", [](Rml::Variant& out) { diff --git a/ultramodern/config.hpp b/ultramodern/config.hpp index cbaaf16..567a7fa 100644 --- a/ultramodern/config.hpp +++ b/ultramodern/config.hpp @@ -23,6 +23,7 @@ namespace ultramodern { RT64::UserConfiguration::Antialiasing msaa_option; RT64::UserConfiguration::RefreshRate rr_option; int rr_manual_value; + int ds_option; bool developer_mode; auto operator<=>(const GraphicsConfig& rhs) const = default;