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

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

48
source/appstates/MainMenuState.cpp
View File

@@ -14,19 +14,23 @@
#include "strings.hpp"
MainMenuState::MainMenuState(void)
: m_renderTarget(sdl::TextureManager::createLoadTexture("MainMenuTarget", 200, 555, SDL_TEXTUREACCESS_STATIC | SDL_TEXTUREACCESS_TARGET)),
m_background(sdl::TextureManager::createLoadTexture("MainMenuBackground", "romfs:/Textures/MenuBackground.png")), m_mainMenu(50, 15, 555),
m_controlGuide(strings::getByName(strings::names::CONTROL_GUIDES, 0)), m_controlGuideX(1220 - sdl::text::getWidth(22, m_controlGuide))
: m_renderTarget(sdl::TextureManager::createLoadTexture("MainMenuTarget",
200,
555,
SDL_TEXTUREACCESS_STATIC | SDL_TEXTUREACCESS_TARGET)),
m_background(sdl::TextureManager::createLoadTexture("MainMenuBackground", "romfs:/Textures/MenuBackground.png")),
m_mainMenu(50, 15, 555), m_controlGuide(strings::get_by_name(strings::names::CONTROL_GUIDES, 0)),
m_controlGuideX(1220 - sdl::text::getWidth(22, m_controlGuide))
{
// Fetch user list.
data::getUsers(sm_users);
data::get_users(sm_users);
// Loop through add user's icon to menu and create states.
for (size_t i = 0; i < sm_users.size(); i++)
{
m_mainMenu.addOption(sm_users.at(i)->getSharedIcon());
m_mainMenu.add_option(sm_users.at(i)->get_shared_icon());
if (config::getByKey(config::keys::JKSM_TEXT_MODE))
if (config::get_by_key(config::keys::JKSM_TEXT_MODE))
{
sm_states.push_back(std::make_shared<TextTitleSelectState>(sm_users.at(i)));
}
@@ -44,34 +48,34 @@ MainMenuState::MainMenuState(void)
m_extrasIcon = sdl::TextureManager::createLoadTexture("ExtrasIcon", "romfs:/Textures/ExtrasIcon.png");
// Finally add them to the end.
m_mainMenu.addOption(m_settingsIcon);
m_mainMenu.addOption(m_extrasIcon);
m_mainMenu.add_option(m_settingsIcon);
m_mainMenu.add_option(m_extrasIcon);
}
void MainMenuState::update(void)
{
m_mainMenu.update(AppState::hasFocus());
m_mainMenu.update(AppState::has_focus());
int selected = m_mainMenu.getSelected();
int selected = m_mainMenu.get_selected();
if (input::buttonPressed(HidNpadButton_A) && selected < static_cast<int>(sm_users.size()) &&
sm_users.at(selected)->getTotalDataEntries() > 0)
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();
JKSV::pushState(sm_states.at(selected));
JKSV::push_state(sm_states.at(selected));
}
else if (input::buttonPressed(HidNpadButton_A) && selected >= static_cast<int>(sm_users.size()))
else if (input::button_pressed(HidNpadButton_A) && selected >= static_cast<int>(sm_users.size()))
{
sm_states.at(selected)->reactivate();
JKSV::pushState(sm_states.at(selected));
JKSV::push_state(sm_states.at(selected));
}
else if (input::buttonPressed(HidNpadButton_X) && selected < static_cast<int>(sm_users.size()))
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 = reinterpret_cast<TitleSelectCommon *>(sm_states.at(selected).get());
JKSV::pushState(std::make_shared<UserOptionState>(targetUser, targetTitleSelect));
JKSV::push_state(std::make_shared<UserOptionState>(targetUser, targetTitleSelect));
}
}
@@ -80,23 +84,23 @@ void MainMenuState::render(void)
// Clear render target by rendering background to it.
m_background->render(m_renderTarget->get(), 0, 0);
// render menu.
m_mainMenu.render(m_renderTarget->get(), AppState::hasFocus());
m_mainMenu.render(m_renderTarget->get(), AppState::has_focus());
// render target to screen.
m_renderTarget->render(NULL, 0, 91);
// render next state for current user and control guide if this state has focus.
if (AppState::hasFocus())
if (AppState::has_focus())
{
sm_states.at(m_mainMenu.getSelected())->render();
sm_states.at(m_mainMenu.get_selected())->render();
sdl::text::render(NULL, m_controlGuideX, 673, 22, sdl::text::NO_TEXT_WRAP, colors::WHITE, m_controlGuide);
}
}
void MainMenuState::refreshViewStates(void)
void MainMenuState::refresh_view_states(void)
{
for (size_t i = 0; i < sm_users.size(); i++)
{
sm_users.at(i)->sortData();
sm_users.at(i)->sort_data();
std::static_pointer_cast<TitleSelectCommon>(sm_states.at(i))->refresh();
}
}