Code cleanup and moved current audio system to legacy

37 files changed, 39 insertions, 39 deletions

diff --git a/TemplateFactory.h b/TemplateFactory.h
index 16bcf00..81b091e 100644
--- a/TemplateFactory.h
+++ b/TemplateFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 
 // namespace GAME {
 
diff --git a/src/Companion.cpp b/src/Companion.cpp
index a896eb3..8059e8c 100644
--- a/src/Companion.cpp
+++ b/src/Companion.cpp
@@ -11,10 +11,6 @@
 #include <iostream>
 #include <filesystem>
 
-#include "factories/BankFactory.h"
-#include "factories/AudioHeaderFactory.h"
-#include "factories/SampleFactory.h"
-#include "factories/SequenceFactory.h"
 #include "factories/GenericArrayFactory.h"
 #include "factories/VtxFactory.h"
 #include "factories/MtxFactory.h"
@@ -30,6 +26,10 @@
 #include "factories/AssetArrayFactory.h"
 #include "factories/ViewportFactory.h"
 
+#include "factories/sm64/audio/BankFactory.h"
+#include "factories/sm64/audio/AudioHeaderFactory.h"
+#include "factories/sm64/audio/SampleFactory.h"
+#include "factories/sm64/audio/SequenceFactory.h"
 #include "factories/sm64/AnimationFactory.h"
 #include "factories/sm64/BehaviorScriptFactory.h"
 #include "factories/sm64/CollisionFactory.h"
@@ -88,10 +88,6 @@ void Companion::Init(const ExportType type) {
     this->RegisterFactory("INC", std::make_shared<IncludeFactory>());
     this->RegisterFactory("LIGHTS", std::make_shared<LightsFactory>());
     this->RegisterFactory("GFX", std::make_shared<DListFactory>());
-    this->RegisterFactory("AUDIO:HEADER", std::make_shared<AudioHeaderFactory>());
-    this->RegisterFactory("SEQUENCE", std::make_shared<SequenceFactory>());
-    this->RegisterFactory("SAMPLE", std::make_shared<SampleFactory>());
-    this->RegisterFactory("BANK", std::make_shared<BankFactory>());
     this->RegisterFactory("VEC3F", std::make_shared<Vec3fFactory>());
     this->RegisterFactory("VEC3S", std::make_shared<Vec3sFactory>());
     this->RegisterFactory("ARRAY", std::make_shared<GenericArrayFactory>());
@@ -99,6 +95,10 @@ void Companion::Init(const ExportType type) {
     this->RegisterFactory("VP", std::make_shared<ViewportFactory>());
 
     // SM64 specific
+    this->RegisterFactory("SM64:AUDIO_HEADER", std::make_shared<AudioHeaderFactory>());
+    this->RegisterFactory("SM64:SEQUENCE", std::make_shared<SequenceFactory>());
+    this->RegisterFactory("SM64:SAMPLE", std::make_shared<SampleFactory>());
+    this->RegisterFactory("SM64:BANK", std::make_shared<BankFactory>());
     this->RegisterFactory("SM64:DIALOG", std::make_shared<SM64::DialogFactory>());
     this->RegisterFactory("SM64:TEXT", std::make_shared<SM64::TextFactory>());
     this->RegisterFactory("SM64:DICTIONARY", std::make_shared<SM64::DictionaryFactory>());
diff --git a/src/factories/mk64/CourseMetadata.h b/src/factories/mk64/CourseMetadata.h
index 1c4bbb8..6394210 100644
--- a/src/factories/mk64/CourseMetadata.h
+++ b/src/factories/mk64/CourseMetadata.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 
 namespace MK64 {
 
diff --git a/src/factories/mk64/CourseVtx.h b/src/factories/mk64/CourseVtx.h
index ffe876b..e348141 100644
--- a/src/factories/mk64/CourseVtx.h
+++ b/src/factories/mk64/CourseVtx.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 
 namespace MK64 {
 
diff --git a/src/factories/mk64/DrivingBehaviour.h b/src/factories/mk64/DrivingBehaviour.h
index c4fd46e..57d84b0 100644
--- a/src/factories/mk64/DrivingBehaviour.h
+++ b/src/factories/mk64/DrivingBehaviour.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 
 namespace MK64 {
 
diff --git a/src/factories/mk64/ItemCurve.h b/src/factories/mk64/ItemCurve.h
index c58e825..1077b57 100644
--- a/src/factories/mk64/ItemCurve.h
+++ b/src/factories/mk64/ItemCurve.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 
 namespace MK64 {
 
diff --git a/src/factories/mk64/SpawnData.h b/src/factories/mk64/SpawnData.h
index 168208d..ce43b73 100644
--- a/src/factories/mk64/SpawnData.h
+++ b/src/factories/mk64/SpawnData.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 
 namespace MK64 {
 
diff --git a/src/factories/mk64/TrackSections.h b/src/factories/mk64/TrackSections.h
index 839661c..fe0f369 100644
--- a/src/factories/mk64/TrackSections.h
+++ b/src/factories/mk64/TrackSections.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 
 namespace MK64 {
 
diff --git a/src/factories/mk64/UnkSpawnData.h b/src/factories/mk64/UnkSpawnData.h
index 0467c31..9bd4765 100644
--- a/src/factories/mk64/UnkSpawnData.h
+++ b/src/factories/mk64/UnkSpawnData.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 
 namespace MK64 {
 
diff --git a/src/factories/mk64/Waypoints.h b/src/factories/mk64/Waypoints.h
index 6e70803..28ec98c 100644
--- a/src/factories/mk64/Waypoints.h
+++ b/src/factories/mk64/Waypoints.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 
 namespace MK64 {
 
diff --git a/src/factories/sf64/AnimFactory.h b/src/factories/sf64/AnimFactory.h
index cef770d..f3fec76 100644
--- a/src/factories/sf64/AnimFactory.h
+++ b/src/factories/sf64/AnimFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 
 namespace SF64 {
 
diff --git a/src/factories/sf64/ColPolyFactory.h b/src/factories/sf64/ColPolyFactory.h
index 4b3dd64..c245d48 100644
--- a/src/factories/sf64/ColPolyFactory.h
+++ b/src/factories/sf64/ColPolyFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 #include "types/Vec3D.h"
 
 namespace SF64 {
diff --git a/src/factories/sf64/EnvironmentFactory.h b/src/factories/sf64/EnvironmentFactory.h
index a184113..873c7a0 100644
--- a/src/factories/sf64/EnvironmentFactory.h
+++ b/src/factories/sf64/EnvironmentFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 #include "types/Vec3D.h"
 
 namespace SF64 {
diff --git a/src/factories/sf64/HitboxFactory.h b/src/factories/sf64/HitboxFactory.h
index 69d20bf..f269d72 100644
--- a/src/factories/sf64/HitboxFactory.h
+++ b/src/factories/sf64/HitboxFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 
 namespace SF64 {
 
diff --git a/src/factories/sf64/MessageFactory.h b/src/factories/sf64/MessageFactory.h
index c000c36..8cf78fb 100644
--- a/src/factories/sf64/MessageFactory.h
+++ b/src/factories/sf64/MessageFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 
 namespace SF64 {
 
diff --git a/src/factories/sf64/MessageLookupFactory.h b/src/factories/sf64/MessageLookupFactory.h
index f647121..5a1f503 100644
--- a/src/factories/sf64/MessageLookupFactory.h
+++ b/src/factories/sf64/MessageLookupFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 
 namespace SF64 {
 
diff --git a/src/factories/sf64/ObjInitFactory.h b/src/factories/sf64/ObjInitFactory.h
index 55b0171..cb985c8 100644
--- a/src/factories/sf64/ObjInitFactory.h
+++ b/src/factories/sf64/ObjInitFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 #include "types/Vec3D.h"
 
 namespace SF64 {
diff --git a/src/factories/sf64/ScriptFactory.h b/src/factories/sf64/ScriptFactory.h
index aa3e22d..759bc6f 100644
--- a/src/factories/sf64/ScriptFactory.h
+++ b/src/factories/sf64/ScriptFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 
 namespace SF64 {
 
diff --git a/src/factories/sf64/SkeletonFactory.h b/src/factories/sf64/SkeletonFactory.h
index c35e04b..8206766 100644
--- a/src/factories/sf64/SkeletonFactory.h
+++ b/src/factories/sf64/SkeletonFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 #include "types/Vec3D.h"
 
 namespace SF64 {
diff --git a/src/factories/sm64/AnimationFactory.h b/src/factories/sm64/AnimationFactory.h
index e5a86dd..9819e5f 100644
--- a/src/factories/sm64/AnimationFactory.h
+++ b/src/factories/sm64/AnimationFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 
 namespace SM64 {
 class AnimationData : public IParsedData {
diff --git a/src/factories/sm64/CollisionFactory.h b/src/factories/sm64/CollisionFactory.h
index dcf7aba..28272ee 100644
--- a/src/factories/sm64/CollisionFactory.h
+++ b/src/factories/sm64/CollisionFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 #include "collision/SpecialPresetNames.h"
 #include "collision/SurfaceTerrains.h"
 
diff --git a/src/factories/sm64/DialogFactory.h b/src/factories/sm64/DialogFactory.h
index ba6579d..2ff9e29 100644
--- a/src/factories/sm64/DialogFactory.h
+++ b/src/factories/sm64/DialogFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 
 namespace SM64 {
 class DialogData : public IParsedData {
diff --git a/src/factories/sm64/DictionaryFactory.h b/src/factories/sm64/DictionaryFactory.h
index a3cd8d2..c4051ad 100644
--- a/src/factories/sm64/DictionaryFactory.h
+++ b/src/factories/sm64/DictionaryFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 
 namespace SM64 {
 
diff --git a/src/factories/sm64/GeoLayoutFactory.h b/src/factories/sm64/GeoLayoutFactory.h
index 7f41a95..8792990 100644
--- a/src/factories/sm64/GeoLayoutFactory.h
+++ b/src/factories/sm64/GeoLayoutFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 #include "geo/GeoCommand.h"
 #include <vector>
 #include <variant>
diff --git a/src/factories/sm64/TextFactory.h b/src/factories/sm64/TextFactory.h
index e7840ac..df05a0d 100644
--- a/src/factories/sm64/TextFactory.h
+++ b/src/factories/sm64/TextFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../BaseFactory.h"
+#include <factories/BaseFactory.h>
 #include "../../types/RawBuffer.h"
 
 namespace SM64 {
diff --git a/src/audio/AIFCDecode.cpp b/src/factories/sm64/audio/AIFCDecode.cpp
index e627ad0..e627ad0 100644
--- a/src/audio/AIFCDecode.cpp
+++ b/src/factories/sm64/audio/AIFCDecode.cpp
diff --git a/src/audio/AIFCDecode.h b/src/factories/sm64/audio/AIFCDecode.h
index e141a80..e141a80 100644
--- a/src/audio/AIFCDecode.h
+++ b/src/factories/sm64/audio/AIFCDecode.h
diff --git a/src/factories/AudioHeaderFactory.cpp b/src/factories/sm64/audio/AudioHeaderFactory.cpp
index 1644a35..dc4d547 100644
--- a/src/factories/AudioHeaderFactory.cpp
+++ b/src/factories/sm64/audio/AudioHeaderFactory.cpp
@@ -1,7 +1,7 @@
 #include "AudioHeaderFactory.h"
 
 #include <vector>
-#include "audio/AudioManager.h"
+#include "AudioManager.h"
 
 std::optional<std::shared_ptr<IParsedData>> AudioHeaderFactory::parse(std::vector<uint8_t>& buffer, YAML::Node& data) {
     AudioManager::Instance->initialize(buffer, data);
diff --git a/src/factories/AudioHeaderFactory.h b/src/factories/sm64/audio/AudioHeaderFactory.h
index ce61413..1c5c0b1 100644
--- a/src/factories/AudioHeaderFactory.h
+++ b/src/factories/sm64/audio/AudioHeaderFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "BaseFactory.h"
+#include <factories/BaseFactory.h>
 
 class AudioDummyExporter : public BaseExporter {
 public:
diff --git a/src/audio/AudioManager.cpp b/src/factories/sm64/audio/AudioManager.cpp
index c168a39..c168a39 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/factories/sm64/audio/AudioManager.cpp
diff --git a/src/audio/AudioManager.h b/src/factories/sm64/audio/AudioManager.h
index b5a9dcc..b5a9dcc 100644
--- a/src/audio/AudioManager.h
+++ b/src/factories/sm64/audio/AudioManager.h
diff --git a/src/factories/BankFactory.cpp b/src/factories/sm64/audio/BankFactory.cpp
index 6e72c53..6e72c53 100644
--- a/src/factories/BankFactory.cpp
+++ b/src/factories/sm64/audio/BankFactory.cpp
diff --git a/src/factories/BankFactory.h b/src/factories/sm64/audio/BankFactory.h
index cb69955..9f4b260 100644
--- a/src/factories/BankFactory.h
+++ b/src/factories/sm64/audio/BankFactory.h
@@ -2,8 +2,8 @@
 
 #include <utility>
 
-#include "BaseFactory.h"
-#include "audio/AudioManager.h"
+#include <factories/BaseFactory.h>
+#include "AudioManager.h"
 
 class BankData : public IParsedData {
 public:
diff --git a/src/factories/SampleFactory.cpp b/src/factories/sm64/audio/SampleFactory.cpp
index b8bc7fa..b8bc7fa 100644
--- a/src/factories/SampleFactory.cpp
+++ b/src/factories/sm64/audio/SampleFactory.cpp
diff --git a/src/factories/SampleFactory.h b/src/factories/sm64/audio/SampleFactory.h
index 7e647fd..ae940e2 100644
--- a/src/factories/SampleFactory.h
+++ b/src/factories/sm64/audio/SampleFactory.h
@@ -2,8 +2,8 @@
 
 #include <utility>
 
-#include "BaseFactory.h"
-#include "audio/AudioManager.h"
+#include <factories/BaseFactory.h>
+#include "AudioManager.h"
 
 class SampleData : public IParsedData {
 public:
diff --git a/src/factories/SequenceFactory.cpp b/src/factories/sm64/audio/SequenceFactory.cpp
index 1090bac..1090bac 100644
--- a/src/factories/SequenceFactory.cpp
+++ b/src/factories/sm64/audio/SequenceFactory.cpp
diff --git a/src/factories/SequenceFactory.h b/src/factories/sm64/audio/SequenceFactory.h
index 7eb4192..b26242c 100644
--- a/src/factories/SequenceFactory.h
+++ b/src/factories/sm64/audio/SequenceFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "BaseFactory.h"
+#include <factories/BaseFactory.h>
 
 class SequenceData : public IParsedData {
 public: