Some small changes and clean up

Zang3th · Apr 20, 2024 · 927d2cd · 927d2cd
1 parent d0bf6c9
commit 927d2cd
Show file tree

Hide file tree

Showing 23 changed files with 114 additions and 66 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,10 +1,6 @@
 name: Build
 
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
+on: [push, pull_request]
 
 env:
   BUILD_TYPE: Debug
@@ -37,4 +33,8 @@ jobs:
 
       - name: Run CellSim
         working-directory: ${{github.workspace}}/build
-        run: xvfb-run -a ./CellSim & sleep 20 ; kill $!
+        run: xvfb-run -a ./CellSim & sleep 20 ; kill $!
+
+      - name: Run Liquefied
+        working-directory: ${{github.workspace}}/build
+        run: xvfb-run -a ./Liquefied & sleep 20 ; kill $!
diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml
@@ -1,10 +1,6 @@
 name: Static analysis
 
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
+on: [push, pull_request]
 
 jobs:
   static_analysis:

diff --git a/Apps/CellSim/CellSimApp.cpp b/Apps/CellSim/CellSimApp.cpp
@@ -120,11 +120,11 @@ namespace CS
     {
         if(InitModules() != EXIT_SUCCESS)
         {
-            appStartSuccess = false;
+            _initSuccess = false;
         }
         else
         {
-            appStartSuccess = true;
+            _initSuccess = true;
             AddObjects();
             AddCellWorld();
         }

diff --git a/Apps/CellSim/CellSimApp.hpp b/Apps/CellSim/CellSimApp.hpp
@@ -15,16 +15,16 @@ namespace CS
             Engine::Scope<Engine::CellManager> _cellManager;
             Engine::Scope<CellSimInterface>    _interface;
 
-            void           LoadResources() final;
-            Engine::uint32 InitModules()   final;
+            void           LoadResources() override;
+            Engine::uint32 InitModules()   override;
             void           AddObjects();
             void           AddCellWorld();
             void           HandleCellSpawn();
             void           HandleCellKill();
 
         public:
             CellSimApp();
-            ~CellSimApp() final;
-            void Update() final;
+            ~CellSimApp() override;
+            void Update() override;
     };
 }
diff --git a/Apps/CellSim/CellSimEntryPoint.cpp b/Apps/CellSim/CellSimEntryPoint.cpp
@@ -6,11 +6,13 @@ int main()
     CS::CellSimApp cellSimApp;
 
     //Check for success
-    if(cellSimApp.appStartSuccess)
+    if(cellSimApp.GetInitSuccess())
     {
         //Start app
         while(cellSimApp.IsRunning())
+        {
             cellSimApp.Update();
+        }
     }
     else
     {

diff --git a/Apps/GreenWorld/GreenWorldApp.cpp b/Apps/GreenWorld/GreenWorldApp.cpp
@@ -203,11 +203,11 @@ namespace GW
     {
         if(InitModules() != EXIT_SUCCESS)
         {
-            appStartSuccess = false;
+            _initSuccess = false;
         }
         else
         {
-            appStartSuccess = true;
+            _initSuccess = true;
             AddObjects();
             AddSprites();
         }

diff --git a/Apps/GreenWorld/GreenWorldApp.hpp b/Apps/GreenWorld/GreenWorldApp.hpp
@@ -15,14 +15,14 @@ namespace GW
             Engine::Scope<GreenWorldInterface>      _interface;
             Engine::Scope<Engine::Audio>            _audio;
 
-            void           LoadResources() final;
-            Engine::uint32 InitModules()   final;
+            void           LoadResources() override;
+            Engine::uint32 InitModules()   override;
             void           AddObjects();
             void           AddSprites();
 
         public:
             GreenWorldApp();
-            ~GreenWorldApp() final;
-            void Update()    final;
+            ~GreenWorldApp() override;
+            void Update()    override;
     };
 }
diff --git a/Apps/GreenWorld/GreenWorldEntryPoint.cpp b/Apps/GreenWorld/GreenWorldEntryPoint.cpp
@@ -6,11 +6,13 @@ int main()
     GW::GreenWorldApp greenWorldApp;
 
     //Check for success
-    if(greenWorldApp.appStartSuccess)
+    if(greenWorldApp.GetInitSuccess())
     {
         //Start app
         while(greenWorldApp.IsRunning())
+        {
             greenWorldApp.Update();
+        }
     }
     else
     {

diff --git a/Apps/Liquefied/LiquefiedApp.cpp b/Apps/Liquefied/LiquefiedApp.cpp
@@ -26,7 +26,7 @@ namespace Liq
         //Load shaders and textures
         LoadResources();
 
-        //Create PixelRenderer
+        //Create pixel renderer
         _pixelRenderer = Engine::RenderManager::AddPixelRenderer("BG_Texture", "SpriteShader");
 
         //Create UI
@@ -41,11 +41,11 @@ namespace Liq
     {
         if(InitModules() != EXIT_SUCCESS)
         {
-            appStartSuccess = false;
+            _initSuccess = false;
         }
         else
         {
-            appStartSuccess = true;
+            _initSuccess = true;
         }
     }
 
@@ -79,26 +79,20 @@ namespace Liq
             Engine::RenderManager::RenderPixels();
 
             //Test of the pixel renderer
-            if(Engine::Window::GetFrameCounter() == 75)
+            if(Engine::Window::GetFrameCounter() == 0)
             {
-                _pixelRenderer->Set(0, 0, COLOR_WHITE);
-                _pixelRenderer->Set(1919, 0, COLOR_RED);
-                _pixelRenderer->Set(0, 1079, COLOR_BLUE);
-                _pixelRenderer->Set(1919, 1079, COLOR_GREEN);
+                _pixelRenderer->SetScreen(COLOR_WHITE);
             }
-            else if(Engine::Window::GetFrameCounter() == 0)
+            else if(Engine::Window::GetFrameCounter() == 80)
             {
-                _pixelRenderer->Reset(0, 0);
-                _pixelRenderer->Reset(1919, 0);
-                _pixelRenderer->Reset(0, 1079);
-                _pixelRenderer->Reset(1919, 1079);
+                _pixelRenderer->ClearScreen();
             }
         }
 
         {
             Engine::PROFILE_SCOPE("Render UI");
 
-            //_interface->AddElements();
+            _interface->AddElements();
             _interface->Render();
         }
 

diff --git a/Apps/Liquefied/LiquefiedApp.hpp b/Apps/Liquefied/LiquefiedApp.hpp
@@ -11,12 +11,12 @@ namespace Liq
             Engine::PixelRenderer*            _pixelRenderer = nullptr;
             Engine::Scope<LiquefiedInterface> _interface;
 
-            void           LoadResources() final;
-            Engine::uint32 InitModules()   final;
+            void           LoadResources() override;
+            Engine::uint32 InitModules()   override;
 
         public:
             LiquefiedApp();
-            ~LiquefiedApp() final;
-            void Update()   final;
+            ~LiquefiedApp() override;
+            void Update()   override;
     };
 }
diff --git a/Apps/Liquefied/LiquefiedEntryPoint.cpp b/Apps/Liquefied/LiquefiedEntryPoint.cpp
@@ -6,11 +6,13 @@ int main()
     Liq::LiquefiedApp liquefiedApp;
 
     //Check for success
-    if(liquefiedApp.appStartSuccess)
+    if(liquefiedApp.GetInitSuccess())
     {
         //Start app
         while(liquefiedApp.IsRunning())
+        {
             liquefiedApp.Update();
+        }
     }
     else
     {

diff --git a/Engine/Application/App.cpp b/Engine/Application/App.cpp
@@ -6,7 +6,12 @@ namespace Engine
 
     App::~App() = default;
 
-    bool App::IsRunning()
+    bool App::GetInitSuccess() const
+    {
+        return _initSuccess;
+    }
+
+    bool App::IsRunning() const
     {
         return Engine::Window::IsRunning();
     }

diff --git a/Engine/Application/App.hpp b/Engine/Application/App.hpp
@@ -8,13 +8,16 @@ namespace Engine
     class App
     {
         protected:
+            bool _initSuccess = false;
+
             virtual void LoadResources() = 0;
             virtual uint32 InitModules() = 0;
 
         public:
-            bool appStartSuccess;
-            virtual ~App() = 0;
+            virtual ~App()        = 0;
             virtual void Update() = 0;
-            static bool IsRunning();
+
+            [[nodiscard]] bool GetInitSuccess() const;
+            [[nodiscard]] bool IsRunning() const;
     };
 }
diff --git a/Engine/Rendering/Renderer/CellRenderer.hpp b/Engine/Rendering/Renderer/CellRenderer.hpp
@@ -29,13 +29,13 @@ namespace Engine
             std::array<glm::vec3, CellSimParams::MAX_CELL_AMOUNT> _colorStorage;
 
             CellRenderer(Shader* shader, const glm::vec3& worldSpawnPos);
-            ~CellRenderer() final = default;
+            ~CellRenderer() override = default;
 
             void InitGpuStorage();
             void UploadGPUStorage();
 
         public:
-            void Flush(Renderer* renderer) final;
+            void Flush(Renderer* renderer) override;
             void UpdateGPUStorage(uint32 index, const glm::u32vec3& cellPos, const glm::vec3& cellColor);
     };
 }
diff --git a/Engine/Rendering/Renderer/ParticleRenderer.hpp b/Engine/Rendering/Renderer/ParticleRenderer.hpp
@@ -41,14 +41,14 @@ namespace Engine
                 uint32 count, float size, float speed, float gravityCompliance, float lifeLength,
                 float respawnThreshold, Texture* textureAtlas, Shader* shader, const glm::vec3& position
             );
-            ~ParticleRenderer() final;
+            ~ParticleRenderer() override;
 
             void      InitGpuStorage();
             void      UpdateGpuStorage();
             void      GenerateParticles();
             glm::mat4 GetModelViewMatrix(Particle* particle);
 
         public:
-            void Flush(Renderer* sceneRenderer) final;
+            void Flush(Renderer* sceneRenderer) override;
     };
 }
diff --git a/Engine/Rendering/Renderer/PixelRenderer.cpp b/Engine/Rendering/Renderer/PixelRenderer.cpp
@@ -7,10 +7,12 @@ namespace Engine
     // ----- Private -----
 
     PixelRenderer::PixelRenderer(const std::string& bgTexture, const std::string& shader)
-        : _canvasSprite(ResourceManager::GetTexture(bgTexture),
+        :   _width(ResourceManager::GetTexture(bgTexture)->GetWidth()),
+            _height(ResourceManager::GetTexture(bgTexture)->GetHeight()),
+            _canvasSprite(ResourceManager::GetTexture(bgTexture),
                         ResourceManager::GetShader(shader),
                         COLOR_WHITE,
-                        glm::vec2((float)WindowParams::WIDTH, (float)WindowParams::HEIGHT))
+                        glm::vec2(_width, _height))
     {
         Logger::Info("Created", "Renderer", __func__);
     }
@@ -21,6 +23,9 @@ namespace Engine
     {
         GLRenderSettings::DisableCulling();
 
+        //Commit texture changes
+        _canvasSprite.GetTexture()->CommitModifications();
+
         //Render sprite
         RenderStatistics::drawnVertices += _canvasSprite.Draw();
         RenderStatistics::drawCalls++;
@@ -41,4 +46,26 @@ namespace Engine
     {
         _canvasSprite.GetTexture()->ResetTextureModification(x, y);
     }
+
+    void PixelRenderer::SetScreen(const glm::vec3& color) const
+    {
+        for(uint32 x = 0; x < _width; x++)
+        {
+            for(uint32 y = 0; y < _height; y++)
+            {
+                Set(x, y, color);
+            }
+        }
+    }
+
+    void PixelRenderer::ClearScreen() const
+    {
+        for(uint32 x = 0; x < _width; x++)
+        {
+            for(uint32 y = 0; y < _height; y++)
+            {
+                Reset(x, y);
+            }
+        }
+    }
 }
diff --git a/Engine/Rendering/Renderer/PixelRenderer.hpp b/Engine/Rendering/Renderer/PixelRenderer.hpp
@@ -17,13 +17,16 @@ namespace Engine
         friend class RenderManager;
 
         private:
+            uint32 _width, _height;
             Sprite _canvasSprite;
 
             PixelRenderer(const std::string& bgTexture, const std::string& shader);
 
         public:
-            void Flush(Renderer* renderer) final;
+            void Flush(Renderer* renderer) override;
             void Set(uint32 x, uint32 y, const glm::vec3& color) const;
             void Reset(uint32 x, uint32 y) const;
+            void SetScreen(const glm::vec3& color) const;
+            void ClearScreen() const;
     };
 }
diff --git a/Engine/Rendering/Renderer/SceneRenderer.hpp b/Engine/Rendering/Renderer/SceneRenderer.hpp
@@ -33,14 +33,14 @@ namespace Engine
             Shader             *_terrainShader, *_modelShader, *_waterShader;
 
             SceneRenderer();
-            ~SceneRenderer() final;
+            ~SceneRenderer() override;
 
             void FlushModel(Model* model, Shader* shader);
             void FlushWater();
             void UpdateMoveFactor();
 
         public:
-            void Flush(Renderer* renderer) final;
+            void Flush(Renderer* renderer) override;
             void FlushModels(Shader* shader);
             void FlushCubemap();
             void FlushTerrain();

diff --git a/Engine/Rendering/Renderer/ShadowRenderer.hpp b/Engine/Rendering/Renderer/ShadowRenderer.hpp
@@ -29,7 +29,7 @@ namespace Engine
             void EndFrame();
 
         public:
-            void Flush(Renderer* sceneRenderer) final;
+            void Flush(Renderer* sceneRenderer) override;
             [[nodiscard]] Texture* GetDepthTexture() const;
             [[nodiscard]] glm::mat4 GetLightProjection() const;
     };