From 104ff0b34a1f8af3d399f24b5ab9e0c35fd44ff0 Mon Sep 17 00:00:00 2001 From: malak585 Date: Mon, 27 Nov 2023 14:44:46 +0100 Subject: [PATCH] worked on scoreboard. - Alma och malin --- assets/scoreboard.png | Bin 0 -> 30265 bytes src/Menus.cc | 52 +++++++++++++++++++++++++++--------------- src/States.h | 6 +++-- 3 files changed, 38 insertions(+), 20 deletions(-) create mode 100644 assets/scoreboard.png diff --git a/assets/scoreboard.png b/assets/scoreboard.png new file mode 100644 index 0000000000000000000000000000000000000000..bdaa06a9d74deba9d9df31c61c435d2e7f5dfb67 GIT binary patch literal 30265 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 literal 0 HcmV?d00001 diff --git a/src/Menus.cc b/src/Menus.cc index 53accbe..6fc0b5b 100644 --- a/src/Menus.cc +++ b/src/Menus.cc @@ -334,21 +334,19 @@ void Pause_menu::handle_input(sf::Event& event) // Scoreboard menu -------------------------------------------- -Scoreboard_menu::Scoreboard_menu() : /*texture{},*/ texture2{}, /*sprite{},*/ menu{false}, exit_game{false}, - startmenutext{}, quittext{}, mouse_r{}, mouse_l{}, font{}, menu_index{1} +Scoreboard_menu::Scoreboard_menu() : texture{}, texture2{}, sprite{}, menu{false}, exit_game{false}, + scoreboardtext{}, firstplacetext{}, startmenutext{}, quittext{}, mouse_r{}, mouse_l{}, font{}, menu_index{1} { - // Add background later - /* - texture.loadFromFile("assets/Pause_bild.png"); + texture.loadFromFile("assets/scoreboard.png"); sprite.setTexture(texture);; sprite.setScale(S_SCALE_KOEFF, S_SCALE_KOEFF); sf::FloatRect gb {sprite.getGlobalBounds()}; sprite.setPosition(0, 0); - */ + // mouse - texture2.loadFromFile("assets/muspekareGul.png"); + texture2.loadFromFile("assets/muspekare2.png"); mouse_l.setTexture(texture2); mouse_l.setScale(0.1, 0.1); @@ -364,17 +362,33 @@ Scoreboard_menu::Scoreboard_menu() : /*texture{},*/ texture2{}, /*sprite{},*/ me throw std::invalid_argument ("Unable to load font"); + // Scoreboard text + scoreboardtext = sf::Text{ "Scoreboard:", font, 39 }; + sf::FloatRect gbs {scoreboardtext.getGlobalBounds()}; + scoreboardtext.setOrigin(gbs.width / 2, gbs.height / 2); + scoreboardtext.setPosition (S_WIDTH / 2 - 15, ((S_HEIGHT / 2) - 120)); + scoreboardtext.setFillColor(sf::Color::Red); + + // ----------------------------------------------------------------------- + // First place text + firstplacetext = sf::Text{ "1. NAME 100p\n 2. NAME 39p" , font, 18 }; + sf::FloatRect gbfp {firstplacetext.getGlobalBounds()}; + firstplacetext.setOrigin(gbfp.width / 2, gbfp.height / 2); + firstplacetext.setPosition (S_WIDTH / 2 - 15, ((S_HEIGHT / 2) - 70)); + firstplacetext.setFillColor(sf::Color::Red); + // ----------------------------------------------------------------------- + // Start menu text startmenutext = sf::Text{ "Start menu", font, 24 }; sf::FloatRect gbr {startmenutext.getGlobalBounds()}; startmenutext.setOrigin(gbr.width / 2, gbr.height / 2); - startmenutext.setPosition (S_WIDTH / 2, ((S_HEIGHT / 2) - 30)); + startmenutext.setPosition (S_WIDTH / 2 - 15, ((S_HEIGHT / 2) + 80)); // Quit text quittext = sf::Text{ "Quit", font, 24 }; - sf::FloatRect gbs {quittext.getGlobalBounds()}; - quittext.setOrigin(gbs.width / 2, gbs.height / 2); - quittext.setPosition (S_WIDTH / 2, ((S_HEIGHT / 2) + 20)); + sf::FloatRect gbq {quittext.getGlobalBounds()}; + quittext.setOrigin(gbq.width / 2, gbq.height / 2); + quittext.setPosition (S_WIDTH / 2 - 15, ((S_HEIGHT / 2) + 130)); } @@ -388,27 +402,29 @@ void Scoreboard_menu::update(Context& context) // changes color on text depending on selection if( menu_index == 1) { - startmenutext.setFillColor(sf::Color::Yellow); - quittext.setFillColor(sf::Color::Black); + startmenutext.setFillColor(sf::Color::Black); + quittext.setFillColor(sf::Color::Red); } else if( menu_index == 2) { - startmenutext.setFillColor(sf::Color::Black); - quittext.setFillColor(sf::Color::Yellow); + startmenutext.setFillColor(sf::Color::Red); + quittext.setFillColor(sf::Color::Black); } // mouse placement - mouse_r.setPosition(((S_WIDTH / 2) + 60), ((S_HEIGHT / 2) - 45 + 50*(menu_index - 1))); - mouse_l.setPosition(((S_WIDTH / 2) - 58), ((S_HEIGHT / 2) + 2 + 50*(menu_index - 1))); + mouse_r.setPosition(((S_WIDTH / 2) + 45), ((S_HEIGHT / 2) + 65 + 50*(menu_index - 1))); + mouse_l.setPosition(((S_WIDTH / 2) - 73), ((S_HEIGHT / 2) + 112 + 50*(menu_index - 1))); } void Scoreboard_menu::render(sf::RenderWindow& window) const { - /*window.draw(sprite);*/ + window.draw(sprite); window.draw(mouse_l); window.draw(mouse_r); + window.draw(scoreboardtext); + window.draw(firstplacetext); window.draw(startmenutext); window.draw(quittext); diff --git a/src/States.h b/src/States.h index 2b07839..c8ab49f 100644 --- a/src/States.h +++ b/src/States.h @@ -98,11 +98,13 @@ public: void render(sf::RenderWindow& window) const override; void handle_input(sf::Event& event) override; private: - /*sf::Texture texture;*/ + sf::Texture texture; sf::Texture texture2; - /*sf::Sprite sprite;*/ + sf::Sprite sprite; sf::Sprite mouse_l; sf::Sprite mouse_r; + sf::Text scoreboardtext; + sf::Text firstplacetext; sf::Text startmenutext; sf::Text quittext; sf::Font font; -- 2.30.2