ja navega pels menus en ServiceMenu
Ja aplica les opcions de video de ServiceMenu
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
#include <string>
|
||||
#include "text.h"
|
||||
#include "resource.h"
|
||||
#include "options.h
|
||||
#include "options.h"
|
||||
|
||||
// Singleton
|
||||
ServiceMenu *ServiceMenu::instance_ = nullptr;
|
||||
@@ -21,16 +21,20 @@ ServiceMenu *ServiceMenu::get() { return ServiceMenu::instance_; }
|
||||
|
||||
// Constructor
|
||||
ServiceMenu::ServiceMenu()
|
||||
: elementText_(Resource::get()->getText("04b_25_flat")),
|
||||
titleText_(Resource::get()->getText("04b_25_flat_2x"))
|
||||
: element_text_(Resource::get()->getText("04b_25_flat")),
|
||||
title_text_(Resource::get()->getText("04b_25_flat_2x")),
|
||||
current_settings_group_(SettingsGroup::MAIN),
|
||||
previous_settings_group_(current_settings_group_)
|
||||
{
|
||||
setAnchors();
|
||||
initializeOptions();
|
||||
updateMenu(current_settings_group_);
|
||||
}
|
||||
|
||||
void ServiceMenu::toggle()
|
||||
{
|
||||
enabled_ = !enabled_;
|
||||
reset();
|
||||
}
|
||||
|
||||
void ServiceMenu::render()
|
||||
@@ -39,40 +43,6 @@ void ServiceMenu::render()
|
||||
{
|
||||
int y = rect_.y;
|
||||
constexpr int H_PADDING = 20;
|
||||
constexpr std::array<const char *, 4> MAIN_LIST = {
|
||||
"VIDEO",
|
||||
"AUDIO",
|
||||
"GAME",
|
||||
"SYSTEM"};
|
||||
|
||||
constexpr std::array<const char *, 5> VIDEO_LIST = {
|
||||
"VIDEO MODE",
|
||||
"WINDOW SIZE",
|
||||
"SHADERS",
|
||||
"VSYNC",
|
||||
"INTEGER SCALE"};
|
||||
|
||||
constexpr std::array<const char *, 4> AUDIO_LIST = {
|
||||
"AUDIO",
|
||||
"MAIN VOLUME",
|
||||
"MUSIC VOLUME",
|
||||
"SFX VOLUME"};
|
||||
|
||||
constexpr std::array<const char *, 2> GAME_LIST = {
|
||||
"AUTOFIRE",
|
||||
"LANG"};
|
||||
|
||||
constexpr std::array<const char *, 3> SYSTEM_LIST = {
|
||||
"RESET",
|
||||
"EXIT",
|
||||
"SHUTDOWN"};
|
||||
|
||||
constexpr std::array<const char *, 5> OPTIONS_LIST = {
|
||||
"FULLSCREEN",
|
||||
"3",
|
||||
"OFF",
|
||||
"ON",
|
||||
"ON"};
|
||||
|
||||
// SOMBRA
|
||||
SDL_FRect shadowRect = {rect_.x + 5, rect_.y + 5, rect_.w, rect_.h};
|
||||
@@ -80,28 +50,28 @@ void ServiceMenu::render()
|
||||
SDL_RenderFillRect(Screen::get()->getRenderer(), &shadowRect);
|
||||
|
||||
// FONDO
|
||||
SDL_SetRenderDrawColor(Screen::get()->getRenderer(), bgColor_.r, bgColor_.g, bgColor_.b, 255);
|
||||
SDL_SetRenderDrawColor(Screen::get()->getRenderer(), bg_color_.r, bg_color_.g, bg_color_.b, 255);
|
||||
SDL_RenderFillRect(Screen::get()->getRenderer(), &rect_);
|
||||
|
||||
// BORDE
|
||||
SDL_SetRenderDrawColor(Screen::get()->getRenderer(), titleColor_.r, titleColor_.g, titleColor_.b, 255);
|
||||
SDL_SetRenderDrawColor(Screen::get()->getRenderer(), title_color_.r, title_color_.g, title_color_.b, 255);
|
||||
SDL_RenderRect(Screen::get()->getRenderer(), &rect_);
|
||||
|
||||
// SERVICE MENU
|
||||
y += lineHeight_;
|
||||
titleText_->writeDX(TEXT_COLOR | TEXT_CENTER, param.game.game_area.center_x, y, "SERVICE MENU", -4, titleColor_);
|
||||
y += line_height_;
|
||||
title_text_->writeDX(TEXT_COLOR | TEXT_CENTER, param.game.game_area.center_x, y, "SERVICE MENU", -4, title_color_);
|
||||
|
||||
// LINEA
|
||||
y += lineHeight_ * 2;
|
||||
SDL_SetRenderDrawColor(Screen::get()->getRenderer(), titleColor_.r, titleColor_.g, titleColor_.b, 255);
|
||||
y += line_height_ * 2;
|
||||
SDL_SetRenderDrawColor(Screen::get()->getRenderer(), title_color_.r, title_color_.g, title_color_.b, 255);
|
||||
SDL_RenderLine(Screen::get()->getRenderer(), rect_.x + H_PADDING, y, rect_.x + rect_.w - H_PADDING, y);
|
||||
|
||||
// LIST
|
||||
for (size_t i = 0; i < VIDEO_LIST.size(); ++i)
|
||||
for (size_t i = 0; i < option_pairs_.size(); ++i)
|
||||
{
|
||||
y += lineHeight_;
|
||||
elementText_->writeColored(rect_.x + H_PADDING, y, VIDEO_LIST.at(i), i == selected_ ? selectedColor_ : textColor_, -2);
|
||||
elementText_->writeColored(rect_.x + H_PADDING + 100, y, "" + std::string(OPTIONS_LIST.at(i)), i == selected_ ? selectedColor_ : textColor_, -2);
|
||||
y += line_height_;
|
||||
element_text_->writeColored(rect_.x + H_PADDING, y, option_pairs_.at(i).first, i == selected_ ? selected_color_ : text_color_, -2);
|
||||
element_text_->writeColored(rect_.x + H_PADDING + 100, y, "" + std::string(option_pairs_.at(i).second), i == selected_ ? selected_color_ : text_color_, -2);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -111,7 +81,7 @@ void ServiceMenu::update()
|
||||
if (enabled_)
|
||||
{
|
||||
updateCounter();
|
||||
selectedColor_ = getSelectedColor();
|
||||
selected_color_ = getSelectedColor();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -119,7 +89,7 @@ void ServiceMenu::setAnchors()
|
||||
{
|
||||
width_ = 220;
|
||||
height_ = 200;
|
||||
lineHeight_ = elementText_->getCharacterSize() + 5;
|
||||
line_height_ = element_text_->getCharacterSize() + 5;
|
||||
rect_ = {
|
||||
(param.game.width - width_) / 2,
|
||||
(param.game.height - height_) / 2,
|
||||
@@ -168,44 +138,137 @@ void ServiceMenu::setSelectorUp()
|
||||
}
|
||||
else
|
||||
{
|
||||
selected_ = 4;
|
||||
selected_ = option_pairs_.size() - 1;
|
||||
}
|
||||
}
|
||||
|
||||
void ServiceMenu::setSelectorDown()
|
||||
{
|
||||
selected_ = (selected_ + 1) % 5;
|
||||
selected_ = (selected_ + 1) % option_pairs_.size();
|
||||
}
|
||||
|
||||
void ServiceMenu::setSelectorRight()
|
||||
{
|
||||
display_options_.at(selected_).adjustValue(true);
|
||||
option_pairs_ = getOptionPairs(current_settings_group_);
|
||||
applySettings(current_settings_group_);
|
||||
}
|
||||
void ServiceMenu::setSelectorLeft()
|
||||
{
|
||||
display_options_.at(selected_).adjustValue(false);
|
||||
option_pairs_ = getOptionPairs(current_settings_group_);
|
||||
applySettings(current_settings_group_);
|
||||
}
|
||||
|
||||
void ServiceMenu::acceptSelection()
|
||||
{
|
||||
if (display_options_.at(selected_).type == ValueType::FOLDER)
|
||||
{
|
||||
previous_settings_group_ = current_settings_group_;
|
||||
current_settings_group_ = display_options_.at(selected_).target_group;
|
||||
updateMenu(current_settings_group_);
|
||||
selected_ = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void ServiceMenu::cancelSelection()
|
||||
void ServiceMenu::moveBack()
|
||||
{
|
||||
if (current_settings_group_ == SettingsGroup::MAIN)
|
||||
{
|
||||
enabled_ = false;
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
selected_ = 0;
|
||||
current_settings_group_ = previous_settings_group_;
|
||||
updateMenu(current_settings_group_);
|
||||
}
|
||||
}
|
||||
|
||||
void ServiceMenu::initializeOptions()
|
||||
{
|
||||
// Video
|
||||
options_.emplace_back("FULLSCREEN", SettingsGroup::VIDEO, OptionBehavior::ADJUST, &options.video.fullscreen, ValueType::BOOL);
|
||||
options_.emplace_back("WINDOW SIZE", SettingsGroup::VIDEO, OptionBehavior::ADJUST, &options.window.size, ValueType::INT);
|
||||
options_.emplace_back("WINDOW SIZE", SettingsGroup::VIDEO, OptionBehavior::ADJUST, &options.window.size, ValueType::INT, 1, options.window.max_size, 1);
|
||||
options_.emplace_back("SHADERS", SettingsGroup::VIDEO, OptionBehavior::ADJUST, &options.video.shaders, ValueType::BOOL);
|
||||
options_.emplace_back("VSYNC", SettingsGroup::VIDEO, OptionBehavior::ADJUST, &options.video.v_sync, ValueType::BOOL);
|
||||
options_.emplace_back("INTEGER SCALE", SettingsGroup::VIDEO, OptionBehavior::ADJUST, &options.video.integer_scale, ValueType::BOOL);
|
||||
|
||||
// Audio
|
||||
options_.emplace_back("AUDIO", SettingsGroup::AUDIO, OptionBehavior::ADJUST, &options.audio.enabled, ValueType::BOOL);
|
||||
options_.emplace_back("MAIN VOLUME", SettingsGroup::AUDIO, OptionBehavior::ADJUST, &options.audio.volume, ValueType::INT);
|
||||
options_.emplace_back("MUSIC VOLUME", SettingsGroup::AUDIO, OptionBehavior::ADJUST, &options.audio.music.volume, ValueType::INT);
|
||||
options_.emplace_back("SFX VOLUME", SettingsGroup::AUDIO, OptionBehavior::ADJUST, &options.audio.sound.volume, ValueType::INT);
|
||||
options_.emplace_back("MAIN VOLUME", SettingsGroup::AUDIO, OptionBehavior::ADJUST, &options.audio.volume, ValueType::INT, 0, 100, 5);
|
||||
options_.emplace_back("MUSIC VOLUME", SettingsGroup::AUDIO, OptionBehavior::ADJUST, &options.audio.music.volume, ValueType::INT, 0, 100, 5);
|
||||
options_.emplace_back("SFX VOLUME", SettingsGroup::AUDIO, OptionBehavior::ADJUST, &options.audio.sound.volume, ValueType::INT, 0, 100, 5);
|
||||
|
||||
// Game
|
||||
options_.emplace_back("AUTOFIRE", SettingsGroup::GAME, OptionBehavior::ADJUST, &options.game.autofire, ValueType::BOOL);
|
||||
//options_.emplace_back("LANG", SettingsGroup::GAME, OptionBehavior::ADJUST, &options.game.language, ValueType::BOOL);
|
||||
// options_.emplace_back("LANG", SettingsGroup::GAME, OptionBehavior::ADJUST, &options.game.language, ValueType::BOOL);
|
||||
|
||||
// System
|
||||
options_.emplace_back("RESET", SettingsGroup::SYSTEM, OptionBehavior::SELECT, nullptr, ValueType::NONE);
|
||||
options_.emplace_back("QUIT", SettingsGroup::SYSTEM, OptionBehavior::SELECT, nullptr, ValueType::NONE);
|
||||
options_.emplace_back("SHUTDOWN", SettingsGroup::SYSTEM, OptionBehavior::SELECT, nullptr, ValueType::NONE);
|
||||
|
||||
// Menu principal
|
||||
options_.emplace_back("VIDEO", SettingsGroup::MAIN, OptionBehavior::SELECT, SettingsGroup::VIDEO);
|
||||
options_.emplace_back("AUDIO", SettingsGroup::MAIN, OptionBehavior::SELECT, SettingsGroup::AUDIO);
|
||||
options_.emplace_back("GAME", SettingsGroup::MAIN, OptionBehavior::SELECT, SettingsGroup::GAME);
|
||||
options_.emplace_back("SYSTEM", SettingsGroup::MAIN, OptionBehavior::SELECT, SettingsGroup::SYSTEM);
|
||||
}
|
||||
|
||||
ServiceMenu::OptionPairs ServiceMenu::getOptionPairs(ServiceMenu::SettingsGroup group) const
|
||||
{
|
||||
OptionPairs optionPairs;
|
||||
|
||||
for (const auto &option : options_)
|
||||
{
|
||||
if (option.group == group)
|
||||
{
|
||||
optionPairs.emplace_back(option.caption, option.getValueAsString());
|
||||
}
|
||||
}
|
||||
|
||||
return optionPairs;
|
||||
}
|
||||
|
||||
std::vector<ServiceMenu::OptionEntry> ServiceMenu::getOptionsByGroup(SettingsGroup group) const
|
||||
{
|
||||
std::vector<OptionEntry> filteredOptions;
|
||||
|
||||
for (const auto &option : options_)
|
||||
{
|
||||
if (option.group == group)
|
||||
{
|
||||
filteredOptions.push_back(option);
|
||||
}
|
||||
}
|
||||
|
||||
return filteredOptions;
|
||||
}
|
||||
|
||||
void ServiceMenu::applySettings(ServiceMenu::SettingsGroup group)
|
||||
{
|
||||
switch (group)
|
||||
{
|
||||
case SettingsGroup::VIDEO:
|
||||
Screen::get()->applySettings();
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void ServiceMenu::updateMenu(SettingsGroup group)
|
||||
{
|
||||
option_pairs_ = getOptionPairs(group);
|
||||
display_options_ = getOptionsByGroup(group);
|
||||
}
|
||||
|
||||
void ServiceMenu::reset()
|
||||
{
|
||||
selected_ = 0;
|
||||
previous_settings_group_ = current_settings_group_ = SettingsGroup::MAIN;
|
||||
updateMenu(current_settings_group_);
|
||||
}
|
||||
Reference in New Issue
Block a user