Support loading Assets for Overlays

This commit is contained in:
2024-01-03 21:26:21 -06:00
parent c50e3b78ca
commit 4723126af2
6 changed files with 45 additions and 10 deletions

View File

@@ -1,4 +1,5 @@
#include "../include/asset_mgr.hpp"
#include "Overlay/Overlays.hpp"
#include <PSX/File/Processor/cd_file_processor.hpp>
#include <PSX/AutoLBA/auto_lba.hpp>
#include <PSX/AutoLBA/auto_lba_declaration.hpp>
@@ -17,7 +18,7 @@ namespace Assets {
};
__declare_lba_header(LBA);
static void load(const CDFile* assets, size_t size) {
static void load(const volatile AutoLBAEntry* lba, const CDFile* assets, size_t size) {
const auto buffer_cfg = CDFileProcessor::BufferConfiguration::new_default();
CDFileProcessor file_processor;
@@ -41,8 +42,8 @@ namespace Assets {
}
template<size_t N>
static void load(const CDFile (&files)[N]) {
return load(files, N);
static void load(const volatile AutoLBAEntry* lba, const CDFile (&files)[N]) {
return load(lba, files, N);
}
namespace Main {
@@ -51,7 +52,7 @@ namespace Assets {
};
void load() {
::Assets::load(Files);
::Assets::load(lba, Files);
}
}
@@ -65,12 +66,12 @@ namespace Assets {
};
void load_controller_test() {
::Assets::load(ControllerFiles);
::Assets::load(lba, ControllerFiles);
}
void load_gpu_test() {
::Assets::load(GPUFiles);
// Load Overlay assets?!
::Assets::load(lba, GPUFiles);
::Assets::load(GPUTest::lba, GPUTest::Assets);
}
}
}