From 6b6afa76b2f2595c5e8562f4213e948f234c1454 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Thu, 28 Dec 2023 17:09:00 +0100 Subject: [PATCH] add text a the bottom fr this time --- assets/open-sans-latin-400-normal.ttf | Bin 0 -> 25808 bytes includes/Ecran.hpp | 10 +++++++++- src/Butin/Butin.cpp | 4 ++++ src/Ecran.cpp | 23 ++++++++++++++++++++++- src/Plateau.cpp | 2 +- 5 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 assets/open-sans-latin-400-normal.ttf diff --git a/assets/open-sans-latin-400-normal.ttf b/assets/open-sans-latin-400-normal.ttf new file mode 100644 index 0000000000000000000000000000000000000000..af3d23557d0955db15f4cc486042836372781a35 GIT binary patch literal 25808 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 literal 0 HcmV?d00001 diff --git a/includes/Ecran.hpp b/includes/Ecran.hpp index ad9c54e..2f8c357 100644 --- a/includes/Ecran.hpp +++ b/includes/Ecran.hpp @@ -4,7 +4,9 @@ #include class Ecran { - static const uint bottomTxtPadding = 20; + static const uint bottomTxtPadding = 30; + + std::string message; public: // Fenêtre @@ -32,4 +34,10 @@ public: static uint hauteur() { return window.getSize().y - bottomTxtPadding; } + + // Ecrire un message en bas de l'écran + void printMessage(std::string msg); + + // Efface le message en bas de l'écran + void cleanMessage(); }; diff --git a/src/Butin/Butin.cpp b/src/Butin/Butin.cpp index 5d17532..b8a35f1 100644 --- a/src/Butin/Butin.cpp +++ b/src/Butin/Butin.cpp @@ -28,4 +28,8 @@ std::ostream &operator<<(std::ostream &out, const Butin &data) { void Butin::init() { plateau.initialiserPlateau(); + + // Demander à J1 de retirer une pièce jaune + + // Demander à J2 de retirer une pièce jaune } diff --git a/src/Ecran.cpp b/src/Ecran.cpp index 646dd27..2ce966b 100644 --- a/src/Ecran.cpp +++ b/src/Ecran.cpp @@ -2,7 +2,7 @@ sf::RenderWindow Ecran::window; -Ecran::Ecran(const uint w, const uint h, const std::string n) { +Ecran::Ecran(const uint w, const uint h, const std::string n) : message("") { // Création de la fenêtre SFML window.create(sf::VideoMode(w, h + bottomTxtPadding), n); } @@ -12,6 +12,15 @@ Ecran::~Ecran() {} void Ecran::afficher( const std::function dessin, const std::function onLeftClick) const { + sf::Font font; + font.loadFromFile("assets/open-sans-latin-400-normal.ttf"); + + sf::Text text; + text.setFont(font); + text.setCharacterSize(24); + text.setPosition(0, hauteur()); + text.setFillColor(sf::Color::White); + while (window.isOpen()) { sf::Event event; while (window.pollEvent(event)) { @@ -32,6 +41,18 @@ void Ecran::afficher( // Appel d'une fonction dessin dessin(); + // Ecriture du message + text.setString(message); + window.draw(text); + window.display(); } } + +void Ecran::printMessage(std::string msg) { + message = msg; +} + +void Ecran::cleanMessage() { + message = ""; +} diff --git a/src/Plateau.cpp b/src/Plateau.cpp index 65a8a89..c77a356 100644 --- a/src/Plateau.cpp +++ b/src/Plateau.cpp @@ -29,7 +29,7 @@ void Plateau::afficherPlateau(std::ostream &out, const bool d) const { // Adapte la vue pour le redimensionnement const float tailleFenetre = taille * tailleCellule; Ecran::window.setView( - sf::View(sf::FloatRect(0, 0, tailleFenetre, tailleFenetre))); + sf::View(sf::FloatRect(0, 0, tailleFenetre, Ecran::window.getSize().y))); // Cellule sf::RectangleShape cell(sf::Vector2f(tailleCellule, tailleCellule));