Add back button

Author: mlsdpk

include/Gui.h

@@ -49,9 +49,10 @@ class Button {
 class DropDownList {
  private:
   sf::Font* font_;
-  gui::Button* mainButton_;
+  std::unique_ptr<gui::Button> mainButton_;
   gui::Button* activeButton_;
-  std::vector<gui::Button*> list_;
+  // std::vector<gui::Button*> list_;
+  std::vector<std::unique_ptr<gui::Button>> list_;
   bool showList_;
   bool activeMode_;
 
@@ -72,6 +73,9 @@ class DropDownList {
   gui::Button* getActiveButton();
   const bool hasActiveButton() const;
 
+  // Mutators
+  void makeButtonInActive();
+
   // Functions
   void updateKeyTime(const float& dt);
   void update(const sf::Vector2f mousePos, const float& dt);

include/States/MainMenu_State.h

@@ -21,7 +21,7 @@ class MainMenu_State : public State {
   std::vector<std::string> algo_vec_;
 
   std::map<std::string, std::unique_ptr<gui::Button>> buttons_;
-  std::unique_ptr<gui::DropDownList> testDDL_;
+  std::unique_ptr<gui::DropDownList> ddl_;
 
   // Functions
   void initFonts();

src/Gui.cpp

@@ -144,24 +144,20 @@ gui::DropDownList::DropDownList(float x, float y, float width, float height,
       keyTime_{0.f},
       activeButton_{nullptr},
       activeMode_{false} {
-  mainButton_ = new gui::Button(
+  mainButton_ = std::make_unique<gui::Button>(
       x, y, width, height, font_, text, 20, sf::Color(251, 244, 249, 255),
       sf::Color(245, 238, 243, 255), sf::Color(214, 214, 215, 200));
+
   for (size_t i = 0; i < numOfElements; i++) {
-    list_.push_back(new gui::Button(
+    list_.emplace_back(std::make_unique<gui::Button>(
         x, y + ((i + 1) * height), width, height, font_, algo_vec[i], 20,
         sf::Color(251, 244, 249, 255), sf::Color(245, 238, 243, 255),
         sf::Color(240, 240, 240, 200)));
   }
 }
 
 // Destructor
-gui::DropDownList::~DropDownList() {
-  delete mainButton_;
-  for (auto i : list_) {
-    delete i;
-  }
-}
+gui::DropDownList::~DropDownList() {}
 
 /**
  * Getter function for DropDownList ACTIVE state.
@@ -184,6 +180,8 @@ const bool gui::DropDownList::hasActiveButton() const {
  */
 gui::Button* gui::DropDownList::getActiveButton() { return activeButton_; }
 
+void gui::DropDownList::makeButtonInActive() { activeButton_ = nullptr; }
+
 /**
  * Getter function for DropDownList key timer.
  *
@@ -238,7 +236,7 @@ void gui::DropDownList::update(const sf::Vector2f mousePos, const float& dt) {
     for (auto& i : list_) {
       i->update(mousePos);
       if (i->isPressed()) {
-        activeButton_ = i;
+        activeButton_ = i.get();
       }
     }
 

src/States/Algorithms/Algorithm.cpp

@@ -15,7 +15,10 @@ Algorithm::Algorithm(sf::RenderWindow* window,
 
 // Destructor
 Algorithm::~Algorithm() {
-  if (!thread_joined_) t_.join();
+  if (!thread_joined_) {
+    // std::cout << "thread joined" << '\n';
+    t_.join();
+  }
 }
 
 void Algorithm::initVariables() {
@@ -25,11 +28,8 @@ void Algorithm::initVariables() {
   mapWidth_ = 900;
   mapHeight_ = 640;
 
-  // old array initialization
-  // nodes_ = std::make_unique<Node[]>((mapWidth_ / gridSize_) * (mapHeight_ /
-  // gridSize_));
   for (int i = 0; i < (mapWidth_ / gridSize_) * (mapHeight_ / gridSize_); i++) {
-    nodes_.push_back(std::make_shared<Node>());
+    nodes_.emplace_back(std::make_shared<Node>());
   }
 
   message_queue_ = std::make_shared<MessageQueue<bool>>();
@@ -87,6 +87,9 @@ void Algorithm::initButtons() {
 
   buttons_["RESET"] = std::make_unique<gui::Button>(
       150, 210, 150, 40, &font2_, "RESET", 18, IDLE_COL, HOVER_COL, ACTIVE_COL);
+
+  buttons_["MENU"] = std::make_unique<gui::Button>(
+      150, 570, 150, 40, &font2_, "MENU", 18, IDLE_COL, HOVER_COL, ACTIVE_COL);
 }
 
 void Algorithm::initNodes() {
@@ -131,7 +134,9 @@ void Algorithm::initNodes() {
                     (mapWidth_ / gridSize_ - 1)];
 }
 
-void Algorithm::endState() { std::cout << "Ending Algorithm State" << '\n'; }
+void Algorithm::endState() {
+  // std::cout << "Ending Algorithm State" << '\n';
+}
 
 void Algorithm::updateKeybinds() { checkForQuit(); }
 
@@ -149,6 +154,11 @@ void Algorithm::updateButtons() {
   if (buttons_["RESET"]->isPressed() && getKeyTime()) {
     Algorithm_reset_ = true;
   }
+
+  // Back to MainMenu
+  if (buttons_["MENU"]->isPressed() && getKeyTime()) {
+    quit_ = true;
+  }
 }
 
 /**

src/States/Algorithms/BFS/BFS.cpp

@@ -5,7 +5,7 @@ BFS::BFS(sf::RenderWindow *window, std::stack<std::unique_ptr<State>> &states)
     : Algorithm(window, states, "BREADTH FIRST SEARCH") {}
 
 // Destructor
-BFS::~BFS() {}
+BFS::~BFS() { std::cout << "BFS Destructor called" << '\n'; }
 
 // override initAlgorithm() function
 void BFS::initAlgorithm() {

src/States/MainMenu_State.cpp

@@ -12,7 +12,9 @@ MainMenu_State::MainMenu_State(sf::RenderWindow *window,
 }
 
 // Destructor
-MainMenu_State::~MainMenu_State() {}
+MainMenu_State::~MainMenu_State() {
+  // std::cout << "MainMenu Destructor called" << '\n';
+}
 
 void MainMenu_State::initColors() {
   BGN_COL = sf::Color(246, 229, 245, 255);
@@ -74,8 +76,8 @@ void MainMenu_State::initButtons() {
   int x = window_->getSize().x / 2;
   int y = window_->getSize().y / 2 - 150;
 
-  testDDL_ = std::make_unique<gui::DropDownList>(
-      x, y, 250, 50, &font2_, "SELECT ALGORITHM", algo_vec_, 4);
+  ddl_ = std::make_unique<gui::DropDownList>(x, y, 250, 50, &font2_,
+                                             "SELECT ALGORITHM", algo_vec_, 4);
 
   buttons_["EXIT"] = std::make_unique<gui::Button>(
       x, y + 410, 150, 50, &font2_, "EXIT", 20, IDLE_COL, HOVER_COL,
@@ -87,10 +89,10 @@ void MainMenu_State::updateButtons(const float &dt) {
     it.second->update(sf::Vector2f(mousePositionWindow_));
   }
 
-  testDDL_->update(sf::Vector2f(mousePositionWindow_), dt);
+  ddl_->update(sf::Vector2f(mousePositionWindow_), dt);
 
-  if (testDDL_->hasActiveButton()) {
-    std::string algo = testDDL_->getActiveButton()->getText();
+  if (ddl_->hasActiveButton()) {
+    std::string algo = ddl_->getActiveButton()->getText();
 
     int index = -1;
     for (auto i = 0; i < algo_vec_.size(); i++) {
@@ -120,6 +122,8 @@ void MainMenu_State::updateButtons(const float &dt) {
       default:
         break;
     }
+
+    ddl_->makeButtonInActive();
   }
 
   // Quit the game
@@ -133,7 +137,7 @@ void MainMenu_State::renderButtons() {
     it.second->render(window_);
   }
 
-  testDDL_->render(window_);
+  ddl_->render(window_);
 }
 
 void MainMenu_State::renderBackground() {
@@ -147,7 +151,7 @@ void MainMenu_State::renderBackground() {
 }
 
 void MainMenu_State::endState() {
-  std::cout << "Ending MainMenu State" << '\n';
+  // std::cout << "Ending MainMenu State" << '\n';
 }
 
 void MainMenu_State::updateKeybinds() { checkForQuit(); }