menu buttons in menu state now

Game.cpp

@@ -14,8 +14,8 @@ bool Game::init(const char* title, int xpos, int ypos, int height, int width, in
 		{
 			m_pGameStateMachine = new GameStateMachine(); 
 			m_pGameStateMachine->changeState(new MenuState());
-			m_gameObjects.push_back(new Player(new LoaderParams(100,100,76,53,"animate")));
-			m_gameObjects.push_back(new Enemy(new LoaderParams(200,200,76,53,"animate")));
+			// m_gameObjects.push_back(new Player(new LoaderParams(100,100,76,53,"animate")));
+			// m_gameObjects.push_back(new Enemy(new LoaderParams(200,200,76,53,"animate")));
 
 			m_bRunning =  TheTextureManager::instance()->load("assets/doggy.png","animate", m_pRenderer);
 		}

GameState.h

@@ -1,6 +1,7 @@
 #ifndef GAME_STATE_H
 #define GAME_STATE_H
 #include <string>
+#include <iostream>
 
 //Abstract Base Class.
 class GameState

Makefile

@@ -1,5 +1,5 @@
 #OBJS specifies which files to compile as part of the project 
-OBJS = main.cpp Game.cpp Player.cpp Enemy.cpp SDLGameObject.cpp TextureManager.cpp Vector2D.cpp InputHandler.cpp MenuState.cpp PlayState.cpp GameStateMachine.cpp
+OBJS = main.cpp Game.cpp Player.cpp Enemy.cpp SDLGameObject.cpp TextureManager.cpp Vector2D.cpp InputHandler.cpp MenuState.cpp PlayState.cpp GameStateMachine.cpp MenuButton.cpp
 
 #CC specifies which compiler we're using 
 CC = g++ 

MenuButton.cpp

@@ -5,12 +5,12 @@ MenuButton::MenuButton(const LoaderParams* pParams) : SDLGameObject(pParams)
 	m_currentFrame = MOUSE_OUT; //start at frame 2, because I've got my sprites backwards;
 }
 
-MenuButton::draw()
+void MenuButton::draw()
 {
 	SDLGameObject::draw(); // use base class drawing
 }
 
-MenuButton::update()
+void MenuButton::update()
 {
 	Vector2D* pMousePos = TheInputHandler::instance()->getMousePosition(); 
 
@@ -21,7 +21,7 @@ MenuButton::update()
 	{
 		m_currentFrame = MOUSE_OVER; 
 
-		if(TheInputHandler::instance->getMouseButtonState(LEFT))
+		if(TheInputHandler::instance()->getMouseButtonState(LEFT))
 		{
 			m_currentFrame = CLICKED;
 		}

MenuButton.h

@@ -2,6 +2,7 @@
 #define MENU_BUTTON_H
 #include "SDLGameObject.h"
 #include "Vector2D.h"
+#include "InputHandler.h"
 
 class MenuButton : public SDLGameObject
 {
@@ -17,7 +18,7 @@ class MenuButton : public SDLGameObject
 		MOUSE_OUT = 2, 
 		MOUSE_OVER = 1, 
 		CLICKED = 0
-	}
-}
+	};
+};
 
 #endif//MENU_BUTTON_H

MenuState.cpp

@@ -4,23 +4,55 @@ const std::string MenuState::s_menuID = "MENU";
 
 void MenuState::update()
 {
-
+	for(int i =0; i < m_gameObjects.size(); i++)
+	{
+		m_gameObjects[i]->update();
+	}
 }
 
 void MenuState::render()
 {
-
+	for(int i =0; i < m_gameObjects.size(); i++)
+	{
+		m_gameObjects[i]->draw();
+	}
 }
 
 bool MenuState::onEnter()
 {
-	std::cout << "enter MenuState" << std::endl; 
+	if(!TheTextureManager::instance()->load("assets/startButton.png","startButton",TheGame::instance()->getRenderer()))
+	{
+		//failed to load startButton
+		return false;
+	}
+
+	if(!TheTextureManager::instance()->load("assets/exitButton.png","exitButton",TheGame::instance()->getRenderer()))
+	{
+		//failed to load exitButton
+		return false;
+	}
+
+	GameObject* button1 = new MenuButton( new LoaderParams(100,100,64,32,"startButton") );
+	GameObject* button2 = new MenuButton( new LoaderParams(100,300,64,32,"exitButton") );
+
+	m_gameObjects.push_back(button1);
+	m_gameObjects.push_back(button2);
+
+	std::cout << "Entering MenuState" << std::endl;
 	return true;
 }
 
 
 bool MenuState::onExit()
 {
-	std::cout << "exiting MenuState" << std::endl;
+	for(int i = 0; i < m_gameObjects.size(); i++)
+	{
+		m_gameObjects[i]->clean();
+	}
+	m_gameObjects.clear();
+	TheTextureManager::instance()->clearFromTextureMap("startButton");
+	TheTextureManager::instance()->clearFromTextureMap("exitButton");
+
+	std::cout << "Exiting MenuState" << std::endl;
 	return true;
 }

MenuState.h

@@ -1,7 +1,13 @@
 #ifndef MENU_STATE_H
 #define MENU_STATE_H
 #include <iostream>
+#include <vector>
 #include "GameState.h"
+#include "GameObject.h"
+#include "LoaderParams.h"
+#include "Game.h"
+#include "TextureManager.h"
+#include "MenuButton.h"
 
 class MenuState : public GameState
 {
@@ -15,6 +21,7 @@ class MenuState : public GameState
 	virtual std::string getStateID() const { return s_menuID;}
 private:
 	static const std::string s_menuID;
+	std::vector<GameObject*> m_gameObjects;
 };
 
 #endif//MENU_STATE_H

TextureManager.cpp

@@ -46,7 +46,7 @@ void TextureManager::drawFrame(std::string id, int x, int y, int width,  int hei
 	SDL_Rect srcRect;
 	SDL_Rect destRect; 
 
-	srcRect.x = currentFrame; 
+	srcRect.x = currentFrame * width; 
 	srcRect.y = height * (currentRow - 1);
 	srcRect.w = destRect.w = width; 
 	srcRect.h = destRect.h = height;
@@ -65,4 +65,9 @@ TextureManager* TextureManager::instance()
 	}
 
 	return s_pInstance;
+}
+
+void TextureManager::clearFromTextureMap(std::string id)
+{
+	m_textureMap.erase(id);
 }

TextureManager.h

@@ -15,6 +15,7 @@ class TextureManager
 	void draw(std::string id, int x, int y, int width, int height, SDL_Renderer* pRenderer, SDL_RendererFlip filp = SDL_FLIP_NONE); 
 	void drawFrame(std::string id, int x, int y, int width,  int height, int currentRow, int currentFrame, SDL_Renderer* pRenderer, SDL_RendererFlip flip = SDL_FLIP_NONE);
 	static TextureManager* instance(); 
+	void clearFromTextureMap(std::string id);
 };
 
 //defining singleton.