Implemented Finite State Machine

.gitignore

@@ -5,7 +5,6 @@ gmon.out
 *.stats
 Thumbs.db
 .DS_Store
-PCH.hpp
 
 # VS Code
 .vscode/ipch

.vscode/c_cpp_properties.json

@@ -29,8 +29,7 @@
 			],
 			"includePath": [
 				"${workspaceFolder}/src",
-				"${workspaceFolder}/lib",
-				"/usr/local/include/**"
+				"${workspaceFolder}/lib"
 			],
 			"defines": [
 				"_DEBUG"

.vscode/settings.json

@@ -85,9 +85,30 @@
 		"streambuf": "cpp",
 		"thread": "cpp",
 		"typeinfo": "cpp",
-		"variant": "cpp"
+		"variant": "cpp",
+		"__bit_reference": "cpp",
+		"__bits": "cpp",
+		"__config": "cpp",
+		"__debug": "cpp",
+		"__errc": "cpp",
+		"__functional_base": "cpp",
+		"__hash_table": "cpp",
+		"__locale": "cpp",
+		"__mutex_base": "cpp",
+		"__node_handle": "cpp",
+		"__nullptr": "cpp",
+		"__split_buffer": "cpp",
+		"__string": "cpp",
+		"__threading_support": "cpp",
+		"__tree": "cpp",
+		"__tuple": "cpp",
+		"bit": "cpp",
+		"complex": "cpp",
+		"ios": "cpp",
+		"locale": "cpp",
+		"stack": "cpp",
+		"__availability": "cpp"
 	},
-	"terminal.integrated.automationShell.windows": "C:/Program Files/Git/bin/bash.exe",
 	"terminal.integrated.env.windows": {
 		"Path": "C:/mingw32/bin;C:/SFML-2.5.1/bin"
 	},

src/Enemy.cpp

@@ -1,18 +1,15 @@
 #include "Enemy.hpp"
+#include "Sprite.hpp"
 
-Enemy::Enemy(sf::Vector2f _pos, sf::Vector2f _size) :
-	Hitbox { _pos, _size }
-{
-	// Load Texture
-	texture.loadFromFile("assets/enemy.png");
-	sprite.setTexture(texture);
-	size = sf::Vector2f(texture.getSize());
+Enemy::Enemy(sf::Vector2f _pos, sf::Vector2f target_size) :
+	Hitbox { _pos, target_size },
+	Sprite { "assets/enemy.png", _pos, target_size }
+{}
 
-	// Initialise Position
-	pos = _pos;
-
-	sprite.setPosition(pos);
-}
+Enemy::Enemy() :
+	Hitbox { sf::Vector2f(), sf::Vector2f() },
+	Sprite { "assets/enemy.png", sf::Vector2f(), sf::Vector2f() }
+{}
 
 void Enemy::updatePosition(StaticSprite* platforms, sf::Vector2f player_pos)
 {
@@ -28,12 +25,11 @@ void Enemy::updatePosition(StaticSprite* platforms, sf::Vector2f player_pos)
 		}
 	}
 
-	// Gets direction to player
-
 	sprite.setPosition(pos);
 }
 
-sf::Vector2f Enemy::getPosition()
+void Enemy::setPosition(sf::Vector2f _pos)
 {
-	return pos;
+	pos = _pos;
+	update_sprite(pos, size);
 }

src/Enemy.hpp

@@ -2,6 +2,7 @@
 #define Enemy_H
 
 #include "Hitbox.hpp"
+#include "Sprite.hpp"
 #include "StaticSprite.hpp"
 
 /**
@@ -10,18 +11,19 @@
  * @param pos The initial position
  * @param size The width and height of the enemy's hitbox
  */
-class Enemy : public Hitbox
+class Enemy : public Hitbox, public Sprite
 {
 private:
 	sf::Texture texture;
 
 public:
-	sf::Sprite sprite;
 	Enemy(sf::Vector2f pos, sf::Vector2f size);
+	Enemy();
 
 	// Updates the position of the sprite
 	void updatePosition(StaticSprite* platforms, sf::Vector2f player_pos);
-	sf::Vector2f getPosition();
+	// Force sets the position of the sprites
+	void setPosition(sf::Vector2f _pos);
 };
 
 #endif

src/Game/Background.cpp

@@ -0,0 +1,15 @@
+#include "Game/Background.hpp"
+
+Background::Background(sf::RenderWindow& window) :
+	Sprite { "assets/background-image.png", sf::Vector2f(0, 0), sf::Vector2f(window.getSize()) }
+{}
+
+void Background::draw(sf::RenderWindow& window, sf::View& view)
+{
+	const sf::Vector2f view_center = view.getCenter();
+	const sf::Vector2f view_size = view.getSize();
+
+	const sf::Vector2f left_top = sf::Vector2f(view_center.x - view_size.x / 2, view_center.y - view_size.y / 2);
+	update_sprite(left_top, view_size);
+	window.draw(sprite);
+}

src/Game/Background.hpp

@@ -0,0 +1,13 @@
+#ifndef Background_H
+#define Background_H
+
+#include "Sprite.hpp"
+
+class Background : public Sprite
+{
+public:
+	Background(sf::RenderWindow& _window);
+	void draw(sf::RenderWindow& window, sf::View& view);
+};
+
+#endif

src/Game/Game.cpp

@@ -0,0 +1,95 @@
+#include "Game/Game.hpp"
+#include "WindowStates/State.hpp"
+
+Game::Game(sf::RenderWindow& _window) :
+	window { _window },
+	player { sf::Vector2f(500.f, 0.f), sf::Vector2f(215.f, 258.f) },
+	platforms {
+		StaticSprite("assets/platform.png", sf::Vector2f(10.f, 500.f), sf::Vector2f(760.f, 107.f)),
+		StaticSprite("assets/platform.png", sf::Vector2f(1100.f, 100.f), sf::Vector2f(760.f, 107.f)),
+		StaticSprite("assets/platform.png", sf::Vector2f(2100.f, 500.f), sf::Vector2f(760.f, 107.f))
+	},
+	enemies {
+		Enemy(sf::Vector2f(0.f, 250.f), sf::Vector2f(215.f, 258.f)),
+		Enemy(sf::Vector2f(2700.f, 250.f), sf::Vector2f(215.f, 258.f))
+	},
+	player_view { sf::FloatRect(0, 0, window.getSize().x, window.getSize().y) }
+{
+	reset_positions(true);
+}
+
+void Game::reset_positions(bool hard_reset)
+{
+	player.setDetails(sf::Vector2f(500.f, 0.f), player.size);
+	if (hard_reset)
+	{
+		enemies[0].setPosition(sf::Vector2f(0.f, 250.f));
+		enemies[1].setPosition(sf::Vector2f(2700.f, 250.f));
+	}
+}
+
+void Game::handleKeyPress(sf::Keyboard::Key key_code)
+{
+	player.handleKeyPress(key_code);
+}
+
+void Game::handleKeyRelease(sf::Keyboard::Key key_code)
+{
+	player.handleKeyRelease(key_code);
+}
+
+void Game::update(WindowStates& next_state)
+{
+	if (player.health < 0)
+	{
+		next_state = WindowStates::MENU;
+		return;
+	}
+
+	player.updatePosition(platforms);
+
+	for (unsigned int i = 0; i < 2; i++)
+	{
+		enemies[i].updatePosition(platforms, player.pos);
+		player.handleCollide(enemies[i]);
+	}
+
+	player.updateHealth();
+
+	frame_tracker.add_info("Vel", std::to_string(player.vel.x).substr(0, 4) + "  |  " + std::to_string(player.vel.y).substr(0, 4));
+	frame_tracker.update();
+}
+
+void Game::moveViewToPlayer()
+{
+	player_view.setCenter(sf::Vector2f(player.pos.x, 300));
+	window.setView(player_view);
+}
+
+void Game::draw()
+{
+	unsigned int i;
+	for (i = 0; i < 2; i++)
+	{
+		enemies[i].draw(window);
+
+		if (show_hitboxes)
+			window.draw(enemies[i].get_hitbox_outline());
+	}
+
+	for (i = 0; i < 3; i++)
+	{
+		platforms[i].draw(window);
+
+		if (show_hitboxes)
+			window.draw(platforms[i].get_hitbox_outline());
+	}
+
+	player.draw(window);
+
+	if (show_hitboxes)
+		window.draw(player.get_hitbox_outline());
+
+	window.draw(frame_tracker.text);
+	window.draw(player.health_display);
+}

src/Game/Game.hpp

@@ -0,0 +1,37 @@
+#ifndef Game_H
+#define Game_H
+
+#include "Enemy.hpp"
+#include "FrameRate.hpp"
+#include "Player.hpp"
+#include "WindowStates/State.hpp"
+
+class Game
+{
+private:
+	sf::RenderWindow& window;
+
+	FrameRateTracker frame_tracker;
+
+	Player player;
+	StaticSprite platforms[3];
+	Enemy enemies[2];
+
+public:
+	sf::View player_view;
+	bool show_hitboxes;
+
+	Game(sf::RenderWindow& window);
+
+	void reset_positions(bool hard_reset);
+
+	void handleKeyPress(sf::Keyboard::Key key_code);
+	void handleKeyRelease(sf::Keyboard::Key key_code);
+
+	void moveViewToPlayer();
+	void draw();
+
+	void update(WindowStates& next_state);
+};
+
+#endif

src/Hitbox.cpp

@@ -23,7 +23,7 @@ Direction CollisionFix::h2_direction()
 	return getDirectionFromVector(h2_displacement);
 }
 
-Hitbox::Hitbox(sf::Vector2f _pos, sf::Vector2f _size = sf::Vector2f(0, 0)) :
+Hitbox::Hitbox(sf::Vector2f _pos, sf::Vector2f _size) :
 	Physics { _pos }
 {
 	size = _size;