Mirrors
/
Zelda64Recomp
mirror of https://github.com/Mr-Wiseguy/Zelda64Recomp.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix navigation on deadzone option, convert backing value to int to match other sliders

This commit is contained in:
Mr-Wiseguy 2024-05-24 17:55:16 -04:00
parent 773cc3bbb0
commit a4f61016bb
4 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
assets/config_menu/general.rml
View File

@ -92,6 +92,7 @@
/>
</div>
</div>
<!-- joystick deadzone -->
<div class="config-option" data-event-mouseover="set_cur_config_index(4)">
<label class="config-option__title">Joystick Deadzone</label>
@ -101,7 +102,7 @@
class="nav-vert"
data-event-blur="set_cur_config_index(-1)"
data-event-focus="set_cur_config_index(4)"
id="joystick_deadzone"
id="joystick_deadzone_input"
type="range"
min="0"
max="100"
@ -112,60 +113,60 @@
</div>
<!-- background input -->
<div class="config-option" data-event-mouseover="set_cur_config_index(4)" id="conf-general__Background-Input">
<div class="config-option" data-event-mouseover="set_cur_config_index(5)" id="conf-general__Background-Input">
<label class="config-option__title">Background Input</label>
<div class="config-option__list">
<input
type="radio"
data-event-blur="set_cur_config_index(-1)"
data-event-focus="set_cur_config_index(4)"
data-event-focus="set_cur_config_index(5)"
name="background_input_mode"
data-checked="background_input_mode"
value="On"
id="bg_input_enabled"
style="nav-up: #mouse_sensitivity_input; nav-down: #autosave_enabled"
style="nav-up: #joystick_deadzone_input; nav-down: #autosave_enabled"
/>
<label class="config-option__tab-label" for="bg_input_enabled">On</label>
<input
type="radio"
data-event-blur="set_cur_config_index(-1)"
data-event-focus="set_cur_config_index(4)"
data-event-focus="set_cur_config_index(5)"
name="background_input_mode"
data-checked="background_input_mode"
value="Off"
id="bg_input_disabled"
style="nav-up: #mouse_sensitivity_input; nav-down: #autosave_disabled"
style="nav-up: #joystick_deadzone_input; nav-down: #autosave_disabled"
/>
<label class="config-option__tab-label" for="bg_input_disabled">Off</label>
</div>
</div>
<!-- autosave -->
<div class="config-option" data-event-mouseover="set_cur_config_index(5)">
<div class="config-option" data-event-mouseover="set_cur_config_index(6)">
<label class="config-option__title">Autosaving</label>
<div class="config-option__list">
<input
type="radio"
data-event-blur="set_cur_config_index(-1)"
data-event-focus="set_cur_config_index(5)"
data-event-focus="set_cur_config_index(6)"
name="autosave_mode"
data-checked="autosave_mode"
value="On"
id="autosave_enabled"
style="nav-up: #bg_input_enabled"
style="nav-up: #bg_input_enabled; nav-down: #analog_cam_enabled"
/>
<label class="config-option__tab-label" for="autosave_enabled">On</label>
<input
type="radio"
data-event-blur="set_cur_config_index(-1)"
data-event-focus="set_cur_config_index(5)"
data-event-focus="set_cur_config_index(6)"
name="autosave_mode"
data-checked="autosave_mode"
value="Off"
id="autosave_disabled"
style="nav-up: #bg_input_disabled"
style="nav-up: #bg_input_disabled; nav-down: #analog_cam_disabled"
/>
<label class="config-option__tab-label" for="autosave_disabled">Off</label>
</div>
@ -197,6 +198,9 @@
<b>This setting does not affect keyboard input.</b>
</p>
<p data-if="cur_config_index == 5">
Applies a deadzone to joystick inputs.
</p>
<p data-if="cur_config_index == 6">
Turns on autosaving and prevents owl saves from being deleted on load. Autosaves act as owl saves and take up the same slot as they do.
<br/>
<br/>

4
include/recomp_input.h
View File

@ -129,10 +129,10 @@ namespace recomp {
// Gyro and mouse sensitivities range from 0 to 100.
int get_gyro_sensitivity();
int get_mouse_sensitivity();
float get_joystick_deadzone();
int get_joystick_deadzone();
void set_gyro_sensitivity(int strength);
void set_mouse_sensitivity(int strength);
void set_joystick_deadzone(float value);
void set_joystick_deadzone(int strength);
enum class TargetingMode {
Switch,

2
src/game/config.cpp
View File

@ -175,7 +175,7 @@ void set_general_settings_from_json(const nlohmann::json& config_json) {
recomp::set_rumble_strength(from_or_default(config_json, "rumble_strength", 25));
recomp::set_gyro_sensitivity(from_or_default(config_json, "gyro_sensitivity", 50));
recomp::set_mouse_sensitivity(from_or_default(config_json, "mouse_sensitivity", is_steam_deck ? 50 : 0));
recomp::set_joystick_deadzone(from_or_default(config_json, "joystick_deadzone", 0.0f));
recomp::set_joystick_deadzone(from_or_default(config_json, "joystick_deadzone", 5));
recomp::set_autosave_mode(from_or_default(config_json, "autosave_mode", recomp::AutosaveMode::On));
recomp::set_debug_mode_enabled(from_or_default(config_json, "debug_mode", false));
}

10
src/ui/ui_config.cpp
View File

@ -274,7 +274,7 @@ struct ControlOptionsContext {
int rumble_strength; // 0 to 100
int gyro_sensitivity; // 0 to 100
int mouse_sensitivity; // 0 to 100
float joystick_deadzone;
int joystick_deadzone; // 0 to 100
recomp::TargetingMode targeting_mode;
recomp::BackgroundInputMode background_input_mode;
recomp::AutosaveMode autosave_mode;
@ -301,7 +301,7 @@ int recomp::get_mouse_sensitivity() {
return control_options_context.mouse_sensitivity;
}
float recomp::get_joystick_deadzone() {
int recomp::get_joystick_deadzone() {
return control_options_context.joystick_deadzone;
}
@ -319,9 +319,9 @@ void recomp::set_mouse_sensitivity(int sensitivity) {
}
}
void recomp::set_joystick_deadzone(float value) {
control_options_context.joystick_deadzone = value;
if(general_model_handle) {
void recomp::set_joystick_deadzone(int deadzone) {
control_options_context.joystick_deadzone = deadzone;
if (general_model_handle) {
general_model_handle.DirtyVariable("joystick_deadzone");
}
}