From 048f1e17b752d2af53db82c1861002283fc300fa Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Fri, 1 May 2015 13:18:26 +0200 Subject: Add some newers things : -Change helper ModelConstants to Keyboard -Now helpers is in folder Helpers -Change direction name to use CamelCase --- src/Controller/ConsoleController/CMakeLists.txt | 3 - .../ConsoleController/ConsoleController.cpp | 112 --------------------- .../ConsoleController/ConsoleController.hpp | 25 ----- 3 files changed, 140 deletions(-) delete mode 100644 src/Controller/ConsoleController/CMakeLists.txt delete mode 100644 src/Controller/ConsoleController/ConsoleController.cpp delete mode 100644 src/Controller/ConsoleController/ConsoleController.hpp (limited to 'src/Controller/ConsoleController') diff --git a/src/Controller/ConsoleController/CMakeLists.txt b/src/Controller/ConsoleController/CMakeLists.txt deleted file mode 100644 index d42803f..0000000 --- a/src/Controller/ConsoleController/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -#Make Model lib -add_library(ConsoleController ./ConsoleController.cpp) -target_link_libraries(ConsoleController Model) diff --git a/src/Controller/ConsoleController/ConsoleController.cpp b/src/Controller/ConsoleController/ConsoleController.cpp deleted file mode 100644 index a2a4a77..0000000 --- a/src/Controller/ConsoleController/ConsoleController.cpp +++ /dev/null @@ -1,112 +0,0 @@ -#include "./ConsoleController.hpp" -#include -#include "../../Model/ModelConstants.hpp" - -ConsoleController::ConsoleController() -{ - m_game = new Game(); -} - -ConsoleController::~ConsoleController() -{ - delete m_game; -} - -void ConsoleController::play() -{ - //Intruction msg - std::cout << "Use arrows to play !" << std::endl; - - //Init keyPress - Direction keyPress; - - //Display the first grid - m_game->showGrid(); - - //Start game - while (!m_game->isOver()) - { - //Get key press - keyPress=this->waitArrowKeyPress(); - - //New line for the console print arrow press - std::cout << std::endl; - - - //Print keyPress - switch(keyPress){ - case UP: - std::cout << "Keypress : Up" << std::endl; - break; - case DOWN: - std::cout << "Keypress : Down" << std::endl; - break; - case LEFT: - std::cout << "Keypress : Left" << std::endl; - break; - case RIGHT: - std::cout << "Keypress : Right" << std::endl; - break; - } - - //Show the Grid - m_game->showGrid(); - std::cout << std::endl; - - - //Pop new number - m_game->pop(); - - } -} - - - -Direction ConsoleController::waitArrowKeyPress() -{ - //Initialise keyPress - Direction keyPress; - - //Wait for keypress - while(1){ - if (sf::Keyboard::isKeyPressed(sf::Keyboard::Left)) - { - keyPress=LEFT; - while(sf::Keyboard::isKeyPressed(sf::Keyboard::Left)) - { - //Wait for release - } - break; - } - if (sf::Keyboard::isKeyPressed(sf::Keyboard::Right)) - { - keyPress=RIGHT; - while(sf::Keyboard::isKeyPressed(sf::Keyboard::Right)) - { - //Wait for release - } - break; - } - if (sf::Keyboard::isKeyPressed(sf::Keyboard::Up)) - { - keyPress=UP; - while(sf::Keyboard::isKeyPressed(sf::Keyboard::Up)) - { - //Wait for release - } - break; - } - if (sf::Keyboard::isKeyPressed(sf::Keyboard::Down)) - { - // la touche "flèche gauche" est enfoncée : on bouge le personnage - keyPress=DOWN; - while(sf::Keyboard::isKeyPressed(sf::Keyboard::Down)) - { - //Wait for release - } - break; - } - } - - return keyPress; -} diff --git a/src/Controller/ConsoleController/ConsoleController.hpp b/src/Controller/ConsoleController/ConsoleController.hpp deleted file mode 100644 index 317759c..0000000 --- a/src/Controller/ConsoleController/ConsoleController.hpp +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef DEF_CTCONSOLE -#define DEF_CTCONSOLE - -/* CTConsole.hpp - * Defines the class CTConsole - * CTConsole is a controller which displays a game in a terminal - * Creators : krilius, manzerbredes - * Date : 29/04/2915 */ - -#include -#include "../../Model/Game.hpp" - -class ConsoleController -{ - private: - - Game * m_game; - Direction waitArrowKeyPress(); - public: - ConsoleController(); - ~ConsoleController(); - void play(); -}; - -#endif -- cgit v1.2.3