MenuButton and PlayerState behaviour fixed/repaired

Author: JOGUI22

Game.cpp

@@ -79,21 +79,15 @@ void Game::render()
     SDL_RenderClear(m_pRenderer); //clean renderer
 
     //actual render images
-    for(int i = 0; i < m_gameObjects.size(); i++) //we draw all gameObject images
-    {
-        m_gameObjects[i]->draw(); //virtual GameObject methods allow us to use the propper inner level class method.
-    }
+    m_pGameStateMachine->render();
 
     ///////////////////
     SDL_RenderPresent(m_pRenderer); //draw in window
 }
 
 void Game::update()
 {
-    for (int i = 0; i < m_gameObjects.size(); i++)//we update all gameObjects
-    {
-        m_gameObjects[i]->update(); //virtual GameObject methods allow us to use the propper inner level class methods
-    }
+    m_pGameStateMachine->update();
 }
 
 void Game::handleEvents()
@@ -113,7 +107,6 @@ void Game::quit()
 
 void Game::clean()
 {
-    cout << "natejem el joc" << endl;
     SDL_DestroyWindow(m_pWindow);
     SDL_DestroyRenderer(m_pRenderer);
     TheInputHandler::Instance()->clean();
@@ -124,3 +117,8 @@ bool Game::running() const
 {
     return m_running;
 }
+
+GameStateMachine* Game::getStateMachine()
+{
+    return m_pGameStateMachine;
+}

Game.h

@@ -47,6 +47,7 @@ class Game //SINGLETON
 
         //GETs
         bool running() const;
+        GameStateMachine* getStateMachine();
 
 
     private:
@@ -59,8 +60,8 @@ class Game //SINGLETON
         bool m_running; //Atribut per mirar si continua el loop del joc.
         SDL_Window* m_pWindow; //Window del joc.
         SDL_Renderer* m_pRenderer; //Renderer del joc.
-        int m_currentFrame;
-        GameStateMachine* m_pGameStateMachine;
+        int m_currentFrame; //NOTE: is it needed?
+        GameStateMachine* m_pGameStateMachine; //ACTUAL GAMESTATEMACHINE
 
         //POLYMORFISM OBJECTS (have it declared allow us to create them everywhere
 

GameStateMachine.cpp

@@ -1,4 +1,7 @@
-#include "GameStateMachine.h"
+#include "GameStateMachine.h"
+#include <iostream>
+
+using namespace std;
 
 GameStateMachine::GameStateMachine()
 {
@@ -33,7 +36,6 @@ void GameStateMachine::changeState(GameState *pState)
         }
         if (m_gameStates.back()->onExit())
         {
-            delete m_gameStates.back();
             m_gameStates.pop_back();
         }
     }
@@ -44,3 +46,19 @@ void GameStateMachine::changeState(GameState *pState)
     m_gameStates.back()->onEnter();
 
 }
+
+void GameStateMachine::update()
+{
+    if(!m_gameStates.empty())
+    {
+        m_gameStates.back()->update();
+    }
+}
+
+void GameStateMachine::render()
+{
+    if(!m_gameStates.empty())
+    {
+      m_gameStates.back()->render();
+    }
+}

GameStateMachine.h

@@ -13,7 +13,11 @@ class GameStateMachine //manages all gamestates
 
         void pushState(GameState* pState); //add state without removing the previous state
         void changeState(GameState* pState); //remove current state and change adding another
-        void popState(); //remove current state without adding another
+        void popState(); //remove current state without adding another
+
+        void update();
+        void render();
+
     protected:
     private:
 

MenuState.cpp

@@ -1,4 +1,6 @@
-#include "MenuState.h"
+#include "MenuState.h"
+#include "TextureManager.h"
+#include "Game.h"
 #include <iostream>
 using namespace std;
 
@@ -16,22 +18,62 @@ string MenuState::getStateID() const
 
 void MenuState::update()
 {
-    //nothing for now
+    for(int i = 0; i < m_gameObjects.size(); i++)
+    {
+        m_gameObjects[i]->update();
+    }
 }
 
 void MenuState::render()
 {
-    //nothig for now
+    for (int i = 0; i < m_gameObjects.size(); i++)
+    {
+        m_gameObjects[i]->draw();
+    }
 }
 
 bool MenuState::onEnter()
 {
+    if(!TheTextureManager::Instance()->load("img/button.png","playbutton", TheGame::Instance()->getRenderer()))
+    {
+        return false;
+    }
+    if(!TheTextureManager::Instance()->load("img/exit.png","exitbutton", TheGame::Instance()->getRenderer()))
+    {
+        return false;
+    }
+
+    GameObject* button1 = new MenuButton(new LoaderParams(100, 100, 400, 100, "playbutton"), s_menuToPlay);
+    GameObject* button2 = new MenuButton(new LoaderParams(100,300, 400, 100, "exitbutton"), s_exitFromMenu);
+
+    m_gameObjects.push_back(button1);
+    m_gameObjects.push_back(button2);
+
     cout << "entering MenuState" << endl;
     return true;
 }
 
 bool MenuState::onExit()
 {
+    for(int i = 0; i < m_gameObjects.size(); i++)
+    {
+        m_gameObjects[i]->clean();
+    }
+    m_gameObjects.clear();
+    TheTextureManager::Instance()->clearFromTextureMap("playbutton"); //clean from TM
+    TheTextureManager::Instance()->clearFromTextureMap("exitbutton"); //clean from TM
     cout << "exiting MenuState" << endl;
     return true;
 }
+
+void MenuState::s_menuToPlay()
+{
+    cout << "Play button clicked" << endl; //Go to play GameState
+    TheGame::Instance()->getStateMachine()->changeState(new PlayState());
+}
+
+void MenuState::s_exitFromMenu()
+{
+    TheGame::Instance()->quit(); //Exit game.
+    cout << "Exit button clicked" << endl;
+}

MenuState.h

@@ -5,6 +5,9 @@ using namespace std;
 
 #include <string>
 #include "GameState.h"
+#include <vector>
+#include "GameObject.h"
+#include "MenuButton.h"
 
 class MenuState : public GameState
 {
@@ -21,7 +24,12 @@ class MenuState : public GameState
     protected:
     private:
 
-        static const string s_menuID;
+        static const string s_menuID; //name of the class
+        vector<GameObject*> m_gameObjects; //container for GameObjects
+
+        //call back functions for menu item, works for use as pointers of the MenuButton
+        static void s_menuToPlay();
+        static void s_exitFromMenu();
 };
 
 #endif // MENUSTATE_H

PlayState.cpp

@@ -1,4 +1,6 @@
 #include "PlayState.h"
+#include "TextureManager.h"
+#include "Game.h"
 #include <iostream>
 
 const string PlayState::s_playID = "PLAY";
@@ -12,22 +14,44 @@ PlayState::PlayState()
 
 void PlayState::update()
 {
-    //nothing for now
+    for(int i = 0; i < m_gameObjects.size(); i++)
+    {
+        m_gameObjects[i]->update();
+    }
 }
 
 void PlayState::render()
 {
-    //nothing for now
+    for (int i = 0; i < m_gameObjects.size(); i++)
+    {
+        m_gameObjects[i]->draw();
+    }
 }
 
 bool PlayState::onEnter()
 {
-    cout << "entering PlayState" << endl;
+    if(!TheTextureManager::Instance()->load("img/helicopter.png","helicopter", TheGame::Instance()->getRenderer())) //can't load images
+    {
+        return false;
+    }
+    GameObject* player = new Player (new LoaderParams(100, 100, 128, 55, "helicopter"));
+    m_gameObjects.push_back(player);
+
+    cout << "Entering PlayState" << endl;
     return true;
 }
 
 bool PlayState::onExit()
 {
+    for (int i = 0; i < m_gameObjects.size(); i++) //clear all existing gameObjects
+    {
+        m_gameObjects[i]->clean();
+    }
+    m_gameObjects.clear(); //clear vector
+
+    //clean textures
+    TheTextureManager::Instance()->clearFromTextureMap("helicopter");
+
     cout << "exiting PlayState " << endl;
     return true;
 }

PlayState.h

@@ -4,7 +4,9 @@
 using namespace std;
 
 #include "GameState.h"
-#include <string>
+#include <string>
+#include <vector>
+#include "GameObject.h"
 
 
 class PlayState : public GameState
@@ -21,7 +23,8 @@ class PlayState : public GameState
     protected:
     private:
 
-        static const string s_playID;
+        static const string s_playID; //string ID identificator
+        vector<GameObject*> m_gameObjects; //vector with all the gameObjects
 };
 
 #endif // PLAYSTATE_H

Player.cpp

@@ -18,7 +18,7 @@ void Player::update()
 
     handleInput();
 
-    m_currentFrame = int((SDL_GetTicks() / 100) % 6);
+    m_currentFrame = int((SDL_GetTicks() / 100) % 5);
 
     SDLGameObject::update(); //call the up-class
 }

SDLGameObject.cpp

@@ -16,9 +16,18 @@ SDLGameObject::SDLGameObject(const LoaderParams* pParams) : GameObject (pParams)
 
 void SDLGameObject::draw()
 {
-    TextureManager::Instance()->drawFrame(m_textureID, int(m_position.getX()), int(m_position.getY()), m_width,
+    if(m_velocity.getX() > 0)
+    {
+        TextureManager::Instance()->drawFrame(m_textureID, int(m_position.getX()), int(m_position.getY()), m_width,
+                                          m_height, m_currentRow, m_currentFrame,
+                                          TheGame::Instance()->getRenderer(), SDL_FLIP_HORIZONTAL);
+    }
+    else
+    {
+        TextureManager::Instance()->drawFrame(m_textureID, int(m_position.getX()), int(m_position.getY()), m_width,
                                           m_height, m_currentRow, m_currentFrame,
                                           TheGame::Instance()->getRenderer());
+    }
 }
 
 void SDLGameObject::update()

TextureManager.cpp

@@ -53,4 +53,9 @@ void TextureManager::drawFrame(std::string id, int x, int y, int width, int heig
     destRect.y = y;
 
     SDL_RenderCopyEx(pRenderer, m_textureMap[id], &srcRect, &destRect, 0, 0, flip); //Load current frame on the buffer game.
+}
+
+void TextureManager::clearFromTextureMap(string id)
+{
+    m_textureMap.erase(id);
 }

TextureManager.h

@@ -33,6 +33,7 @@ class TextureManager //its a SINGLETON (unitary class) it's called TextureManage
         void drawFrame(string id, int x, int y, int width, int height,
                        int currentRow, int currentFrame, SDL_Renderer* pRenderer, SDL_RendererFlip flip = SDL_FLIP_NONE); //draw image sprite
 
+        void clearFromTextureMap(string id); //delete SDL_Texture from the map
     private:
         map<string, SDL_Texture*> m_textureMap; //map with all the SDL_Textures
         TextureManager(){}; //now is a SINGLETON