Added text rendering and for showing labels on top of entities

Author: Raelr

engine/core/ResourceSystem.cpp

@@ -7,6 +7,7 @@
 //
 
 #include "ResourceSystem.h"
+
 #include <vector>
 
 namespace Siege
@@ -18,15 +19,15 @@ static std::map<String, Texture> textures = std::map<String, Texture>();
 void ResourceSystem::RegisterModel(const String& path)
 {
     String fullPath = baseDir + path;
-//    if (models.find(fullPath) != models.end()) return;
-//    models[fullPath] = LoadModel(fullPath);
+    //    if (models.find(fullPath) != models.end()) return;
+    //    models[fullPath] = LoadModel(fullPath);
 }
 
 void ResourceSystem::RegisterTexture(const String& path)
 {
     String fullPath = baseDir + path;
-//    if (textures.find(fullPath) != textures.end()) return;
-//    textures[fullPath] = LoadTexture(fullPath);
+    //    if (textures.find(fullPath) != textures.end()) return;
+    //    textures[fullPath] = LoadTexture(fullPath);
 }
 
 void* ResourceSystem::GetModel(const String& path)
@@ -48,23 +49,23 @@ void ResourceSystem::FreeResources()
     // Iterate over vectors backwards to avoid memory issues
     for (auto i = freedModels.rbegin(); i != freedModels.rend(); i++)
     {
-//        UnloadModel(**i);
+        //        UnloadModel(**i);
     }
     freedModels.clear();
     models.clear();
 
     for (auto i = freedTextures.rbegin(); i != freedTextures.rend(); i++)
     {
-//        UnloadTexture(**i);
+        //        UnloadTexture(**i);
     }
     freedTextures.clear();
     textures.clear();
 }
 
 void ResourceSystem::ClearResources()
 {
-//    for (auto& model : models) freedModels.push_back(&model.second);
-//    for (auto& texture : textures) freedTextures.push_back(&texture.second);
+    //    for (auto& model : models) freedModels.push_back(&model.second);
+    //    for (auto& texture : textures) freedTextures.push_back(&texture.second);
 }
 
 void ResourceSystem::SetBaseDirectory(const String& dir)

engine/core/ResourceSystem.h

@@ -14,13 +14,11 @@
 #include <map>
 #include <vector>
 
-struct Model {
+struct Model
+{};
 
-};
-
-struct Texture {
-
-};
+struct Texture
+{};
 
 namespace Siege
 {

engine/core/Statics.cpp

@@ -8,9 +8,9 @@
 
 #include "Statics.h"
 
+#include "ResourceSystem.h"
 #include "physics/CollisionSystem.h"
 #include "scene/SceneSystem.h"
-#include "ResourceSystem.h"
 
 namespace Siege
 {

engine/core/scene/SceneFile.cpp

@@ -13,8 +13,8 @@
 
 #include <algorithm>
 
-#include "../entity/Entity.h"
 #include "../ResourceSystem.h"
+#include "../entity/Entity.h"
 
 namespace Siege
 {

engine/core/scene/SceneSystem.cpp

@@ -12,9 +12,9 @@
 
 #include <vector>
 
+#include "../ResourceSystem.h"
 #include "../Statics.h"
 #include "../entity/Entity.h"
-#include "../ResourceSystem.h"
 #include "SceneFile.h"
 
 namespace Siege

engine/render/renderer/Renderer.h

@@ -31,11 +31,6 @@ class Renderer
 
     ~Renderer();
 
-    float GetAspectRatio() const
-    {
-        return static_cast<float>(window.GetWidth()) / static_cast<float>(window.GetHeight());
-    }
-
     void SetCamera3D(const Camera& camera)
     {
         camera3D = camera;

engine/render/renderer/renderer/TextRenderer.cpp

@@ -122,12 +122,12 @@ void TextRenderer::Render(Vulkan::CommandBuffer& buffer,
                           const void* globalData,
                           uint32_t frameIndex)
 {
-    if (characters.Count() == 0) return;
-
     defaultMaterial.SetUniformData(globalDataId, globalDataSize, globalData);
 
     for (uint32_t i = 0; i < characters.Count(); i++)
     {
+        if (characters[i].Count() == 0) continue;
+
         uint32_t texIndex = i;
 
         defaultMaterial.BindPushConstant(buffer, &texIndex);

engine/window/Input.cpp

@@ -8,10 +8,10 @@
 
 #include "Input.h"
 
-#include "window/platform/glfw/Input.h"
-
 #include <utils/Logging.h>
 
+#include "window/platform/glfw/Input.h"
+
 namespace Siege
 {
 Glfw::Window Input::primaryWindow = nullptr;

engine/window/Window.h

@@ -20,6 +20,8 @@ class Window
 {
 public:
 
+    static MHArray<const char*> GetRequiredExtensions();
+
     // 'Structors
 
     Window(char const* name, WindowExtents extents);
@@ -52,10 +54,13 @@ class Window
 
     void ResetWindowResized();
 
-    static MHArray<const char*> GetRequiredExtensions();
-
     void WaitEvents();
 
+    inline float AspectRatio()
+    {
+        return static_cast<float>(extents.width) / static_cast<float>(extents.height);
+    }
+
 private:
 
     // Private variables

examples/game/src/RenderResources.cpp

@@ -7,6 +7,7 @@
 //
 
 #include "RenderResources.h"
+
 #include <render/renderer/renderer/ModelRenderer.h>
 
 RenderResources::RenderResources()