diff options
Diffstat (limited to 'src/port/resource/importers')
| -rw-r--r-- | src/port/resource/importers/AudioSequenceFactory.cpp | 4 | ||||
| -rw-r--r-- | src/port/resource/importers/BetterTextureFactory.cpp | 4 | ||||
| -rw-r--r-- | src/port/resource/importers/ResourceUtil.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/port/resource/importers/AudioSequenceFactory.cpp b/src/port/resource/importers/AudioSequenceFactory.cpp index dd078cdd6..5b42a699b 100644 --- a/src/port/resource/importers/AudioSequenceFactory.cpp +++ b/src/port/resource/importers/AudioSequenceFactory.cpp @@ -33,14 +33,14 @@ SM64::AudioSequenceFactoryV0::ReadResource(std::shared_ptr<Ship::File> file, bank->mData.id = id; for (const auto& ext : extension) { - auto custom = Ship::Context::GetInstance()->GetResourceManager()->LoadFileProcess(initData->Path + ext); + auto custom = Ship::Context::GetRawInstance()->GetResourceManager()->LoadFileProcess(initData->Path + ext); if (custom != nullptr) { bank->sampleData = std::vector<uint8_t>(custom->Buffer->begin(), custom->Buffer->end()); uint8_t* data = bank->sampleData.data(); size_t size = bank->sampleData.size(); - auto metadata = Ship::Context::GetInstance()->GetResourceManager()->LoadFileProcess(initData->Path + ".json"); + auto metadata = Ship::Context::GetRawInstance()->GetResourceManager()->LoadFileProcess(initData->Path + ".json"); if (metadata != nullptr) { auto json = nlohmann::json::parse(std::string(metadata->Buffer->begin(), metadata->Buffer->end())); HMAS_Info info; diff --git a/src/port/resource/importers/BetterTextureFactory.cpp b/src/port/resource/importers/BetterTextureFactory.cpp index 3d323b6e6..c344f8226 100644 --- a/src/port/resource/importers/BetterTextureFactory.cpp +++ b/src/port/resource/importers/BetterTextureFactory.cpp @@ -32,7 +32,7 @@ ResourceFactoryBinaryTextureV0::ReadResource(std::shared_ptr<Ship::File> file, } for (const auto& ext : extension) { - auto filePng = Ship::Context::GetInstance()->GetResourceManager()->LoadFileProcess( + auto filePng = Ship::Context::GetRawInstance()->GetResourceManager()->LoadFileProcess( initData->Path + ext); if (filePng != nullptr) { @@ -62,7 +62,7 @@ ResourceFactoryBinaryTextureV1::ReadResource(std::shared_ptr<Ship::File> file, } for (const auto& ext : extension) { - auto filePng = Ship::Context::GetInstance()->GetResourceManager()->LoadFileProcess( + auto filePng = Ship::Context::GetRawInstance()->GetResourceManager()->LoadFileProcess( initData->Path + ext); if (filePng != nullptr) { diff --git a/src/port/resource/importers/ResourceUtil.h b/src/port/resource/importers/ResourceUtil.h index d27512e52..5ff4b289b 100644 --- a/src/port/resource/importers/ResourceUtil.h +++ b/src/port/resource/importers/ResourceUtil.h @@ -10,14 +10,14 @@ template <typename T> T LoadChild(uint64_t crc) { if (path == nullptr) { return nullptr; } - auto asset = Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(path); + auto asset = Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(path); return asset ? static_cast<T>(asset->GetRawPointer()) : nullptr; } template <typename T> T LoadChild(const char* path) { if (path == nullptr) { return nullptr; } - auto asset = Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(path); + auto asset = Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(path); return asset ? static_cast<T>(asset->GetRawPointer()) : nullptr; } } |