Implemented XML Audio Sequences

Author: KiritoDv

Torch

@@ -12,6 +12,7 @@
       binary: sm64.o2r
       code: code/jp
       headers: include/assets
+      modding: mods/assets
   segments:
     - 0x000000
     - 0x000000
@@ -48,6 +49,7 @@
     output:
       binary: sm64.o2r
       code: code/us
+      modding: mods/assets
       headers: include/assets
   segments:
     - 0x000000

config.yml

@@ -290,6 +290,8 @@ void GameEngine::FinishInit() {
                                     "AudioSample", static_cast<uint32_t>(SM64::ResourceType::Sample), 0);
     loader->RegisterResourceFactory(std::make_shared<SM64::AudioSequenceFactoryV0>(), RESOURCE_FORMAT_BINARY,
                                     "AudioSequence", static_cast<uint32_t>(SM64::ResourceType::Sequence), 0);
+    loader->RegisterResourceFactory(std::make_shared<SM64::AudioSequenceXMLFactoryV0>(), RESOURCE_FORMAT_XML,
+                                    "Sequence", static_cast<uint32_t>(SM64::ResourceType::Sequence), 0);
     loader->RegisterResourceFactory(std::make_shared<SM64::DialogFactoryV0>(), RESOURCE_FORMAT_BINARY, "Dialog",
                                     static_cast<uint32_t>(SM64::ResourceType::SDialog), 0);
     loader->RegisterResourceFactory(std::make_shared<SM64::DictionaryFactoryV0>(), RESOURCE_FORMAT_BINARY, "Dictionary",
@@ -916,6 +918,9 @@ void GameEngine::AudioInit() {
     }
 
     for (auto& sequence : *sequences_files) {
+        if(sequence.find(".m64") != std::string::npos) {
+            continue;
+        }
         auto path = "__OTR__" + sequence;
         auto seq = static_cast<AudioSequenceData*>(ResourceGetDataByName(path.c_str()));
         Instance->sequenceTable[seq->id] = path;

src/port/Engine.cpp

@@ -2,6 +2,7 @@
 #include "port/importer/types/AudioSequence.h"
 #include "spdlog/spdlog.h"
 #include "port/Engine.h"
+#include <tinyxml2.h>
 #include "port/importer/types/AudioBank.h"
 
 std::shared_ptr<Ship::IResource>
@@ -32,4 +33,38 @@ SM64::AudioSequenceFactoryV0::ReadResource(std::shared_ptr<Ship::File> file,
     bank->mData.id = id;
 
     return bank;
-}
+}
+
+
+std::shared_ptr<Ship::IResource>
+SM64::AudioSequenceXMLFactoryV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                           std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
+        return nullptr;
+    }
+
+    std::shared_ptr<AudioSequence> seq = std::make_shared<AudioSequence>(initData);
+    auto child =
+        std::get<std::shared_ptr<tinyxml2::XMLDocument>>(file->Reader)->FirstChildElement();
+
+    auto m64File = Ship::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->LoadFile(child->Attribute("Path"));
+
+    tinyxml2::XMLElement* banksRoot = child->FirstChildElement("Banks");
+    tinyxml2::XMLElement* banks = banksRoot->FirstChildElement();
+    while (banks != nullptr) {
+        auto path = banks->Attribute("Path");
+        seq->banks.push_back(GameEngine::GetBankIdByName(path));
+        banks = banks->NextSiblingElement();
+    }
+
+    // Copy m64 to sampleData
+    for(size_t i = 0; i < m64File->Buffer->size(); i++) {
+        seq->sampleData.push_back((uint8_t) m64File->Buffer->at(i));
+    }
+
+    seq->mData.id = child->IntAttribute("ID");
+    seq->mData.banks = seq->banks.data();
+    seq->mData.bankCount = seq->banks.size();
+    seq->mData.data = seq->sampleData.data();
+    return seq;
+}

src/port/importer/AudioSequenceFactory.cpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <ship/resource/Resource.h>
+#include <ship/resource/ResourceFactoryXML.h>
 #include <ship/resource/ResourceFactoryBinary.h>
 
 namespace SM64 {
@@ -9,4 +10,10 @@ class AudioSequenceFactoryV0 : public Ship::ResourceFactoryBinary {
     std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
                                                   std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
+
+class AudioSequenceXMLFactoryV0 : public Ship::ResourceFactoryXML {
+  public:
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
+};
 }