Removed default font from TextRenderer

Author: Raelr

README.md

@@ -89,7 +89,7 @@ $ sudo apt install libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi
     ```
     ```console
     // Windows
-    > ./scripts/setup.bat
+    > ./scripts/Setup.ps1
     ```
 
 3. This should install all required dependencies. Once completed a `.env` file will be generated with all required variables. If the build is completed with no issue then you can proceed to build the project.
@@ -104,14 +104,14 @@ $ ./scripts/setup.sh --include-validation-layers
 ```
 ```console
 // Windows
-> ./scripts/setup.bat --include-validation-layers
+> ./scripts/Setup.ps1 -Include_Validation_Layers
 ```
 
 **NOTE**: Building with this option can take some time to complete. Please be patient while the project builds the required validation layers.
 
 ### Building the Project
 
-Assuming all dependencies have been satisfied, the project can be build using the following command:
+Assuming all dependencies have been satisfied, the project can be built using the following command:
 
 ```console
 // Linux and macOS

engine/render/renderer/Renderer.cpp

@@ -20,7 +20,7 @@ Renderer* Renderer::instance {nullptr};
 Vulkan::CommandBuffer Renderer::commandBuffers;
 uint32_t Renderer::currentFrameIndex = 0;
 
-Renderer::Renderer(Window& window, const char* defaultFontPath) : window {window}
+Renderer::Renderer(Window& window) : window {window}
 {
     Statics::Initialise();
 
@@ -40,7 +40,7 @@ Renderer::Renderer(Window& window, const char* defaultFontPath) : window {window
 
     DescriptorPool::BuildPool();
 
-    Renderer3D::Initialise(defaultFontPath);
+    Renderer3D::Initialise();
     Renderer2D::Initialise();
 
     commandBuffers = Vulkan::CommandBuffer(Vulkan::Swapchain::MAX_FRAMES_IN_FLIGHT);

engine/render/renderer/Renderer.h

@@ -26,7 +26,7 @@ class Renderer
 {
 public:
 
-    explicit Renderer(Window& window, const char* defaultFontPath);
+    explicit Renderer(Window& window);
 
     ~Renderer();
 

engine/render/renderer/renderer/Renderer3D.cpp

@@ -23,15 +23,15 @@ TextRenderer Renderer3D::textRenderer;
 
 Renderer3D::GlobalData Renderer3D::global3DData;
 
-void Renderer3D::Initialise(const char* defaultTextPath)
+void Renderer3D::Initialise()
 {
     globalDataId = INTERN_STR("globalData");
 
     modelRenderer.Initialise("globalData");
     debugRenderer.Initialise("globalData");
     billboardRenderer.Initialise("globalData");
     lightRenderer.Initialise("globalData");
-    textRenderer.Initialise(defaultTextPath, "globalData");
+    textRenderer.Initialise("globalData");
 
     gridMaterial = Vulkan::Material(
         Vulkan::Shader::Builder()

engine/render/renderer/renderer/Renderer3D.h

@@ -33,7 +33,7 @@ class Renderer3D
         PointLight::Data lightData;
     };
 
-    static void Initialise(const char* defaulTextPath);
+    static void Initialise();
 
     static void DrawModel(Model* model,
                           const Vec3& position,
@@ -58,7 +58,7 @@ class Renderer3D
                            const Vec3 rotation,
                            const Vec2 scale,
                            const IColour& colour,
-                           Vulkan::Font* font = nullptr);
+                           Vulkan::Font* font);
 
     static void RecreateMaterials();
 

engine/render/renderer/renderer/TextRenderer.cpp

@@ -15,15 +15,15 @@
 namespace Siege
 {
 
-void TextRenderer::Initialise(const char* defaultTextPath, const String& globalDataAttributeName)
+void TextRenderer::Initialise(const String& globalDataAttributeName)
 {
     using Vulkan::Material;
     using Vulkan::Mesh;
     using Vulkan::Shader;
 
     globalDataId = INTERN_STR(globalDataAttributeName);
 
-    defaultFont = Vulkan::Font(defaultTextPath);
+    defaultTexture = Vulkan::Texture2D("default");
 
     defaultMaterial =
         Material(Shader::Builder()
@@ -40,7 +40,7 @@ void TextRenderer::Initialise(const char* defaultTextPath, const String& globalD
                  Shader::Builder()
                      .FromFragmentShader("assets/shaders/text2D.frag.spv")
                      .WithTexture("texture", 0, 16)
-                     .WithDefaultTexture(defaultFont.GetTexture())
+                     .WithDefaultTexture(&defaultTexture)
                      .Build());
 
     textureId = INTERN_STR("texture");
@@ -61,7 +61,7 @@ void TextRenderer::Initialise(const char* defaultTextPath, const String& globalD
 
 void TextRenderer::Free()
 {
-    defaultFont.Free();
+    defaultTexture.Free();
     defaultMaterial.Free();
     for (auto it = perFrameVertexBuffers.CreateIterator(); it; ++it) it->Free();
     indexBuffer.Free();
@@ -74,9 +74,9 @@ void TextRenderer::DrawFont(const char* text,
                             const IColour& colour,
                             Vulkan::Font* font)
 {
-    auto targetFont = font == nullptr ? &defaultFont : font;
+    if (font == nullptr) return;
 
-    auto texIndex = defaultMaterial.SetTexture(textureId, targetFont->GetTexture());
+    auto texIndex = defaultMaterial.SetTexture(textureId, font->GetTexture());
 
     if (texIndex >= characters.Count()) characters.Append(MHArray<QuadData>(OFFSET_PER_FONT));
 
@@ -85,14 +85,14 @@ void TextRenderer::DrawFont(const char* text,
     size_t textSize = strlen(text);
     float textScale = 64.f;
 
-    float totalWidth = (GetTotalTextWidth(text, textSize, targetFont->GetGlyphs()));
+    float totalWidth = (GetTotalTextWidth(text, textSize, font->GetGlyphs()));
 
     float x = 0 - (totalWidth / 2.f);
     float y = 0;
 
     for (size_t i = 0; i < textSize; i++)
     {
-        auto glyph = targetFont->GetGlyph(text[i]);
+        auto glyph = font->GetGlyph(text[i]);
 
         float height = glyph.height;
 

engine/render/renderer/renderer/TextRenderer.h

@@ -23,15 +23,15 @@ class TextRenderer
 {
 public:
 
-    void Initialise(const char* defaultTextPath, const String& globalDataAttributeName);
+    void Initialise(const String& globalDataAttributeName);
     void Free();
 
     void DrawFont(const char* text,
                   const Vec3& position,
                   const Vec3& rotation,
                   const Vec2 scale,
                   const IColour& colour,
-                  Vulkan::Font* font = nullptr);
+                  Vulkan::Font* font);
 
     void RecreateMaterials();
 
@@ -67,11 +67,11 @@ class TextRenderer
     Hash::StringId textureId;
 
     MSArray<MHArray<QuadData>, MAX_FONTS> characters;
-
     MHArray<Vulkan::VertexBuffer> perFrameVertexBuffers;
+
     Vulkan::IndexBuffer indexBuffer;
 
-    Vulkan::Font defaultFont;
+    Vulkan::Texture2D defaultTexture;
     Vulkan::Material defaultMaterial;
 };
 

examples/render/src/main.cpp

@@ -46,7 +46,7 @@ int main()
 
     Siege::Input::SetWindowPointer(&window);
 
-    Siege::Renderer renderer(window, "assets/fonts/PublicPixel.ttf");
+    Siege::Renderer renderer(window);
 
     Camera camera;
 
@@ -55,6 +55,7 @@ int main()
     auto cappy = Siege::Vulkan::Texture2D("Cthulhu", "assets/textures/cappy.png");
 
     auto meslo = Siege::Vulkan::Font("assets/fonts/meslo-lg/MesloLGS-Regular.ttf");
+    auto pixel = Siege::Vulkan::Font("assets/fonts/PublicPixel.ttf");
 
     // Shader Declaration
 
@@ -198,7 +199,8 @@ int main()
                                       {0.f, -.85f, -.51f},
                                       {},
                                       {.13f, .13f},
-                                      Siege::IColour::White);
+                                      Siege::IColour::White,
+                                      &pixel);
         Siege::Renderer3D::DrawText3D("AryehThulu",
                                       {-1.95f, -.75f, 2.95f},
                                       {},
@@ -209,12 +211,14 @@ int main()
                                       {2.f, -.75f, 2.95f},
                                       {},
                                       {.25f, .25f},
-                                      Siege::IColour::Blue);
+                                      Siege::IColour::Blue,
+                                      &pixel);
         Siege::Renderer3D::DrawText3D("Default Texture",
                                       {0.f, -.8f, 2.95f},
                                       {},
                                       {.1f, .1f},
-                                      Siege::IColour::Red);
+                                      Siege::IColour::Red,
+                                      &pixel);
 
         Siege::Renderer3D::DrawText3D("Wow, isn't it great that we can finally render text?",
                                       {2.99f, -3.f, 0.f},
@@ -226,7 +230,8 @@ int main()
                                       {2.99f, -2.4f, 0.f},
                                       {0.f, 1.5707963268f, 0.1f},
                                       {.25f, .25f},
-                                      Siege::IColour::Red);
+                                      Siege::IColour::Red,
+                                      &pixel);
         Siege::Renderer3D::DrawText3D("Yeah but it was like... hard",
                                       {2.99f, -2.f, 0.f},
                                       {0.f, 1.5707963268f, 0.f},
@@ -249,13 +254,15 @@ int main()
                                       {2.99f, -1.2f, -1.7f},
                                       {0.f, 1.5707963268f, -0.1f},
                                       {.25f, .25f},
-                                      Siege::IColour::Blue);
+                                      Siege::IColour::Blue,
+                                      &pixel);
 
         Siege::Renderer3D::DrawText3D("But hey, at least it's done, right?",
                                       {2.99f, -.5f, 0.f},
                                       {0.f, 1.5707963268f, -0.1f},
                                       {.25f, .25f},
-                                      Siege::IColour::White);
+                                      Siege::IColour::White,
+                                      &pixel);
 
         renderer.EndFrame();
     }