From f883bd5baba07a5a4e0eb9706013c4c695c2c303 Mon Sep 17 00:00:00 2001 From: zulianc Date: Fri, 28 Mar 2025 21:31:24 +0100 Subject: [PATCH] ajout board menu --- src/GraphicalUI/AppMenus/GameBoardAppMenu.cpp | 67 +++++++++++++++++++ src/GraphicalUI/AppMenus/GameBoardAppMenu.h | 21 ++++++ .../AppMenus/GameSettingsAppMenu.cpp | 12 +++- src/GraphicalUI/AppMenus/InfoAppMenu.cpp | 2 +- src/GraphicalUI/AppMenus/MainAppMenu.cpp | 2 +- .../AppMenus/SettingsControlsAppMenu.cpp | 2 +- .../AppMenus/SettingsKeybindsAppMenu.cpp | 2 +- .../AppMenus/SettingsMainAppMenu.cpp | 2 +- 8 files changed, 102 insertions(+), 8 deletions(-) create mode 100644 src/GraphicalUI/AppMenus/GameBoardAppMenu.cpp create mode 100644 src/GraphicalUI/AppMenus/GameBoardAppMenu.h diff --git a/src/GraphicalUI/AppMenus/GameBoardAppMenu.cpp b/src/GraphicalUI/AppMenus/GameBoardAppMenu.cpp new file mode 100644 index 0000000..f806a7d --- /dev/null +++ b/src/GraphicalUI/AppMenus/GameBoardAppMenu.cpp @@ -0,0 +1,67 @@ +#include "GameBoardAppMenu.h" + +#include "AppMenu.h" +#include "../PlayerCursor.h" + +#include +#include +#include +#include + + +GameBoardAppMenu::GameBoardAppMenu(std::shared_ptr menuStack, std::shared_ptr settings, std::shared_ptr renderWindow) : + AppMenu(menuStack, settings, renderWindow), + playerCursor({1, 1}) { + +} + +void GameBoardAppMenu::computeFrame() { + this->updateMetaBinds(); + this->playerCursor.updatePosition(); + + Menu& menu = this->settings->getMenu(); + + switch (this->playerCursor.getPosition().y) { + case 0 : { + if (this->playerCursor.movedLeft()) { + menu.setBoardWidth(std::max(1, menu.getBoardWidth() - 1)); + } + if (this->playerCursor.movedRight()) { + menu.setBoardWidth(std::min(MAXIMUM_BOARD_WIDTH, menu.getBoardWidth() + 1)); + } + break; + } + case 1 : { + if (this->playerCursor.movedLeft()) { + menu.setBoardHeight(std::max(1, menu.getBoardHeight() - 1)); + } + if (this->playerCursor.movedRight()) { + menu.setBoardHeight(std::min(MAXIMUM_BOARD_HEIGHT, menu.getBoardHeight() + 1)); + } + break; + } + } + + if (this->escReleased) { + this->menuStack->pop(); + } +} + +void GameBoardAppMenu::drawFrame() const { + this->renderWindow->clear(sf::Color(200, 200, 200)); + + const Menu& menu = this->settings->getMenu(); + + sf::Text text(this->pressStartFont, "", this->settings->getWindowSizeMultiplier() * 2); + text.setFillColor(sf::Color(0, 0, 0)); + text.setOutlineColor(sf::Color(255, 255, 255)); + + this->placeTitle(text, {}, "BOARD SETTINGS", 5.f, {}); + + sf::Vector2u windowSize = this->renderWindow->getSize(); + + this->placeText(text, this->playerCursor, "< BOARD WIDTH: " + std::to_string(menu.getBoardWidth()) + " >", 5.f, 15.f, sf::Vector2u{0, 0}); + this->placeText(text, this->playerCursor, "< BOARD HEIGHT: " + std::to_string(menu.getBoardHeight()) + " >", 5.f, 25.f, sf::Vector2u{0, 1}); + + this->renderWindow->display(); +} diff --git a/src/GraphicalUI/AppMenus/GameBoardAppMenu.h b/src/GraphicalUI/AppMenus/GameBoardAppMenu.h new file mode 100644 index 0000000..d8124ac --- /dev/null +++ b/src/GraphicalUI/AppMenus/GameBoardAppMenu.h @@ -0,0 +1,21 @@ +#pragma once + +#include "AppMenu.h" +#include "../PlayerCursor.h" + +#include +#include +#include + + +class GameBoardAppMenu : public AppMenu { + private: + PlayerCursor playerCursor; + + public: + GameBoardAppMenu(std::shared_ptr menuStack, std::shared_ptr settings, std::shared_ptr renderWindow); + + void computeFrame() override; + + void drawFrame() const override; +}; diff --git a/src/GraphicalUI/AppMenus/GameSettingsAppMenu.cpp b/src/GraphicalUI/AppMenus/GameSettingsAppMenu.cpp index 0eb4dc8..bfbe708 100644 --- a/src/GraphicalUI/AppMenus/GameSettingsAppMenu.cpp +++ b/src/GraphicalUI/AppMenus/GameSettingsAppMenu.cpp @@ -1,6 +1,7 @@ #include "GameSettingsAppMenu.h" #include "AppMenu.h" +#include "GameBoardAppMenu.h" #include "GamePlayingAppMenu.h" #include "../PlayerCursor.h" @@ -12,7 +13,7 @@ GameSettingsAppMenu::GameSettingsAppMenu(std::shared_ptr menuStack, std::shared_ptr settings, std::shared_ptr renderWindow) : AppMenu(menuStack, settings, renderWindow), - playerCursor(std::vector({2, 3, 2})) { + playerCursor({2, 3, 3}) { } @@ -41,7 +42,12 @@ void GameSettingsAppMenu::computeFrame() { if (this->enterReleased) { if (this->playerCursor.getPosition().y == 0) { - //TODO + if (this->playerCursor.getPosition().x == 0) { + //TODO + } + if (this->playerCursor.getPosition().x == 1) { + this->menuStack->push(std::make_shared(this->menuStack, this->settings, this->renderWindow)); + } } if (this->playerCursor.getPosition().y > 0) { this->menuStack->push(std::make_shared(this->menuStack, this->settings, this->renderWindow)); @@ -62,7 +68,7 @@ void GameSettingsAppMenu::drawFrame() const { this->placeTitle(text, {}, "GAME SETTINGS", 5.f, {}); this->placeText(text, this->playerCursor, "PIECES SELECT (TODO)", 5.f, 15.f, sf::Vector2u{0, 0}); - this->placeText(text, this->playerCursor, "BOARD SELECT (TODO)", 40.f, 15.f, sf::Vector2u{1, 0}); + this->placeText(text, this->playerCursor, "BOARD SELECT", 40.f, 15.f, sf::Vector2u{1, 0}); this->placeText(text, this->playerCursor, "SPRINT", 5.f, 25.f, sf::Vector2u{0, 1}); this->placeText(text, this->playerCursor, "MARATHON", 25.f, 25.f, sf::Vector2u{1, 1}); diff --git a/src/GraphicalUI/AppMenus/InfoAppMenu.cpp b/src/GraphicalUI/AppMenus/InfoAppMenu.cpp index e5bb28e..43589f1 100644 --- a/src/GraphicalUI/AppMenus/InfoAppMenu.cpp +++ b/src/GraphicalUI/AppMenus/InfoAppMenu.cpp @@ -11,7 +11,7 @@ InfoAppMenu::InfoAppMenu(std::shared_ptr menuStack, std::shared_ptr settings, std::shared_ptr renderWindow) : AppMenu(menuStack, settings, renderWindow), - playerCursor(std::vector({4})), + playerCursor({4}), sectionsName( "< ABOUT >", "< ROTATION SYSTEM >", diff --git a/src/GraphicalUI/AppMenus/MainAppMenu.cpp b/src/GraphicalUI/AppMenus/MainAppMenu.cpp index 845d089..4c03d56 100644 --- a/src/GraphicalUI/AppMenus/MainAppMenu.cpp +++ b/src/GraphicalUI/AppMenus/MainAppMenu.cpp @@ -14,7 +14,7 @@ MainAppMenu::MainAppMenu(std::shared_ptr menuStack, std::shared_ptr settings, std::shared_ptr renderWindow) : AppMenu(menuStack, settings, renderWindow), - playerCursor(std::vector({1, 1, 1})) { + playerCursor({1, 1, 1}) { } diff --git a/src/GraphicalUI/AppMenus/SettingsControlsAppMenu.cpp b/src/GraphicalUI/AppMenus/SettingsControlsAppMenu.cpp index 7f35deb..58aeb55 100644 --- a/src/GraphicalUI/AppMenus/SettingsControlsAppMenu.cpp +++ b/src/GraphicalUI/AppMenus/SettingsControlsAppMenu.cpp @@ -11,7 +11,7 @@ SettingsControlsAppMenu::SettingsControlsAppMenu(std::shared_ptr menuStack, std::shared_ptr settings, std::shared_ptr renderWindow) : AppMenu(menuStack, settings, renderWindow), - playerCursor(std::vector({1, 1, 1})) { + playerCursor({1, 1, 1}) { } diff --git a/src/GraphicalUI/AppMenus/SettingsKeybindsAppMenu.cpp b/src/GraphicalUI/AppMenus/SettingsKeybindsAppMenu.cpp index 33ff632..df49705 100644 --- a/src/GraphicalUI/AppMenus/SettingsKeybindsAppMenu.cpp +++ b/src/GraphicalUI/AppMenus/SettingsKeybindsAppMenu.cpp @@ -15,7 +15,7 @@ SettingsKeybindsAppMenu::SettingsKeybindsAppMenu(std::shared_ptr menuStack, std::shared_ptr settings, std::shared_ptr renderWindow) : AppMenu(menuStack, settings, renderWindow), - playerCursor(std::vector(12, 1)) { + playerCursor({12, 1}) { this->selectedAnAction = false; diff --git a/src/GraphicalUI/AppMenus/SettingsMainAppMenu.cpp b/src/GraphicalUI/AppMenus/SettingsMainAppMenu.cpp index 6dbf1fe..8ccb98e 100644 --- a/src/GraphicalUI/AppMenus/SettingsMainAppMenu.cpp +++ b/src/GraphicalUI/AppMenus/SettingsMainAppMenu.cpp @@ -13,7 +13,7 @@ SettingsMainAppMenu::SettingsMainAppMenu(std::shared_ptr menuStack, std::shared_ptr settings, std::shared_ptr renderWindow) : AppMenu(menuStack, settings, renderWindow), - playerCursor(std::vector({1, 1, 1, 1})) { + playerCursor({1, 1, 1, 1}) { }