More settings/editor components

This commit is contained in:
Luke Street
2026-04-29 19:54:37 -06:00
parent d92515f0d4
commit ecd74a4cbd
8 changed files with 464 additions and 90 deletions
+115 -43
View File
@@ -8,6 +8,8 @@
#include "pane.hpp"
#include "ui.hpp"
#include <algorithm>
namespace dusk::ui {
template <typename T>
@@ -15,81 +17,109 @@ struct ConfigProps {
Rml::String key;
ConfigVar<T>* value;
std::function<void(T)> onChange;
std::function<bool()> isDisabled;
Rml::String helpText;
Pane* rightPane = nullptr;
bool selected = false;
};
class ConfigBoolSelect : public SelectButton {
template <typename T>
class ConfigSelect : public SelectButton {
public:
using Props = ConfigProps<bool>;
using Props = ConfigProps<T>;
ConfigBoolSelect(Rml::Element* parent, Props props)
: SelectButton(
parent, {
.key = std::move(props.key),
.getValue = [this] { return mValue->getValue() ? "On" : "Off"; },
.onPressed = [this](SelectButton&, Rml::Event&) { toggle_value(); },
.selected = props.selected,
}),
mValue(props.value), onChange(std::move(props.onChange)),
ConfigSelect(Rml::Element* parent, Props props)
: SelectButton(parent, {std::move(props.key)}), mVar(props.value),
mOnChange(std::move(props.onChange)), mIsDisabled(std::move(props.isDisabled)),
mHelpText(std::move(props.helpText)), mRightPane(props.rightPane) {
if (!mHelpText.empty() && mRightPane != nullptr) {
listen(nullptr, Rml::EventId::Focus, [this](Rml::Event&) {
listen(Rml::EventId::Focus, [this](Rml::Event&) {
mRightPane->clear();
mRightPane->add_text(mHelpText);
});
listen(nullptr, Rml::EventId::Mouseover, [this](Rml::Event&) {
listen(Rml::EventId::Mouseover, [this](Rml::Event&) {
mRightPane->clear();
mRightPane->add_text(mHelpText);
});
}
listen(nullptr, Rml::EventId::Keydown, [this](Rml::Event& event) {
const auto cmd = map_nav_event(event);
if (cmd == NavCommand::Left || cmd == NavCommand::Right || cmd == NavCommand::Confirm) {
toggle_value();
event.StopPropagation();
}
});
}
private:
void toggle_value() {
const bool newValue = !mValue->getValue();
mValue->setValue(newValue);
if (onChange) {
onChange(newValue);
void update() override {
if (mIsDisabled) {
set_disabled(mIsDisabled());
}
set_value_label(get_value());
SelectButton::update();
}
protected:
virtual Rml::String get_value() = 0;
void set_value(T newValue) {
if (mVar->getValue() == newValue) {
return;
}
mVar->setValue(newValue);
if (mOnChange) {
mOnChange(newValue);
}
config::Save();
}
ConfigVar<bool>* mValue;
std::function<void(bool)> onChange;
ConfigVar<T>* mVar;
std::function<void(T)> mOnChange;
std::function<bool()> mIsDisabled;
Rml::String mHelpText;
Pane* mRightPane;
};
class ConfigBoolSelect : public ConfigSelect<bool> {
public:
ConfigBoolSelect(Rml::Element* parent, Props props) : ConfigSelect(parent, std::move(props)) {}
protected:
Rml::String get_value() override { return mVar->getValue() ? "On" : "Off"; }
bool handle_nav_command(NavCommand cmd) override {
if (cmd == NavCommand::Confirm || cmd == NavCommand::Left || cmd == NavCommand::Right) {
set_value(!mVar->getValue());
return true;
}
return false;
}
};
class ConfigIntPercentSelect : public ConfigSelect<int> {
public:
ConfigIntPercentSelect(Rml::Element* parent, Props props)
: ConfigSelect(parent, std::move(props)) {}
protected:
Rml::String get_value() override { return fmt::format("{}%", mVar->getValue()); }
bool handle_nav_command(NavCommand cmd) override {
if (cmd == NavCommand::Left) {
set_value(std::max(mVar->getValue() - 1, 0));
return true;
} else if (cmd == NavCommand::Right) {
set_value(std::min(mVar->getValue() + 1, 100));
return true;
}
return false;
}
};
SettingsWindow::SettingsWindow() {
add_tab("Audio", [this](Rml::Element* content) {
auto& leftPane = add_child<Pane>(content, Pane::Direction::Vertical);
auto& rightPane = add_child<Pane>(content, Pane::Direction::Vertical);
leftPane.add_section("Volume");
{
auto& btn = leftPane.add_select_button({
leftPane.add_child<ConfigIntPercentSelect>(leftPane.root(),
ConfigIntPercentSelect::Props{
.key = "Master Volume",
.getValue =
[] { return fmt::format("{}%", getSettings().audio.masterVolume.getValue()); },
.value = &getSettings().audio.masterVolume,
.onChange = [](int value) { audio::SetMasterVolume(value / 100.f); },
.helpText = "Adjusts the volume of all sounds in the game.",
.rightPane = &rightPane,
});
btn.listen(nullptr, Rml::EventId::Focus, [&](Rml::Event&) {
rightPane.clear();
rightPane.add_text("Adjusts the volume of all sounds in the game.");
});
btn.listen(nullptr, Rml::EventId::Mouseover, [&](Rml::Event&) {
rightPane.clear();
rightPane.add_text("Adjusts the volume of all sounds in the game.");
});
}
leftPane.add_section("Effects");
leftPane.add_child<ConfigBoolSelect>(
@@ -119,7 +149,49 @@ SettingsWindow::SettingsWindow() {
});
add_tab("Cheats", [this](Rml::Element* content) {
auto& leftPane = add_child<Pane>(content, Pane::Direction::Vertical);
auto& rightPane = add_child<Pane>(content, Pane::Direction::Vertical);
auto addCheat = [&](const Rml::String& key, ConfigVar<bool>& value,
const Rml::String& helpText) {
leftPane.add_child<ConfigBoolSelect>(
leftPane.root(), ConfigBoolSelect::Props{
.key = key,
.value = &value,
.isDisabled = [] { return !getSettings().game.speedrunMode; },
.helpText = helpText,
.rightPane = &rightPane,
});
};
leftPane.add_section("Resources");
addCheat("Infinite Hearts", getSettings().game.infiniteHearts, "Keeps your health full.");
addCheat(
"Infinite Arrows", getSettings().game.infiniteArrows, "Keeps your arrow count full.");
addCheat("Infinite Bombs", getSettings().game.infiniteBombs, "Keeps all bomb bags full.");
addCheat("Infinite Oil", getSettings().game.infiniteOil, "Keeps your lantern oil full.");
addCheat("Infinite Oxygen", getSettings().game.infiniteOxygen,
"Keeps your underwater oxygen meter full.");
addCheat(
"Infinite Rupees", getSettings().game.infiniteRupees, "Keeps your rupee count full.");
addCheat("No Item Timer", getSettings().game.enableIndefiniteItemDrops,
"Item drops such as rupees and hearts will never disappear after they drop.");
leftPane.add_section("Abilities");
addCheat(
"Moon Jump (R+A)", getSettings().game.moonJump, "Hold R and A to rise into the air.");
addCheat("Super Clawshot", getSettings().game.superClawshot,
"Extends clawshot behavior beyond the normal game rules.");
addCheat("Always Greatspin", getSettings().game.alwaysGreatspin,
"Allows the Great Spin attack without requiring full health.");
addCheat("Fast Iron Boots", getSettings().game.enableFastIronBoots,
"Speeds up movement while wearing the Iron Boots.");
addCheat("Can Transform Anywhere", getSettings().game.canTransformAnywhere,
"Allows transforming even if NPCs are looking.");
addCheat("Fast Spinner", getSettings().game.fastSpinner,
"Speeds up Spinner movement while holding R.");
addCheat("Free Magic Armor", getSettings().game.freeMagicArmor,
"Lets the magic armor work without consuming rupees.");
});
add_tab("Gameplay", [this](Rml::Element* content) {
@@ -177,4 +249,4 @@ SettingsWindow::SettingsWindow() {
});
}
} // namespace dusk::ui
} // namespace dusk::ui