wip stuff that isn't working

Author: briaguya-ai

src/CMakeLists.txt

@@ -251,6 +251,10 @@ set(Source_Files__Window__Gui
     ${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
+    ${CMAKE_CURRENT_SOURCE_DIR}/window/gui/resource/GuiTextureResource.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/window/gui/resource/GuiTextureResource.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/window/gui/resource/GuiTextureResourceFactory.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/window/gui/resource/GuiTextureResourceFactory.cpp
 )
 
 source_group("window/gui" FILES ${Source_Files__Window__Gui})

src/window/gui/Gui.cpp

@@ -15,6 +15,7 @@
 #include "resource/File.h"
 #include <stb/stb_image.h>
 #include "window/gui/Fonts.h"
+#include "window/gui/resource/GuiTextureResourceFactory.h"
 
 #ifdef __WIIU__
 #include <gx2/registers.h> // GX2SetViewport / GX2SetScissor
@@ -150,6 +151,10 @@ void Gui::Init(GuiWindowInitData windowImpl) {
     GetGuiWindow("Console")->Init();
     GetGameOverlay()->Init();
 
+    Context::GetInstance()->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(
+    std::make_shared<ResourceFactoryBinaryGuiTextureResourceV0>(), RESOURCE_FORMAT_BINARY, "GuiTexture",
+    static_cast<uint32_t>(RESOURCE_TYPE_GUI_TEXTURE), 0);
+
     ImGuiWMInit();
     ImGuiBackendInit();
 #ifdef __SWITCH__
@@ -230,39 +235,17 @@ void Gui::ImGuiBackendInit() {
 }
 
 void Gui::LoadTextureFromRawImage(const std::string& name, const std::string& path) {
-    // GuiTexture (put in Gui)
-    const auto res = Context::GetInstance()->GetResourceManager()->GetArchiveManager()->LoadFileRaw(path);
-
-    if (!res) {
-        SPDLOG_ERROR("Failed to load resource");
-        return;
-    }
-    if (!res->Buffer || res->Buffer->empty()) {
-        SPDLOG_ERROR("Buffer is null or empty");
-        return;
-    }
-
-    GuiTexture asset;
-    asset.Width = 0;
-    asset.Height = 0;
-    uint8_t* imgData = stbi_load_from_memory(reinterpret_cast<const stbi_uc*>(res->Buffer->data()), res->Buffer->size(),
-                                             &asset.Width, &asset.Height, nullptr, 4);
+    auto initData = std::make_shared<ResourceInitData>();
+    initData->Format = RESOURCE_FORMAT_BINARY;
+    initData->Type = static_cast<uint32_t>(RESOURCE_TYPE_GUI_TEXTURE);
+    initData->ResourceVersion = 0;
+    auto guiTextureResource =  std::static_pointer_cast<GuiTextureResource>(Context::GetInstance()->GetResourceManager()->LoadResource(path, false, initData));
 
-    if (imgData == nullptr) {
-        SPDLOG_ERROR("Error loading imgui texture {}", stbi_failure_reason());
+    if (guiTextureResource == nullptr) {
         return;
     }
 
-    GfxRenderingAPI* api = gfx_get_current_rendering_api();
-
-    // TODO: Nothing ever unloads the texture from Fast3D here.
-    asset.RendererTextureId = api->new_texture();
-    api->select_texture(0, asset.RendererTextureId);
-    api->set_sampler_parameters(0, false, 0, 0);
-    api->upload_texture(imgData, asset.Width, asset.Height);
-
-    mGuiTextures[name] = asset;
-    stbi_image_free(imgData);
+    mGuiTextures[name] = guiTextureResource->GuiTextureData;
 }
 
 bool Gui::SupportsViewports() {

src/window/gui/Gui.h

@@ -18,6 +18,7 @@
 #include "window/gui/GuiWindow.h"
 #include "window/gui/GuiMenuBar.h"
 #include "libultraship/libultra/controller.h"
+#include "window/gui/resource/GuiTextureResource.h"
 
 namespace LUS {
 
@@ -100,12 +101,6 @@ class Gui {
     int16_t GetIntegerScaleFactor();
 
   private:
-    struct GuiTexture {
-        uint32_t RendererTextureId;
-        int32_t Width;
-        int32_t Height;
-    };
-
     GuiWindowInitData mImpl;
     ImGuiIO* mImGuiIo;
     bool mNeedsConsoleVariableSave;

src/window/gui/resource/GuiTextureResource.cpp

@@ -0,0 +1,14 @@
+#include "GuiTextureResource.h"
+
+namespace LUS {
+GuiTextureResource::GuiTextureResource() : Resource(std::shared_ptr<ResourceInitData>()) {
+}
+
+void* GuiTextureResource::GetPointer() {
+    return ImageData.data();
+}
+
+size_t GuiTextureResource::GetPointerSize() {
+    return ImageData.size() * sizeof(uint8_t);
+}
+} // namespace LUS

src/window/gui/resource/GuiTextureResource.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include "resource/Resource.h"
+
+namespace LUS {
+#define RESOURCE_TYPE_GUI_TEXTURE 0x47544558 //GTEX
+
+struct GuiTexture {
+    uint32_t RendererTextureId;
+    int32_t Width;
+    int32_t Height;
+};
+
+class GuiTextureResource : public Resource<void> {
+  public:
+    using Resource::Resource;
+
+    GuiTextureResource();
+
+    void* GetPointer() override;
+    size_t GetPointerSize() override;
+
+    std::vector<uint8_t> ImageData;
+    GuiTexture GuiTextureData;
+};
+}; // namespace LUS

src/window/gui/resource/GuiTextureResourceFactory.cpp

@@ -0,0 +1,51 @@
+#include "window/gui/resource/GuiTextureResourceFactory.h"
+#include "window/gui/resource/GuiTextureResource.h"
+#include "spdlog/spdlog.h"
+#include <stb/stb_image.h>
+#include "graphic/Fast3D/gfx_rendering_api.h"
+#include "graphic/Fast3D/gfx_pc.h"
+
+namespace LUS {
+std::shared_ptr<IResource> ResourceFactoryBinaryGuiTextureResourceV0::ReadResource(std::shared_ptr<File> file) {
+    if (!FileHasValidFormatAndReader(file)) {
+        return nullptr;
+    }
+
+    auto guiTextureResource = std::make_shared<GuiTextureResource>(file->InitData);
+    auto reader = std::get<std::shared_ptr<BinaryReader>>(file->Reader);
+
+    uint32_t dataSize = file->Buffer->size();
+    guiTextureResource->ImageData.reserve(dataSize);
+    for (uint32_t i = 0; i < dataSize; i++) {
+        guiTextureResource->ImageData.push_back(reader->ReadUByte());
+    }
+
+    guiTextureResource->GuiTextureData.Width = 0;
+    guiTextureResource->GuiTextureData.Height = 0;
+    uint8_t* imgData = stbi_load_from_memory(reinterpret_cast<const stbi_uc*>(guiTextureResource->ImageData.data()), dataSize,
+                                            &guiTextureResource->GuiTextureData.Width, &guiTextureResource->GuiTextureData.Height, nullptr, 4);
+
+    if (imgData == nullptr) {
+        SPDLOG_ERROR("Error loading imgui texture {}", stbi_failure_reason());
+        return nullptr;
+    }
+
+    // todo: figure out why this doesn't work
+    // guiTextureResource->ImageData.reserve(dataSize);
+    // for (uint32_t i = 0; i < dataSize; i++) {
+    //     guiTextureResource->ImageData.push_back(imgData[i]);
+    // }
+
+    GfxRenderingAPI* api = gfx_get_current_rendering_api();
+
+    // TODO: Nothing ever unloads the texture from Fast3D here.
+    guiTextureResource->GuiTextureData.RendererTextureId = api->new_texture();
+    api->select_texture(0, guiTextureResource->GuiTextureData.RendererTextureId);
+    api->set_sampler_parameters(0, false, 0, 0);
+    api->upload_texture(/* guiTextureResource->ImageData.data() */ imgData, guiTextureResource->GuiTextureData.Width, guiTextureResource->GuiTextureData.Height);
+
+    stbi_image_free(imgData);
+
+    return guiTextureResource;
+}
+} // namespace LUS

src/window/gui/resource/GuiTextureResourceFactory.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include "resource/Resource.h"
+#include "resource/ResourceFactoryBinary.h"
+
+namespace LUS {
+class ResourceFactoryBinaryGuiTextureResourceV0 : public ResourceFactoryBinary {
+  public:
+    std::shared_ptr<IResource> ReadResource(std::shared_ptr<File> file) override;
+};
+}; // namespace LUS