Modified Application and AppStateGame to fit with AppState having an sf::RenderWindow as a protected member.

Integrated GraphicsHandler into AppStateGame.

Author: Thumperrr

src/AppStateGame.cpp

@@ -4,90 +4,19 @@ const std::string FILEPATH = "C:/Users/Steve/Documents/Visual Studio 2012/Projec
 
 namespace chesspp
 {
-    AppStateGame::AppStateGame( Application* _app ) : app(_app)
+    AppStateGame::AppStateGame( Application* _app, sf::RenderWindow *_display ) : app(_app), AppState(_display), graphics(display)
     {
-        backgroundPath = FILEPATH + "res/img/chessboard_640x640.png";
-        piecePath = FILEPATH + "res/img/chess_pieces_80x80_each.png";
-        validMovePath = FILEPATH + "res/img/valid_move.png";
-        std::string gamePath(FILEPATH);
-        try
-        {
-            background = sf::Sprite(TextureManager::getInstance().Load(backgroundPath));
-            pieces = sf::Sprite(TextureManager::getInstance().Load(piecePath));
-            validMove = sf::Sprite(TextureManager::getInstance().Load(validMovePath));
 
-            board = new Board();
-
-            gamePath += "res/games/new_game.txt";
-            board->newGame(gamePath);
-        }
-        catch (chesspp::exception e)
-        {
-            std::cout << "Files not loaded here are the paths:\n"
-                << backgroundPath << '\n'
-                << piecePath << '\n'
-                << validMovePath << '\n'
-                << gamePath << '\n'
-                << "\nDo Not Hit Enter.  Quit the Game\n";
-            std::cin.get();
-        }
+        std::string gamePath(FILEPATH + "res/games/new_game.txt");
+        board = new Board();
+        board->newGame(gamePath);
     }
 
     int AppStateGame::id() { return 1; }
 
-    void AppStateGame::OnRender(sf::RenderWindow &display)
+    void AppStateGame::OnRender()
     {
-        // We can't do anything with these sprites unless we declare them
-        // Might as well only call load once...
-
-        // Draw the background
-        display.draw(background);
-
-
-        static const int SIZE = 80;  // To Be defined somwhere
-
-        // Valid moves are drawn for the piece being hovered over
-        // Or the piece that is currently selected
-
-        Piece* pCurrent = board->getCurrent();
-        Piece* pSelect  = board->getSelected();
-        if (pSelect)
-        {
-            for (posList::const_iterator iter = pSelect->getTrajectory().begin(); iter != pSelect->getTrajectory().end(); iter++)
-            {
-                if (!iter->isValid()) continue;
-                validMove.setPosition(iter->getX() * SIZE, iter->getY() * SIZE);
-                display.draw(validMove);
-            }
-        }
-        else if (pCurrent)
-        {
-            for (posList::const_iterator iter = pCurrent->getTrajectory().begin(); iter != pCurrent->getTrajectory().end(); iter++)
-            {
-                if (!iter->isValid()) continue;
-                validMove.setPosition(iter->getX() * SIZE, iter->getY() * SIZE);
-                display.draw(validMove);
-            }
-        }
-
-        // Draw the non-selected pieces
-        for (auto iter = board->pieces.begin(); iter != board->pieces.end(); iter++)
-        {
-            if (!*iter || *iter == board->getSelected()) continue;
-
-            pieces.setTextureRect(sf::IntRect((*iter)->getTexturePos().getX(), (*iter)->getTexturePos().getY(), SIZE, SIZE));
-            pieces.setPosition((*iter)->getBoardPos().getX() * SIZE, (*iter)->getBoardPos().getY() * SIZE);
-            display.draw(pieces);
-        }
-
-        // Draw the selected piece
-        if (board->getSelected())
-        {
-            pieces.setTextureRect(sf::IntRect(board->getSelected()->getTexturePos().getX(), board->getSelected()->getTexturePos().getY(), SIZE, SIZE));
-            sf::Vector2i mPos = sf::Mouse::getPosition(display);
-            pieces.setPosition(mPos.x - (SIZE / 2), mPos.y - (SIZE / 2));
-            display.draw(pieces);
-        }
+        graphics.drawBoard(board);
     }
 
     void AppStateGame::OnLButtonPressed(int x, int y)

src/AppStateGame.h

@@ -2,7 +2,8 @@
 	#define _APPSTATEGAME_H
 #include "SFML.hpp"
 #include "TextureManager.h"
-#include "board\Board.h"
+#include "Graphics.h"
+#include "board/Board.h"
 
 #ifdef _DEBUG
 	#include <iostream>
@@ -14,26 +15,16 @@ namespace chesspp
     class Application;
     class AppStateGame : public AppState
     {
-	    Application* app;    
-
-        // Adding some variables to avoid initializing for every render
-        // I know that this doesn't go with the flow, but the only way I see it now.
-        sf::Sprite background;
-        sf::Sprite pieces;
-        sf::Sprite validMove;
-
-        std::string backgroundPath;
-        std::string piecePath;
-        std::string validMovePath;
-
+	    Application* app;
         Board* board;
+        graphics::GraphicsHandler graphics;
 
     public:
-        AppStateGame(Application* _app);
+        AppStateGame(Application* _app, sf::RenderWindow *_display);
         virtual ~AppStateGame() {}
 
         virtual int id();
-        virtual void OnRender(sf::RenderWindow &display);
+        virtual void OnRender();
 
         virtual void OnLButtonPressed(int x, int y);
         virtual void OnLButtonReleased(int x, int y);

src/Application.cpp

@@ -6,7 +6,7 @@ namespace chesspp
     Application::Application()
     :  	display(sf::VideoMode(640, 640), "ChessPlusPlus", sf::Style::Close),
 	    running(true),
-	    state(new AppStateGame(this))
+	    state(new AppStateGame(this, &display))
     {
         display.setVerticalSyncEnabled(true);
     }
@@ -19,7 +19,7 @@ namespace chesspp
             while(display.pollEvent(Event))
                 OnEvent(&Event);
 
-            state->OnRender(display);
+            state->OnRender();
 	        display.display();
         }
 

src/board/Board.h

@@ -68,9 +68,9 @@ namespace chesspp
 		// Returns the Piece* at pos.  NULL if pos is out of bounds
 		Piece* at(const Position& pos) const;
 
-		// Given screen coordinates, set the currentPiece to the proper piece
-		// Note that this uses magic number 80 to know how large the screen is
-		void setCurrent(int screenX, int screenY);
+        // Given screen coordinates, set the currentPiece to the proper piece
+        // Note that this uses magic number 80 to know how large the screen is
+        void setCurrent(int screenX, int screenY);
 		Piece* getCurrent(void) const;
 
 		// Set the selected piece to the parameter