State design

.gitattributes

@@ -1,2 +1,2 @@
-*.png filter=lfs diff=lfs merge=lfs -text
-*.ttf filter=lfs diff=lfs merge=lfs -text
+**/*.png filter=lfs diff=lfs merge=lfs -text
+**/*.ttf filter=lfs diff=lfs merge=lfs -text

CMakeLists.txt

@@ -60,6 +60,7 @@ add_subdirectory(src/Map)
 add_subdirectory(src/Math)
 add_subdirectory(src/NavigationManager)
 add_subdirectory(src/Strike)
+add_subdirectory(src/State)
 add_subdirectory(src/TextureManager)
 add_subdirectory(src/TimeManager)
 add_subdirectory(src/Utility)

app/main.cpp

@@ -13,7 +13,7 @@
 
 int main() {
 	using namespace wolfenstein;
-	GeneralConfig config(800, 600, 0, 50, 120, 15.0, ToRadians(60.0), false);
+	GeneralConfig config(800, 600, 0, 30, 120, 15.0, ToRadians(60.0), false);
 
 	Game game(config);
 	game.Run();

src/Animation/CMakeLists.txt

@@ -2,8 +2,8 @@ add_library(
     animation
     STATIC
     src/time_based_single_animation.cpp
-    src/walk_animation.cpp
 )
 target_include_directories(animation PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
+

src/Characters/CMakeLists.txt

@@ -15,6 +15,7 @@ target_link_libraries(
     collision_manager
     animation
     SDL2
-    shotgun
+    weapon
+    enemy_state
 )
 

src/Characters/include/Characters/enemy.h

@@ -12,21 +12,25 @@
 #ifndef CHARACTERS_INCLUDE_ENEMY_H_
 #define CHARACTERS_INCLUDE_ENEMY_H_
 
-#include "Animation/walk_animation.h"
 #include "Characters/character.h"
 #include "GameObjects/game_object.h"
 #include "Math/vector.h"
+#include "State/enemy_state.h"
+#include <memory>
 
 namespace wolfenstein {
 
-class Enemy : public ICharacter, public IGameObject
+class Enemy : public ICharacter,
+			  public IGameObject,
+			  public std::enable_shared_from_this<Enemy>
 {
   public:
-	explicit Enemy(CharacterConfig config, double width, double height,
-				   WalkAnimation animation);
+	explicit Enemy(CharacterConfig config, std::shared_ptr<State<Enemy>> state,
+				   double width, double height);
 	~Enemy() = default;
-
+	void Init();
 	void Update(double delta_time) override;
+	void TransitionTo(std::shared_ptr<State<Enemy>> state);
 
 	void SetPose(const vector2d& pose) override;
 	void SetPosition(Position2D position) override;
@@ -42,16 +46,17 @@ class Enemy : public ICharacter, public IGameObject
 	void SetNextPose(vector2d pose);
 
   private:
+	Enemy() = default;
 	void Move(double delta_time);
 
 	Position2D position_;
 	double rotation_speed_;
 	double translation_speed_;
-	std::string id_;
+	std::shared_ptr<State<Enemy>> state_;
 	double width;
 	double height;
+	std::string id_;
 	vector2d next_pose;
-	WalkAnimation animation;
 };
 
 }  // namespace wolfenstein

src/Characters/include/Characters/player.h

@@ -14,7 +14,7 @@
 
 #include "Characters/character.h"
 #include "GameObjects/game_object.h"
-#include "Strike/shotgun.h"
+#include "Strike/weapon.h"
 #include <functional>
 #include <memory>
 
@@ -35,23 +35,23 @@ class Player : public ICharacter, public IGameObject
 	void SetPosition(Position2D position) override;
 	Position2D GetPosition() const override;
 	std::string GetId() const override;
-	int GetTextureId() const override { return shotgun_->GetTextureId(); }
-	double GetWidth() const override { return width_; }
-	double GetHeight() const override { return height_; }
+	int GetTextureId() const override;
+	double GetWidth() const override;
+	double GetHeight() const override;
 	void SubscribeToPlayerPosition(std::function<void(Position2D)> subscriber);
 
   private:
 	void Move(double delta_time);
 	void Rotate(double delta_time);
-	void Shoot();
+	void ShootAndReload();
 
 	Position2D position_;
 	double rotation_speed_;
 	double translation_speed_;
 	double width_{0.4};
 	double height_{1.0};
 	std::string id_;
-	std::shared_ptr<Shotgun> shotgun_;
+	std::shared_ptr<Weapon> weapon_;
 	std::vector<std::function<void(Position2D)>> player_position_subscribers_;
 };
 

src/Characters/src/enemy.cpp

@@ -2,27 +2,33 @@
 #include "CollisionManager/collision_manager.h"
 #include "Math/vector.h"
 #include "Utility/uuid_generator.h"
+#include <memory>
 
 namespace wolfenstein {
 
-Enemy::Enemy(CharacterConfig config, double width, double height,
-			 WalkAnimation animation)
+Enemy::Enemy(CharacterConfig config, std::shared_ptr<State<Enemy>> state,
+			 double width, double height)
 	: position_(config.initial_position),
 	  rotation_speed_(config.rotation_speed),
 	  translation_speed_(config.translation_speed),
+	  state_(state),
 	  width(width),
 	  height(height),
-	  animation(animation) {
-	id_ = UuidGenerator::GetInstance().GenerateUuid().bytes();
+	  id_(UuidGenerator::GetInstance().GenerateUuid().bytes()) {}
+
+void Enemy::Init() {
+	state_->SetContext(shared_from_this());
+}
+
+void Enemy::TransitionTo(std::shared_ptr<State<Enemy>> state) {
+	state_ = state;
+	state_->SetContext(shared_from_this());
 }
 
 void Enemy::Update(double delta_time) {
+	state_->Update(delta_time);
 	if (next_pose != position_.pose) {
 		Move(delta_time);
-		animation.Update(delta_time);
-	}
-	else {
-		animation.Reset();
 	}
 }
 
@@ -69,7 +75,7 @@ void Enemy::SetNextPose(vector2d pose) {
 }
 
 int Enemy::GetTextureId() const {
-	return animation.GetCurrentFrame();
+	return state_->GetCurrentFrame();
 }
 
 double Enemy::GetWidth() const {