trianta/snakeplusplus
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases 1 Wiki Activity

More cleaning for readabillity, added common file

Browse Source
This commit is contained in:
TriantaTV
2023-03-12 21:57:46 -05:00
parent de189301d4
commit 6589dabc09
9 changed files with 161 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Common.cpp
+11
View File
@@ -0,0 +1,11 @@
#include "Common.h"
// Test for collision between two object positions
bool GlobalCollision(sf::Vector2f object1Position, sf::Vector2f object2Position)
{
if (object1Position.x != object2Position.x)
return false;
if (object1Position.y != object2Position.y)
return false;
return true;
}
src/GameState.cpp
+29 -12
View File
@@ -1,20 +1,21 @@
// GameState.cpp
#include <SFML\Graphics.hpp>
#include <SFML\System.hpp>
#include "Common.h"
#include "Snake.h"
#include "GameState.h"
GameState::GameState()
{
delay = sf::milliseconds(100);
gameVideoSettings = sf::VideoMode(1024, 725);
delay = sf::milliseconds(75);
gameVideoSettings = sf::VideoMode(1025, 725);
gameWindow.create(gameVideoSettings, "SnakePlusPlus");
return;
}
GameState::GameState(int maxHorizontal, int maxVertical)
{
delay = sf::milliseconds(100);
delay = sf::milliseconds(75);
gameVideoSettings = sf::VideoMode(maxHorizontal, maxVertical);
gameWindow.create(gameVideoSettings, "SnakePlusPlus");
return;
@@ -26,6 +27,7 @@ void GameState::StartGame()
Snake player(sf::Vector2f(kGridSize,kGridSize));
SnakeFood playerFood(sf::Vector2f(kGridSize,kGridSize));
RunGameLoop();
return;
}
sf::Vector2f GameState::GetGameBoundaries(void)
@@ -36,6 +38,26 @@ sf::Vector2f GameState::GetGameBoundaries(void)
return boundaries;
}
void GameState::GetKeyboardInput(void)
{
sf::Event event;
while (gameWindow.pollEvent(event))
{
if ((event.type == sf::Event::Closed) ||
(sf::Keyboard::isKeyPressed(sf::Keyboard::Escape)))
gameWindow.close();
}
if (sf::Keyboard::isKeyPressed(sf::Keyboard::Left))
player.UpdateDirection(kLeft);
if (sf::Keyboard::isKeyPressed(sf::Keyboard::Up))
player.UpdateDirection(kUp);
if (sf::Keyboard::isKeyPressed(sf::Keyboard::Down))
player.UpdateDirection(kDown);
if (sf::Keyboard::isKeyPressed(sf::Keyboard::Right))
player.UpdateDirection(kRight);
return;
}
// Generates new food until not colliding with player
void GameState::RegenerateFood(void)
{
@@ -47,21 +69,15 @@ void GameState::RegenerateFood(void)
void GameState::RunGameLoop(void)
{
sf::Event event;
while (gameWindow.isOpen())
{
while (gameWindow.pollEvent(event))
{
if ((event.type == sf::Event::Closed) ||
(sf::Keyboard::isKeyPressed(sf::Keyboard::Escape)))
gameWindow.close();
}
player.CheckDirection();
player.MoveSnake(playerFood, gameVideoSettings);
GetKeyboardInput();
player.MoveSnake(&playerFood);
RegenerateFood();
RenderWindow();
sf::sleep(delay);
}
return;
}
void GameState::RenderWindow(void)
@@ -70,4 +86,5 @@ void GameState::RenderWindow(void)
player.DisplaySnake(gameWindow);
gameWindow.draw(playerFood.GetFoodObject());
gameWindow.display();
return;
}
src/Snake.cpp
+78 -104
View File
@@ -2,11 +2,12 @@
#include <iostream>
#include <queue>
#include <SFML\Graphics.hpp>
#include "Common.h"
#include "Snake.h"
#include "SnakeFood.h"
// General constructor for snake class
Snake::Snake()
Snake::Snake(void)
{
sf::RectangleShape newBodyPart(sf::Vector2f(kGridSize, kGridSize));
newBodyPart.setFillColor(sf::Color::Green);
@@ -23,121 +24,28 @@ Snake::Snake(sf::Vector2f headSize)
return;
}
// Get a new coordinate position based on snake direction
sf::Vector2f CalculateNewPosition(int direction, sf::Vector2f position)
// Iterate through snake deque and draw to window
void Snake::DisplaySnake(sf::RenderWindow& window)
{
if (direction == 0)
return position;
if (direction == 1)
position.x -= kGridSize;
if (direction == 2)
position.y -= kGridSize;
if (direction == 3)
position.y += kGridSize;
if (direction == 4)
position.x += kGridSize;
return position;
}
// Test for collision between two object positions
bool GlobalCollision(sf::Vector2f object1Position, sf::Vector2f object2Position)
{
if (object1Position.x != object2Position.x)
return 0;
if (object1Position.y != object2Position.y)
return 0;
return 1;
}
// Check keyboard for new direction of snake
void Snake::CheckDirection()
{
if (sf::Keyboard::isKeyPressed(sf::Keyboard::Left))
snakeDirection = 1;
if (sf::Keyboard::isKeyPressed(sf::Keyboard::Up))
snakeDirection = 2;
if (sf::Keyboard::isKeyPressed(sf::Keyboard::Down))
snakeDirection = 3;
if (sf::Keyboard::isKeyPressed(sf::Keyboard::Right))
snakeDirection = 4;
for (auto snakeBodyPart = snakeBody.cbegin(); snakeBodyPart != snakeBody.cend(); ++snakeBodyPart)
window.draw(*snakeBodyPart);
return;
}
// Check snake head for running into boundaries
bool Snake::CheckBoundaries()
{
if (snakeBody.front().getPosition().x == 0 && snakeDirection == 1)
return true;
if (snakeBody.front().getPosition().y == 0 && snakeDirection == 2)
return true;
// TODO: Change boundaries to not be hard-coded
if (snakeBody.front().getPosition().y > 675 && snakeDirection == 3)
return true;
if (snakeBody.front().getPosition().x > 975 && snakeDirection == 4)
return true;
return false;
}
// Move snake based on direction and test for eating food
void Snake::MoveSnake(SnakeFood& snakeFood, sf::VideoMode gameVideoMode)
{
// CheckDirection();
sf::Vector2f newHeadPosition;
newHeadPosition = GetSnakeHeadPosition();
if (CheckBoundaries())
return;
newHeadPosition = CalculateNewPosition(snakeDirection, newHeadPosition);
sf::RectangleShape newBodyPart(sf::Vector2f(kGridSize, kGridSize));
newBodyPart.setPosition(newHeadPosition);
if (IsSelfCollision(newBodyPart)) // Do nothing if self collision
{
return;
}
newBodyPart.setFillColor(sf::Color::Green);
snakeBody.push_front(newBodyPart);
if (!GlobalCollision(GetSnakeHead().getPosition(), snakeFood.GetFoodObject().getPosition()))
snakeBody.pop_back();
return;
}
// Return the Vector2f head of snake
sf::Vector2f Snake::GetSnakeHeadPosition()
{
sf::Vector2f position;
position = snakeBody.front().getPosition();
return position;
}
// Return the RectangleShape head of snake
sf::RectangleShape Snake::GetSnakeHead()
sf::RectangleShape Snake::GetSnakeHead(void)
{
sf::RectangleShape head;
head = snakeBody.front();
return head;
}
// Iterate through snake deque and draw to window
void Snake::DisplaySnake(sf::RenderWindow& window)
// Return the Vector2f head of snake
sf::Vector2f Snake::GetSnakeHeadPosition(void)
{
for (auto it = snakeBody.cbegin(); it != snakeBody.cend(); ++it)
{
window.draw(*it);
}
return;
}
// Test for snake self collision
bool Snake::IsSelfCollision(sf::RectangleShape testRectangle)
{
for (auto it = snakeBody.cbegin(); it != snakeBody.cend(); ++it)
{
if (GlobalCollision(testRectangle.getPosition(), (*it).getPosition()))
{
return true;
}
}
return false;
sf::Vector2f position;
position = snakeBody.front().getPosition();
return position;
}
// Checks if snake position matches object position
@@ -153,3 +61,69 @@ bool Snake::IsTouchingObject(sf::RectangleShape object)
}
return false;
}
// Move snake based on direction and check for collision
void Snake::MoveSnake(SnakeFood* snakeFood)
{
// TODO: Add losing on wall collision
if (CheckBoundaries()) // Wall collision
return;
sf::Vector2f newHeadPosition;
newHeadPosition = CalculateNewPosition(GetSnakeHeadPosition());
sf::RectangleShape newBodyPart(sf::Vector2f(kGridSize, kGridSize));
newBodyPart.setPosition(newHeadPosition);
// TODO: Add losing on self collision
if (IsSelfCollision(newBodyPart)) // Snake collision
return;
newBodyPart.setFillColor(sf::Color::Green);
snakeBody.push_front(newBodyPart);
if (!GlobalCollision(GetSnakeHeadPosition(), snakeFood->GetFoodObjectPosition()))
snakeBody.pop_back();
return;
}
void Snake::UpdateDirection(int newDirection)
{
snakeDirection = newDirection;
return;
}
// Get a new coordinate position based on snake direction
sf::Vector2f Snake::CalculateNewPosition(sf::Vector2f position)
{
if (snakeDirection == 0)
return position;
if (snakeDirection == kLeft)
position.x -= kGridSize;
if (snakeDirection == kUp)
position.y -= kGridSize;
if (snakeDirection == kDown)
position.y += kGridSize;
if (snakeDirection == kRight)
position.x += kGridSize;
return position;
}
// Check snake head for running into boundaries
bool Snake::CheckBoundaries(void)
{
if (snakeBody.front().getPosition().x == 0 && snakeDirection == kLeft)
return true;
if (snakeBody.front().getPosition().y == 0 && snakeDirection == kUp)
return true;
// TODO: Change boundaries to not be hard-coded
if (snakeBody.front().getPosition().y > 675 && snakeDirection == kDown)
return true;
if (snakeBody.front().getPosition().x > 975 && snakeDirection == kRight)
return true;
return false;
}
// Test for snake self collision
bool Snake::IsSelfCollision(sf::RectangleShape testRectangle)
{
for (auto snakeBodyPart = snakeBody.cbegin(); snakeBodyPart != snakeBody.cend(); ++snakeBodyPart)
if (GlobalCollision(testRectangle.getPosition(), (*snakeBodyPart).getPosition()))
return true;
return false;
}
src/SnakeFood.cpp
+10 -7
View File
@@ -1,20 +1,22 @@
// SnakeFood.cpp
#include <iostream>
#include <SFML\Graphics.hpp>
#include "Common.h"
#include "SnakeFood.h"
const int kGridSize = 25;
SnakeFood::SnakeFood()
{
snakeFoodObject.setSize(sf::Vector2f(kGridSize,kGridSize));
snakeFoodObject.setSize(sf::Vector2f(kGridSize, kGridSize));
snakeFoodObject.setFillColor(sf::Color::Red);
return;
}
SnakeFood::SnakeFood(sf::Vector2f snakeFoodSize)
{
snakeFoodObject.setSize(snakeFoodSize);
snakeFoodObject.setFillColor(sf::Color::Red);
return;
}
// Returns a new food object for the snakeFood
@@ -24,11 +26,7 @@ void SnakeFood::GenerateNewFood(sf::Vector2f windowSize)
newPosition.x = GenerateRandomNumber(windowSize.x);
newPosition.y = GenerateRandomNumber(windowSize.y);
snakeFoodObject.setPosition(newPosition);
// if (GlobalCollision(snakeFoodObject.getPosition(), newPosition))
// {
// std::cout << "Location error: " << newPosition.x << " " << newPosition.y << '\n';
// throw std::runtime_error("Error! New generation on same location");
// }
return;
}
sf::RectangleShape SnakeFood::GetFoodObject(void)
@@ -36,6 +34,11 @@ sf::RectangleShape SnakeFood::GetFoodObject(void)
return snakeFoodObject;
}
sf::Vector2f SnakeFood::GetFoodObjectPosition(void)
{
return snakeFoodObject.getPosition();
}
// Returns a newly generated number
int SnakeFood::GenerateRandomNumber(int generationLimit)
{