From 7f7a18a7086452ecd736555eae846959be4448bf Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 23 Aug 2019 19:24:04 -0400 Subject: [PATCH] DataSpec/DNACommon: Resolve indirect includes where applicable Avoids indirect inclusions where applicable and includes the necessary headers as used by the interface. This way, it prevents code from failing to compile due to changes in other header inclusions. --- DataSpec/DNACommon/ANCS.cpp | 9 +++++++-- DataSpec/DNACommon/ANCS.hpp | 20 ++++++++++++++++---- DataSpec/DNACommon/ANIM.cpp | 16 ++++++++++++++-- DataSpec/DNACommon/ANIM.hpp | 7 ++++++- DataSpec/DNACommon/ATBL.cpp | 17 ++++++++++++++++- DataSpec/DNACommon/ATBL.hpp | 9 +++++++-- DataSpec/DNACommon/BabeDead.cpp | 13 ++++++++++--- DataSpec/DNACommon/BabeDead.hpp | 7 ++++--- DataSpec/DNACommon/CMDL.cpp | 25 +++++++++++++++---------- DataSpec/DNACommon/CMDL.hpp | 23 ++++++++++++++++++----- DataSpec/DNACommon/CRSC.cpp | 8 +++++++- DataSpec/DNACommon/CRSC.hpp | 20 ++++++++++++++++---- DataSpec/DNACommon/DGRP.cpp | 11 +++++++---- DataSpec/DNACommon/DGRP.hpp | 6 ++++-- DataSpec/DNACommon/DPSC.cpp | 7 ++++++- DataSpec/DNACommon/DPSC.hpp | 19 ++++++++++++++++--- DataSpec/DNACommon/DeafBabe.cpp | 20 ++++++++++++++------ DataSpec/DNACommon/DeafBabe.hpp | 7 ++++++- DataSpec/DNACommon/EGMC.hpp | 2 +- DataSpec/DNACommon/ELSC.cpp | 4 +++- DataSpec/DNACommon/ELSC.hpp | 13 ++++++++++--- DataSpec/DNACommon/FONT.cpp | 6 +++++- DataSpec/DNACommon/FONT.hpp | 16 ++++++++++++++-- DataSpec/DNACommon/FSM2.cpp | 8 ++++++-- DataSpec/DNACommon/FSM2.hpp | 16 +++++++++++++--- DataSpec/DNACommon/GX.hpp | 5 ++++- DataSpec/DNACommon/MAPA.cpp | 23 +++++++++++++---------- DataSpec/DNACommon/MAPA.hpp | 15 +++++++++++++-- DataSpec/DNACommon/MAPU.cpp | 14 ++++++++------ DataSpec/DNACommon/MAPU.hpp | 13 ++++++++++++- DataSpec/DNACommon/MLVL.cpp | 13 ++++++++----- DataSpec/DNACommon/MLVL.hpp | 15 +++++++++++++-- DataSpec/DNACommon/OBBTreeBuilder.cpp | 16 +++++++++++----- DataSpec/DNACommon/OBBTreeBuilder.hpp | 4 +++- DataSpec/DNACommon/PAK.cpp | 9 +++++---- DataSpec/DNACommon/PAK.hpp | 14 +++++++++++--- DataSpec/DNACommon/PART.cpp | 4 +++- DataSpec/DNACommon/PART.hpp | 16 +++++++++++++--- DataSpec/DNACommon/ParticleCommon.hpp | 7 ++++++- DataSpec/DNACommon/RigInverter.cpp | 6 ++++-- DataSpec/DNACommon/RigInverter.hpp | 10 ++++++---- DataSpec/DNACommon/SAVWCommon.hpp | 5 +++-- DataSpec/DNACommon/STRG.cpp | 11 +++++++---- DataSpec/DNACommon/STRG.hpp | 15 +++++++++++---- DataSpec/DNACommon/SWHC.cpp | 6 +++++- DataSpec/DNACommon/SWHC.hpp | 15 ++++++++++++--- DataSpec/DNACommon/TXTR.cpp | 14 ++++++++++---- DataSpec/DNACommon/TXTR.hpp | 8 +++++++- DataSpec/DNACommon/WPSC.cpp | 6 +++++- DataSpec/DNACommon/WPSC.hpp | 13 ++++++++++--- DataSpec/DNAMP1/DeafBabe.hpp | 1 + 51 files changed, 445 insertions(+), 142 deletions(-) diff --git a/DataSpec/DNACommon/ANCS.cpp b/DataSpec/DNACommon/ANCS.cpp index 91cb73e0a..4ce0e8c36 100644 --- a/DataSpec/DNACommon/ANCS.cpp +++ b/DataSpec/DNACommon/ANCS.cpp @@ -1,11 +1,16 @@ -#include "ANCS.hpp" +#include "DataSpec/DNACommon/ANCS.hpp" + +#include "DataSpec/DNACommon/CMDL.hpp" +#include "DataSpec/DNACommon/DNACommon.hpp" +#include "DataSpec/DNACommon/RigInverter.hpp" #include "DataSpec/DNAMP1/DNAMP1.hpp" #include "DataSpec/DNAMP1/ANCS.hpp" #include "DataSpec/DNAMP2/DNAMP2.hpp" #include "DataSpec/DNAMP2/ANCS.hpp" #include "DataSpec/DNAMP3/DNAMP3.hpp" #include "DataSpec/DNAMP3/CHAR.hpp" -#include "hecl/Blender/Connection.hpp" + +#include namespace DataSpec::DNAANCS { diff --git a/DataSpec/DNACommon/ANCS.hpp b/DataSpec/DNACommon/ANCS.hpp index 8ad77a9cb..fa2eb9e77 100644 --- a/DataSpec/DNACommon/ANCS.hpp +++ b/DataSpec/DNACommon/ANCS.hpp @@ -1,9 +1,21 @@ #pragma once -#include -#include "DNACommon.hpp" -#include "CMDL.hpp" -#include "RigInverter.hpp" +#include +#include +#include +#include + +#include +#include +#include + +namespace DataSpec { +struct SpecBase; +} + +namespace hecl { +class ProjectPath; +} namespace DataSpec::DNAANCS { diff --git a/DataSpec/DNACommon/ANIM.cpp b/DataSpec/DNACommon/ANIM.cpp index 1da1e436c..895de4afe 100644 --- a/DataSpec/DNACommon/ANIM.cpp +++ b/DataSpec/DNACommon/ANIM.cpp @@ -1,8 +1,20 @@ -#include "zeus/Math.hpp" -#include "ANIM.hpp" +#include "DataSpec/DNACommon/ANIM.hpp" + +#include +#include +#include + +#include +#include +#include #define DUMP_KEYS 0 +#if DUMP_KEYS +#include +#include +#endif + namespace DataSpec::DNAANIM { size_t ComputeBitstreamSize(size_t keyFrameCount, const std::vector& channels) { diff --git a/DataSpec/DNACommon/ANIM.hpp b/DataSpec/DNACommon/ANIM.hpp index bbbbccda9..903fda326 100644 --- a/DataSpec/DNACommon/ANIM.hpp +++ b/DataSpec/DNACommon/ANIM.hpp @@ -1,7 +1,12 @@ #pragma once -#include "DNACommon.hpp" +#include #include +#include +#include +#include + +#include namespace DataSpec::DNAANIM { diff --git a/DataSpec/DNACommon/ATBL.cpp b/DataSpec/DNACommon/ATBL.cpp index e22c5f54f..702e2bc5a 100644 --- a/DataSpec/DNACommon/ATBL.cpp +++ b/DataSpec/DNACommon/ATBL.cpp @@ -1,4 +1,19 @@ -#include "ATBL.hpp" +#include "DataSpec/DNACommon/ATBL.hpp" + +#include +#include +#include +#include + +#include "DataSpec/DNACommon/DNACommon.hpp" +#include "DataSpec/DNACommon/PAK.hpp" + +#include +#include +#include +#include + +#include namespace DataSpec::DNAAudio { diff --git a/DataSpec/DNACommon/ATBL.hpp b/DataSpec/DNACommon/ATBL.hpp index 406e3869c..bcd5abef4 100644 --- a/DataSpec/DNACommon/ATBL.hpp +++ b/DataSpec/DNACommon/ATBL.hpp @@ -1,7 +1,12 @@ #pragma once -#include "DNACommon.hpp" -#include "PAK.hpp" +namespace DataSpec { +class PAKEntryReadStream; +} + +namespace hecl { +class ProjectPath; +} namespace DataSpec::DNAAudio { diff --git a/DataSpec/DNACommon/BabeDead.cpp b/DataSpec/DNACommon/BabeDead.cpp index 22a0531b0..2b4d8eed9 100644 --- a/DataSpec/DNACommon/BabeDead.cpp +++ b/DataSpec/DNACommon/BabeDead.cpp @@ -1,8 +1,15 @@ -#include "BabeDead.hpp" +#include "DataSpec/DNACommon/BabeDead.hpp" + #include "DataSpec/DNAMP1/MREA.hpp" #include "DataSpec/DNAMP3/MREA.hpp" -#include "zeus/CTransform.hpp" -#include "hecl/Blender/Connection.hpp" + +#include + +#include +#include +#include + +#include namespace DataSpec { diff --git a/DataSpec/DNACommon/BabeDead.hpp b/DataSpec/DNACommon/BabeDead.hpp index 7ef2662b0..348ea4fe9 100644 --- a/DataSpec/DNACommon/BabeDead.hpp +++ b/DataSpec/DNACommon/BabeDead.hpp @@ -1,8 +1,9 @@ #pragma once -#include "zeus/Math.hpp" -#include "hecl/hecl.hpp" -#include +namespace hecl::blender { +struct Light; +class PyOutStream; +} namespace DataSpec { diff --git a/DataSpec/DNACommon/CMDL.cpp b/DataSpec/DNACommon/CMDL.cpp index 7f4cb2ffa..3577c4b49 100644 --- a/DataSpec/DNACommon/CMDL.cpp +++ b/DataSpec/DNACommon/CMDL.cpp @@ -1,13 +1,18 @@ -#include "CMDL.hpp" -#include "../DNAMP1/CMDLMaterials.hpp" -#include "../DNAMP1/CSKR.hpp" -#include "../DNAMP1/MREA.hpp" -#include "../DNAMP2/CMDLMaterials.hpp" -#include "../DNAMP2/CSKR.hpp" -#include "../DNAMP3/CMDLMaterials.hpp" -#include "../DNAMP3/CSKR.hpp" -#include "zeus/CAABox.hpp" -#include "hecl/Blender/Connection.hpp" +#include "DataSpec/DNACommon/CMDL.hpp" + +#include + +#include "DataSpec/DNAMP1/CMDLMaterials.hpp" +#include "DataSpec/DNAMP1/CSKR.hpp" +#include "DataSpec/DNAMP1/MREA.hpp" +#include "DataSpec/DNAMP2/CMDLMaterials.hpp" +#include "DataSpec/DNAMP2/CSKR.hpp" +#include "DataSpec/DNAMP3/CMDLMaterials.hpp" +#include "DataSpec/DNAMP3/CSKR.hpp" + +#include +#include +#include namespace DataSpec::DNACMDL { diff --git a/DataSpec/DNACommon/CMDL.hpp b/DataSpec/DNACommon/CMDL.hpp index ddd520556..3b305e8be 100644 --- a/DataSpec/DNACommon/CMDL.hpp +++ b/DataSpec/DNACommon/CMDL.hpp @@ -1,10 +1,23 @@ #pragma once -#include "athena/FileWriter.hpp" -#include "PAK.hpp" -#include "GX.hpp" -#include "TXTR.hpp" -#include "zeus/CAABox.hpp" +#include +#include +#include + +#include "DataSpec/DNACommon/GX.hpp" +#include "DataSpec/DNACommon/TXTR.hpp" + +#include +#include +#include + +namespace hecl { +class ProjectPath; +} + +namespace zeus { +class CAABox; +} namespace DataSpec::DNACMDL { diff --git a/DataSpec/DNACommon/CRSC.cpp b/DataSpec/DNACommon/CRSC.cpp index 10a6220a4..0493018f9 100644 --- a/DataSpec/DNACommon/CRSC.cpp +++ b/DataSpec/DNACommon/CRSC.cpp @@ -1,4 +1,10 @@ -#include "CRSC.hpp" +#include "DataSpec/DNACommon/CRSC.hpp" + +#include + +#include "DataSpec/DNACommon/PAK.hpp" + +#include namespace DataSpec::DNAParticle { static const std::vector GeneratorTypes = { diff --git a/DataSpec/DNACommon/CRSC.hpp b/DataSpec/DNACommon/CRSC.hpp index 0f94ded2c..3bc7ff2f1 100644 --- a/DataSpec/DNACommon/CRSC.hpp +++ b/DataSpec/DNACommon/CRSC.hpp @@ -1,9 +1,21 @@ #pragma once -#include "ParticleCommon.hpp" -#include "PAK.hpp" -#include "athena/FileWriter.hpp" -#include +#include +#include +#include + +#include "DataSpec/DNACommon/DNACommon.hpp" +#include "DataSpec/DNACommon/ParticleCommon.hpp" + +#include + +namespace DataSpec { +class PAKEntryReadStream; +} + +namespace hecl { +class ProjectPath; +} namespace DataSpec::DNAParticle { template diff --git a/DataSpec/DNACommon/DGRP.cpp b/DataSpec/DNACommon/DGRP.cpp index 1d14de93c..d39427e1b 100644 --- a/DataSpec/DNACommon/DGRP.cpp +++ b/DataSpec/DNACommon/DGRP.cpp @@ -1,7 +1,10 @@ -#include "athena/IStreamReader.hpp" -#include "athena/IStreamWriter.hpp" -#include "athena/FileWriter.hpp" -#include "DGRP.hpp" +#include "DataSpec/DNACommon/DGRP.hpp" + +#include +#include +#include + +#include namespace DataSpec::DNADGRP { diff --git a/DataSpec/DNACommon/DGRP.hpp b/DataSpec/DNACommon/DGRP.hpp index 38cf8cb60..37850ee6f 100644 --- a/DataSpec/DNACommon/DGRP.hpp +++ b/DataSpec/DNACommon/DGRP.hpp @@ -1,7 +1,9 @@ #pragma once -#include "DNACommon.hpp" -#include "PAK.hpp" +#include + +#include "DataSpec/DNACommon/DNACommon.hpp" +#include "DataSpec/DNACommon/PAK.hpp" namespace DataSpec::DNADGRP { diff --git a/DataSpec/DNACommon/DPSC.cpp b/DataSpec/DNACommon/DPSC.cpp index 8960bf00b..3455743de 100644 --- a/DataSpec/DNACommon/DPSC.cpp +++ b/DataSpec/DNACommon/DPSC.cpp @@ -1,4 +1,9 @@ -#include "DPSC.hpp" +#include "DataSpec/DNACommon/DPSC.hpp" + +#include "DataSpec/DNACommon/PAK.hpp" + +#include +#include namespace DataSpec::DNAParticle { diff --git a/DataSpec/DNACommon/DPSC.hpp b/DataSpec/DNACommon/DPSC.hpp index 5306edf1f..f8feab5eb 100644 --- a/DataSpec/DNACommon/DPSC.hpp +++ b/DataSpec/DNACommon/DPSC.hpp @@ -1,8 +1,21 @@ #pragma once -#include "ParticleCommon.hpp" -#include "PAK.hpp" -#include "athena/FileWriter.hpp" +#include +#include +#include + +#include "DataSpec/DNACommon/DNACommon.hpp" +#include "DataSpec/DNACommon/ParticleCommon.hpp" + +#include + +namespace DataSpec { +class PAKEntryReadStream; +} + +namespace hecl { +class ProjectPath; +} namespace DataSpec::DNAParticle { diff --git a/DataSpec/DNACommon/DeafBabe.cpp b/DataSpec/DNACommon/DeafBabe.cpp index abcac6417..5f93be382 100644 --- a/DataSpec/DNACommon/DeafBabe.cpp +++ b/DataSpec/DNACommon/DeafBabe.cpp @@ -1,10 +1,18 @@ -#include "DeafBabe.hpp" -#include "AROTBuilder.hpp" -#include "DataSpec/DNAMP1/DeafBabe.hpp" -#include "DataSpec/DNAMP2/DeafBabe.hpp" -#include "DataSpec/DNAMP1/DCLN.hpp" -#include "hecl/Blender/Connection.hpp" +#include "DataSpec/DNACommon/DeafBabe.hpp" + #include +#include +#include +#include + +#include "DataSpec/DNACommon/AROTBuilder.hpp" +#include "DataSpec/DNAMP1/DeafBabe.hpp" +#include "DataSpec/DNAMP1/DCLN.hpp" +#include "DataSpec/DNAMP2/DeafBabe.hpp" + +#include +#include +#include namespace DataSpec { diff --git a/DataSpec/DNACommon/DeafBabe.hpp b/DataSpec/DNACommon/DeafBabe.hpp index 99f56f129..230df7a77 100644 --- a/DataSpec/DNACommon/DeafBabe.hpp +++ b/DataSpec/DNACommon/DeafBabe.hpp @@ -1,6 +1,11 @@ #pragma once -#include "DNACommon.hpp" +#include + +namespace hecl::blender { +class PyOutStream; +struct ColMesh; +} // namespace hecl::blender namespace DataSpec { diff --git a/DataSpec/DNACommon/EGMC.hpp b/DataSpec/DNACommon/EGMC.hpp index ce3c3e608..54f7b717b 100644 --- a/DataSpec/DNACommon/EGMC.hpp +++ b/DataSpec/DNACommon/EGMC.hpp @@ -1,6 +1,6 @@ #pragma once -#include "DNACommon.hpp" +#include "DataSpec/DNACommon/DNACommon.hpp" namespace DataSpec::DNACommon { struct EGMC : public BigDNA { diff --git a/DataSpec/DNACommon/ELSC.cpp b/DataSpec/DNACommon/ELSC.cpp index 3bb0e5e58..a4bd8aac9 100644 --- a/DataSpec/DNACommon/ELSC.cpp +++ b/DataSpec/DNACommon/ELSC.cpp @@ -1,4 +1,6 @@ -#include "ELSC.hpp" +#include "DataSpec/DNACommon/ELSC.hpp" + +#include namespace DataSpec::DNAParticle { diff --git a/DataSpec/DNACommon/ELSC.hpp b/DataSpec/DNACommon/ELSC.hpp index 0e441d50a..52ff09e35 100644 --- a/DataSpec/DNACommon/ELSC.hpp +++ b/DataSpec/DNACommon/ELSC.hpp @@ -1,8 +1,15 @@ #pragma once -#include "ParticleCommon.hpp" -#include "PAK.hpp" -#include "athena/FileWriter.hpp" +#include + +#include "DataSpec/DNACommon/ParticleCommon.hpp" +#include "DataSpec/DNACommon/PAK.hpp" + +#include + +namespace hecl { +class ProjectPath; +} namespace DataSpec::DNAParticle { template diff --git a/DataSpec/DNACommon/FONT.cpp b/DataSpec/DNACommon/FONT.cpp index 7e3ebeb42..74051d1b4 100644 --- a/DataSpec/DNACommon/FONT.cpp +++ b/DataSpec/DNACommon/FONT.cpp @@ -1,4 +1,8 @@ -#include "FONT.hpp" +#include "DataSpec/DNACommon/FONT.hpp" + +#include "DataSpec/DNACommon/PAK.hpp" + +#include namespace DataSpec::DNAFont { logvisor::Module LogModule("urde::DNAFont"); diff --git a/DataSpec/DNACommon/FONT.hpp b/DataSpec/DNACommon/FONT.hpp index 78664c8e9..0ebdef68d 100644 --- a/DataSpec/DNACommon/FONT.hpp +++ b/DataSpec/DNACommon/FONT.hpp @@ -1,7 +1,19 @@ #pragma once -#include "PAK.hpp" -#include "athena/FileWriter.hpp" +#include +#include + +#include "DataSpec/DNACommon/DNACommon.hpp" + +#include + +namespace DataSpec { +class PAKEntryReadStream; +} + +namespace hecl { +class ProjectPath; +} namespace DataSpec::DNAFont { struct GlyphRect : BigDNA { diff --git a/DataSpec/DNACommon/FSM2.cpp b/DataSpec/DNACommon/FSM2.cpp index 0c7f95a0e..23438e2b4 100644 --- a/DataSpec/DNACommon/FSM2.cpp +++ b/DataSpec/DNACommon/FSM2.cpp @@ -1,8 +1,12 @@ +#include "DataSpec/DNACommon/FSM2.hpp" + +#include "DataSpec/DNACommon/PAK.hpp" + +#include #include -#include #include -#include "FSM2.hpp" +#include namespace DataSpec::DNAFSM2 { logvisor::Module LogDNAFSM2("urde::DNAFSM2"); diff --git a/DataSpec/DNACommon/FSM2.hpp b/DataSpec/DNACommon/FSM2.hpp index e0de55f7e..163e22243 100644 --- a/DataSpec/DNACommon/FSM2.hpp +++ b/DataSpec/DNACommon/FSM2.hpp @@ -1,8 +1,18 @@ #pragma once -#include "PAK.hpp" -#include "DNACommon.hpp" -#include "athena/FileWriter.hpp" +#include + +#include "DataSpec/DNACommon/DNACommon.hpp" + +#include + +namespace DataSpec { +class PAKEntryReadStream; +} + +namespace hecl { +class ProjectPath; +} namespace DataSpec::DNAFSM2 { struct IFSM : BigDNAVYaml { diff --git a/DataSpec/DNACommon/GX.hpp b/DataSpec/DNACommon/GX.hpp index 9d2e5b813..e9e1a573a 100644 --- a/DataSpec/DNACommon/GX.hpp +++ b/DataSpec/DNACommon/GX.hpp @@ -1,5 +1,8 @@ #pragma once -#include "athena/DNA.hpp" + +#include + +#include namespace GX { enum AttrType { NONE, DIRECT, INDEX8, INDEX16 }; diff --git a/DataSpec/DNACommon/MAPA.cpp b/DataSpec/DNACommon/MAPA.cpp index bdc372680..c76cd8ca9 100644 --- a/DataSpec/DNACommon/MAPA.cpp +++ b/DataSpec/DNACommon/MAPA.cpp @@ -1,13 +1,16 @@ -#include "MAPA.hpp" -#include "../DNAMP1/DNAMP1.hpp" -#include "../DNAMP2/DNAMP2.hpp" -#include "../DNAMP3/DNAMP3.hpp" -#include "../DNAMP1/MAPA.hpp" -#include "../DNAMP2/MAPA.hpp" -#include "../DNAMP3/MAPA.hpp" -#include "zeus/CTransform.hpp" -#include "zeus/CAABox.hpp" -#include "hecl/Blender/Connection.hpp" +#include "DataSpec/DNACommon/MAPA.hpp" + +#include "DataSpec/DNACommon/GX.hpp" +#include "DataSpec/DNAMP1/DNAMP1.hpp" +#include "DataSpec/DNAMP2/DNAMP2.hpp" +#include "DataSpec/DNAMP3/DNAMP3.hpp" +#include "DataSpec/DNAMP1/MAPA.hpp" +#include "DataSpec/DNAMP2/MAPA.hpp" +#include "DataSpec/DNAMP3/MAPA.hpp" + +#include +#include +#include namespace DataSpec::DNAMAPA { diff --git a/DataSpec/DNACommon/MAPA.hpp b/DataSpec/DNACommon/MAPA.hpp index 5b8a2ad46..4d3a470f4 100644 --- a/DataSpec/DNACommon/MAPA.hpp +++ b/DataSpec/DNACommon/MAPA.hpp @@ -1,7 +1,18 @@ #pragma once -#include "DNACommon.hpp" -#include "GX.hpp" +#include +#include + +#include "DataSpec/DNACommon/DNACommon.hpp" + +namespace hecl { +class ProjectPath; +} + +namespace hecl::blender { +class Connection; +struct MapArea; +} // namespace hecl::blender namespace DataSpec::DNAMAPA { struct MAPA : BigDNA { diff --git a/DataSpec/DNACommon/MAPU.cpp b/DataSpec/DNACommon/MAPU.cpp index b7bf6844e..2187e109a 100644 --- a/DataSpec/DNACommon/MAPU.cpp +++ b/DataSpec/DNACommon/MAPU.cpp @@ -1,9 +1,11 @@ -#include "MAPU.hpp" -#include "../DNAMP1/DNAMP1.hpp" -#include "../DNAMP2/DNAMP2.hpp" -#include "../DNAMP3/DNAMP3.hpp" -#include "zeus/CTransform.hpp" -#include "hecl/Blender/Connection.hpp" +#include "DataSpec/DNACommon/MAPU.hpp" + +#include "DataSpec/DNAMP1/DNAMP1.hpp" +#include "DataSpec/DNAMP2/DNAMP2.hpp" +#include "DataSpec/DNAMP3/DNAMP3.hpp" + +#include +#include namespace DataSpec::DNAMAPU { diff --git a/DataSpec/DNACommon/MAPU.hpp b/DataSpec/DNACommon/MAPU.hpp index b101be7bc..88214f8e7 100644 --- a/DataSpec/DNACommon/MAPU.hpp +++ b/DataSpec/DNACommon/MAPU.hpp @@ -1,6 +1,17 @@ #pragma once -#include "DNACommon.hpp" +#include + +#include "DataSpec/DNACommon/DNACommon.hpp" + +namespace hecl { +class ProjectPath; +} + +namespace hecl::blender { +class Connection; +struct MapUniverse; +} // namespce hecl::blender namespace DataSpec::DNAMAPU { struct MAPU : BigDNA { diff --git a/DataSpec/DNACommon/MLVL.cpp b/DataSpec/DNACommon/MLVL.cpp index c7294419f..1db5939b1 100644 --- a/DataSpec/DNACommon/MLVL.cpp +++ b/DataSpec/DNACommon/MLVL.cpp @@ -1,8 +1,11 @@ -#include "MLVL.hpp" -#include "../DNAMP1/MLVL.hpp" -#include "../DNAMP2/MLVL.hpp" -#include "../DNAMP3/MLVL.hpp" -#include "hecl/Blender/Connection.hpp" +#include "DataSpec/DNACommon/MLVL.hpp" + +#include "DataSpec/DNAMP1/MLVL.hpp" +#include "DataSpec/DNAMP2/MLVL.hpp" +#include "DataSpec/DNAMP3/MLVL.hpp" + +#include +#include namespace DataSpec::DNAMLVL { diff --git a/DataSpec/DNACommon/MLVL.hpp b/DataSpec/DNACommon/MLVL.hpp index c2fa0271a..e598662c0 100644 --- a/DataSpec/DNACommon/MLVL.hpp +++ b/DataSpec/DNACommon/MLVL.hpp @@ -1,7 +1,18 @@ #pragma once -#include "DNACommon.hpp" -#include "zeus/CVector3f.hpp" +#include + +#include "DataSpec/DNACommon/DNACommon.hpp" + +#include + +namespace hecl { +class ProjectPath; +} + +namespace hecl::blender { +class Connection; +} namespace DataSpec::DNAMLVL { diff --git a/DataSpec/DNACommon/OBBTreeBuilder.cpp b/DataSpec/DNACommon/OBBTreeBuilder.cpp index bb26977ee..e778d4b5f 100644 --- a/DataSpec/DNACommon/OBBTreeBuilder.cpp +++ b/DataSpec/DNACommon/OBBTreeBuilder.cpp @@ -1,9 +1,15 @@ -#include "athena/Types.hpp" -#include "OBBTreeBuilder.hpp" -#include "zeus/CTransform.hpp" +#include "DataSpec/DNACommon/OBBTreeBuilder.hpp" + +#include +#include +#include + #include "DataSpec/DNAMP1/DCLN.hpp" -#include "gmm/gmm.h" -#include "hecl/Blender/Connection.hpp" + +#include +#include +#include +#include namespace DataSpec { diff --git a/DataSpec/DNACommon/OBBTreeBuilder.hpp b/DataSpec/DNACommon/OBBTreeBuilder.hpp index a8db2f2d7..45085966f 100644 --- a/DataSpec/DNACommon/OBBTreeBuilder.hpp +++ b/DataSpec/DNACommon/OBBTreeBuilder.hpp @@ -1,6 +1,8 @@ #pragma once -#include "DNACommon.hpp" +#include + +#include namespace DataSpec { diff --git a/DataSpec/DNACommon/PAK.cpp b/DataSpec/DNACommon/PAK.cpp index d3bd03b36..b9a0c0306 100644 --- a/DataSpec/DNACommon/PAK.cpp +++ b/DataSpec/DNACommon/PAK.cpp @@ -1,7 +1,8 @@ -#include "PAK.hpp" -#include "../DNAMP1/DNAMP1.hpp" -#include "../DNAMP2/DNAMP2.hpp" -#include "../DNAMP3/DNAMP3.hpp" +#include "DataSpec/DNACommon/PAK.hpp" + +#include "DataSpec/DNAMP1/DNAMP1.hpp" +#include "DataSpec/DNAMP2/DNAMP2.hpp" +#include "DataSpec/DNAMP3/DNAMP3.hpp" namespace DataSpec { diff --git a/DataSpec/DNACommon/PAK.hpp b/DataSpec/DNACommon/PAK.hpp index 2b27f1b98..39d1a6c5e 100644 --- a/DataSpec/DNACommon/PAK.hpp +++ b/DataSpec/DNACommon/PAK.hpp @@ -1,9 +1,17 @@ #pragma once -#include "DNACommon.hpp" -#include "boo/ThreadLocalPtr.hpp" #include -#include "zeus/CMatrix4f.hpp" +#include +#include +#include +#include +#include + +#include "DataSpec/DNACommon/DNACommon.hpp" + +#include +#include +#include namespace DataSpec { diff --git a/DataSpec/DNACommon/PART.cpp b/DataSpec/DNACommon/PART.cpp index 43db33527..4f9cfd260 100644 --- a/DataSpec/DNACommon/PART.cpp +++ b/DataSpec/DNACommon/PART.cpp @@ -1,4 +1,6 @@ -#include "PART.hpp" +#include "DataSpec/DNACommon/PART.hpp" + +#include "DataSpec/DNACommon/PAK.hpp" namespace DataSpec::DNAParticle { diff --git a/DataSpec/DNACommon/PART.hpp b/DataSpec/DNACommon/PART.hpp index 9f2c445cc..0475dc217 100644 --- a/DataSpec/DNACommon/PART.hpp +++ b/DataSpec/DNACommon/PART.hpp @@ -1,8 +1,18 @@ #pragma once -#include "ParticleCommon.hpp" -#include "PAK.hpp" -#include "athena/FileWriter.hpp" +#include +#include + +#include "DataSpec/DNACommon/DNACommon.hpp" +#include "DataSpec/DNACommon/ParticleCommon.hpp" + +namespace DataSpec { +class PAKEntryReadStream; +} + +namespace hecl { +class ProjectPath; +} namespace DataSpec::DNAParticle { diff --git a/DataSpec/DNACommon/ParticleCommon.hpp b/DataSpec/DNACommon/ParticleCommon.hpp index 1f5f07f90..f08e9776c 100644 --- a/DataSpec/DNACommon/ParticleCommon.hpp +++ b/DataSpec/DNACommon/ParticleCommon.hpp @@ -1,6 +1,11 @@ #pragma once -#include "DNACommon.hpp" +#include +#include + +#include "DataSpec/DNACommon/DNACommon.hpp" + +#include namespace DataSpec::DNAParticle { extern logvisor::Module LogModule; diff --git a/DataSpec/DNACommon/RigInverter.cpp b/DataSpec/DNACommon/RigInverter.cpp index a5e0c7639..b8642ac9d 100644 --- a/DataSpec/DNACommon/RigInverter.cpp +++ b/DataSpec/DNACommon/RigInverter.cpp @@ -1,8 +1,10 @@ -#include "RigInverter.hpp" +#include "DataSpec/DNACommon/RigInverter.hpp" + #include "DataSpec/DNAMP1/CINF.hpp" #include "DataSpec/DNAMP2/CINF.hpp" #include "DataSpec/DNAMP3/CINF.hpp" -#include "hecl/Blender/Connection.hpp" + +#include namespace DataSpec::DNAANIM { diff --git a/DataSpec/DNACommon/RigInverter.hpp b/DataSpec/DNACommon/RigInverter.hpp index 237d68ab7..11e644ad3 100644 --- a/DataSpec/DNACommon/RigInverter.hpp +++ b/DataSpec/DNACommon/RigInverter.hpp @@ -1,10 +1,12 @@ #pragma once -#include "zeus/CVector3f.hpp" -#include "zeus/CMatrix3f.hpp" -#include "zeus/CQuaternion.hpp" -#include "hecl/hecl.hpp" +#include #include +#include + +#include +#include +#include namespace DataSpec::DNAANIM { diff --git a/DataSpec/DNACommon/SAVWCommon.hpp b/DataSpec/DNACommon/SAVWCommon.hpp index f51563f28..5258c2ffd 100644 --- a/DataSpec/DNACommon/SAVWCommon.hpp +++ b/DataSpec/DNACommon/SAVWCommon.hpp @@ -1,6 +1,7 @@ #pragma once -#include "DNACommon.hpp" -#include "PAK.hpp" + +#include "DataSpec/DNACommon/DNACommon.hpp" +#include "DataSpec/DNACommon/PAK.hpp" namespace DataSpec::SAVWCommon { enum class EScanCategory { None, Data, Lore, Creature, Research, Artifact }; diff --git a/DataSpec/DNACommon/STRG.cpp b/DataSpec/DNACommon/STRG.cpp index da014cb14..d49339bee 100644 --- a/DataSpec/DNACommon/STRG.cpp +++ b/DataSpec/DNACommon/STRG.cpp @@ -1,7 +1,10 @@ -#include "STRG.hpp" -#include "../DNAMP1/STRG.hpp" -#include "../DNAMP2/STRG.hpp" -#include "../DNAMP3/STRG.hpp" +#include "DataSpec/DNACommon/STRG.hpp" + +#include "DataSpec/DNAMP1/STRG.hpp" +#include "DataSpec/DNAMP2/STRG.hpp" +#include "DataSpec/DNAMP3/STRG.hpp" + +#include namespace DataSpec { diff --git a/DataSpec/DNACommon/STRG.hpp b/DataSpec/DNACommon/STRG.hpp index 8f32d3055..179e28979 100644 --- a/DataSpec/DNACommon/STRG.hpp +++ b/DataSpec/DNACommon/STRG.hpp @@ -1,11 +1,18 @@ #pragma once +#include +#include +#include #include -#include +#include + +#include "DataSpec/DNACommon/DNACommon.hpp" + #include -#include -#include -#include "DNACommon.hpp" + +namespace athena::io { +class IStreamReader; +} namespace DataSpec { struct ISTRG : BigDNAVYaml { diff --git a/DataSpec/DNACommon/SWHC.cpp b/DataSpec/DNACommon/SWHC.cpp index 0143b6c83..6460a6ded 100644 --- a/DataSpec/DNACommon/SWHC.cpp +++ b/DataSpec/DNACommon/SWHC.cpp @@ -1,4 +1,8 @@ -#include "SWHC.hpp" +#include "DataSpec/DNACommon/SWHC.hpp" + +#include "DataSpec/DNACommon/PAK.hpp" + +#include namespace DataSpec::DNAParticle { diff --git a/DataSpec/DNACommon/SWHC.hpp b/DataSpec/DNACommon/SWHC.hpp index c88b7387e..3c81344c0 100644 --- a/DataSpec/DNACommon/SWHC.hpp +++ b/DataSpec/DNACommon/SWHC.hpp @@ -1,8 +1,17 @@ #pragma once -#include "ParticleCommon.hpp" -#include "PAK.hpp" -#include "athena/FileWriter.hpp" +#include + +#include "DataSpec/DNACommon/DNACommon.hpp" +#include "DataSpec/DNACommon/ParticleCommon.hpp" + +namespace DataSpec { +class PAKEntryReadStream; +} + +namespace hecl { +class ProjectPath; +} namespace DataSpec::DNAParticle { diff --git a/DataSpec/DNACommon/TXTR.cpp b/DataSpec/DNACommon/TXTR.cpp index 4947b2ff4..ef0e59962 100644 --- a/DataSpec/DNACommon/TXTR.cpp +++ b/DataSpec/DNACommon/TXTR.cpp @@ -1,9 +1,15 @@ +#include "DataSpec/DNACommon/TXTR.hpp" + +#include +#include + +#include "DataSpec/DNACommon/PAK.hpp" + +#include +#include +#include #include #include -#include "TXTR.hpp" -#include "PAK.hpp" -#include "athena/FileWriter.hpp" -#include "hecl/hecl.hpp" namespace DataSpec { diff --git a/DataSpec/DNACommon/TXTR.hpp b/DataSpec/DNACommon/TXTR.hpp index 664fc9fd1..8a69e6efb 100644 --- a/DataSpec/DNACommon/TXTR.hpp +++ b/DataSpec/DNACommon/TXTR.hpp @@ -1,6 +1,12 @@ #pragma once -#include "DNACommon.hpp" +#include + +#include "DataSpec/DNACommon/DNACommon.hpp" + +namespace hecl { +class ProjectPath; +} namespace DataSpec { class PAKEntryReadStream; diff --git a/DataSpec/DNACommon/WPSC.cpp b/DataSpec/DNACommon/WPSC.cpp index e0b245649..02a0b4bfe 100644 --- a/DataSpec/DNACommon/WPSC.cpp +++ b/DataSpec/DNACommon/WPSC.cpp @@ -1,4 +1,8 @@ -#include "WPSC.hpp" +#include "DataSpec/DNACommon/WPSC.hpp" + +#include "DataSpec/DNACommon/PAK.hpp" + +#include namespace DataSpec::DNAParticle { diff --git a/DataSpec/DNACommon/WPSC.hpp b/DataSpec/DNACommon/WPSC.hpp index 81071ef98..3df67b7bd 100644 --- a/DataSpec/DNACommon/WPSC.hpp +++ b/DataSpec/DNACommon/WPSC.hpp @@ -1,8 +1,15 @@ #pragma once -#include "ParticleCommon.hpp" -#include "PAK.hpp" -#include "athena/FileWriter.hpp" +#include "DataSpec/DNACommon/DNACommon.hpp" +#include "DataSpec/DNACommon/ParticleCommon.hpp" + +namespace DataSpec { +class PAKEntryReadStream; +} + +namespace hecl { +class ProjectPath; +} namespace DataSpec::DNAParticle { template diff --git a/DataSpec/DNAMP1/DeafBabe.hpp b/DataSpec/DNAMP1/DeafBabe.hpp index cd7a3f77b..f573d4625 100644 --- a/DataSpec/DNAMP1/DeafBabe.hpp +++ b/DataSpec/DNAMP1/DeafBabe.hpp @@ -1,6 +1,7 @@ #pragma once #include "DataSpec/DNACommon/DeafBabe.hpp" +#include "DataSpec/DNACommon/DNACommon.hpp" namespace DataSpec::DNAMP1 {