refactor: make text renderer a singleton in play state passed to whatever systems that use it

Author: OmarGamal10

src/game/components/health.hpp

@@ -7,7 +7,7 @@ namespace gameplay {
     class HealthComponent : public our::Component {
     public:
         float maxHealth = 100.0f;
-        float currentHealth = 100.0f;
+        float currentHealth = 75.0f;
         float invulnerabilityTimer = 0.0f;
         bool isDead = false;
 

src/game/systems/player-hud.cpp

@@ -45,7 +45,6 @@ namespace gameplay {
         weaponMaterial->pipelineState.blending.sourceFactor = GL_SRC_ALPHA;
         weaponMaterial->pipelineState.blending.destinationFactor = GL_ONE_MINUS_SRC_ALPHA;
 
-        textRenderer.initialize();
         testFont.load(fontPath, fontTexturePath);
     }
 
@@ -76,7 +75,7 @@ namespace gameplay {
         fontTexturePath = data.value("fontTexturePath", fontTexturePath);
     }
 
-    void PlayerHUDSystem::render(our::World* world, our::Entity* playerEntity, glm::ivec2 windowSize) {
+    void PlayerHUDSystem::render(our::World* world, our::Entity* playerEntity, glm::ivec2 windowSize, our::TextRenderer* textRenderer) {
         if (!playerEntity) return;
 
         HealthComponent* playerHealth = playerEntity->getComponent<HealthComponent>();
@@ -126,25 +125,27 @@ namespace gameplay {
         }
 
         // Ammo Counter
-        std::string ammoText = std::to_string(playerComp->currentAmmo) + "-" + std::to_string(playerComp->maxAmmo);
-        
-        glm::vec4 outlineColor = glm::vec4(0.0f, 0.0f, 0.0f, 1.0f);
-        
-        // PS2 ahh way to make outline, I can't find a solution to balance outline with scale, this is good enough :)
-        // (draws the text blackened four times to create an outline)
-        our::UIRect tr = ammoTextRect; tr.offset += glm::vec2(outlineSpread, outlineSpread);
-        textRenderer.drawText(&testFont, ammoText, tr, windowSize, textScale, orthoVP, outlineColor);
-        
-        our::UIRect bl = ammoTextRect; bl.offset += glm::vec2(-outlineSpread, -outlineSpread);
-        textRenderer.drawText(&testFont, ammoText, bl, windowSize, textScale, orthoVP, outlineColor);
-        
-        our::UIRect tl = ammoTextRect; tl.offset += glm::vec2(-outlineSpread, outlineSpread);
-        textRenderer.drawText(&testFont, ammoText, tl, windowSize, textScale, orthoVP, outlineColor);
-        
-        our::UIRect br = ammoTextRect; br.offset += glm::vec2(outlineSpread, -outlineSpread);
-        textRenderer.drawText(&testFont, ammoText, br, windowSize, textScale, orthoVP, outlineColor);
-
-        textRenderer.drawText(&testFont, ammoText, ammoTextRect, windowSize, textScale, orthoVP, ammoColor);
+        if (textRenderer) {
+            std::string ammoText = std::to_string(playerComp->currentAmmo) + "-" + std::to_string(playerComp->maxAmmo);
+            
+            glm::vec4 outlineColor = glm::vec4(0.0f, 0.0f, 0.0f, 1.0f);
+            
+            // PS2 ahh way to make outline, I can't find a solution to balance outline with scale, this is good enough :)
+            // (draws the text blackened four times to create an outline)
+            our::UIRect tr = ammoTextRect; tr.offset += glm::vec2(outlineSpread, outlineSpread);
+            textRenderer->drawText(&testFont, ammoText, tr, windowSize, textScale, orthoVP, outlineColor);
+            
+            our::UIRect bl = ammoTextRect; bl.offset += glm::vec2(-outlineSpread, -outlineSpread);
+            textRenderer->drawText(&testFont, ammoText, bl, windowSize, textScale, orthoVP, outlineColor);
+            
+            our::UIRect tl = ammoTextRect; tl.offset += glm::vec2(-outlineSpread, outlineSpread);
+            textRenderer->drawText(&testFont, ammoText, tl, windowSize, textScale, orthoVP, outlineColor);
+            
+            our::UIRect br = ammoTextRect; br.offset += glm::vec2(outlineSpread, -outlineSpread);
+            textRenderer->drawText(&testFont, ammoText, br, windowSize, textScale, orthoVP, outlineColor);
+
+            textRenderer->drawText(&testFont, ammoText, ammoTextRect, windowSize, textScale, orthoVP, ammoColor);
+        }
     }
 
     void PlayerHUDSystem::destroy() {
@@ -158,7 +159,6 @@ namespace gameplay {
             delete weaponMaterial;
         }
 
-        textRenderer.destroy();
         testFont.destroy();
     }
 

src/game/systems/player-hud.hpp

@@ -16,7 +16,6 @@ namespace gameplay {
         our::ShaderProgram* texturedShader = nullptr;
         our::TexturedMaterial* weaponMaterial = nullptr;
 
-        our::TextRenderer textRenderer;
         our::Font testFont;
 
         our::UIRect weaponRect     = { {1.0f, 0.0f}, {1.0f, 0.0f}, {-20.0f, 20.0f}, {80.0f, 80.0f} };
@@ -35,7 +34,7 @@ namespace gameplay {
     public:
         void initialize();
         void deserialize(const nlohmann::json& data);
-        void render(our::World* world, our::Entity* playerEntity, glm::ivec2 windowSize);
+        void render(our::World* world, our::Entity* playerEntity, glm::ivec2 windowSize, our::TextRenderer* textRenderer);
         void destroy();
     };
 

src/states/play-state.hpp

@@ -18,6 +18,7 @@
 class Playstate : public our::State {
     our::World world;
     our::ForwardRenderer renderer;
+    our::TextRenderer textRenderer;
     our::FreeCameraControllerSystem cameraController;
     our::MovementSystem movementSystem;
     ALuint reloadSource = 0;  // TODO: remove when implementing a proper weapon/player system
@@ -88,6 +89,7 @@ class Playstate : public our::State {
         // Then we initialize the renderer
         auto size = getApp()->getFrameBufferSize();
         renderer.initialize(size, config["renderer"]);
+        textRenderer.initialize();
         collisionSystem.initialize();
 
         enemySpawner.deserialize(config);
@@ -106,7 +108,7 @@ class Playstate : public our::State {
         // And finally we use the renderer system to draw the scene
         collisionSystem.update(&world);
         renderer.render(&world);
-        playerHud.render(&world,playerEntity,  getApp()->getFrameBufferSize());
+        playerHud.render(&world, playerEntity, getApp()->getFrameBufferSize(), &textRenderer);
 
 #ifdef COLLISION_DEBUG_DRAW
         // Toggle debug draw with F3
@@ -151,6 +153,7 @@ class Playstate : public our::State {
     void onDestroy() override {
         collisionSystem.destroy();
         renderer.destroy();
+        textRenderer.destroy();
         playerHud.destroy();
         // On exit, we call exit for the camera controller system to make sure that the mouse is unlocked
         cameraController.exit();