Add fade effect to both States

The game now has a fade in/out effect when starting/leaving a State.

Author: tamanegicode

PlayState.cpp

@@ -32,6 +32,11 @@ void PlayState::update(float deltaTime)
 	if (witch.getDead())
 	{
 		countdownToReset -= deltaTime;
+		if (countdownToReset <= 1.0f)
+		{
+			fadeIn = false;
+		}
+
 		if (countdownToReset <= 0)
 			m_GameStateManager.setGameState(std::make_unique<PlayState>(m_CanvasWidth, m_CanvasHeight, m_GameStateManager, m_MaxScore));
 
@@ -95,6 +100,25 @@ void PlayState::render(float deltaTime)
 	DrawText(TextFormat("Score: %i", score), 5, 5, 10, RAYWHITE);
 	DrawText(TextFormat("High Score: %i", m_MaxScore), 5, 20, 1, RAYWHITE);
 
+	if (fadeColor.a > 0 && fadeIn)
+	{
+		if (fadeColor.a - fadeSpeed * deltaTime < 0)
+			fadeColor.a = 0;
+		else
+			fadeColor.a -= fadeSpeed * deltaTime;
+
+		DrawRectangle(0, 0, m_CanvasWidth, m_CanvasHeight, fadeColor);
+	}
+	else if (fadeColor.a <= 255 && !fadeIn)
+	{
+		if (fadeColor.a + fadeSpeed * deltaTime > 255)
+			fadeColor.a = 255;
+		else
+			fadeColor.a += fadeSpeed * deltaTime;
+
+		DrawRectangle(0, 0, m_CanvasWidth, m_CanvasHeight, fadeColor);
+	}
+
 	//Uncomment to make current FPS visible for testing purposes
 	//DrawText(TextFormat("%i FPS", GetFPS()), 5, m_CanvasHeight - 10, 10, GREEN);
 }

PlayState.h

@@ -44,6 +44,10 @@ class PlayState : public GameState
 
 	int score{ 0 };
 	int& m_MaxScore;
-	float countdownToReset{ 3.0f };
 	Sound crashSound{ LoadSound("assets/sounds/crash.mp3") };
+	float countdownToReset{ 3.0f };
+
+	Color fadeColor{ 0, 0, 0, 255 };
+	float fadeSpeed{ 300.0f };
+	bool fadeIn{ true };
 };

TitleScreenState.cpp

@@ -14,10 +14,16 @@ void TitleScreenState::update(float deltaTime)
 
 	if (isMouseOverPlayButton && IsMouseButtonReleased(MOUSE_BUTTON_LEFT))
 	{
-		m_GameStateManager.setGameState(std::make_unique<PlayState>(m_CanvasWidth, m_CanvasHeight, m_GameStateManager, m_MaxScore));
+		fadeIn = false;
 	}
 
 	clouds.update(deltaTime);
+
+	if (!fadeIn)
+	{
+		if(fadeColor.a >= 255)
+			m_GameStateManager.setGameState(std::make_unique<PlayState>(m_CanvasWidth, m_CanvasHeight, m_GameStateManager, m_MaxScore));
+	}
 }
 
 void TitleScreenState::render(float deltaTime)
@@ -71,7 +77,26 @@ void TitleScreenState::render(float deltaTime)
 	else
 	{
 		DrawTexture(playButtonDefault, playButtonPosition.x, playButtonPosition.y, WHITE);
-	}	
+	}
+
+	if (fadeColor.a > 0 && fadeIn)
+	{
+		if (fadeColor.a - fadeSpeed * deltaTime < 0)
+			fadeColor.a = 0;
+		else
+			fadeColor.a -= fadeSpeed * deltaTime;
+
+		DrawRectangle(0, 0, m_CanvasWidth, m_CanvasHeight, fadeColor);
+	}
+	else if (fadeColor.a <= 255 && !fadeIn)
+	{
+		if (fadeColor.a + fadeSpeed * deltaTime > 255)
+			fadeColor.a = 255;
+		else
+			fadeColor.a += fadeSpeed * deltaTime;
+
+		DrawRectangle(0, 0, m_CanvasWidth, m_CanvasHeight, fadeColor);
+	}
 }
 
 void TitleScreenState::unloadAssets()

TitleScreenState.h

@@ -32,6 +32,10 @@ class TitleScreenState : public GameState
 	bool isMouseOverPlayButton{ false };
 
 	BackgroundLayer clouds { "assets/textures/titleScreenClouds.png", 2, m_CanvasWidth, m_CanvasHeight };
+
+	Color fadeColor{ 0, 0, 0, 255 };
+	float fadeSpeed{ 300.0f };
+	bool fadeIn{ true };
 
 	int witchFrameToDraw{ 0 };
 	int witchFrameNumber{ 3 };