mirror/Zelda64Recomp
1
0
Fork 0
mirror of https://github.com/Zelda64Recomp/Zelda64Recomp synced 2026-05-29 08:43:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add active_binding_input and active_binding_slot bindings in controls UI

Browse Source
This commit is contained in:
Mr-Wiseguy
2024-01-17 02:22:36 -05:00
parent 23f0235996
commit d0e01cdec1
4 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/ui_config.cpp
+20 -3
View File
@@ -54,14 +54,18 @@ void bind_option(Rml::DataModelConstructor& constructor, const std::string& name
);
};
static size_t scanned_binding_index;
static size_t scanned_input_index;
static int scanned_binding_index = -1;
static int scanned_input_index = -1;
constexpr recomp::InputDevice cur_device = recomp::InputDevice::Controller;
void recomp::finish_scanning_input(recomp::InputField scanned_field) {
recomp::set_input_binding(scanned_input_index, scanned_binding_index, cur_device, scanned_field);
scanned_input_index = -1;
scanned_binding_index = -1;
controls_model_handle.DirtyVariable("inputs");
controls_model_handle.DirtyVariable("active_binding_input");
controls_model_handle.DirtyVariable("active_binding_slot");
}
class ConfigMenu : public recomp::MenuController {
@@ -142,7 +146,7 @@ public:
constructor.BindFunc("input_count", [](Rml::Variant& out) { out = recomp::get_num_inputs(); } );
constructor.RegisterTransformFunc("get_input_name", [](const Rml::VariantList& inputs) {
return Rml::Variant{recomp::get_input_names().at(inputs.at(0).Get<size_t>())};
return Rml::Variant{recomp::get_input_name(inputs.at(0).Get<size_t>())};
});
constructor.BindEventCallback("set_input_binding",
@@ -150,6 +154,8 @@ public:
scanned_input_index = inputs.at(0).Get<size_t>();
scanned_binding_index = inputs.at(1).Get<size_t>();
recomp::start_scanning_input(cur_device);
model_handle.DirtyVariable("active_binding_input");
model_handle.DirtyVariable("active_binding_slot");
});
constructor.BindEventCallback("clear_input_bindings",
@@ -209,6 +215,17 @@ public:
static InputContainer dummy_container;
constructor.Bind("inputs", &dummy_container);
constructor.BindFunc("active_binding_input", [](Rml::Variant& out) {
if (scanned_input_index == -1) {
out = "NONE";
}
else {
out = recomp::get_input_enum_name(scanned_input_index);
}
});
constructor.Bind<int>("active_binding_slot", &scanned_binding_index);
controls_model_handle = constructor.GetModelHandle();
}