created GameManager

Author: RiverHillbug

FluffyEngine/Singleton.h

@@ -43,6 +43,10 @@ namespace Fluffy
 		inline static T* m_pInstance{ nullptr };
 
 		ComponentSingleton() = default;
-		virtual void RegisterInstance() = 0;
+		void RegisterInstance(T* instance)
+		{
+			if (m_pInstance == nullptr)
+				m_pInstance = instance;
+		}
 	};
 }

Galaga/CharactersManager.cpp

@@ -11,65 +11,21 @@
 #include "EventParams.h"
 #include "BulletsManager.h"
 #include "Structs.h"
-#include "Parser.h"
 #include <memory>
 #include <algorithm>
 
-const float CharactersManager::PLAYER_RESPAWN_TIMER_DURATION{ 1.0f };
-
-CharactersManager::CharactersManager(Fluffy::GameObject* pOwner)
-	: Component(pOwner)
-{
-	RegisterInstance();
-}
-
-void CharactersManager::StartLevel1()
-{
-	std::vector<EnemyEnteringData> data;
-	Parser::GetInstance().ParseEnemyLayoutData("D:/Repos/FluffyEngine/Data/Formations/galaga_level_1.csv", data);
-	data;
-
-	std::queue<EnemyEnteringData> enemiesData{};
-
-	BezierPath firstPath{};
-	BezierCurve firstCurve{ { -32.0f, -32.0f }, { -32.0f, -32.0f }, { 290.0f, 200.0f }, { 290.0f, 200.0f } };
-	firstPath.AddCurve(firstCurve, 1);
-
-	enemiesData.push({ 4.0f, {}, firstPath, EnemyType::Boss });
-
-	BezierPath secondPath{};
-	BezierCurve secondCurve{ { 640.0f, -32.0f }, { 640.0f, -32.0f }, { 330.0f, 200.0f }, { 330.0f, 200.0f } };
-	secondPath.AddCurve(secondCurve, 1);
-
-	enemiesData.push({ 4.3f, {}, secondPath, EnemyType::Bee });
-
-	m_Level.StartLevel(enemiesData);
-
-	BulletsManager::GetInstance().Initialize();
-}
-
-void CharactersManager::Update(const float deltaTime)
-{
-	PurgeDestroyedCharacters();
-
-	// if the level has started
-	m_Level.Update(deltaTime);
-
-	UpdatePlayerRespawnTimers(deltaTime);
-
-	BulletsManager::GetInstance().Update(deltaTime);
-}
-
-void CharactersManager::CreatePlayerCharacters(Fluffy::Scene& scene)
+void CharactersManager::CreatePlayerCharacters(Fluffy::Scene* pScene)
 {
 	std::shared_ptr<Fluffy::GameObject> pPlayer1{ std::make_shared<Fluffy::GameObject>(SCREEN_SIZE.x / 2.0f, SCREEN_SIZE.y - 80.0f) };
 
 	pPlayer1->AddComponent<Fluffy::Sprite>("galaga_player1.png");
 	PlayerCharacter* pPlayer1Component{ pPlayer1->AddComponent<PlayerCharacter>(4, int(m_PlayerCharacters.size())) };
-	scene.Add(pPlayer1);
+	pScene->Add(pPlayer1);
 	pPlayer1Component->GetOnDeath().AddListener(this);
 
 	m_PlayerCharacters.push_back(pPlayer1Component);
+
+	m_pCurrentScene = pScene;
 }
 
 EnemyCharacter* CharactersManager::SpawnEnemy(const EnemyEnteringData& data)
@@ -96,14 +52,14 @@ EnemyCharacter* CharactersManager::SpawnEnemy(const EnemyEnteringData& data)
 
 	const float enemySpeed{ 200.0f };
 	EnemyCharacter* pEnemyCharacter{ pEnemy->AddComponent<EnemyCharacter>(data.type, enemySpeed) };
-	m_pOwner->GetScene()->Add(pEnemy);
+	m_pCurrentScene->Add(pEnemy);
 	pEnemyCharacter->GetOnDeath().AddListener(this);
 	m_Enemies.push_back(pEnemyCharacter);
 
 	return pEnemyCharacter;
 }
 
-void CharactersManager::KillEnemy(int killerIndex)
+void CharactersManager::KillEnemy(const int killerIndex)
 {
 	if (!m_Enemies.empty())
 	{
@@ -113,6 +69,11 @@ void CharactersManager::KillEnemy(int killerIndex)
 	}
 }
 
+void CharactersManager::RespawnPlayer(const int playerIndex)
+{
+	m_PlayerCharacters[playerIndex]->Respawn();
+}
+
 void CharactersManager::OnNotify(const Fluffy::EventType& eventType, const Fluffy::IEventParam* param)
 {
 	switch (eventType)
@@ -125,11 +86,16 @@ void CharactersManager::OnNotify(const Fluffy::EventType& eventType, const Fluff
 			if (characterIndex != INVALID_PLAYER_INDEX)
 			{
 				m_OnPlayerKilled.Invoke(param);
-				StartPlayerRespawnTimer(characterIndex);
 			}
 			else
 			{
 				m_OnEnemyKilled.Invoke(param);
+
+				const EnemyCharacter* pEnemy{ static_cast<EnemyCharacter*>(deathParam->GetCharacter()) };
+
+				const auto& it{ std::ranges::find(m_Enemies, pEnemy) };
+				if (it != m_Enemies.end())
+					m_Enemies.erase(it);
 			}
 		}
 		break;
@@ -142,45 +108,3 @@ PlayerCharacter* CharactersManager::GetPlayer(const int playerIndex)
 			m_PlayerCharacters[playerIndex] :
 			nullptr;
 }
-
-void CharactersManager::RegisterInstance()
-{
-	if (m_pInstance == nullptr)
-		m_pInstance = this;
-}
-
-void CharactersManager::PurgeDestroyedCharacters()
-{
-	m_PlayerCharacters.erase(std::ranges::remove_if(m_PlayerCharacters, [](const PlayerCharacter* pPlayer)
-		{
-			return pPlayer->GetGameObject()->IsDestroyed();
-		}).begin(), m_PlayerCharacters.end());
-
-	m_Enemies.erase(std::ranges::remove_if(m_Enemies, [](const EnemyCharacter* pEnemy)
-		{
-			return pEnemy->GetGameObject()->IsDestroyed();
-		}).begin(), m_Enemies.end());
-}
-
-void CharactersManager::StartPlayerRespawnTimer(const int playerIndex)
-{
-	m_PlayerRespawnTimers[playerIndex] = PLAYER_RESPAWN_TIMER_DURATION;
-}
-
-void CharactersManager::UpdatePlayerRespawnTimers(const float deltaTime)
-{
-	for (int i = 0; i < 2; ++i)
-	{
-		if (m_PlayerRespawnTimers[i] <= 0.0f)
-			continue;
-
-		m_PlayerRespawnTimers[i] -= deltaTime;
-		if (m_PlayerRespawnTimers[i] <= 0.0f)
-			RespawnPlayer(i);
-	}
-}
-
-void CharactersManager::RespawnPlayer(const int playerIndex)
-{
-	m_PlayerCharacters[playerIndex]->Respawn();
-}

Galaga/CharactersManager.h

@@ -2,60 +2,36 @@
 #include "Singleton.h"
 #include "Event.h"
 #include "IEventListener.h"
+#include "Structs.h"
 #include <memory>
 #include <vector>
 #include <queue>
-#include "Structs.h"
-#include "Level.h"
 
 namespace Fluffy
 {
 	struct IEventParam;
 	class Scene;
-	class GameObject;
 }
 
-class CharactersManager final : public Fluffy::Component, public Fluffy::ComponentSingleton<CharactersManager>, public Fluffy::IEventListener
+class CharactersManager final : public Fluffy::Singleton<CharactersManager>, public Fluffy::IEventListener
 {
 public:
-	CharactersManager(Fluffy::GameObject* pOwner);
-	~CharactersManager() = default;
-
-	CharactersManager(const CharactersManager&) = delete;
-	CharactersManager(CharactersManager&&) = delete;
-	CharactersManager& operator=(const CharactersManager&) = delete;
-	CharactersManager& operator=(CharactersManager&&) = delete;
-
-	void StartLevel1();
-
-	void Update(const float deltaTime) override;
-
-	void CreatePlayerCharacters(class Fluffy::Scene& scene);
+	void CreatePlayerCharacters(Fluffy::Scene* pScene);
 	class EnemyCharacter* SpawnEnemy(const EnemyEnteringData& data);
-	void KillEnemy(int killerIndex);
+	void KillEnemy(const int killerIndex);
+	void RespawnPlayer(const int playerIndex);
 	void OnNotify(const Fluffy::EventType& eventType, const Fluffy::IEventParam* param) override;
 
 	class PlayerCharacter* GetPlayer(const int playerIndex);
 	inline Fluffy::Event& GetOnPlayerKilled() { return m_OnPlayerKilled; }
 	inline Fluffy::Event& GetOnEnemyKilled() { return m_OnEnemyKilled; }
 
-protected:
-	void RegisterInstance() override;
-
 private:
-	Level m_Level{};
 	Fluffy::Event m_OnPlayerKilled{ Fluffy::EventType::OnPlayerKilled };
 	Fluffy::Event m_OnEnemyKilled{ Fluffy::EventType::OnEnemyKilled };
 
 	std::vector<class PlayerCharacter*> m_PlayerCharacters{};
 	std::vector<class EnemyCharacter*> m_Enemies{};
 
-	const static float PLAYER_RESPAWN_TIMER_DURATION;
-
-	float m_PlayerRespawnTimers[2]{ 0.0f };
-
-	void PurgeDestroyedCharacters();
-	void StartPlayerRespawnTimer(const int playerIndex);
-	void UpdatePlayerRespawnTimers(const float deltaTime);
-	void RespawnPlayer(const int playerIndex);
+	Fluffy::Scene* m_pCurrentScene{};
 };

Galaga/Galaga.vcxproj

@@ -172,8 +172,8 @@
     <ClCompile Include="FiniteStateMachine.cpp" />
     <ClCompile Include="FPSCounter.cpp" />
     <ClCompile Include="GameEvents.cpp" />
+    <ClCompile Include="GameManager.cpp" />
     <ClCompile Include="HealthDisplayComponent.cpp" />
-    <ClCompile Include="KillEnemyCommand.cpp" />
     <ClCompile Include="Level.cpp" />
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="MoveCommand.cpp" />
@@ -183,7 +183,6 @@
     <ClCompile Include="ShootCommand.cpp" />
     <ClCompile Include="EnemyStates.cpp" />
     <ClCompile Include="SoundManager.cpp" />
-    <ClCompile Include="SuicideCommand.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="AchievementComponent.h" />
@@ -197,9 +196,9 @@
     <ClInclude Include="FiniteStateMachine.h" />
     <ClInclude Include="FPSCounter.h" />
     <ClInclude Include="GameEvents.h" />
+    <ClInclude Include="GameManager.h" />
     <ClInclude Include="HealthDisplayComponent.h" />
     <ClInclude Include="Parser.h" />
-    <ClInclude Include="KillEnemyCommand.h" />
     <ClInclude Include="Level.h" />
     <ClInclude Include="MoveCommand.h" />
     <ClInclude Include="PlayerCharacter.h" />
@@ -209,7 +208,6 @@
     <ClInclude Include="EnemyStates.h" />
     <ClInclude Include="SoundManager.h" />
     <ClInclude Include="Structs.h" />
-    <ClInclude Include="SuicideCommand.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Galaga/Galaga.vcxproj.filters

@@ -36,9 +36,6 @@
     <ClCompile Include="HealthDisplayComponent.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="KillEnemyCommand.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="MoveCommand.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -51,9 +48,6 @@
     <ClCompile Include="ScoreComponent.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="SuicideCommand.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="ShootCommand.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -78,6 +72,9 @@
     <ClCompile Include="GameEvents.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="GameManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="AchievementComponent.h">
@@ -98,9 +95,6 @@
     <ClInclude Include="HealthDisplayComponent.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="KillEnemyCommand.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="MoveCommand.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -113,9 +107,6 @@
     <ClInclude Include="ScoreComponent.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SuicideCommand.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Structs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -152,5 +143,8 @@
     <ClInclude Include="SoundManager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="GameManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>