Leahnaya/JKSV
1
0
Fork 0
mirror of https://github.com/J-D-K/JKSV.git synced 2026-09-14 13:35:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Code style update.

Browse Source
This commit is contained in:
J-D-K
2025-02-21 13:31:40 -05:00
parent 88e66992ed
commit 11672043c3
71 changed files with 1027 additions and 810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
source/appstates/SettingsState.cpp
View File

@@ -15,35 +15,38 @@ namespace
} // namespace
// Declarations. Definitions after class members.
static const char *getValueText(uint8_t value);
static const char *getSortTypeText(uint8_t value);
static const char *get_value_text(uint8_t value);
static const char *get_sort_type_text(uint8_t value);
SettingsState::SettingsState(void)
: m_settingsMenu(32, 8, 1000, 24, 555),
m_renderTarget(sdl::TextureManager::createLoadTexture(SECONDARY_TARGET, 1080, 555, SDL_TEXTUREACCESS_STATIC | SDL_TEXTUREACCESS_TARGET)),
m_controlGuideX(1220 - sdl::text::getWidth(22, strings::getByName(strings::names::CONTROL_GUIDES, 3)))
m_renderTarget(sdl::TextureManager::createLoadTexture(SECONDARY_TARGET,
1080,
555,
SDL_TEXTUREACCESS_STATIC | SDL_TEXTUREACCESS_TARGET)),
m_controlGuideX(1220 - sdl::text::getWidth(22, strings::get_by_name(strings::names::CONTROL_GUIDES, 3)))
{
// Loop and allocation the strings and menu options.
int currentString = 0;
const char *settingsString = nullptr;
while ((settingsString = strings::getByName(strings::names::SETTINGS_MENU, currentString++)) != nullptr)
while ((settingsString = strings::get_by_name(strings::names::SETTINGS_MENU, currentString++)) != nullptr)
{
m_settingsMenu.addOption(settingsString);
m_settingsMenu.add_option(settingsString);
}
// Run the update routine so they're right.
SettingsState::updateMenuOptions();
SettingsState::update_menu_options();
}
void SettingsState::update(void)
{
m_settingsMenu.update(AppState::hasFocus());
m_settingsMenu.update(AppState::has_focus());
if (input::buttonPressed(HidNpadButton_A))
if (input::button_pressed(HidNpadButton_A))
{
SettingsState::toggleOptions();
SettingsState::toggle_options();
}
else if (input::buttonPressed(HidNpadButton_B))
else if (input::button_pressed(HidNpadButton_B))
{
AppState::deactivate();
}
@@ -52,10 +55,10 @@ void SettingsState::update(void)
void SettingsState::render(void)
{
m_renderTarget->clear(colors::TRANSPARENT);
m_settingsMenu.render(m_renderTarget->get(), AppState::hasFocus());
m_settingsMenu.render(m_renderTarget->get(), AppState::has_focus());
m_renderTarget->render(NULL, 201, 91);
if (AppState::hasFocus())
if (AppState::has_focus())
{
sdl::text::render(NULL,
m_controlGuideX,
@@ -63,91 +66,94 @@ void SettingsState::render(void)
22,
sdl::text::NO_TEXT_WRAP,
colors::WHITE,
strings::getByName(strings::names::CONTROL_GUIDES, 3));
strings::get_by_name(strings::names::CONTROL_GUIDES, 3));
}
}
void SettingsState::updateMenuOptions(void)
void SettingsState::update_menu_options(void)
{
// These can be looped, so screw it.
for (int i = 2; i < 13; i++)
{
std::string updatedOption =
stringutil::getFormattedString(strings::getByName(strings::names::SETTINGS_MENU, i), getValueText(config::getByIndex(i - 2)));
m_settingsMenu.editOption(i, updatedOption);
stringutil::get_formatted_string(strings::get_by_name(strings::names::SETTINGS_MENU, i),
get_value_text(config::get_by_index(i - 2)));
m_settingsMenu.edit_option(i, updatedOption);
}
// This just displays the value. The config value is offset to account for the first two settings options.
m_settingsMenu.editOption(13,
stringutil::getFormattedString(strings::getByName(strings::names::SETTINGS_MENU, 13), config::getByIndex(11)));
m_settingsMenu.edit_option(13,
stringutil::get_formatted_string(strings::get_by_name(strings::names::SETTINGS_MENU, 13),
config::get_by_index(11)));
// This gets the type according to the value.
m_settingsMenu.editOption(
14,
stringutil::getFormattedString(strings::getByName(strings::names::SETTINGS_MENU, 14), getSortTypeText(config::getByIndex(12))));
m_settingsMenu.edit_option(14,
stringutil::get_formatted_string(strings::get_by_name(strings::names::SETTINGS_MENU, 14),
get_sort_type_text(config::get_by_index(12))));
// Loop again.
for (int i = 15; i < 18; i++)
{
std::string updatedOption =
stringutil::getFormattedString(strings::getByName(strings::names::SETTINGS_MENU, i), getValueText(config::getByIndex(i - 2)));
m_settingsMenu.editOption(i, updatedOption);
stringutil::get_formatted_string(strings::get_by_name(strings::names::SETTINGS_MENU, i),
get_value_text(config::get_by_index(i - 2)));
m_settingsMenu.edit_option(i, updatedOption);
}
// Animating scaling.
m_settingsMenu.editOption(
18,
stringutil::getFormattedString(strings::getByName(strings::names::SETTINGS_MENU, 18), config::getAnimationScaling()));
m_settingsMenu.edit_option(18,
stringutil::get_formatted_string(strings::get_by_name(strings::names::SETTINGS_MENU, 18),
config::get_animation_scaling()));
}
void SettingsState::toggleOptions(void)
void SettingsState::toggle_options(void)
{
int selected = m_settingsMenu.getSelected();
int selected = m_settingsMenu.get_selected();
// These are just true or false more or less.
if ((selected >= 2 && selected <= 12) || (selected >= 14 && selected <= 17))
{
config::toggleByIndex(selected - 2);
config::toggle_by_index(selected - 2);
}
else if (selected == 13)
{
// This is the zip compression level.
uint8_t zipLevel = config::getByKey(config::keys::ZIP_COMPRESSION_LEVEL);
uint8_t zipLevel = config::get_by_key(config::keys::ZIP_COMPRESSION_LEVEL);
if (++zipLevel > 9)
{
zipLevel = 0;
}
config::setByKey(config::keys::ZIP_COMPRESSION_LEVEL, zipLevel);
config::set_by_key(config::keys::ZIP_COMPRESSION_LEVEL, zipLevel);
}
else if (selected == 14)
{
// This is the title sorting type.
uint8_t sortType = config::getByKey(config::keys::TITLE_SORT_TYPE);
uint8_t sortType = config::get_by_key(config::keys::TITLE_SORT_TYPE);
if (++sortType > 2)
{
sortType = 0;
}
config::setByKey(config::keys::TITLE_SORT_TYPE, sortType);
config::set_by_key(config::keys::TITLE_SORT_TYPE, sortType);
}
else if (selected == 18)
{
// This is the animation scaling.
double scaling = config::getAnimationScaling();
double scaling = config::get_animation_scaling();
if ((scaling += 0.25f) > 4.0f)
{
scaling = 1.0f;
}
config::setAnimationScaling(scaling);
config::set_animation_scaling(scaling);
}
// Toggle the update routine.
SettingsState::updateMenuOptions();
SettingsState::update_menu_options();
}
static const char *getValueText(uint8_t value)
static const char *get_value_text(uint8_t value)
{
return value ? strings::getByName(strings::names::ON_OFF, 1) : strings::getByName(strings::names::ON_OFF, 0);
return value ? strings::get_by_name(strings::names::ON_OFF, 1) : strings::get_by_name(strings::names::ON_OFF, 0);
}
static const char *getSortTypeText(uint8_t value)
static const char *get_sort_type_text(uint8_t value)
{
switch (value)
{