Merge branch 'main' into guitexture-resource

Author: briaguya-ai

src/window/gui/GameOverlay.cpp

@@ -26,7 +26,7 @@ void GameOverlay::LoadFont(const std::string& name, const std::string& path, flo
     std::shared_ptr<Font> font = std::static_pointer_cast<Font>(
         Context::GetInstance()->GetResourceManager()->LoadResource(path, false, initData));
     if (font != nullptr) {
-        mFonts[name] = io.Fonts->AddFontFromMemoryTTF(font->Data.data(), font->Data.size(), fontSize);
+        mFonts[name] = io.Fonts->AddFontFromMemoryTTF(font->Data, font->DataSize, fontSize);
     }
 }
 

src/window/gui/resource/Font.cpp

@@ -4,11 +4,17 @@ namespace LUS {
 Font::Font() : Resource(std::shared_ptr<ResourceInitData>()) {
 }
 
+Font::~Font() {
+    if (Data != nullptr) {
+        delete Data;
+    }
+}
+
 void* Font::GetPointer() {
-    return Data.data();
+    return Data;
 }
 
 size_t Font::GetPointerSize() {
-    return Data.size() * sizeof(char);
+    return DataSize * sizeof(char);
 }
 } // namespace LUS

src/window/gui/resource/Font.h

@@ -3,17 +3,19 @@
 #include "resource/Resource.h"
 
 namespace LUS {
-#define RESOURCE_TYPE_FONT 0x464F4E54
+#define RESOURCE_TYPE_FONT 0x464F4E54 // FONT
 
 class Font : public Resource<void> {
   public:
     using Resource::Resource;
 
     Font();
+    ~Font();
 
     void* GetPointer() override;
     size_t GetPointerSize() override;
 
-    std::vector<char> Data;
+    char* Data = nullptr;
+    size_t DataSize;
 };
 }; // namespace LUS

src/window/gui/resource/FontFactory.cpp

@@ -11,13 +11,10 @@ std::shared_ptr<IResource> ResourceFactoryBinaryFontV0::ReadResource(std::shared
     auto font = std::make_shared<Font>(file->InitData);
     auto reader = std::get<std::shared_ptr<BinaryReader>>(file->Reader);
 
-    uint32_t dataSize = file->Buffer->size();
+    font->DataSize = file->Buffer->size();
 
-    font->Data.reserve(dataSize);
-
-    for (uint32_t i = 0; i < dataSize; i++) {
-        font->Data.push_back(reader->ReadChar());
-    }
+    font->Data = new char[font->DataSize];
+    reader->Read(font->Data, font->DataSize);
 
     return font;
 }