feat(GameState/Transition setup) : moving data that we need from leveltransition to gameState files to not changing state or stopping our network

Author: Gabriel15066

client/include/GameState.hpp

@@ -113,6 +113,7 @@ namespace RType {
             void initializeBossHealthBar();
             void destroyBossHealthBar();
             void renderGameOverOverlay();
+            void renderLevelTransition();
             void triggerGameOverIfNeeded();
             void enterResultsScreen();
 
@@ -152,6 +153,10 @@ namespace RType {
             void CreatePlayerNameLabel(RType::ECS::Entity playerEntity, const std::string& playerName, float x, float y);
             void UpdatePlayerNameLabelPosition(RType::ECS::Entity playerEntity, float x, float y);
             void DestroyPlayerNameLabel(RType::ECS::Entity playerEntity);
+
+            // Level transition
+            void UpdateLevelTransition(float dt);
+            void LoadNextLevel();
         private:
             GameStateMachine& m_machine;
             GameContext& m_context;
@@ -237,14 +242,23 @@ namespace RType {
             std::unordered_map<uint32_t, uint8_t> m_bulletFlagsMap; // Track bullet flags to detect type changes
             RType::ECS::Entity m_localPlayerEntity = RType::ECS::NULL_ENTITY; // Local player entity mirrored from server
 
-            // Level progression tracking
+            // Level progression tracking with visual transition
+            enum class TransitionPhase {
+                NONE,
+                FADE_OUT,
+                LOADING,
+                FADE_IN
+            };
+
             struct LevelProgressionState {
-                bool bossSpawned = false;
                 bool bossDefeated = false;
                 bool levelComplete = false;
                 float transitionTimer = 0.0f;
                 int currentLevelNumber = 1;
+                int nextLevelNumber = 2;
                 int totalLevels = 3;
+                TransitionPhase transitionPhase = TransitionPhase::NONE;
+                float fadeAlpha = 0.0f;
             };
             LevelProgressionState m_levelProgress;
 

client/src/GameState.cpp

@@ -11,3 +11,4 @@
 #include "game/GameStateNetwork.cpp"
 #include "game/GameStateUpdate.cpp"
 #include "game/GameStateHelpers.cpp"
+#include "game/GameStateTransition.cpp"

client/src/game/GameStateNetwork.cpp

@@ -6,7 +6,6 @@
 */
 
 #include "../../include/GameState.hpp"
-#include "../../include/LevelTransitionState.hpp"
 
 #include "ECS/Components/TextLabel.hpp"
 #include "ECS/Component.hpp"
@@ -816,31 +815,19 @@ namespace RType {
         }
 
         void InGameState::OnLevelComplete(uint8_t completedLevel, uint8_t nextLevel) {
-            Core::Logger::Info("[InGameState] Level {} complete! Next level: {}",
+            Core::Logger::Info("[InGameState] Level {} complete! Starting transition to level {}",
                               static_cast<int>(completedLevel),
                               static_cast<int>(nextLevel));
 
+            m_levelProgress.transitionPhase = TransitionPhase::FADE_OUT;
+            m_levelProgress.transitionTimer = 0.0f;
+            m_levelProgress.fadeAlpha = 0.0f;
             m_levelProgress.levelComplete = true;
             m_levelProgress.bossDefeated = true;
+            m_levelProgress.currentLevelNumber = static_cast<int>(completedLevel);
+            m_levelProgress.nextLevelNumber = static_cast<int>(nextLevel);
 
-            if (m_context.networkClient) {
-                Core::Logger::Info("[InGameState] Stopping network client for transition");
-                m_context.networkClient->Stop();
-            }
-
-            std::string nextLevelPath = "";
-            if (nextLevel > 0) {
-                nextLevelPath = "assets/levels/level" + std::to_string(nextLevel) + ".json";
-            }
-
-            Core::Logger::Info("[InGameState] Transitioning to level transition screen");
-            m_machine.ChangeState(std::make_unique<LevelTransitionState>(
-                m_machine,
-                m_context,
-                static_cast<int>(completedLevel),
-                m_playerScore,
-                nextLevelPath
-            ));
+            Core::Logger::Info("[InGameState] Transition started - staying in GameState, network stays active");
         }
 
     }

client/src/game/GameStateUpdate.cpp

@@ -116,6 +116,8 @@ namespace RType {
         }
 
         void InGameState::Update(float dt) {
+            UpdateLevelTransition(dt);
+
             if (m_context.networkClient) {
                 m_context.networkClient->ReceivePackets();
             } else {