summaryrefslogtreecommitdiff
path: root/mm/2s2h/resource
diff options
context:
space:
mode:
Diffstat (limited to 'mm/2s2h/resource')
-rw-r--r--mm/2s2h/resource/importer/AnimationFactory.cpp6
-rw-r--r--mm/2s2h/resource/importer/AudioSampleFactory.cpp2
-rw-r--r--mm/2s2h/resource/importer/AudioSequenceFactory.cpp2
-rw-r--r--mm/2s2h/resource/importer/AudioSoundFontFactory.cpp27
-rw-r--r--mm/2s2h/resource/importer/KeyFrameFactory.cpp4
-rw-r--r--mm/2s2h/resource/importer/SkeletonFactory.cpp4
-rw-r--r--mm/2s2h/resource/importer/scenecommand/SetAlternateHeadersFactory.cpp2
-rw-r--r--mm/2s2h/resource/importer/scenecommand/SetAnimatedMaterialListFactory.cpp2
-rw-r--r--mm/2s2h/resource/importer/scenecommand/SetCollisionHeaderFactory.cpp3
-rw-r--r--mm/2s2h/resource/importer/scenecommand/SetCutscenesFactory.cpp2
-rw-r--r--mm/2s2h/resource/importer/scenecommand/SetPathwaysFactory.cpp2
-rw-r--r--mm/2s2h/resource/type/Skeleton.cpp2
12 files changed, 32 insertions, 26 deletions
diff --git a/mm/2s2h/resource/importer/AnimationFactory.cpp b/mm/2s2h/resource/importer/AnimationFactory.cpp
index 5f6d2e3b4..7ae6a16a4 100644
--- a/mm/2s2h/resource/importer/AnimationFactory.cpp
+++ b/mm/2s2h/resource/importer/AnimationFactory.cpp
@@ -89,17 +89,17 @@ ResourceFactoryBinaryAnimationV0::ReadResource(std::shared_ptr<Ship::File> file,
// Read the segment pointer (always 32 bit, doesn't adjust for system pointer size)
std::string path = reader->ReadString();
auto animData = std::static_pointer_cast<Animation>(
- Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(path.c_str()));
+ Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(path.c_str()));
// If direct load failed and alt assets are enabled, try with alt/ prefix
- if (animData == nullptr && Ship::Context::GetInstance()->GetResourceManager()->IsAltAssetsEnabled()) {
+ if (animData == nullptr && Ship::Context::GetRawInstance()->GetResourceManager()->IsAltAssetsEnabled()) {
std::string altPath = path;
if (altPath.find("__OTR__") == 0) {
altPath = altPath.substr(7); // Strip __OTR__
}
altPath = "alt/" + altPath;
animData = std::static_pointer_cast<Animation>(
- Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(altPath.c_str()));
+ Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(altPath.c_str()));
}
if (animData != nullptr) {
diff --git a/mm/2s2h/resource/importer/AudioSampleFactory.cpp b/mm/2s2h/resource/importer/AudioSampleFactory.cpp
index 2263dced2..8948a6793 100644
--- a/mm/2s2h/resource/importer/AudioSampleFactory.cpp
+++ b/mm/2s2h/resource/importer/AudioSampleFactory.cpp
@@ -291,7 +291,7 @@ ResourceFactoryXMLAudioSampleV0::ReadResource(std::shared_ptr<Ship::File> file,
const char* path = child->Attribute("Path");
- auto sampleFile = Ship::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->LoadFile(path);
+ auto sampleFile = Ship::Context::GetRawInstance()->GetResourceManager()->GetArchiveManager()->LoadFile(path);
audioSample->sample.fileSize = sampleFile->Buffer.get()->size();
if (customFormatStr != nullptr) {
// Compressed files can take a really long time to decode (~250ms per).
diff --git a/mm/2s2h/resource/importer/AudioSequenceFactory.cpp b/mm/2s2h/resource/importer/AudioSequenceFactory.cpp
index d036106f2..8db7faa71 100644
--- a/mm/2s2h/resource/importer/AudioSequenceFactory.cpp
+++ b/mm/2s2h/resource/importer/AudioSequenceFactory.cpp
@@ -341,7 +341,7 @@ ResourceFactoryXMLAudioSequenceV0::ReadResource(std::shared_ptr<Ship::File> file
const char* path = child->Attribute("Path");
std::shared_ptr<Ship::File> seqFile;
if (path != nullptr) {
- seqFile = Ship::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->LoadFile(path);
+ seqFile = Ship::Context::GetRawInstance()->GetResourceManager()->GetArchiveManager()->LoadFile(path);
}
if (!streamed) {
diff --git a/mm/2s2h/resource/importer/AudioSoundFontFactory.cpp b/mm/2s2h/resource/importer/AudioSoundFontFactory.cpp
index 0dd6db9f0..71e01f65d 100644
--- a/mm/2s2h/resource/importer/AudioSoundFontFactory.cpp
+++ b/mm/2s2h/resource/importer/AudioSoundFontFactory.cpp
@@ -65,7 +65,8 @@ ResourceFactoryBinaryAudioSoundFontV2::ReadResource(std::shared_ptr<Ship::File>
if (sampleFileName.empty()) {
drum->sound.sample = nullptr;
} else {
- auto res = Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleFileName.c_str());
+ auto res =
+ Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(sampleFileName.c_str());
drum->sound.sample = static_cast<Sample*>(res ? res->GetRawPointer() : nullptr);
}
@@ -109,7 +110,8 @@ ResourceFactoryBinaryAudioSoundFontV2::ReadResource(std::shared_ptr<Ship::File>
bool hasSampleRef = reader->ReadInt8();
std::string sampleFileName = reader->ReadString();
instrument->lowNotesSound.tuning = reader->ReadFloat();
- auto res = Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleFileName.c_str());
+ auto res =
+ Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(sampleFileName.c_str());
instrument->lowNotesSound.sample = static_cast<Sample*>(res ? res->GetRawPointer() : nullptr);
} else {
instrument->lowNotesSound.sample = nullptr;
@@ -122,7 +124,8 @@ ResourceFactoryBinaryAudioSoundFontV2::ReadResource(std::shared_ptr<Ship::File>
bool hasSampleRef = reader->ReadInt8();
std::string sampleFileName = reader->ReadString();
instrument->normalNotesSound.tuning = reader->ReadFloat();
- auto res = Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleFileName.c_str());
+ auto res =
+ Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(sampleFileName.c_str());
instrument->normalNotesSound.sample = static_cast<Sample*>(res ? res->GetRawPointer() : nullptr);
} else {
instrument->normalNotesSound.sample = nullptr;
@@ -134,7 +137,8 @@ ResourceFactoryBinaryAudioSoundFontV2::ReadResource(std::shared_ptr<Ship::File>
bool hasSampleRef = reader->ReadInt8();
std::string sampleFileName = reader->ReadString();
instrument->highNotesSound.tuning = reader->ReadFloat();
- auto res = Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleFileName.c_str());
+ auto res =
+ Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(sampleFileName.c_str());
instrument->highNotesSound.sample = static_cast<Sample*>(res ? res->GetRawPointer() : nullptr);
} else {
instrument->highNotesSound.sample = nullptr;
@@ -161,7 +165,8 @@ ResourceFactoryBinaryAudioSoundFontV2::ReadResource(std::shared_ptr<Ship::File>
bool hasSampleRef = reader->ReadInt8();
std::string sampleFileName = reader->ReadString();
soundEffect.tuning = reader->ReadFloat();
- auto res = Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleFileName.c_str());
+ auto res =
+ Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(sampleFileName.c_str());
soundEffect.sample = static_cast<Sample*>(res ? res->GetRawPointer() : nullptr);
}
@@ -234,7 +239,7 @@ void ResourceFactoryXMLSoundFontV0::ParseDrums(AudioSoundFont* soundFont, tinyxm
const char* sampleStr = element->Attribute("SampleRef");
if (sampleStr != nullptr && sampleStr[0] != 0) {
- auto res = Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleStr);
+ auto res = Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(sampleStr);
drum->sound.sample = static_cast<Sample*>(res ? res->GetRawPointer() : nullptr);
} else {
drum->sound.sample = nullptr;
@@ -310,7 +315,7 @@ void ResourceFactoryXMLSoundFontV0::ParseInstruments(AudioSoundFont* soundFont,
const char* sampleStr = instrumentElement->Attribute("SampleRef");
if (sampleStr != nullptr && sampleStr[0] != 0) {
std::shared_ptr<SOH::AudioSample> res = static_pointer_cast<SOH::AudioSample>(
- Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleStr));
+ Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(sampleStr));
if (res->tuning != -1.0f) {
instrument->lowNotesSound.tuning = res->tuning;
}
@@ -324,7 +329,7 @@ void ResourceFactoryXMLSoundFontV0::ParseInstruments(AudioSoundFont* soundFont,
const char* sampleStr = instrumentElement->Attribute("SampleRef");
if (sampleStr != nullptr && sampleStr[0] != 0) {
std::shared_ptr<SOH::AudioSample> res = static_pointer_cast<SOH::AudioSample>(
- Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleStr));
+ Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(sampleStr));
if (res->tuning != -1.0f) {
instrument->normalNotesSound.tuning = res->tuning;
}
@@ -338,7 +343,7 @@ void ResourceFactoryXMLSoundFontV0::ParseInstruments(AudioSoundFont* soundFont,
const char* sampleStr = instrumentElement->Attribute("SampleRef");
if (sampleStr != nullptr && sampleStr[0] != 0) {
std::shared_ptr<SOH::AudioSample> res = static_pointer_cast<SOH::AudioSample>(
- Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleStr));
+ Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(sampleStr));
if (res->tuning != -1.0f) {
instrument->highNotesSound.tuning = res->tuning;
}
@@ -378,7 +383,7 @@ void ResourceFactoryXMLSoundFontV0::ParseSfxTable(AudioSoundFont* soundFont, tin
sound.tuning = element->FloatAttribute("Tuning");
if (sampleStr[0] != 0) {
auto res = static_pointer_cast<SOH::AudioSample>(
- Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleStr));
+ Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(sampleStr));
if (res->tuning != -1.0f) {
sound.tuning = res->tuning;
}
@@ -433,7 +438,7 @@ ResourceFactoryXMLSoundFontV0::ReadResource(std::shared_ptr<Ship::File> file,
std::string origName = "audio/fonts/";
origName += patch;
audioSoundFont = dynamic_pointer_cast<AudioSoundFont>(
- Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(origName));
+ Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(origName));
} else {
audioSoundFont = std::make_shared<AudioSoundFont>(initData);
memset(&audioSoundFont->soundFont, 0, sizeof(audioSoundFont->soundFont));
diff --git a/mm/2s2h/resource/importer/KeyFrameFactory.cpp b/mm/2s2h/resource/importer/KeyFrameFactory.cpp
index b0ac93ffb..3beb64000 100644
--- a/mm/2s2h/resource/importer/KeyFrameFactory.cpp
+++ b/mm/2s2h/resource/importer/KeyFrameFactory.cpp
@@ -24,7 +24,7 @@ ResourceFactoryBinaryKeyFrameSkel::ReadResource(std::shared_ptr<Ship::File> file
for (uint32_t i = 0; i < numLimbs; i++) {
std::string dlStr = reader->ReadString();
- auto dl = Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(dlStr.c_str());
+ auto dl = Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(dlStr.c_str());
limbs[i].dList = nullptr;
if (dl != nullptr) {
limbs[i].dList = dl->GetRawPointer();
@@ -41,7 +41,7 @@ ResourceFactoryBinaryKeyFrameSkel::ReadResource(std::shared_ptr<Ship::File> file
for (uint32_t i = 0; i < numLimbs; i++) {
std::string dlStr = reader->ReadString();
- auto dl = Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(dlStr.c_str());
+ auto dl = Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(dlStr.c_str());
limbs[i].dList = nullptr;
if (dl != nullptr) {
limbs[i].dList = dl->GetRawPointer();
diff --git a/mm/2s2h/resource/importer/SkeletonFactory.cpp b/mm/2s2h/resource/importer/SkeletonFactory.cpp
index a14e50988..647f28c82 100644
--- a/mm/2s2h/resource/importer/SkeletonFactory.cpp
+++ b/mm/2s2h/resource/importer/SkeletonFactory.cpp
@@ -57,7 +57,7 @@ ResourceFactoryBinarySkeletonV0::ReadResource(std::shared_ptr<Ship::File> file,
for (size_t i = 0; i < skeleton->limbTable.size(); i++) {
std::string limbStr = skeleton->limbTable[i];
- auto limb = Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(limbStr.c_str());
+ auto limb = Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(limbStr.c_str());
skeleton->skeletonHeaderSegments.push_back(limb ? limb->GetRawPointer() : nullptr);
}
@@ -117,7 +117,7 @@ ResourceFactoryXMLSkeletonV0::ReadResource(std::shared_ptr<Ship::File> file,
std::string limbName = child->Attribute("Path");
skel->limbTable.push_back(limbName);
- auto limb = Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(limbName.c_str());
+ auto limb = Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(limbName.c_str());
skel->skeletonHeaderSegments.push_back(limb ? limb->GetRawPointer() : nullptr);
}
diff --git a/mm/2s2h/resource/importer/scenecommand/SetAlternateHeadersFactory.cpp b/mm/2s2h/resource/importer/scenecommand/SetAlternateHeadersFactory.cpp
index 0a9e5ade4..8abd5b651 100644
--- a/mm/2s2h/resource/importer/scenecommand/SetAlternateHeadersFactory.cpp
+++ b/mm/2s2h/resource/importer/scenecommand/SetAlternateHeadersFactory.cpp
@@ -17,7 +17,7 @@ SetAlternateHeadersFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData>
auto headerName = reader->ReadString();
if (!headerName.empty()) {
setAlternateHeaders->headers.push_back(std::static_pointer_cast<Scene>(
- Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(headerName.c_str())));
+ Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(headerName.c_str())));
} else {
setAlternateHeaders->headers.push_back(nullptr);
}
diff --git a/mm/2s2h/resource/importer/scenecommand/SetAnimatedMaterialListFactory.cpp b/mm/2s2h/resource/importer/scenecommand/SetAnimatedMaterialListFactory.cpp
index 5ccbfc5bc..9e7df4376 100644
--- a/mm/2s2h/resource/importer/scenecommand/SetAnimatedMaterialListFactory.cpp
+++ b/mm/2s2h/resource/importer/scenecommand/SetAnimatedMaterialListFactory.cpp
@@ -15,7 +15,7 @@ SetAnimatedMaterialListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitD
std::string str = reader->ReadString();
const auto data = std::static_pointer_cast<TextureAnimation>(
- Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(str.c_str()));
+ Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(str.c_str()));
AnimatedMaterial* res = data->GetPointer();
setAnimatedMat->mat = res;
diff --git a/mm/2s2h/resource/importer/scenecommand/SetCollisionHeaderFactory.cpp b/mm/2s2h/resource/importer/scenecommand/SetCollisionHeaderFactory.cpp
index bc85af445..ef876ab3b 100644
--- a/mm/2s2h/resource/importer/scenecommand/SetCollisionHeaderFactory.cpp
+++ b/mm/2s2h/resource/importer/scenecommand/SetCollisionHeaderFactory.cpp
@@ -13,7 +13,8 @@ SetCollisionHeaderFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData>
setCollisionHeader->fileName = reader->ReadString();
setCollisionHeader->collisionHeader = std::static_pointer_cast<CollisionHeader>(
- Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(setCollisionHeader->fileName.c_str()));
+ Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(
+ setCollisionHeader->fileName.c_str()));
return setCollisionHeader;
}
diff --git a/mm/2s2h/resource/importer/scenecommand/SetCutscenesFactory.cpp b/mm/2s2h/resource/importer/scenecommand/SetCutscenesFactory.cpp
index d308fe95a..c38767088 100644
--- a/mm/2s2h/resource/importer/scenecommand/SetCutscenesFactory.cpp
+++ b/mm/2s2h/resource/importer/scenecommand/SetCutscenesFactory.cpp
@@ -20,7 +20,7 @@ std::shared_ptr<Ship::IResource> SetCutsceneFactoryMM::ReadResource(std::shared_
entry.entrance = reader->ReadUByte();
entry.flag = reader->ReadUByte();
entry.data = std::static_pointer_cast<Cutscene>(
- Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(path.c_str()))
+ Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(path.c_str()))
->GetPointer();
setCutscenes->entries.emplace_back(entry);
}
diff --git a/mm/2s2h/resource/importer/scenecommand/SetPathwaysFactory.cpp b/mm/2s2h/resource/importer/scenecommand/SetPathwaysFactory.cpp
index 8aac0b133..100027042 100644
--- a/mm/2s2h/resource/importer/scenecommand/SetPathwaysFactory.cpp
+++ b/mm/2s2h/resource/importer/scenecommand/SetPathwaysFactory.cpp
@@ -15,7 +15,7 @@ std::shared_ptr<Ship::IResource> SetPathwaysMMFactory::ReadResource(std::shared_
for (uint32_t i = 0; i < setPathways->numPaths; i++) {
std::string pathFileName = reader->ReadString();
auto path = std::static_pointer_cast<PathMM>(
- Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(pathFileName.c_str()));
+ Ship::Context::GetRawInstance()->GetResourceManager()->LoadResourceProcess(pathFileName.c_str()));
setPathways->paths.push_back(path->GetPointer());
}
return setPathways;
diff --git a/mm/2s2h/resource/type/Skeleton.cpp b/mm/2s2h/resource/type/Skeleton.cpp
index 8a25c3e4b..594011fd4 100644
--- a/mm/2s2h/resource/type/Skeleton.cpp
+++ b/mm/2s2h/resource/type/Skeleton.cpp
@@ -69,7 +69,7 @@ void SkeletonPatcher::ClearSkeletons() {
}
void SkeletonPatcher::UpdateSkeletons() {
- auto resourceMgr = Ship::Context::GetInstance()->GetResourceManager();
+ auto resourceMgr = Ship::Context::GetRawInstance()->GetResourceManager();
bool isAlt = resourceMgr->IsAltAssetsEnabled();
for (const auto& skel : skeletons) {
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 02:08:50 +0000