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

Refactoring, fixes.

Browse Source
This commit is contained in:
J-D-K
2025-08-06 19:35:23 -04:00
parent 211f55fdaf
commit 884f1a36f9
97 changed files with 3070 additions and 2186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/appstates/MainMenuState.cpp
View File

@@ -25,17 +25,14 @@ namespace
}
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{static_cast<int>(1220 - sdl::text::get_width(22, m_controlGuide))}
, m_dataStruct{std::make_shared<MainMenuState::DataStruct>()}
: m_renderTarget(sdl::TextureManager::create_load_texture("mainMenuTarget", 200, 555, 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))
, m_dataStruct(std::make_shared<MainMenuState::DataStruct>())
{
MainMenuState::initialize_settings_extras();
MainMenuState::initialize_menu();
@@ -74,16 +71,16 @@ void MainMenuState::render()
const bool hasFocus = BaseState::has_focus();
const int selected = m_mainMenu.get_selected();
m_background->render(m_renderTarget->get(), 0, 0);
m_mainMenu.render(m_renderTarget->get(), hasFocus);
m_renderTarget->render(NULL, 0, 91);
m_background->render(m_renderTarget, 0, 0);
m_mainMenu.render(m_renderTarget, hasFocus);
m_renderTarget->render(sdl::Texture::Null, 0, 91);
if (hasFocus)
{
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);
sdl::text::render(sdl::Texture::Null, m_controlGuideX, 673, 22, sdl::text::NO_WRAP, colors::WHITE, m_controlGuide);
}
}