From ae9b13a79d4262624823c0d9cc438a51a6b40fc4 Mon Sep 17 00:00:00 2001 From: hatcyl Date: Sun, 21 Jul 2024 23:19:07 -0700 Subject: [PATCH] Implement setting for special item HUD. --- assets/config_menu/graphics.rml | 37 ++++++++++++++++++++++++++++---- include/zelda_config.h | 13 +++++++++++ patches/misc_funcs.h | 1 + patches/syms.ld | 1 + patches/ui_patches.c | 7 ++++-- src/game/config.cpp | 4 ++++ src/game/recomp_api.cpp | 4 ++++ src/main/rt64_render_context.cpp | 10 +++++++++ src/ui/ui_config.cpp | 14 ++++++++++++ 9 files changed, 85 insertions(+), 6 deletions(-) diff --git a/assets/config_menu/graphics.rml b/assets/config_menu/graphics.rml index a11de72..228b71e 100644 --- a/assets/config_menu/graphics.rml +++ b/assets/config_menu/graphics.rml @@ -239,7 +239,7 @@ data-checked="hr_option" value="Original" id="hr_original" - style="nav-up: #msaa_none; nav-down: #apply_button" + style="nav-up: #msaa_none; nav-down: #special_item_hud_enabled" /> @@ -260,13 +260,39 @@ data-checked="hr_option" value="Full" id="hr_full" - style="nav-up: #msaa_4x; nav-down: #apply_button" + style="nav-up: #msaa_4x; nav-down: #special_item_hud_disabled" data-style-nav-up="msaa4x_supported ? '#msaa_4x' : (msaa2x_supported ? '#msaa_2x' : '#msaa_none')" /> +
+ +
+ + + + +
+
+

@@ -302,6 +328,9 @@

Adjusts the placement of HUD elements to fit the selected aspect ratio. Expand will use the aspect ratio of the game's output window.

+

+ Enables visibility of the special item HUD. Affects visibility only, functionality can be modified in the Controls setting tab. +

@@ -314,7 +343,7 @@ data-attrif-disabled="!options_changed" onclick="apply_options" id="apply_button" - style="nav-up:#hr_original" + style="nav-up:#special_item_hud_enabled" >
Apply{{gfx_help__apply}}
diff --git a/include/zelda_config.h b/include/zelda_config.h index 59b41f0..8354b7d 100644 --- a/include/zelda_config.h +++ b/include/zelda_config.h @@ -35,6 +35,17 @@ namespace zelda64 { {zelda64::AutosaveMode::Off, "Off"} }); + enum class SpecialItemHudMode { + On, + Off, + OptionCount + }; + + NLOHMANN_JSON_SERIALIZE_ENUM(zelda64::SpecialItemHudMode, { + {zelda64::SpecialItemHudMode::On, "On"}, + {zelda64::SpecialItemHudMode::Off, "Off"} + }); + enum class TargetingMode { Switch, Hold, @@ -84,6 +95,8 @@ namespace zelda64 { AutosaveMode get_autosave_mode(); void set_autosave_mode(AutosaveMode mode); + SpecialItemHudMode get_special_item_hud_mode(); + AnalogCamMode get_analog_cam_mode(); void set_analog_cam_mode(AnalogCamMode mode); diff --git a/patches/misc_funcs.h b/patches/misc_funcs.h index 853877b..99c34f1 100644 --- a/patches/misc_funcs.h +++ b/patches/misc_funcs.h @@ -11,5 +11,6 @@ DECLARE_FUNC(void, recomp_handle_quicksave_actions_main, OSMesgQueue* enter_mq, DECLARE_FUNC(u16, recomp_get_pending_warp); DECLARE_FUNC(u32, recomp_get_pending_set_time); DECLARE_FUNC(s32, recomp_autosave_enabled); +DECLARE_FUNC(s32, recomp_special_item_hud_on); #endif diff --git a/patches/syms.ld b/patches/syms.ld index a0e5d7d..ccab8a6 100644 --- a/patches/syms.ld +++ b/patches/syms.ld @@ -44,3 +44,4 @@ recomp_get_inverted_axes = 0x8F0000A4; recomp_high_precision_fb_enabled = 0x8F0000A8; recomp_get_resolution_scale = 0x8F0000AC; recomp_get_analog_inverted_axes = 0x8F0000B0; +recomp_special_item_hud_on = 0x8F0000B4; diff --git a/patches/ui_patches.c b/patches/ui_patches.c index f40387c..ccddbc1 100644 --- a/patches/ui_patches.c +++ b/patches/ui_patches.c @@ -3,6 +3,7 @@ #include "buffers.h" #include "sys_cfb.h" #include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h" +#include "misc_funcs.h" // This moves elements towards the screen edges when increased s32 margin_reduction = 8; @@ -488,8 +489,10 @@ void Interface_Draw(PlayState* play) { // @recomp Draw the D-Pad and its item icons as well as the autosave icon if the game is unpaused. if (pauseCtx->state != PAUSE_STATE_MAIN) { - draw_dpad(play); - draw_dpad_icons(play); + if (recomp_special_item_hud_on()) { + draw_dpad(play); + draw_dpad_icons(play); + } draw_autosave_icon(play); } diff --git a/src/game/config.cpp b/src/game/config.cpp index ac8ebff..89d1686 100644 --- a/src/game/config.cpp +++ b/src/game/config.cpp @@ -23,6 +23,7 @@ constexpr std::u8string_view program_id = u8"Zelda64Recompiled"; constexpr auto res_default = ultramodern::renderer::Resolution::Auto; constexpr auto hr_default = ultramodern::renderer::HUDRatioMode::Clamp16x9; +constexpr auto special_item_hud_default = ultramodern::renderer::SpecialItemHUD::On; constexpr auto api_default = ultramodern::renderer::GraphicsApi::Auto; constexpr auto ar_default = ultramodern::renderer::AspectRatio::Expand; constexpr auto msaa_default = ultramodern::renderer::Antialiasing::MSAA2X; @@ -92,6 +93,7 @@ namespace ultramodern { {"res_option", config.res_option}, {"wm_option", config.wm_option}, {"hr_option", config.hr_option}, + {"special_item_hud_option", config.special_item_hud_option}, {"api_option", config.api_option}, {"ds_option", config.ds_option}, {"ar_option", config.ar_option}, @@ -107,6 +109,7 @@ namespace ultramodern { config.res_option = from_or_default(j, "res_option", res_default); config.wm_option = from_or_default(j, "wm_option", wm_default()); config.hr_option = from_or_default(j, "hr_option", hr_default); + config.special_item_hud_option = from_or_default(j, "special_item_hud_option", special_item_hud_default); config.api_option = from_or_default(j, "api_option", api_default); config.ds_option = from_or_default(j, "ds_option", ds_default); config.ar_option = from_or_default(j, "ar_option", ar_default); @@ -323,6 +326,7 @@ void reset_graphics_options() { new_config.res_option = res_default; new_config.wm_option = wm_default(); new_config.hr_option = hr_default; + new_config.special_item_hud_option = special_item_hud_default; new_config.ds_option = ds_default; new_config.ar_option = ar_default; new_config.msaa_option = msaa_default; diff --git a/src/game/recomp_api.cpp b/src/game/recomp_api.cpp index 28b4779..3709cb3 100644 --- a/src/game/recomp_api.cpp +++ b/src/game/recomp_api.cpp @@ -95,6 +95,10 @@ extern "C" void recomp_autosave_enabled(uint8_t* rdram, recomp_context* ctx) { _return(ctx, static_cast(zelda64::get_autosave_mode() == zelda64::AutosaveMode::On)); } +extern "C" void recomp_special_item_hud_on(uint8_t * rdram, recomp_context * ctx) { + _return(ctx, static_cast(zelda64::get_special_item_hud_mode() == zelda64::SpecialItemHudMode::On)); +} + extern "C" void recomp_load_overlays(uint8_t * rdram, recomp_context * ctx) { u32 rom = _arg<0, u32>(rdram, ctx); PTR(void) ram = _arg<1, PTR(void)>(rdram, ctx); diff --git a/src/main/rt64_render_context.cpp b/src/main/rt64_render_context.cpp index 497e504..33c3140 100644 --- a/src/main/rt64_render_context.cpp +++ b/src/main/rt64_render_context.cpp @@ -146,6 +146,16 @@ void set_application_user_config(RT64::Application* application, const ultramode break; } + switch (config.special_item_hud_option) { + default: + case ultramodern::renderer::SpecialItemHUD::On: + application->userConfig.specialItemHud = true; + break; + case ultramodern::renderer::SpecialItemHUD::Off: + application->userConfig.specialItemHud = false; + break; + } + application->userConfig.aspectRatio = to_rt64(config.ar_option); application->userConfig.antialiasing = to_rt64(config.msaa_option); application->userConfig.refreshRate = to_rt64(config.rr_option); diff --git a/src/ui/ui_config.cpp b/src/ui/ui_config.cpp index 12bb20e..37a71e9 100644 --- a/src/ui/ui_config.cpp +++ b/src/ui/ui_config.cpp @@ -288,6 +288,7 @@ struct ControlOptionsContext { zelda64::TargetingMode targeting_mode; recomp::BackgroundInputMode background_input_mode; zelda64::AutosaveMode autosave_mode; + zelda64::SpecialItemHudMode special_item_hud_mode; zelda64::CameraInvertMode camera_invert_mode; zelda64::AnalogCamMode analog_cam_mode; zelda64::CameraInvertMode analog_camera_invert_mode; @@ -378,6 +379,18 @@ void zelda64::set_autosave_mode(zelda64::AutosaveMode mode) { } } +zelda64::SpecialItemHudMode zelda64::get_special_item_hud_mode() { + switch (new_options.special_item_hud_option) { + default: + case ultramodern::renderer::SpecialItemHUD::On: + return zelda64::SpecialItemHudMode::On; + break; + case ultramodern::renderer::SpecialItemHUD::Off: + return zelda64::SpecialItemHudMode::Off; + break; + } +} + zelda64::CameraInvertMode zelda64::get_camera_invert_mode() { return control_options_context.camera_invert_mode; } @@ -637,6 +650,7 @@ public: bind_option(constructor, "wm_option", &new_options.wm_option); bind_option(constructor, "ar_option", &new_options.ar_option); bind_option(constructor, "hr_option", &new_options.hr_option); + bind_option(constructor, "special_item_hud_option", &new_options.special_item_hud_option); bind_option(constructor, "msaa_option", &new_options.msaa_option); bind_option(constructor, "rr_option", &new_options.rr_option); constructor.BindFunc("rr_manual_value",