Merge pull request #21 from Trimutex/development

Development

src/CMakeLists.txt

@@ -6,6 +6,7 @@ add_executable(snakeplusplus
     ./snake.cpp
     ./playerinterface.cpp
     ./common.cpp
+    ./botinterface.cpp
 )
 
 target_include_directories(snakeplusplus PUBLIC ${CMAKE_CURRENT_LIST_DIR})

src/botinterface.cpp

@@ -0,0 +1,26 @@
+#include "botinterface.hpp"
+#include "common.hpp"
+#include <SFML/System/Vector2.hpp>
+
+namespace snakeplusplus
+{
+    PlayerDirection lastKnownDirection = kNone;
+    PlayerDirection GetBotInput(const sf::Vector2f* snakeHeadLocation, const sf::Vector2f* foodLocation)
+    {
+        sf::Vector2f directionDelta;
+        directionDelta = *snakeHeadLocation - *foodLocation;
+        if ((directionDelta.y > 0)
+                && (lastKnownDirection != kDown))
+            { lastKnownDirection = kUp; }
+        else if ((directionDelta.y < 0)
+                && (lastKnownDirection != kUp)) 
+            { lastKnownDirection = kDown; }
+        else if ((directionDelta.x > 0)
+                && (lastKnownDirection != kRight)) 
+            { lastKnownDirection = kLeft; }
+        else if ((directionDelta.x < 0)
+                && (lastKnownDirection != kLeft)) 
+            { lastKnownDirection = kRight; }
+        return lastKnownDirection;
+    }
+}

src/botinterface.hpp

@@ -0,0 +1,12 @@
+#ifndef BOTINTERFACE_HPP
+#define BOTINTERFACE_HPP
+
+#include "common.hpp"
+#include <SFML/System/Vector2.hpp>
+
+namespace snakeplusplus
+{
+    PlayerDirection GetBotInput(const sf::Vector2f* snakeHeadLocation, const sf::Vector2f* foodLocation);
+}
+
+#endif 

src/gamestate.cpp

@@ -1,7 +1,7 @@
 // GameState.cpp
 #include <stdexcept>
 #include <SFML/Graphics.hpp>
-#include <tuple>
+#include "botinterface.hpp"
 #include "common.hpp"
 #include "playerinterface.hpp"
 #include "gamestate.hpp"
@@ -10,7 +10,7 @@ namespace snakeplusplus
 {
     GameEngine::GameEngine()
     {
-        snakeplusplus::InitializeGenerator();
+        InitializeGenerator();
         return;
     }
 
@@ -24,10 +24,10 @@ namespace snakeplusplus
 
     void GameEngine::Reset()
     {
-        graphics.CheckContinue();
+        graphics.CheckContinue(isBotControlled);
         player.Reset();
         PrepareGameBoard();
-        isGameOver = 0;
+        isGameOver = false;
         return;
     }
 
@@ -35,7 +35,7 @@ namespace snakeplusplus
     {
         while (graphics.IsOpen())
         {
-            if (isGameOver) {Reset();}
+            if (isGameOver) { Reset(); }
             UpdatePlayerSpeed();
             PlaceNewSnakePart(MovePlayer());
             RegenerateFood();
@@ -88,8 +88,7 @@ namespace snakeplusplus
             playerFood.GenerateNewFood(GetGameBoundaries());
             newLocation = playerFood.location;
         }
-        if (isUpdated)
-            gameBoard.at(newLocation.y).at(newLocation.x) = 'X';
+        if (isUpdated) { gameBoard.at(newLocation.y).at(newLocation.x) = 'X'; }
         return;
     }
 
@@ -99,40 +98,44 @@ namespace snakeplusplus
         sf::Vector2f boardDimensions = GetGameBoundaries();
         gameBoard.resize(boardDimensions.y, std::vector<char> (boardDimensions.x, ' '));
         // Snake setup
+        player.headLocation.x = GenerateRandomNumber(boardDimensions.x);
+        player.headLocation.y = GenerateRandomNumber(boardDimensions.y);
         {
-            player.headLocation.x = GenerateRandomNumber(boardDimensions.x);
-            player.headLocation.y = GenerateRandomNumber(boardDimensions.y);
             char* locationState = &gameBoard.at(player.headLocation.y).at(player.headLocation.x);
             player.body.push(locationState);
             *locationState = 'O';
         }
         // Food setup
-        {
-            playerFood.GenerateNewFood(boardDimensions);
-            sf::Vector2f newLocation = playerFood.location;
-            gameBoard.at(newLocation.y).at(newLocation.x) = 'X';
-        }
+        playerFood.GenerateNewFood(boardDimensions);
+        gameBoard.at(playerFood.location.y).at(playerFood.location.x) = 'X';
         return;
     }
 
     void GameEngine::UpdatePlayerSpeed(void)
     {
-        switch (GetPlayerInput()) {
+        PlayerDirection controller;
+        if (isBotControlled) { controller = GetBotInput(&player.headLocation, &playerFood.location); }
+        else { controller = GetPlayerInput(); }
+        switch (controller) { 
             case kUp:
+                if (player.speed.y == kUnitSpeed) { break; }
                 player.speed.x = 0;
-                player.speed.y = -1;
+                player.speed.y = -kUnitSpeed;
                 break;
             case kLeft:
-                player.speed.x = -1;
+                if (player.speed.x == kUnitSpeed) { break; }
+                player.speed.x = -kUnitSpeed;
                 player.speed.y = 0;
                 break;
             case kRight:
-                player.speed.x = 1;
+                if (player.speed.x == -kUnitSpeed) { break; }
+                player.speed.x = kUnitSpeed;
                 player.speed.y = 0;
                 break;
             case kDown:
+                if (player.speed.y == -kUnitSpeed) { break; }
                 player.speed.x = 0;
-                player.speed.y = 1;
+                player.speed.y = kUnitSpeed;
                 break;
             default:
                 break;

src/gamestate.hpp

@@ -8,6 +8,8 @@
 
 namespace snakeplusplus
 {
+    const int kUnitSpeed = 1;
+
     class GameEngine
     {
     public:
@@ -21,6 +23,7 @@ namespace snakeplusplus
         Snake player;
         Food playerFood;
         bool isGameOver = 0;
+        bool isBotControlled = 1;
         void DisplayEndScreen(void);
         void Loop(void);
         sf::Vector2f MovePlayer(void);

src/playerinterface.cpp

@@ -38,9 +38,9 @@ namespace snakeplusplus
         return;
     }
 
-    void PlayerOutput::CheckContinue(void)
+    void PlayerOutput::CheckContinue(bool isBotControlled)
     {
-        sf::Event event;
+        if (isBotControlled) { return; }
         DisplayEndScreen();
         while (true)
         {
@@ -108,7 +108,6 @@ namespace snakeplusplus
 
     void PlayerOutput::CheckWindowEvents(void)
     {
-        sf::Event event;
         while (gameWindow.pollEvent(event))
         {
             if ((event.type == sf::Event::Closed)

src/playerinterface.hpp

@@ -16,7 +16,7 @@ namespace snakeplusplus
         sf::Vector2f gameBoundaries;
         PlayerOutput(void);
         bool IsOpen(void);
-        void CheckContinue(void);
+        void CheckContinue(bool isBotControlled);
         void DisplayGameState(std::vector< std::vector<char> >& gameBoard);
         void StartGameWindow(void);
     private:
@@ -28,8 +28,9 @@ namespace snakeplusplus
         sf::RenderWindow gameWindow;
         sf::VideoMode gameVideoSettings;
         sf::RectangleShape drawObject;
+        sf::Event event;
         bool isWindowAlive;
-        sf::Time delay = sf::milliseconds(60);
+        sf::Time delay = sf::milliseconds(50);
     };
 }
 

src/snake.cpp

@@ -24,8 +24,8 @@ namespace snakeplusplus
     // Returns a new food object for the snakeFood
     void Food::GenerateNewFood(sf::Vector2f boundaries)
     {
-        location.x = snakeplusplus::GenerateRandomNumber(boundaries.x);
-        location.y = snakeplusplus::GenerateRandomNumber(boundaries.y);
+        location.x = GenerateRandomNumber(boundaries.x);
+        location.y = GenerateRandomNumber(boundaries.y);
         return;
     }
 }