Merge pull request #12 from Thumperrr/master

Framework overhaul

Author: Thumperrr

src/AppState.h

@@ -1,6 +1,8 @@
 #ifndef _APPSTATE_H
 #define _APPSTATE_H
+
 #include "SFMLEvent.h"
+#include <SFML/Graphics.hpp>
 
 namespace chesspp
 {
@@ -11,12 +13,12 @@ namespace chesspp
         AppState() {}
         virtual ~AppState() {}
 
-        virtual void onActivate() = 0;
-        void onEvent(sf::Event *Event) { SFMLEvent::OnEvent(Event); }
-        virtual void onLoop() = 0;
-        virtual void onRender(sf::RenderWindow *display) = 0;
-        virtual void onDeactivate() = 0;
+        virtual int id() = 0;
+        virtual void OnRender(sf::RenderWindow &display) = 0;
     }; 
 }
 
+#include "AppStateGame.h"
+/* Convenience header inclusion so we don't have to include each individual inheritor */
+
 #endif

src/AppStateGame.cpp

@@ -1,35 +1,18 @@
-#include "AppStateGame.h"
+#include "AppState.h"
 
 namespace chesspp
 {
-    void AppStateGame::onRender(sf::RenderWindow *display)
+    int AppStateGame::id() { return 1; }
+	
+    void AppStateGame::OnRender(sf::RenderWindow &display)
     {
-        display->draw(sf::Sprite(TextureManager::getInstance().Load("../res/img/chessboard_640x640.png")));
-    }
-
-    void AppStateGame::onLoop()
-    {
-
-    }
-
-    void AppStateGame::onActivate()
-    {
-#ifdef _DEBUG
-        cout << "AppStateGame activated." << endl; //<--- placeholder for proof of concept
-#endif // _DEBUG
-    }
-
-    void AppStateGame::onDeactivate()
-    {
-#ifdef _DEBUG
-        cout << "AppStateGame deactivated." << endl; //<--- placeholder for proof of concept
-#endif // _DEBUG
+        display.draw(sf::Sprite(TextureManager::getInstance().Load("../res/img/chessboard_640x640.png")));
     }
 
     void AppStateGame::OnLButtonPressed(int x, int y)
     {
 #ifdef _DEBUG
-        cout << "Left button clicked." << endl;
+	        cout << "Left clicked at (" << x << ", " << y << ")\n";
 #endif // _DEBUG
-    } 
+    }
 }

src/AppStateGame.h

@@ -2,7 +2,6 @@
 	#define _APPSTATEGAME_H
 #include "SFML.hpp"
 #include "TextureManager.h"
-#include "AppState.h"
 
 #ifdef _DEBUG
 	#include <iostream>
@@ -11,29 +10,19 @@
 
 namespace chesspp
 {
+    class Application;
     class AppStateGame : public AppState
     {
+	    Application* app;    
+	    
     public:
-        AppStateGame(const AppStateGame&);
-        AppStateGame() {}
-        ~AppStateGame() {}
+        AppStateGame(Application* _app) : app(_app) {}
+        virtual ~AppStateGame() {}
+        
+        virtual int id();
+        virtual void OnRender(sf::RenderWindow &display);
 
-        static AppStateGame *getInstance() //singleton class
-        {
-            static AppStateGame instance;
-            return &instance;
-        }
-
-        void onActivate();
-        void onLoop();
-        void onRender(sf::RenderWindow *display);
-        void onDeactivate();
-
-        //Event handler example. SFMLEvent interface redirects certain events into function calls.
-        virtual void OnLButtonPressed(int x, int y);
-
-    private:
-        //members of game can go here, board, etc etc.
+        virtual void OnLButtonPressed(int x, int y); //example implementation
     }; 
 }