Skip to content
GitLab

added pattern Observer

Open Ушкова Диана Петровна requested to merge ui_disagn into main
Viewing commit 2e7f7920
Prev Next
Show latest version
10 files
+ 66
− 38
source/application/Drawable/DrawMenu/Button/Button.cpp
+ 6
− 5
@@ -14,7 +14,8 @@ Button::Button(sf::Vector2f pos, sf::Vector2f button_size,
m_text = sf::Text(text, MyFont::Instance(), font_size);
m_text.setFillColor(ThemeManager::Instance().getButtonTextColor());
m_text.setPosition(pos);
sf::FloatRect textRect = m_text.getLocalBounds();
m_text.setPosition(pos.x + (button_size.x - textRect.width) / 2.0f - textRect.left, pos.y + (button_size.y - textRect.height) / 2.0f - textRect.top);
m_rectangle.setFillColor(ThemeManager::Instance().getButtonFillColor());
m_ptr_command = std::move(ptr_command);
}
@@ -54,15 +55,15 @@ bool ChooseButton::contains(sf::Vector2f point) const {
ChooseButton::ChooseButton(sf::Vector2f pos, const std::string &text, size_t font_size) {
m_out_circle.setRadius(15.f);
m_out_circle.setOutlineThickness(2.f);
m_out_circle.setRadius(10.f);
m_out_circle.setOutlineThickness(1.f);
m_out_circle.setOutlineColor(ThemeManager::Instance().getButtonOutlineColor());
m_out_circle.setFillColor(sf::Color::Transparent);
m_out_circle.setPosition(pos);
m_in_circle.setRadius(8.f);
m_in_circle.setRadius(6.f);
m_in_circle.setFillColor(sf::Color::Blue);
m_in_circle.setPosition(pos.x + 7.f, pos.y + 7.f);
m_in_circle.setPosition(pos.x + 4.f, pos.y + 4.f);
m_in_circle.setOutlineThickness(0);
m_text = sf::Text(text, MyFont::Instance(), font_size);
source/application/Drawable/DrawMenu/Menu/Menu.cpp
+ 23
− 17
@@ -28,19 +28,18 @@ Menu::Menu(IStateManager& state_manager) : m_state_manager(state_manager) {
config::HARD_GAME_TITLE,
config::HARD_GAME_ENEMY_RATIO));
float y_pos = 100.f;
m_choose_button.push_back(std::make_unique<ChooseButton>(sf::Vector2f(80.f, y_pos), "Easy game", 24));
m_choose_button.push_back(std::make_unique<ChooseButton>(sf::Vector2f(80.f, y_pos + 40.f), "Medium game", 24));
m_choose_button.push_back(std::make_unique<ChooseButton>(sf::Vector2f(80.f, y_pos + 80.f), "Hard game", 24));
m_choose_button.push_back(std::make_unique<ChooseButton>(sf::Vector2f(400.f, 130.f), config::EASY_GAME_TITLE, 24));
m_choose_button.push_back(std::make_unique<ChooseButton>(sf::Vector2f(400.f, 170.f), config::MEDIUM_GAME_TITLE, 24));
m_choose_button.push_back(std::make_unique<ChooseButton>(sf::Vector2f(400.f, 210.f), config::HARD_GAME_TITLE, 24));
m_choose_button_players.push_back(std::make_unique<ChooseButton>(sf::Vector2f(80.f, y_pos + 150.f), "One player", 24));
m_choose_button_players.push_back(std::make_unique<ChooseButton>(sf::Vector2f(80.f, y_pos + 190.f), "Two players", 24));
m_choose_button_players.push_back(std::make_unique<ChooseButton>(sf::Vector2f(400.f, 255.f), config::ONE_PLAYER_GAME_TITLE, 24));
m_choose_button_players.push_back(std::make_unique<ChooseButton>(sf::Vector2f(400.f, 295.f), config::TWO_PLAYER_GAME_TITLE, 24));
m_choose_button_theme.push_back(std::make_unique<ChooseButton>(sf::Vector2f(80.f, y_pos + 260.f), "Light theme", 24));
m_choose_button_theme.push_back(std::make_unique<ChooseButton>(sf::Vector2f(80.f, y_pos + 295.f), "Dark theme", 24));
m_choose_button_theme.push_back(std::make_unique<ChooseButton>(sf::Vector2f(400.f, 343.f), config::BUTTON_THEME_WHITE, 24));
m_choose_button_theme.push_back(std::make_unique<ChooseButton>(sf::Vector2f(400.f, 383.f), config::BUTTON_THEME_BLACK, 24));
m_choose_button_theme[m_selected_theme]->select();
m_exit_button = std::make_unique<Button>(sf::Vector2f(300.f, y_pos + 200.f), sf::Vector2f(150.f, 50.f), "Exit", 24, std::make_unique<ExitCommand>(state_manager));
m_proceed_button = std::make_unique<Button>(sf::Vector2f(300.f, y_pos + 250.f), sf::Vector2f(150.f, 50.f), "Go to game", 24,nullptr);
m_exit_button = std::make_unique<Button>(sf::Vector2f(900.f, 500.f), sf::Vector2f(150.f, 50.f), config::BUTTON_TEXT_EXIT, 24, std::make_unique<ExitCommand>(state_manager));
m_proceed_button = std::make_unique<Button>(sf::Vector2f(450.f, 500.f), sf::Vector2f(150.f, 50.f), config::BUTTON_START_GAME, 24,nullptr);
}
void Menu::process_mouse(sf::Vector2f pos, bool is_pressed) {
@@ -64,7 +63,6 @@ void Menu::process_mouse(sf::Vector2f pos, bool is_pressed) {
button->unselect();
m_choose_button_players[i]->select();
m_selected_players = i;
break;
}
}
///> выбор темы приложения
@@ -90,18 +88,26 @@ void Menu::process_mouse(sf::Vector2f pos, bool is_pressed) {
}
void Menu::draw_into(sf::RenderWindow &window) {
sf::Text title("Select level", MyFont::Instance(), 30);
title.setPosition(80.f, 50.f);
sf::Text title(config::SELECT_LEVEL_TITLE_WINDOW, MyFont::Instance(), 40);
title.setPosition(window.getSize().x/2.f-100.f, 50.f);
title.setFillColor(ThemeManager::Instance().getTitleTextColor());
window.draw(title);
for (auto& button : m_choose_button)
button->draw_into(window);
sf::Text title2("Select number of players", MyFont::Instance(), 30);
title2.setPosition(80.f, 210.f);
sf::Text title2(config::SELECT_LEVEL_TITLE, MyFont::Instance(), 30);
title2.setPosition(window.getSize().x/2.f-350.f, 120.f);
title2.setFillColor(ThemeManager::Instance().getTitleTextColor());
window.draw(title2);
for (auto& button : m_choose_button)
button->draw_into(window);
sf::Text title3(config::SELECT_LEVEL_TITLE_PLAYER, MyFont::Instance(), 30);
title3.setPosition(window.getSize().x/2.f-350.f, 240.f);
title3.setFillColor(ThemeManager::Instance().getTitleTextColor());
window.draw(title3);
for (auto& button : m_choose_button_players)
button->draw_into(window);
sf::Text title4(config::SELECT_THEME, MyFont::Instance(), 30);
title4.setPosition(window.getSize().x/2.f-350.f, 330.f);
title4.setFillColor(ThemeManager::Instance().getTitleTextColor());
window.draw(title4);
for (auto& button : m_choose_button_theme)
button->draw_into(window);
m_proceed_button->draw_into(window);
source/application/Drawable/DrawMenu/Menu/Menu.h
+ 1
− 1
@@ -19,7 +19,7 @@ private:
std::unique_ptr<Button> m_exit_button;
std::vector<std::unique_ptr<GameBuilderDirector>> m_directors;
int m_selected_level = -1;
int m_selected_players = 0;
int m_selected_players = -1;
int m_selected_theme = 0;
IStateManager& m_state_manager;
std::vector<std::unique_ptr<Button>> m_buttons; //@todo vector changes to array<Button, 4>
source/application/Drawable/Entity/MyTexture.cpp
+ 4
− 0
@@ -33,3 +33,7 @@ FoodTexture::FoodTexture() {
EnemyTexture::EnemyTexture() {
m_texture_enemy.loadFromFile(std::string(ASSETS_PATH) + "enemy.png");
}
BackgroundTexture::BackgroundTexture() {
m_texture_background.loadFromFile(std::string(ASSETS_PATH) + "background.png");
}
\ No newline at end of file
source/application/Drawable/Entity/MyTexture.h
+ 9
− 0
@@ -43,3 +43,12 @@ private:
EnemyTexture();
sf::Texture m_texture_enemy;
};
class BackgroundTexture : public MyTexture {
public:
static BackgroundTexture& instance() { static BackgroundTexture instance; return instance; }
sf::Texture& get_texture() override { return m_texture_background; }
private:
BackgroundTexture();
sf::Texture m_texture_background;
};
source/application/State/SelectState.cpp
+ 3
− 1
@@ -5,6 +5,8 @@ SelectState::SelectState(IStateManager& state_manager,
const std::string& window_title) :
IState(state_manager), IWindowKeeper(video_mode, window_title), m_menu(state_manager) {
update_theme();
set_texture(&BackgroundTexture::instance());
m_backgorund_sprite.setTexture(m_background->get_texture());
}
void SelectState::event_handling() {
@@ -27,7 +29,7 @@ void SelectState::update() {
}
void SelectState::render() {
update_theme();
m_window.clear(ThemeManager::Instance().getSelectLevelBackgroundColor());
m_window.draw(m_backgorund_sprite);
m_menu.draw_into(m_window);
m_window.display();
}
source/application/State/SelectState.h
+ 3
− 0
@@ -6,10 +6,13 @@
struct SelectState: public IState, public IWindowKeeper {
SelectState(IStateManager& state_manager, const sf::VideoMode& video_mode, const std::string& window_title);
void event_handling() override;
void set_texture(MyTexture* ptr_texture) { m_background = ptr_texture; }
void update() override;
void render() override;
bool do_step() override;
private:
void update_theme() { ThemeManager::Instance().applyTheme(); }
MyTexture* m_background;
sf::Sprite m_backgorund_sprite;
Menu m_menu;
};
\ No newline at end of file
source/application/State/ThemeManager.cpp
+ 6
− 10
@@ -42,10 +42,6 @@ sf::Color ThemeManager::getGameBackgroundLostColor() const {
return m_currentColors.game_background_lost;
}
sf::Color ThemeManager::getSelectLevelBackgroundColor() const {
return m_currentColors.select_level_background;
}
sf::Color ThemeManager::getRoomColor() const {
return m_currentColors.room_color;
}
@@ -57,10 +53,10 @@ sf::Color ThemeManager::getWallColor() const {
void ThemeManager::loadThemeColors() {
if (m_theme == Theme::LIGHT) {
m_currentColors = {
sf::Color::Blue, // button_text
sf::Color(200, 200, 200), // button_fill
sf::Color(150, 150, 150), // button_selection
sf::Color::Blue, // button_frame
sf::Color::White, // button_text
sf::Color(21, 117, 217), // button_fill
sf::Color(0, 0, 0), // button_selection
sf::Color::White, // button_frame
sf::Color(240, 240, 240), // select_level_background
sf::Color(255, 255, 255), // game_background_ingame
sf::Color(0, 255, 0), // game_background_win
@@ -71,14 +67,14 @@ void ThemeManager::loadThemeColors() {
sf::Color(50, 50, 50), // game_wall
sf::Color(255, 165, 0), // game_food
sf::Color(255, 0, 0), // game_enemy
sf::Color::Blue, // title_text
sf::Color::White, // title_text
sf::Color(255, 255, 255), // room_color
sf::Color(0, 0, 0) // wall_color
};
} else if (m_theme == Theme::DARK) {
m_currentColors = {
sf::Color::White, // button_text
sf::Color(50, 50, 50), // button_fill
sf::Color(21, 117, 217), // button_fill
sf::Color(80, 80, 80), // button_selection
sf::Color::White, // button_frame
sf::Color(30, 30, 30), // select_level_background
source/application/State/ThemeManager.h
+ 0
− 1
@@ -42,7 +42,6 @@ public:
sf::Color getGameBackgroundInGameColor() const;
sf::Color getGameBackgroundWinColor() const;
sf::Color getGameBackgroundLostColor() const;
sf::Color getSelectLevelBackgroundColor() const;
sf::Color getRoomColor() const;
sf::Color getWallColor() const;
config.h
+ 11
− 3
@@ -8,16 +8,24 @@ namespace config {
const sf::Vector2f BUTTON_SIZE = { 250, 100 };
const size_t BUTTON_FONT_SIZE = static_cast<size_t>(BUTTON_SIZE.y / 1.5f); const float BUTTON_FRAME_THICKNESS = 2.0f;
const char FONT_FILE[] = "Calibri.ttf";
const char SELECT_LEVEL_TITLE[] = "Select Level";
const sf::VideoMode SELECT_LEVEL_VIDEO_MODE{ 400, 600 };
const char SELECT_LEVEL_TITLE_WINDOW[] = "Settings";
const char SELECT_LEVEL_TITLE[] = "Select Level:";
const char SELECT_LEVEL_TITLE_PLAYER[] = "Select Player:";
const char SELECT_THEME[] = "Select Theme:";
const char BUTTON_THEME_WHITE[] = "Theme: White";
const char BUTTON_THEME_BLACK[] = "Theme: Black";
const sf::VideoMode SELECT_LEVEL_VIDEO_MODE{ 1138, 620 };
const std::vector<std::string> BUTTON_TEXT = {"Easy","Medium", "Hard", "Exit"};
const char BUTTON_TEXT_EASY[] = "Easy";
const char BUTTON_TEXT_MEDIUM[] = "Medium";
const char BUTTON_TEXT_HARD[] = "Hard";
const char BUTTON_TEXT_EXIT[] = "Exit";
// Игра:
const sf::VideoMode GAME_VIDEO_MODE{ 880, 620 };
const sf::VideoMode GAME_VIDEO_MODE{ 1138, 620 };
const char BUTTON_START_GAME[] = "Start Game";
const char EASY_GAME_TITLE[] = "Level: Easy";
const char ONE_PLAYER_GAME_TITLE[] = "Player: One";
const char TWO_PLAYER_GAME_TITLE[] = "Player: Two";
const char MEDIUM_GAME_TITLE[] = "Level: Medium";
const char HARD_GAME_TITLE[] = "Level: Hard";
const float EASY_GAME_ENEMY_RATIO = 0.0f;