From 4cc6c6596b614fce392040b85a182dbf50d0b044 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Sun, 3 May 2015 09:57:31 +0200 Subject: Organize all the code --- .../ConsoleController/ConsoleController.cpp | 28 +++++++++++++--------- .../ConsoleController/ConsoleController.hpp | 4 +++- 2 files changed, 20 insertions(+), 12 deletions(-) (limited to 'src/Controllers/ConsoleController') diff --git a/src/Controllers/ConsoleController/ConsoleController.cpp b/src/Controllers/ConsoleController/ConsoleController.cpp index 66dc370..1bc9b84 100644 --- a/src/Controllers/ConsoleController/ConsoleController.cpp +++ b/src/Controllers/ConsoleController/ConsoleController.cpp @@ -2,14 +2,22 @@ #include #include "../../Helpers/Keyboard.hpp" + +//==================== Constructor and Destructor ==================== + +//Constructor ConsoleController::ConsoleController() { } +//Destructor ConsoleController::~ConsoleController() { } +//==================== Helpers ==================== + +//Run the game. void ConsoleController::run() { @@ -22,7 +30,7 @@ void ConsoleController::run() //Pop a random number on the grid m_game.popRandomNumber(); - + //First cout stats this->coutStats(); //First cout grid @@ -38,21 +46,25 @@ void ConsoleController::run() //Apply move bool moveDone=m_game.swipe(keyPress); - - + //Cout stats this->coutStats(); //Cout grid m_game.coutGrid(); } - + + //Last cout stats this->coutStats(); + + //Last cout grid m_game.coutGrid(); } + +//Wait for keypress and return the keyPress. kbdh::Direction ConsoleController::waitArrowKeyPress() { //Initialise keyPress @@ -92,7 +104,6 @@ kbdh::Direction ConsoleController::waitArrowKeyPress() } if (sf::Keyboard::isKeyPressed(sf::Keyboard::Down)) { - // la touche "flèche gauche" est enfoncée : on bouge le personnage keyPress=kbdh::Down; while(sf::Keyboard::isKeyPressed(sf::Keyboard::Down)) { @@ -107,12 +118,7 @@ kbdh::Direction ConsoleController::waitArrowKeyPress() } -void ConsoleController::clearScreen(){ - for(int i;i<100;i++){ - std::cout << std::endl; - } -} - +//Cout the stats of the game void ConsoleController::coutStats(){ std::cout << std::endl << "Score : " << m_game.getScore() << std::endl; diff --git a/src/Controllers/ConsoleController/ConsoleController.hpp b/src/Controllers/ConsoleController/ConsoleController.hpp index 59d4bb3..f3e9952 100644 --- a/src/Controllers/ConsoleController/ConsoleController.hpp +++ b/src/Controllers/ConsoleController/ConsoleController.hpp @@ -18,10 +18,12 @@ class ConsoleController Game m_game; kbdh::Direction waitArrowKeyPress(); public: + //Constructor and Destructor ConsoleController(); ~ConsoleController(); + + //Helpers void run(); - void clearScreen(); void coutStats(); }; -- cgit v1.2.3