fonts loading

Author: briaguya-ai

src/CMakeLists.txt

@@ -247,6 +247,10 @@ set(Source_Files__Window__Gui
     ${CMAKE_CURRENT_SOURCE_DIR}/window/gui/GuiElement.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/window/gui/GuiMenuBar.h
     ${CMAKE_CURRENT_SOURCE_DIR}/window/gui/GuiMenuBar.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/window/gui/resource/Font.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/window/gui/resource/Font.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/window/gui/resource/FontFactory.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/window/gui/resource/FontFactory.cpp
 )
 
 source_group("window/gui" FILES ${Source_Files__Window__Gui})

src/resource/ResourceManager.cpp

@@ -174,7 +174,7 @@ std::shared_future<std::shared_ptr<IResource>> ResourceManager::LoadResourceAsyn
 }
 
 std::shared_ptr<IResource> ResourceManager::LoadResource(const std::string& filePath, bool loadExact, std::shared_ptr<ResourceInitData> initData) {
-    auto resource = LoadResourceAsync(filePath, loadExact, true).get();
+    auto resource = LoadResourceAsync(filePath, loadExact, true, initData).get();
     if (resource == nullptr) {
         SPDLOG_ERROR("Failed to load resource file at path {}", filePath);
     }

src/resource/ResourceType.h

@@ -14,6 +14,5 @@ enum class ResourceType {
     Array = 0x4F415252,       // OARR
     Blob = 0x4F424C42,        // OBLB
     Texture = 0x4F544558,     // OTEX
-    Font = 0x464F4E54         // FONT
 };
 } // namespace LUS

src/window/gui/GameOverlay.cpp

@@ -2,7 +2,8 @@
 
 #include "public/bridge/consolevariablebridge.h"
 #include "resource/File.h"
-#include "resource/type/Font.h"
+#include "window/gui/resource/Font.h"
+#include "window/gui/resource/FontFactory.h"
 #include "resource/archive/Archive.h"
 #include "resource/ResourceManager.h"
 #include "Context.h"
@@ -21,7 +22,7 @@ void GameOverlay::LoadFont(const std::string& name, const std::string& path, flo
     ImGuiIO& io = ImGui::GetIO();
     auto initData = std::make_shared<ResourceInitData>();
     initData->Format = RESOURCE_FORMAT_BINARY;
-    initData->Type = static_cast<uint32_t>(ResourceType::Font);
+    initData->Type = static_cast<uint32_t>(RESOURCE_TYPE_FONT);
     initData->ResourceVersion = 0;
     std::shared_ptr<Font> font = std::static_pointer_cast<Font>(Context::GetInstance()->GetResourceManager()->LoadResource(path, false, initData));
     if (font != nullptr) {
@@ -137,6 +138,7 @@ ImVec2 GameOverlay::CalculateTextSize(const char* text, const char* textEnd, boo
 }
 
 void GameOverlay::Init() {
+    Context::GetInstance()->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(std::make_shared<ResourceFactoryBinaryFontV0>(), RESOURCE_FORMAT_BINARY, "Font", static_cast<uint32_t>(RESOURCE_TYPE_FONT), 0);
     LoadFont("Press Start 2P", "fonts/PressStart2P-Regular.ttf", 12.0f);
     LoadFont("Fipps", "fonts/Fipps-Regular.otf", 32.0f);
     const std::string defaultFont = mFonts.begin()->first;

src/resource/type/Font.cpp src/window/gui/resource/Font.cpp

@@ -3,6 +3,8 @@
 #include "resource/Resource.h"
 
 namespace LUS {
+#define RESOURCE_TYPE_FONT 0x464F4E54
+
 class Font : public Resource<void> {
   public:
     using Resource::Resource;

src/resource/type/Font.h src/window/gui/resource/Font.h

@@ -1,5 +1,5 @@
-#include "resource/factory/FontFactory.h"
-#include "resource/type/Font.h"
+#include "window/gui/resource/FontFactory.h"
+#include "window/gui/resource/Font.h"
 #include "spdlog/spdlog.h"
 
 namespace LUS {