Added Pause feature and some refactor/cleanup

Author: GauravDe-git

Mini_Assailants/Mini_Assailants.vcxproj

@@ -36,9 +36,6 @@
     <ClInclude Include="inc\UiBar.hpp" />
     <ClInclude Include="resource.h" />
   </ItemGroup>
-  <ItemGroup>
-    <Text Include="src\Todo.txt" />
-  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Mini_Assailants.rc" />
   </ItemGroup>

Mini_Assailants/Mini_Assailants.vcxproj.filters

@@ -84,11 +84,6 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-  <ItemGroup>
-    <Text Include="src\Todo.txt">
-      <Filter>Source Files</Filter>
-    </Text>
-  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Mini_Assailants.rc">
       <Filter>Resource Files</Filter>

Mini_Assailants/inc/Enemy.cpp

@@ -25,7 +25,7 @@ Enemy::Enemy(const glm::vec2& pos,Type _type)
 	{
 		case Type::Goblin:
 			aabbs[State::Idle] = { {65,30,0},{80,70,0} };
-			aabbs[State::Attack] = { {56,33,0},{80,70,0} };
+			aabbs[State::Attack] = { {59,33,0},{80,70,0} };
 			aabbs[State::Dead] = { {0,0,0},{0,0,0} };
 			aabbs[State::None] = { {0,0,0},{0,0,0} };
 			attackDistance = 55.0f;
@@ -280,7 +280,7 @@ Math::Circle Enemy::getAttackCircle() const
 	case Type::Cerberus:
 		return { {transform.getPosition() + glm::vec2{ 40.f, 17.f } *-transform.getScale() }, 9.f };
 	case Type::FlyingEye:
-		return { {transform.getPosition() + glm::vec2{ 35.f, 45.f } *-transform.getScale() }, 6.f };
+		return { {transform.getPosition() + glm::vec2{ 35.f, 45.f } *-transform.getScale() }, 11.f };
 	}
 	return {};
 }

Mini_Assailants/inc/Level.hpp

@@ -17,8 +17,6 @@
 #include <vector>
 #include <random>
 
-//Level class: Responsible for both loading/changing levels
-//			   and changing between Game States.
 
 namespace Graphics
 {
@@ -32,6 +30,7 @@ class Level {
 		Menu,
 		HelpScreen,
 		Playing,
+		Paused,
 		Win,
 		GameOver
 	};
@@ -46,6 +45,9 @@ class Level {
 	GameState getGameState() const { return gameState; }
 	void setState(GameState newState);
 
+// Got help to implement processEvents(),onMouseMoved(), onResized() from~
+// Source: https://github.com/jpvanoosten/SoftwareRasterizer/blob/main/samples/07-PixelAdventure/src/Game.cpp
+
 	void processEvents(const Graphics::Event& e);
 	void onMouseMoved(Graphics::MouseMovedEventArgs& args);
 	void onResized(Graphics::ResizeEventArgs& args);
@@ -57,13 +59,14 @@ class Level {
 	};
 
 	void updateEnemies(float deltaTime) const;
-	void beginState(GameState newState);
-	void endState(GameState oldState);
+	void beginState(GameState newState,GameState oldState);
+	void endState(GameState oldState,GameState newState);
 
 	void doMenu();
 	void doHelp();
 	void enemySteerAi(Enemy* enemy) const;
 	void doPlaying(float deltaTime);
+	void doPaused(float deltaTime);
 	void doGameOver();
 	void doWin();
 

Mini_Assailants/inc/UiBar.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-//Description: The Ui HP and MP bar 
+//Description: The Ui HP and MP bar
 
 #include <glm/vec2.hpp>
 

Mini_Assailants/src/Level.cpp

@@ -148,7 +148,7 @@ void Level::setLevel(int levelNumber)
         backgroundPath = "assets/textures/stage3.png";
         topEdgeCollision = 210;
         enemyInfos = {
-        {Enemy::Type::Cerberus, {510,250}},
+        {Enemy::Type::Cerberus, {530,250}},
             {Enemy::Type::Cerberus, {900,250}},
             {Enemy::Type::Cerberus, {910,240}},
             {Enemy::Type::Golem, {1310,240}},
@@ -185,6 +185,9 @@ void Level::update(float deltaTime)
         updateEnemies(deltaTime);
         doPlaying(deltaTime);
         break;
+    case GameState::Paused:
+        doPaused(deltaTime);
+        break;
     case GameState::GameOver:
         updateEnemies(deltaTime);
         doGameOver();
@@ -219,11 +222,11 @@ void Level::draw(Image& image)
     case GameState::Playing:
         background.draw(image, camera);
 
-        //sorting order of drawing player/enemy based on their Y position
-        // Solution using std::sort and lambda fn. suggested by Jeremiah
+        // Sorting order of drawing player/enemy based on their Y position
+        // Solution using std::sort and lambda fn. suggested by Jeremiah van Oosten (@jpvanoosten)
         //** ranges algorithm suggested by resharper over the normal std::sort
         std::ranges::sort(entities, [](const Entity* a, const Entity* b) {return a->getPosition().y < b->getPosition().y; });
-        for (const auto entity : entities)
+        for (auto entity : entities)
         {
             entity->draw(image, camera);
         }
@@ -239,6 +242,24 @@ void Level::draw(Image& image)
         image.drawSprite(coinUiAnim, glm::vec2{SCREEN_WIDTH - 150.f, 1.f});
         image.drawText(Font::Default, std::to_string(player.getCoins()), glm::vec2{ SCREEN_WIDTH - 115.f, 5.f }, Color::Yellow);
         break;
+	case GameState::Paused:
+        background.draw(image, camera);
+        player.draw(image, camera);
+        for (auto& enemy : enemies)
+        {
+            enemy->draw(image, camera);
+        }
+        image.drawSprite(coinUiAnim, glm::vec2{ SCREEN_WIDTH - 150.f, 1.f });
+        image.drawText(Font::Default, std::to_string(player.getCoins()), glm::vec2{ SCREEN_WIDTH - 115.f, 5.f }, Color::Yellow);
+
+        image.drawText(tafelSans, "Game is Paused, press P to unpause", glm::vec2{ SCREEN_WIDTH / 2 - 110, SCREEN_HEIGHT / 2.3 - 1.5f }, Color::Black);
+        image.drawText(tafelSans, "Game is Paused, press P to unpause", glm::vec2{ SCREEN_WIDTH / 2 - 110, SCREEN_HEIGHT / 2.3 + 3.5f }, Color::Black);
+        image.drawText(tafelSans, "Game is Paused, press P to unpause", glm::vec2{ SCREEN_WIDTH / 2 - 110, SCREEN_HEIGHT / 2.3 }, Color::Yellow);
+
+        image.drawText(tafelSans, "Press Q to go back to main menu", glm::vec2{ SCREEN_WIDTH / 2 - 110, SCREEN_HEIGHT / 2 - 1.5f }, Color::Black);
+        image.drawText(tafelSans, "Press Q to go back to main menu", glm::vec2{ SCREEN_WIDTH / 2 - 110, SCREEN_HEIGHT / 2 + 3.5f }, Color::Black);
+        image.drawText(tafelSans, "Press Q to go back to main menu", glm::vec2{ SCREEN_WIDTH / 2 - 110, SCREEN_HEIGHT / 2 }, Color::Yellow);
+        break;
     case GameState::GameOver:
         background.draw(image, camera);
         for(auto& enemy : enemies)
@@ -259,7 +280,7 @@ void Level::draw(Image& image)
 		std::string winText2 = "Press Enter to go back";
         if (currentLevel < 3)
         {
-            winText = "Congrats on clearing level " + std::to_string(currentLevel) /*+ ", press Enter to go to level " + std::to_string(currentLevel + 1)*/;
+            winText = "Congrats on clearing level " + std::to_string(currentLevel);
 			winText2 = "Press Enter to go to next level";
         }
         image.drawText(tafelSans, winText, glm::vec2{ SCREEN_WIDTH / 2 - 120, SCREEN_HEIGHT / 2 + 3.5f }, Color::Black);
@@ -278,12 +299,15 @@ void Level::setState(GameState newState)
 {
     if (newState != gameState)
     {
-        beginState(newState);
-        endState(gameState);
+        beginState(newState, gameState);
+        endState(gameState, newState);
         gameState = newState;
     }
 }
 
+// Got help to implement processEvents(),onMouseMoved(), onResized() from~
+// Source: https://github.com/jpvanoosten/SoftwareRasterizer/blob/main/samples/07-PixelAdventure/src/Game.cpp
+
 void Level::processEvents(const Event& e)
 {
     // Copy the event so you can modify it.
@@ -358,17 +382,17 @@ void Level::onResized(ResizeEventArgs& args)
 
     // Update any UI elements or positions that depend on the game rectangle.
 
-    playButton.setTransform(Transform2D{ { 120, 170 }/*,{0.8f,0.8f}*/ });
-    helpButton.setTransform(Transform2D{ { 220, 170 }/*,{0.8f,0.8f}*/ });
-    quitButton.setTransform(Transform2D{ { 320, 170 }/*,{0.8f,0.8f}*/ });
+    playButton.setTransform(Transform2D{ { 120, 170 } });
+    helpButton.setTransform(Transform2D{ { 220, 170 } });
+    quitButton.setTransform(Transform2D{ { 320, 170 } });
     for (int i = 0; i < 3; ++i)
     {
-        levelButtons[i].setTransform(Transform2D{ { 230 + i * 35, 215}/*,{0.8f,0.8f}*/ });
+        levelButtons[i].setTransform(Transform2D{ { 230 + i * 35, 215} });
     }
-    backButton.setTransform(Transform2D{ { 285, 1 },{0.7f,0.7f} });
+    backButton.setTransform(Transform2D{ { 375, 220 },{0.7f,0.7f} });
 }
 
-void Level::beginState(GameState newState)
+void Level::beginState(GameState newState, GameState oldState)
 {
     switch (newState)
     {
@@ -381,7 +405,7 @@ void Level::beginState(GameState newState)
         player.setCoins(0);
         break;
     case GameState::Playing:
-        if (!isFirstLoad)
+        if (!isFirstLoad && oldState != GameState::Paused)
         {
             loadLevelAssets();
             camera.setPosition(glm::vec2{ 0,0 });
@@ -396,15 +420,17 @@ void Level::beginState(GameState newState)
     }
 }
 
-void Level::endState(GameState oldState)
+void Level::endState(GameState oldState,GameState newState)
 {
     switch (oldState)
     {
     case GameState::Menu:
         break;
     case GameState::Playing:
-        entities.clear();
-        //enemies.clear();
+        if (newState != GameState::Paused)
+        {
+            entities.clear();
+        }
         break;
     case GameState::GameOver:
 		enemies.clear();
@@ -607,13 +633,28 @@ void Level::doPlaying(float deltaTime)
             ++iter;
         }
     }
+    if (Input::getKeyDown(KeyCode::P))
+    {
+        setState(GameState::Paused);
+    }
 
     if (enemies.empty())
     {
     	setState(GameState::Win);
     }
 }
 
+void Level::doPaused(float deltaTime)
+{
+	// Any logic that needs to happen when the game is paused
+	if (Input::getKeyDown(KeyCode::P))
+		setState(GameState::Playing);
+
+    if (Input::getKeyDown(KeyCode::Q))
+        setState(GameState::Menu);
+
+}
+
 void Level::doGameOver()
 {
     // Any logic that needs to happen when the game is over

Mini_Assailants/src/Player.cpp

@@ -148,7 +148,7 @@ void Player::draw(Image& image, const Camera& camera)
 	mpBar.Draw(image, mp, maxMp, glm::vec2{ 10, 40 }, magicColor);
 
 	//Logic to flash the player sprite upon damage
-	//Solution using Sin wave shown by Jeremiah
+	//Solution using Sin wave shown by Jeremiah van Oosten (@jpvanoosten)
 	Color color = Color::White;
 	if (hitCounter > 0.f)
 	{
@@ -392,7 +392,7 @@ void Player::doLightAtk1(float deltaTime)
 
 		lightAtk1Sprite.update(deltaTime);
 
-		if (lightAtk1Sprite.getCurrentFrame() >= 3)
+		if (lightAtk1Sprite.getCurrentFrame() >= 3 && lightAtk1Sprite.getCurrentFrame() <= 5)
 		{
 			attackCircle = { transform.getPosition() + glm::vec2{ 32.f, -25.f } *transform.getScale(),8.5f };
 		}
@@ -409,7 +409,7 @@ void Player::doLightAtk2(float deltaTime)
 
 	lightAtk2Sprite.update(deltaTime);
 
-	if (lightAtk2Sprite.getCurrentFrame() >= 3 && lightAtk2Sprite.getCurrentFrame() <= 4)
+	if (lightAtk2Sprite.getCurrentFrame() == 3)
 		attackCircle = { transform.getPosition() + glm::vec2{ 32.f, -30.f } *transform.getScale(),11.f };
 
 	if (lightAtk2Sprite.isDone())

Mini_Assailants/src/Todo.txt

@@ -1,12 +1,27 @@
+// Credits for the framework: C++ For Games by Jeremiah van Oosten (@jpvanoosten)
+// Source: https://github.com/BredaUniversityGames/cppforgames-template
+//		   https://github.com/jpvanoosten/SoftwareRasterizer
+
+// Framework Includes:
+// 2D software rasterizer in the Image class.
+// Support for gamepads(currently using XInput on Windows)
+// Spatialized audio library with support for wav, mp3, ogg, flac audio file sources.
+// Create your own waveforms for your game using the Waveform class.
+// A few math helpers in the math library(AABB, Camera2D, Transform2D, etc...)
+
 #include <Game.hpp>
 #include <Constants.hpp>
 
 #include "Graphics/Window.hpp"
 
+#include <iostream>
+
 using namespace Graphics;
 
 int main()
 {
+	std::cout << "...Loading Game" << '\n'; 
+
 	Window window{ L"Mini Assailants", SCREEN_WIDTH, SCREEN_HEIGHT };
 
 	Game game{ SCREEN_WIDTH, SCREEN_HEIGHT, window };