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

Refactor MainMenuState

Browse Source
This commit is contained in:
J-D-K
2025-07-18 12:01:43 -04:00
parent 8083ab30bd
commit d0c032710d
2 changed files with 83 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
source/appstates/MainMenuState.cpp
View File

@@ -1,4 +1,5 @@
#include "appstates/MainMenuState.hpp"
#include "StateManager.hpp"
#include "appstates/ExtrasMenuState.hpp"
#include "appstates/SettingsState.hpp"
@@ -17,105 +18,63 @@ MainMenuState::MainMenuState()
: m_renderTarget(sdl::TextureManager::create_load_texture("mainMenuTarget",
200,
555,
SDL_TEXTUREACCESS_STATIC | SDL_TEXTUREACCESS_TARGET)),
m_background(sdl::TextureManager::create_load_texture("mainBackground", "romfs:/Textures/MenuBackground.png")),
m_settingsIcon(sdl::TextureManager::create_load_texture("settingsIcon", "romfs:/Textures/SettingsIcon.png")),
m_extrasIcon(sdl::TextureManager::create_load_texture("extrasIcon", "romfs:/Textures/ExtrasIcon.png")),
m_mainMenu(50, 15, 555), m_controlGuide(strings::get_by_name(strings::names::CONTROL_GUIDES, 0)),
m_controlGuideX(1220 - sdl::text::get_width(22, m_controlGuide))
SDL_TEXTUREACCESS_STATIC | SDL_TEXTUREACCESS_TARGET))
, m_background(sdl::TextureManager::create_load_texture("mainBackground", "romfs:/Textures/MenuBackground.png"))
, m_settingsIcon(sdl::TextureManager::create_load_texture("settingsIcon", "romfs:/Textures/SettingsIcon.png"))
, m_extrasIcon(sdl::TextureManager::create_load_texture("extrasIcon", "romfs:/Textures/ExtrasIcon.png"))
, m_mainMenu(50, 15, 555)
, m_controlGuide(strings::get_by_name(strings::names::CONTROL_GUIDES, 0))
, m_controlGuideX(1220 - sdl::text::get_width(22, m_controlGuide))
{
if (!sm_settingsState || !sm_extrasState)
{
sm_settingsState = std::make_shared<SettingsState>();
sm_extrasState = std::make_shared<ExtrasMenuState>();
}
// Grab the users and setup the main menu. Users shouldn't change.
data::get_users(sm_users);
for (data::User *user : sm_users)
{
m_mainMenu.add_option(user->get_shared_icon());
}
// Add the last two.
m_mainMenu.add_option(m_settingsIcon);
m_mainMenu.add_option(m_extrasIcon);
// Just call this.
MainMenuState::initialize_settings_extras();
MainMenuState::initialize_menu();
MainMenuState::initialize_view_states();
}
void MainMenuState::update()
{
const int selected = m_mainMenu.get_selected();
const bool hasFocus = BaseState::has_focus();
const bool aPressed = input::button_pressed(HidNpadButton_A);
const bool xPressed = input::button_pressed(HidNpadButton_X);
const bool toUserOptions = xPressed && selected < sm_userCount;
if (aPressed) { MainMenuState::push_target_state(); }
else if (toUserOptions) { MainMenuState::create_user_options(); };
// Update the main menu.
m_mainMenu.update(hasFocus);
int selected = m_mainMenu.get_selected();
// To do: Simplify this logic.
if (input::button_pressed(HidNpadButton_A) && selected < static_cast<int>(sm_users.size()) &&
sm_users.at(selected)->get_total_data_entries() > 0)
{
sm_states.at(selected)->reactivate();
StateManager::push_state(sm_states.at(selected));
}
else if (input::button_pressed(HidNpadButton_A) && selected >= static_cast<int>(sm_users.size()))
{
sm_states.at(selected)->reactivate();
StateManager::push_state(sm_states.at(selected));
}
else if (input::button_pressed(HidNpadButton_X) && selected < static_cast<int>(sm_users.size()))
{
// Get pointers to data the user option state needs.
data::User *targetUser = sm_users.at(selected);
TitleSelectCommon *targetTitleSelect = static_cast<TitleSelectCommon *>(sm_states.at(selected).get());
StateManager::push_state(std::make_shared<UserOptionState>(targetUser, targetTitleSelect));
}
}
void MainMenuState::render()
{
const bool hasFocus = BaseState::has_focus();
const int selected = m_mainMenu.get_selected();
// Clear render target by rendering background to it.
m_background->render(m_renderTarget->get(), 0, 0);
// render menu.
m_mainMenu.render(m_renderTarget->get(), hasFocus);
// render target to screen.
m_renderTarget->render(NULL, 0, 91);
// render next state for current user and control guide if this state has focus. To do: Maybe this different?
if (hasFocus)
{
sm_states.at(m_mainMenu.get_selected())->render();
BaseState *target = sm_states.at(selected).get();
target->render();
sdl::text::render(NULL, m_controlGuideX, 673, 22, sdl::text::NO_TEXT_WRAP, colors::WHITE, m_controlGuide);
}
}
void MainMenuState::initialize_view_states()
{
// Constructor should have taken care of the menu and user list.
// Start by clearing the vector.
const bool jksmMode = config::get_by_key(config::keys::JKSM_TEXT_MODE);
sm_states.clear();
// Grab this from config instead of calling it every loop.
bool textMode = config::get_by_key(config::keys::JKSM_TEXT_MODE);
// Loop through users.
for (data::User *user : sm_users)
{
if (textMode)
{
sm_states.push_back(std::make_shared<TextTitleSelectState>(user));
}
else
{
sm_states.push_back(std::make_shared<TitleSelectState>(user));
}
std::shared_ptr<BaseState> state{};
if (jksmMode) { state = std::make_shared<TextTitleSelectState>(user); }
else { state = std::make_shared<TitleSelectState>(user); }
sm_states.push_back(state);
}
sm_states.push_back(sm_settingsState);
sm_states.push_back(sm_extrasState);
@@ -123,10 +82,46 @@ void MainMenuState::initialize_view_states()
void MainMenuState::refresh_view_states()
{
// For this, we're only looping through the user states to be extra careful because the last two don't have the refresh() function.
int userCount = sm_users.size();
for (int i = 0; i < userCount; i++)
for (int i = 0; i < sm_userCount; i++)
{
static_cast<TitleSelectCommon *>(sm_states.at(i).get())->refresh();
TitleSelectCommon *target = static_cast<TitleSelectCommon *>(sm_states.at(i).get());
target->refresh();
}
}
void MainMenuState::initialize_settings_extras()
{
if (!sm_settingsState || !sm_extrasState)
{
sm_settingsState = std::make_shared<SettingsState>();
sm_extrasState = std::make_shared<ExtrasMenuState>();
}
}
void MainMenuState::initialize_menu()
{
data::get_users(sm_users);
sm_userCount = sm_users.size();
for (data::User *user : sm_users) { m_mainMenu.add_option(user->get_shared_icon()); }
m_mainMenu.add_option(m_settingsIcon);
m_mainMenu.add_option(m_extrasIcon);
}
void MainMenuState::push_target_state()
{
const int selected = m_mainMenu.get_selected();
auto &target = sm_states.at(selected);
target->reactivate();
StateManager::push_state(target);
}
void MainMenuState::create_user_options()
{
const int selected = m_mainMenu.get_selected();
data::User *user = sm_users.at(selected);
TitleSelectCommon *titleSelect = static_cast<TitleSelectCommon *>(sm_states.at(selected).get());
auto userOptions = std::make_shared<UserOptionState>(user, titleSelect);
StateManager::push_state(userOptions);
}