added skip level command

FluffyEngine/Controller.h

@@ -11,17 +11,17 @@ namespace Fluffy
 {
 	enum class Button : unsigned int
 	{
-		NONE = 0x0000,
+		NONE = 0,
 
-		XINPUT_CONTROLLER_A = 0x1000,
-		XINPUT_CONTROLLER_B = 0x2000,
-		XINPUT_CONTROLLER_X = 0x4000,
-		XINPUT_CONTROLLER_Y = 0x8000,
+		GAMEPAD_A = XINPUT_GAMEPAD_A,
+		GAMEPAD_B = XINPUT_GAMEPAD_B,
+		GAMEPAD_X = XINPUT_GAMEPAD_X,
+		GAMEPAD_Y = XINPUT_GAMEPAD_Y,
 
-		XINPUT_GAMEPAD_DRAD_UP = 0x0001,
-		XINPUT_GAMEPAD_DRAD_DOWN = 0x0002,
-		XINPUT_GAMEPAD_DRAD_LEFT = 0x0004,
-		XINPUT_GAMEPAD_DRAD_RIGHT = 0x0008
+		GAMEPAD_DPAD_UP = XINPUT_GAMEPAD_DPAD_UP,
+		GAMEPAD_DPAD_DOWN = XINPUT_GAMEPAD_DPAD_DOWN,
+		GAMEPAD_DPAD_LEFT = XINPUT_GAMEPAD_DPAD_LEFT,
+		GAMEPAD_DPAD_RIGHT = XINPUT_GAMEPAD_DPAD_RIGHT,
 	};
 
 	struct ControllerInput
@@ -70,14 +70,14 @@ namespace Fluffy
 		void AddCommand(ControllerInput input, std::unique_ptr<class Command> command);
 
 	private:
-		int m_ControllerIndex;
+		int m_ControllerIndex{};
 
 		XINPUT_STATE m_InputState{};
 
-		unsigned int m_PressedButtons;
-		unsigned int m_ReleasedButtons;
-		unsigned int m_PreviousButtons;
+		unsigned int m_PressedButtons{};
+		unsigned int m_ReleasedButtons{};
+		unsigned int m_PreviousButtons{};
 
-		std::unordered_map<ControllerInput, std::unique_ptr<class Command>> m_ButtonBindings;
+		std::unordered_map<ControllerInput, std::unique_ptr<class Command>> m_ButtonBindings{};
 	};
 }

Galaga/Galaga.vcxproj

@@ -183,6 +183,7 @@
     <ClCompile Include="ScoreComponent.cpp" />
     <ClCompile Include="ShootCommand.cpp" />
     <ClCompile Include="EnemyStates.cpp" />
+    <ClCompile Include="SkipLevelCommand.cpp" />
     <ClCompile Include="SoundManager.cpp" />
     <ClCompile Include="UIManager.cpp" />
   </ItemGroup>
@@ -209,6 +210,7 @@
     <ClInclude Include="ScoreComponent.h" />
     <ClInclude Include="ShootCommand.h" />
     <ClInclude Include="EnemyStates.h" />
+    <ClInclude Include="SkipLevelCommand.h" />
     <ClInclude Include="SoundManager.h" />
     <ClInclude Include="Structs.h" />
     <ClInclude Include="UIManager.h" />

Galaga/Galaga.vcxproj.filters

@@ -81,6 +81,9 @@
     <ClCompile Include="GameOverScreen.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="SkipLevelCommand.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="AchievementComponent.h">
@@ -158,5 +161,8 @@
     <ClInclude Include="GameOverScreen.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="SkipLevelCommand.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

Galaga/GameManager.cpp

@@ -74,6 +74,19 @@ void GameManager::StartLevel(const int levelIndex)
 	BulletsManager::GetInstance().Initialize();
 }
 
+void GameManager::SkipToNextLevel()
+{
+	if (++m_CurrentLevelIndex <= LEVELS_COUNT)
+	{
+		GameEvents::OnLevelCompleted.Invoke();
+		StartLevel(m_CurrentLevelIndex);
+	}
+	else
+	{
+		TriggerGameOver();
+	}
+}
+
 void GameManager::Update(const float deltaTime)
 {
 	// if the level has started
@@ -107,15 +120,7 @@ void GameManager::OnNotify(const Fluffy::EventType& eventType, const Fluffy::IEv
 	case Fluffy::EventType::OnEnemyKilled:
 		if (CharactersManager::GetInstance().AreAllEnemiesDead())
 		{
-			if (++m_CurrentLevelIndex <= LEVELS_COUNT)
-			{
-				GameEvents::OnLevelCompleted.Invoke();
-				StartLevel(m_CurrentLevelIndex);
-			}
-			else
-			{
-				TriggerGameOver();
-			}
+			SkipToNextLevel();
 		}
 		break;
 

Galaga/GameManager.h

@@ -23,6 +23,7 @@ class GameManager final : public Fluffy::Component, public Fluffy::ComponentSing
 	GameManager& operator=(GameManager&&) = delete;
 
 	void StartLevel(const int levelIndex);
+	void SkipToNextLevel();
 	void Update(const float deltaTime) override;
 	void OnNotify(const Fluffy::EventType& eventType, const Fluffy::IEventParam* param) override;
 

Galaga/Main.cpp

@@ -28,6 +28,7 @@
 #include "HealthDisplayComponent.h"
 #include "MoveCommand.h"
 #include "ShootCommand.h"
+#include "SkipLevelCommand.h"
 #include "BulletsManager.h"
 #include "CollidersHandler.h"
 #include "CollisionLayers.h"
@@ -64,20 +65,23 @@ static void CreateScene()
 	const KeyboardInput k_left{ SDL_SCANCODE_A, InputState::Held };
 	const KeyboardInput k_right{ SDL_SCANCODE_D, InputState::Held };
 	const KeyboardInput k_Space{ SDL_SCANCODE_SPACE, InputState::Held };
+	const KeyboardInput k_F1{ SDL_SCANCODE_F1, InputState::Released };
 
 	keyboard->AddCommand(k_left, std::make_unique<MoveCommand>(0, glm::vec2(-1.0f, 0.0f), 200.0f));
 	keyboard->AddCommand(k_right, std::make_unique<MoveCommand>(0, glm::vec2(1.0f, 0.0f), 200.0f));
 	keyboard->AddCommand(k_Space, std::make_unique<ShootCommand>(0));
+	keyboard->AddCommand(k_F1, std::make_unique<SkipLevelCommand>());
 
 	std::unique_ptr<Controller> controller = std::make_unique<Controller>();
 
-	const ControllerInput left{ Button::XINPUT_GAMEPAD_DRAD_LEFT, InputState::Held };
-	const ControllerInput right{ Button::XINPUT_GAMEPAD_DRAD_RIGHT, InputState::Held };
-	const ControllerInput B{ Button::XINPUT_CONTROLLER_B, InputState::Held };
+	const ControllerInput c_left{ Button::GAMEPAD_DPAD_LEFT, InputState::Held };
+	const ControllerInput c_right{ Button::GAMEPAD_DPAD_RIGHT, InputState::Held };
+	const ControllerInput c_B{ Button::GAMEPAD_B, InputState::Held };
 
-	controller->AddCommand(left, std::make_unique<MoveCommand>(1, glm::vec2(-1.0f, 0.0f), 200.0f));
-	controller->AddCommand(right, std::make_unique<MoveCommand>(1, glm::vec2(1.0f, 0.0f), 200.0f));
-	controller->AddCommand(B, std::make_unique<ShootCommand>(1));
+	// since we don't have multiplayer right now, we're using both keyboard and gamepad for the same player index
+	controller->AddCommand(c_left, std::make_unique<MoveCommand>(0, glm::vec2(-1.0f, 0.0f), 200.0f));
+	controller->AddCommand(c_right, std::make_unique<MoveCommand>(0, glm::vec2(1.0f, 0.0f), 200.0f));
+	controller->AddCommand(c_B, std::make_unique<ShootCommand>(0));
 
 	auto& input = InputManager::GetInstance();
 	input.AddDevice(std::move(keyboard));

Galaga/MoveCommand.h

@@ -2,11 +2,6 @@
 #include "Command.h"
 #include "glm/glm.hpp"
 
-namespace Fluffy
-{
-	class Command;
-}
-
 class MoveCommand final : public Fluffy::Command
 {
 public:

Galaga/ShootCommand.h

@@ -1,11 +1,5 @@
 #pragma once
 #include "Command.h"
-#include "glm/glm.hpp"
-
-namespace Fluffy
-{
-	class Command;
-}
 
 class ShootCommand final : public Fluffy::Command
 {
@@ -23,4 +17,3 @@ class ShootCommand final : public Fluffy::Command
 private:
 	const int m_PlayerIndex;
 };
-

Galaga/SkipLevelCommand.cpp

@@ -0,0 +1,8 @@
+#include "SkipLevelCommand.h"
+#include "GameManager.h"
+
+void SkipLevelCommand::Execute()
+{
+	if (GameManager::GetInstance() != nullptr)
+		GameManager::GetInstance()->SkipToNextLevel();
+}

Galaga/SkipLevelCommand.h

@@ -0,0 +1,16 @@
+#pragma once
+#include "Command.h"
+
+class SkipLevelCommand final : public Fluffy::Command
+{
+public:
+	SkipLevelCommand() = default;
+	~SkipLevelCommand() = default;
+
+	SkipLevelCommand(const SkipLevelCommand& other) = default;
+	SkipLevelCommand& operator=(const SkipLevelCommand& other) = default;
+	SkipLevelCommand(SkipLevelCommand&& other) = default;
+	SkipLevelCommand& operator=(SkipLevelCommand&& other) = default;
+
+	void Execute() override;
+};