added GameOverState and basic collision system in PlayState

Author: JOGUI22

AnimatedGraphic.cpp

@@ -0,0 +1,21 @@
+#include "AnimatedGraphic.h"
+
+AnimatedGraphic::AnimatedGraphic(const LoaderParams* pParams, int animSpeed) : SDLGameObject(pParams), m_animSpeed(animSpeed)
+{
+    //ctor
+}
+
+void AnimatedGraphic::draw()
+{
+    SDLGameObject::draw();
+}
+
+void AnimatedGraphic::update()
+{
+    m_currentFrame = int(((SDL_GetTicks() / (1000 / m_animSpeed)) % m_numFrames));
+}
+
+void AnimatedGraphic::clean()
+{
+    SDLGameObject::clean();
+}

AnimatedGraphic.h

@@ -0,0 +1,21 @@
+#ifndef ANIMATEDGRAPHIC_H
+#define ANIMATEDGRAPHIC_H
+
+#include "SDLGameObject.h"
+
+class AnimatedGraphic : public SDLGameObject
+{
+    public:
+        AnimatedGraphic(const LoaderParams* pParams, int animSpeed); //constructor
+
+        virtual void draw();
+        virtual void update();
+        virtual void clean();
+
+    protected:
+    private:
+
+        int m_animSpeed;
+};
+
+#endif // ANIMATEDGRAPHIC_H

Enemy.cpp

@@ -2,7 +2,8 @@
 
 Enemy::Enemy(const LoaderParams* pParams) : SDLGameObject(pParams)
 {
-    //ctor
+    m_velocity.setY(2);
+    m_velocity.setX(0.001);
 }
 
 
@@ -13,9 +14,16 @@ void Enemy::draw()
 
 void Enemy::update()
 {
-    m_acceleration.setX(1);
-    m_acceleration.setY(1);
-    m_currentFrame = int((SDL_GetTicks() / 100) % 6);
+    m_currentFrame = int((SDL_GetTicks() / 100) % m_numFrames);
+
+    if(m_position.getY() < 0)
+    {
+        m_velocity.setY(2);
+    }
+    else if (m_position.getY() > 400)
+    {
+        m_velocity.setY(-2);
+    }
 
     SDLGameObject::update();
 }

Game.cpp

@@ -49,22 +49,11 @@ bool Game::init(char* title, int xpos, int ypos, int width, int height, Uint32 f
     cout << "incialitacio correcte " << endl;
     m_running = true;
 
-    //load images/sprites on database;
-    TextureManager::Instance()->load("img/animate-alpha.png", "animate_dog", m_pRenderer);
-
-    //Initialize GameObjects optmized
-    m_gameObjects.push_back(new Enemy(new LoaderParams(100, 100, 128, 82, "animate_dog")));
-    m_gameObjects.push_back(new Player(new LoaderParams(300, 300, 128, 82, "animate_dog")));
-    m_gameObjects.push_back(new Player(new LoaderParams(400, 0, 128, 82, "animate_dog")));
-
-
-    // no necessari ara mateix // SDL_QueryTexture(m_pTexture, NULL, NULL, &m_sourceRectangle.w, &m_sourceRectangle.h); //guardem a msourceRectangle les dimensions de m_pTexture
-
     //joystick handling
     TheInputHandler::Instance()->initialiseJoysticks();
 
     //
-    SDL_SetRenderDrawColor(m_pRenderer, 255, 0, 0, 255);
+    SDL_SetRenderDrawColor(m_pRenderer, 255, 255, 255, 255);
 
     //init of GameStateMachine
     m_pGameStateMachine = new GameStateMachine();

Game.h

@@ -60,13 +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; //NOTE: is it needed?
         GameStateMachine* m_pGameStateMachine; //ACTUAL GAMESTATEMACHINE
-
-        //POLYMORFISM OBJECTS (have it declared allow us to create them everywhere
-
-        //STL containers
-        vector<GameObject*> m_gameObjects; //saves all gameObjects
+
 };
 
 typedef Game TheGame;

GameOverState.cpp

@@ -0,0 +1,84 @@
+#include "GameOverState.h"
+#include "Game.h"
+#include "TextureManager.h"
+
+const string GameOverState::s_gameOverID = "GAMEOVER";
+
+GameOverState::GameOverState()
+{
+
+}
+
+void GameOverState::s_gameOverToMain()
+{
+    TheGame::Instance()->getStateMachine()->changeState(new MenuState());
+}
+
+void GameOverState::s_restartPlay()
+{
+    TheGame::Instance()->getStateMachine()->changeState(new PlayState());
+}
+
+void GameOverState::update()
+{
+    for (int i = 0; i < m_gameObjects.size(); i++)
+    {
+        m_gameObjects[i]->update();
+    }
+}
+
+void GameOverState::render()
+{
+    for (int i = 0; i < m_gameObjects.size(); i++)
+    {
+        m_gameObjects[i]->draw();
+    }
+}
+
+bool GameOverState::onEnter()
+{
+    if(!TheTextureManager::Instance()->load("img/gameover.png", "gameovertext", TheGame::Instance()->getRenderer()))
+    {
+        return false; //can't load texutre, error
+    }
+    if (!TheTextureManager::Instance()->load("img/main.png", "mainbutton", TheGame::Instance()->getRenderer()))
+    {
+        return false; //can't load texture, error
+    }
+    if(!TheTextureManager::Instance()->load("img/restart.png", "restartbutton", TheGame::Instance()->getRenderer()))
+    {
+        return false;
+    }
+
+    GameObject* gameOverText = new AnimatedGraphic(new LoaderParams(200, 100, 190, 30, 2, "gameovertext"), 2);
+    GameObject* button1 = new MenuButton(new LoaderParams(200, 200, 200, 80, 3, "mainbutton"), s_gameOverToMain);
+    GameObject* button2 = new MenuButton(new LoaderParams(200, 300, 200, 80, 3, "restartbutton"), s_restartPlay);
+
+    m_gameObjects.push_back(gameOverText);
+    m_gameObjects.push_back(button1);
+    m_gameObjects.push_back(button2);
+
+    cout << "entering GameOverState" << endl;
+    return true;
+}
+
+bool GameOverState::onExit()
+{
+    for (int i = 0; i < m_gameObjects.size(); i++)
+    {
+        m_gameObjects[i]->clean();
+    }
+    m_gameObjects.clear();
+
+    TheTextureManager::Instance()->clearFromTextureMap("resumebutton");
+    TheTextureManager::Instance()->clearFromTextureMap("mainbutton");
+
+    cout << "exiting GameOverState" << endl;
+    return true;
+}
+
+string GameOverState::getStateID() const
+{
+    return s_gameOverID;
+}
+

GameOverState.h

@@ -0,0 +1,37 @@
+#ifndef GAMEOVERSTATE_H
+#define GAMEOVERSTATE_H
+
+#include "GameState.h"
+#include "AnimatedGraphic.h"
+#include <vector>
+#include <iostream>
+
+using namespace std;
+
+class GameOverState : public GameState
+{
+    public:
+        GameOverState();
+
+        virtual void update();
+        virtual void render();
+
+        virtual bool onEnter();
+        virtual bool onExit();
+
+        //GETs
+        virtual string getStateID() const;
+
+    protected:
+    private:
+
+        //private methods:
+        static void s_gameOverToMain(); //changes GameState to Main Menu
+        static void s_restartPlay(); //Reset PlayState
+
+        static const string s_gameOverID; //string identificator ID of the state
+
+        vector<GameObject*> m_gameObjects; //container with all the gameObjects
+};
+
+#endif // GAMEOVERSTATE_H

LoaderParams.h

@@ -8,8 +8,8 @@ using namespace std;
 class LoaderParams //This class load to abstract classes the right information
 {
     public:
-        LoaderParams(int x, int y, int width, int height, string textureID) : m_x(x),
-                                        m_y(y), m_width(width), m_height(height), m_textureID(textureID)
+        LoaderParams(int x, int y, int width, int height, int numFrames, string textureID) : m_x(x),
+                                        m_y(y), m_width(width), m_height(height), m_numFrames(numFrames), m_textureID(textureID)
         {
 
         }
@@ -18,6 +18,7 @@ class LoaderParams //This class load to abstract classes the right information
         int getY() const { return m_y; }
         int getWidth() const { return m_width; }
         int getHeight() const { return m_height; }
+        int getnFrames() const { return m_numFrames; }
         string getTextureID() const { return m_textureID; }
 
 
@@ -28,6 +29,7 @@ class LoaderParams //This class load to abstract classes the right information
 
         int m_width;
         int m_height;
+        int m_numFrames;
 
         string m_textureID;
 };

MenuState.cpp

@@ -43,8 +43,8 @@ bool MenuState::onEnter()
         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);
+    GameObject* button1 = new MenuButton(new LoaderParams(100, 100, 400, 100, 3, "playbutton"), s_menuToPlay);
+    GameObject* button2 = new MenuButton(new LoaderParams(100,300, 400, 100, 3, "exitbutton"), s_exitFromMenu);
 
     m_gameObjects.push_back(button1);
     m_gameObjects.push_back(button2);

PauseState.cpp

@@ -41,8 +41,8 @@ bool PauseState::onEnter()
         return false; //can't load texture, error
     }
 
-    GameObject* button1 = new MenuButton(new LoaderParams(200, 100, 200, 80, "mainbutton"), s_pauseToMain);
-    GameObject* button2 = new MenuButton(new LoaderParams(200, 300, 200, 80, "resumebutton"), s_resumePlay);
+    GameObject* button1 = new MenuButton(new LoaderParams(200, 100, 200, 80, 3, "mainbutton"), s_pauseToMain);
+    GameObject* button2 = new MenuButton(new LoaderParams(200, 300, 200, 80, 3, "resumebutton"), s_resumePlay);
 
     m_gameObjects.push_back(button1);
     m_gameObjects.push_back(button2);

PlayState.cpp

@@ -15,14 +15,23 @@ PlayState::PlayState()
 
 void PlayState::update()
 {
+    //input behaviour
     if(TheInputHandler::Instance()->isKeyDown(SDL_SCANCODE_ESCAPE))
     {
         TheGame::Instance()->getStateMachine()->pushState(new PauseState());
     }
+
+    //update GameObjects
     for(int i = 0; i < m_gameObjects.size(); i++)
     {
         m_gameObjects[i]->update();
     }
+
+    //Collision detection
+    if(checkCollision(dynamic_cast<SDLGameObject*>(m_gameObjects[0]), dynamic_cast<SDLGameObject*>(m_gameObjects[1])))
+    {
+        TheGame::Instance()->getStateMachine()->pushState(new GameOverState());
+    }
 }
 
 void PlayState::render()
@@ -39,8 +48,14 @@ bool PlayState::onEnter()
     {
         return false;
     }
-    GameObject* player = new Player (new LoaderParams(100, 100, 128, 55, "helicopter"));
+    if(!TheTextureManager::Instance()->load("img/helicopter2.png", "helicopter2", TheGame::Instance()->getRenderer()))
+    {
+        return false;
+    }
+    GameObject* player = new Player (new LoaderParams(100, 100, 128, 55, 5, "helicopter"));
+    GameObject* enemy = new Enemy (new LoaderParams(500, 100, 128, 55, 5, "helicopter2"));
     m_gameObjects.push_back(player);
+    m_gameObjects.push_back(enemy);
 
     cout << "Entering PlayState" << endl;
     return true;
@@ -65,3 +80,30 @@ string PlayState::getStateID() const
 {
     return s_playID;
 }
+
+bool PlayState::checkCollision(SDLGameObject* p1, SDLGameObject* p2)
+{
+    int leftA, leftB;
+    int rightA, rightB;
+    int topA, topB;
+    int bottomA, bottomB;
+
+    //Calculate sides of rect b
+    leftA = p1->getPosition().getX();
+    rightA = p1->getPosition().getX() + p1->getWidth();
+    topA = p1->getPosition().getY();
+    bottomA = p1->getPosition().getY() + p1->getHeight();
+
+    //Calculate sides of rect b
+    leftB = p2->getPosition().getX();
+    rightB = p2->getPosition().getX() + p2->getWidth();
+    topB = p2->getPosition().getY();
+    bottomB = p2->getPosition().getY() + p2->getHeight();
+
+    //check collision
+    if (bottomA <= topB or topA >= bottomB or rightA <= leftB or leftA >= rightB) //no collision
+        return false;
+    else
+        return true;
+
+}

PlayState.h

@@ -7,7 +7,9 @@ using namespace std;
 #include <string>
 #include <vector>
 #include "GameObject.h"
-#include "PauseState.h"
+#include "PauseState.h"
+#include "SDLGameObject.h"
+#include "GameOverState.h"
 
 
 class PlayState : public GameState
@@ -24,6 +26,10 @@ class PlayState : public GameState
     protected:
     private:
 
+        //Private methods:
+        bool checkCollision(SDLGameObject* p1, SDLGameObject* p2); //checks collision between p1 and p2
+
+        //Atributes:
         static const string s_playID; //string ID identificator
         vector<GameObject*> m_gameObjects; //vector with all the gameObjects
 };

Player.cpp

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