Re-added the event file, change how AppStates are constructed, made a changestate function

Author: computerquip

src/AppState.h

@@ -1,18 +1,18 @@
 #ifndef _APPSTATE_H
 #define _APPSTATE_H
 
+#include "Event.h"
 #include <SFML/Graphics.hpp>
 
 namespace chesspp
 {
     //pure virtual abstract base class for game state management. 
-    class AppState
+    class AppState : public Event
     {
     public:
         AppState() {}
         virtual ~AppState() {}
 
-        virtual void OnEvent(sf::Event& event) {} //Nothing by default
         virtual int id() = 0;
         virtual void OnRender(sf::RenderWindow &display) = 0;
     }; 

src/AppStateGame.h

@@ -12,15 +12,14 @@ namespace chesspp
 {
     class AppStateGame : public AppState
     {
+	Application* app;    
+	    
     public:
-        AppStateGame() {}
+        AppStateGame(Application*);
         virtual ~AppStateGame() {}
 
         virtual int id();
         virtual void OnRender(sf::RenderWindow &display);
-	
-    private:
-        //members of game can go here, board, etc etc.
     }; 
 }
 

src/Application.cpp

@@ -6,7 +6,7 @@ namespace chesspp
     Application::Application()
     :  	display(sf::VideoMode(640, 640), "ChessPlusPlus"), 
 	running(true),
-	state(new AppStateGame)
+	state(new AppStateGame(this))
     {
     }
 

src/Application.h

@@ -14,7 +14,13 @@ namespace chesspp
     public:  
 	Application();
 	~Application();
-		
+	
+	template <class NewState> void ChangeState()
+	{
+		delete state;
+		state = new NewState;
+	}
+	
         int Exec();
     }; 
 }

src/Event.cpp

@@ -0,0 +1,59 @@
+namepspace chesspp {
+    Event::Event()
+    {
+    }
+
+    Event::~Event()
+    {
+    }
+    
+    //pure virtual, do nothing
+    void Event::OnClosed() {
+    }
+    void Event::OnResized(uint w, uint h) {
+    }
+    void Event::OnLostFocus() {
+    }
+    void Event::OnGainedFocus() {
+    }
+    void Event::OnTextEntered(sf::Uint32 unicode) {
+    }
+    void Event::OnKeyPressed(sf::Keyboard::Key key, bool alt, bool control, bool shift, bool system) {
+    }
+    void Event::OnKeyReleased(sf::Keyboard::Key key, bool alt, bool control, bool shift, bool system) {
+    }
+    void Event::OnMouseWheelMoved(int delta, int x, int y) {
+    }
+    void Event::OnLButtonPressed(int x, int y) {
+    }
+    void Event::OnLButtonReleased(int x, int y) {
+    }
+    void Event::OnRButtonPressed(int x, int y) {
+    }
+    void Event::OnRButtonReleased(int x, int y) {
+    }
+    void Event::OnMButtonPressed(int x, int y) {
+    }
+    void Event::OnMButtonReleased(int x, int y) {
+    }
+    void Event::OnMouseButtonPressed(sf::Mouse::Button button, int x, int y) {
+    }
+    void Event::OnMouseButtonReleased(sf::Mouse::Button button, int x, int y) {
+    }
+    void Event::OnMouseMoved(int x, int y) {
+    }
+    void Event::OnMouseEnteredWindow() {
+    }
+    void Event::OnMouseLeftWindow() {
+    }
+    void Event::OnJoystickButtonPressed(uint joystickID, uint button) {
+    }
+    void Event::OnJoystickButtonReleased(uint joystickID, uint button) {
+    }
+    void Event::OnJoystickMoved(uint joystickID, sf::Joystick::Axis axis, float position) {
+    }
+    void Event::OnJoystickConnected(uint joystickID) {
+    }
+    void Event::OnJoystickDisconnected(uint joystickID) {
+    } 
+}

src/Event.h

@@ -0,0 +1,41 @@
+#ifndef _EVENT_H
+	#define _EVENT_H
+
+#include "SFML.hpp"
+
+namespace chesspp
+{
+    class Event
+    {
+    public:
+        typedef unsigned int uint;
+
+        virtual void OnEvent(sf::Event *Event);
+        virtual void OnClosed();
+        virtual void OnResized(uint w, uint h);
+        virtual void OnLostFocus();
+        virtual void OnGainedFocus();
+        virtual void OnTextEntered(sf::Uint32 unicode);
+        virtual void OnKeyPressed(sf::Keyboard::Key key, bool alt, bool control, bool shift, bool system);
+        virtual void OnKeyReleased(sf::Keyboard::Key key, bool alt, bool control, bool shift, bool system);
+        virtual void OnMouseWheelMoved(int delta, int x, int y);
+        virtual void OnLButtonPressed(int x, int y);
+        virtual void OnLButtonReleased(int x, int y);
+        virtual void OnRButtonPressed(int x, int y);
+        virtual void OnRButtonReleased(int x, int y);
+        virtual void OnMButtonPressed(int x, int y);
+        virtual void OnMButtonReleased(int x, int y);
+        virtual void OnMouseButtonPressed(sf::Mouse::Button button, int x, int y);
+        virtual void OnMouseButtonReleased(sf::Mouse::Button button, int x, int y);
+        virtual void OnMouseMoved(int x, int y);
+        virtual void OnMouseEnteredWindow();
+        virtual void OnMouseLeftWindow();
+        virtual void OnJoystickButtonPressed(uint joystickID, uint button);
+        virtual void OnJoystickButtonReleased(uint joystickID, uint button);
+        virtual void OnJoystickMoved(uint joystickID, sf::Joystick::Axis axis, float position);
+        virtual void OnJoystickConnected(uint joystickID);
+        virtual void OnJoystickDisconnected(uint joystickID);
+    }; 
+}
+
+#endif