AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-05-14 01:51:22 +00:00
Code Issues Projects Releases Wiki Activity

DataSpec/DNACommon: Resolve indirect includes where applicable

Browse Source 
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.
This commit is contained in:
Lioncash 2019-08-23 19:24:04 -04:00
parent 52667b2069
commit 7f7a18a708
51 changed files with 445 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DataSpec/DNACommon/ANCS.cpp
View File

@ -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/DNAMP1.hpp"
#include "DataSpec/DNAMP1/ANCS.hpp" #include "DataSpec/DNAMP1/ANCS.hpp"
#include "DataSpec/DNAMP2/DNAMP2.hpp" #include "DataSpec/DNAMP2/DNAMP2.hpp"
#include "DataSpec/DNAMP2/ANCS.hpp" #include "DataSpec/DNAMP2/ANCS.hpp"
#include "DataSpec/DNAMP3/DNAMP3.hpp" #include "DataSpec/DNAMP3/DNAMP3.hpp"
#include "DataSpec/DNAMP3/CHAR.hpp" #include "DataSpec/DNAMP3/CHAR.hpp"
#include "hecl/Blender/Connection.hpp"
#include <hecl/Blender/Connection.hpp>
namespace DataSpec::DNAANCS { namespace DataSpec::DNAANCS {

20
DataSpec/DNACommon/ANCS.hpp
View File

@ -1,9 +1,21 @@
#pragma once #pragma once
#include <unordered_set> #include <functional>
#include "DNACommon.hpp" #include <string>
#include "CMDL.hpp" #include <utility>
#include "RigInverter.hpp" #include <vector>
#include <athena/Types.hpp>
#include <hecl/Blender/Connection.hpp>
#include <hecl/SystemChar.hpp>
namespace DataSpec {
struct SpecBase;
}
namespace hecl {
class ProjectPath;
}
namespace DataSpec::DNAANCS { namespace DataSpec::DNAANCS {

16
DataSpec/DNACommon/ANIM.cpp
View File

@ -1,8 +1,20 @@
#include "zeus/Math.hpp" #include "DataSpec/DNACommon/ANIM.hpp"
#include "ANIM.hpp"
#include <cfloat>
#include <cmath>
#include <cstring>
#include <hecl/hecl.hpp>
#include <zeus/Global.hpp>
#include <zeus/Math.hpp>
#define DUMP_KEYS 0 #define DUMP_KEYS 0
#if DUMP_KEYS
#include <cstdio>
#include <fmt/format.h>
#endif
namespace DataSpec::DNAANIM { namespace DataSpec::DNAANIM {
size_t ComputeBitstreamSize(size_t keyFrameCount, const std::vector<Channel>& channels) { size_t ComputeBitstreamSize(size_t keyFrameCount, const std::vector<Channel>& channels) {

7
DataSpec/DNACommon/ANIM.hpp
View File

@ -1,7 +1,12 @@
#pragma once #pragma once
#include "DNACommon.hpp" #include <cassert>
#include <cmath> #include <cmath>
#include <cstddef>
#include <memory>
#include <vector>
#include <athena/Types.hpp>
namespace DataSpec::DNAANIM { namespace DataSpec::DNAANIM {

17
DataSpec/DNACommon/ATBL.cpp
View File

@ -1,4 +1,19 @@
#include "ATBL.hpp" #include "DataSpec/DNACommon/ATBL.hpp"
#include <algorithm>
#include <cstdint>
#include <cstdlib>
#include <vector>
#include "DataSpec/DNACommon/DNACommon.hpp"
#include "DataSpec/DNACommon/PAK.hpp"
#include <athena/FileReader.hpp>
#include <athena/FileWriter.hpp>
#include <athena/YAMLDocReader.hpp>
#include <athena/YAMLDocWriter.hpp>
#include <fmt/format.h>
namespace DataSpec::DNAAudio { namespace DataSpec::DNAAudio {

9
DataSpec/DNACommon/ATBL.hpp
View File

@ -1,7 +1,12 @@
#pragma once #pragma once
#include "DNACommon.hpp" namespace DataSpec {
#include "PAK.hpp" class PAKEntryReadStream;
}
namespace hecl {
class ProjectPath;
}
namespace DataSpec::DNAAudio { namespace DataSpec::DNAAudio {

13
DataSpec/DNACommon/BabeDead.cpp
View File

@ -1,8 +1,15 @@
#include "BabeDead.hpp" #include "DataSpec/DNACommon/BabeDead.hpp"
#include "DataSpec/DNAMP1/MREA.hpp" #include "DataSpec/DNAMP1/MREA.hpp"
#include "DataSpec/DNAMP3/MREA.hpp" #include "DataSpec/DNAMP3/MREA.hpp"
#include "zeus/CTransform.hpp"
#include "hecl/Blender/Connection.hpp" #include <cfloat>
#include <hecl/Blender/Connection.hpp>
#include <zeus/CTransform.hpp>
#include <zeus/Math.hpp>
#include <fmt/format.h>
namespace DataSpec { namespace DataSpec {

7
DataSpec/DNACommon/BabeDead.hpp
View File

@ -1,8 +1,9 @@
#pragma once #pragma once
#include "zeus/Math.hpp" namespace hecl::blender {
#include "hecl/hecl.hpp" struct Light;
#include <cfloat> class PyOutStream;
}
namespace DataSpec { namespace DataSpec {

25
DataSpec/DNACommon/CMDL.cpp
View File

@ -1,13 +1,18 @@
#include "CMDL.hpp" #include "DataSpec/DNACommon/CMDL.hpp"
#include "../DNAMP1/CMDLMaterials.hpp"
#include "../DNAMP1/CSKR.hpp" #include <utility>
#include "../DNAMP1/MREA.hpp"
#include "../DNAMP2/CMDLMaterials.hpp" #include "DataSpec/DNAMP1/CMDLMaterials.hpp"
#include "../DNAMP2/CSKR.hpp" #include "DataSpec/DNAMP1/CSKR.hpp"
#include "../DNAMP3/CMDLMaterials.hpp" #include "DataSpec/DNAMP1/MREA.hpp"
#include "../DNAMP3/CSKR.hpp" #include "DataSpec/DNAMP2/CMDLMaterials.hpp"
#include "zeus/CAABox.hpp" #include "DataSpec/DNAMP2/CSKR.hpp"
#include "hecl/Blender/Connection.hpp" #include "DataSpec/DNAMP3/CMDLMaterials.hpp"
#include "DataSpec/DNAMP3/CSKR.hpp"
#include <fmt/format.h>
#include <hecl/Blender/Connection.hpp>
#include <zeus/CAABox.hpp>
namespace DataSpec::DNACMDL { namespace DataSpec::DNACMDL {

23
DataSpec/DNACommon/CMDL.hpp
View File

@ -1,10 +1,23 @@
#pragma once #pragma once
#include "athena/FileWriter.hpp" #include <cstddef>
#include "PAK.hpp" #include <cstdint>
#include "GX.hpp" #include <vector>
#include "TXTR.hpp"
#include "zeus/CAABox.hpp" #include "DataSpec/DNACommon/GX.hpp"
#include "DataSpec/DNACommon/TXTR.hpp"
#include <athena/DNA.hpp>
#include <athena/Types.hpp>
#include <hecl/Blender/Connection.hpp>
namespace hecl {
class ProjectPath;
}
namespace zeus {
class CAABox;
}
namespace DataSpec::DNACMDL { namespace DataSpec::DNACMDL {

8
DataSpec/DNACommon/CRSC.cpp
View File

@ -1,4 +1,10 @@
#include "CRSC.hpp" #include "DataSpec/DNACommon/CRSC.hpp"
#include <algorithm>
#include "DataSpec/DNACommon/PAK.hpp"
#include <logvisor/logvisor.hpp>
namespace DataSpec::DNAParticle { namespace DataSpec::DNAParticle {
static const std::vector<FourCC> GeneratorTypes = { static const std::vector<FourCC> GeneratorTypes = {

20
DataSpec/DNACommon/CRSC.hpp
View File

@ -1,9 +1,21 @@
#pragma once #pragma once
#include "ParticleCommon.hpp" #include <cstdint>
#include "PAK.hpp" #include <unordered_map>
#include "athena/FileWriter.hpp" #include <vector>
#include <optional>
#include "DataSpec/DNACommon/DNACommon.hpp"
#include "DataSpec/DNACommon/ParticleCommon.hpp"
#include <athena/DNA.hpp>
namespace DataSpec {
class PAKEntryReadStream;
}
namespace hecl {
class ProjectPath;
}
namespace DataSpec::DNAParticle { namespace DataSpec::DNAParticle {
template <class IDType> template <class IDType>

11
DataSpec/DNACommon/DGRP.cpp
View File

@ -1,7 +1,10 @@
#include "athena/IStreamReader.hpp" #include "DataSpec/DNACommon/DGRP.hpp"
#include "athena/IStreamWriter.hpp"
#include "athena/FileWriter.hpp" #include <athena/DNAYaml.hpp>
#include "DGRP.hpp" #include <athena/FileWriter.hpp>
#include <athena/IStreamWriter.hpp>
#include <hecl/hecl.hpp>
namespace DataSpec::DNADGRP { namespace DataSpec::DNADGRP {

6
DataSpec/DNACommon/DGRP.hpp
View File

@ -1,7 +1,9 @@
#pragma once #pragma once
#include "DNACommon.hpp" #include <vector>
#include "PAK.hpp"
#include "DataSpec/DNACommon/DNACommon.hpp"
#include "DataSpec/DNACommon/PAK.hpp"
namespace DataSpec::DNADGRP { namespace DataSpec::DNADGRP {

7
DataSpec/DNACommon/DPSC.cpp
View File

@ -1,4 +1,9 @@
#include "DPSC.hpp" #include "DataSpec/DNACommon/DPSC.hpp"
#include "DataSpec/DNACommon/PAK.hpp"
#include <athena/DNAYaml.hpp>
#include <logvisor/logvisor.hpp>
namespace DataSpec::DNAParticle { namespace DataSpec::DNAParticle {

19
DataSpec/DNACommon/DPSC.hpp
View File

@ -1,8 +1,21 @@
#pragma once #pragma once
#include "ParticleCommon.hpp" #include <cstddef>
#include "PAK.hpp" #include <cstdint>
#include "athena/FileWriter.hpp" #include <vector>
#include "DataSpec/DNACommon/DNACommon.hpp"
#include "DataSpec/DNACommon/ParticleCommon.hpp"
#include <athena/FileWriter.hpp>
namespace DataSpec {
class PAKEntryReadStream;
}
namespace hecl {
class ProjectPath;
}
namespace DataSpec::DNAParticle { namespace DataSpec::DNAParticle {

20
DataSpec/DNACommon/DeafBabe.cpp
View File

@ -1,10 +1,18 @@
#include "DeafBabe.hpp" #include "DataSpec/DNACommon/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 <cinttypes> #include <cinttypes>
#include <cstddef>
#include <memory>
#include <type_traits>
#include "DataSpec/DNACommon/AROTBuilder.hpp"
#include "DataSpec/DNAMP1/DeafBabe.hpp"
#include "DataSpec/DNAMP1/DCLN.hpp"
#include "DataSpec/DNAMP2/DeafBabe.hpp"
#include <fmt/format.h>
#include <hecl/Blender/Connection.hpp>
#include <zeus/Global.hpp>
namespace DataSpec { namespace DataSpec {

7
DataSpec/DNACommon/DeafBabe.hpp
View File

@ -1,6 +1,11 @@
#pragma once #pragma once
#include "DNACommon.hpp" #include <athena/Types.hpp>
namespace hecl::blender {
class PyOutStream;
struct ColMesh;
} // namespace hecl::blender
namespace DataSpec { namespace DataSpec {

2
DataSpec/DNACommon/EGMC.hpp
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "DNACommon.hpp" #include "DataSpec/DNACommon/DNACommon.hpp"
namespace DataSpec::DNACommon { namespace DataSpec::DNACommon {
struct EGMC : public BigDNA { struct EGMC : public BigDNA {

4
DataSpec/DNACommon/ELSC.cpp
View File

@ -1,4 +1,6 @@
#include "ELSC.hpp" #include "DataSpec/DNACommon/ELSC.hpp"
#include <logvisor/logvisor.hpp>
namespace DataSpec::DNAParticle { namespace DataSpec::DNAParticle {

13
DataSpec/DNACommon/ELSC.hpp
View File

@ -1,8 +1,15 @@
#pragma once #pragma once
#include "ParticleCommon.hpp" #include <vector>
#include "PAK.hpp"
#include "athena/FileWriter.hpp" #include "DataSpec/DNACommon/ParticleCommon.hpp"
#include "DataSpec/DNACommon/PAK.hpp"
#include <athena/FileWriter.hpp>
namespace hecl {
class ProjectPath;
}
namespace DataSpec::DNAParticle { namespace DataSpec::DNAParticle {
template <class IDType> template <class IDType>

6
DataSpec/DNACommon/FONT.cpp
View File

@ -1,4 +1,8 @@
#include "FONT.hpp" #include "DataSpec/DNACommon/FONT.hpp"
#include "DataSpec/DNACommon/PAK.hpp"
#include <logvisor/logvisor.hpp>
namespace DataSpec::DNAFont { namespace DataSpec::DNAFont {
logvisor::Module LogModule("urde::DNAFont"); logvisor::Module LogModule("urde::DNAFont");

16
DataSpec/DNACommon/FONT.hpp
View File

@ -1,7 +1,19 @@
#pragma once #pragma once
#include "PAK.hpp" #include <memory>
#include "athena/FileWriter.hpp" #include <vector>
#include "DataSpec/DNACommon/DNACommon.hpp"
#include <athena/FileWriter.hpp>
namespace DataSpec {
class PAKEntryReadStream;
}
namespace hecl {
class ProjectPath;
}
namespace DataSpec::DNAFont { namespace DataSpec::DNAFont {
struct GlyphRect : BigDNA { struct GlyphRect : BigDNA {

8
DataSpec/DNACommon/FSM2.cpp
View File

@ -1,8 +1,12 @@
#include "DataSpec/DNACommon/FSM2.hpp"
#include "DataSpec/DNACommon/PAK.hpp"
#include <athena/FileWriter.hpp>
#include <athena/Global.hpp> #include <athena/Global.hpp>
#include <athena/IStreamReader.hpp>
#include <athena/IStreamWriter.hpp> #include <athena/IStreamWriter.hpp>
#include "FSM2.hpp" #include <logvisor/logvisor.hpp>
namespace DataSpec::DNAFSM2 { namespace DataSpec::DNAFSM2 {
logvisor::Module LogDNAFSM2("urde::DNAFSM2"); logvisor::Module LogDNAFSM2("urde::DNAFSM2");

16
DataSpec/DNACommon/FSM2.hpp
View File

@ -1,8 +1,18 @@
#pragma once #pragma once
#include "PAK.hpp" #include <memory>
#include "DNACommon.hpp"
#include "athena/FileWriter.hpp" #include "DataSpec/DNACommon/DNACommon.hpp"
#include <athena/DNA.hpp>
namespace DataSpec {
class PAKEntryReadStream;
}
namespace hecl {
class ProjectPath;
}
namespace DataSpec::DNAFSM2 { namespace DataSpec::DNAFSM2 {
struct IFSM : BigDNAVYaml { struct IFSM : BigDNAVYaml {

5
DataSpec/DNACommon/GX.hpp
View File

@ -1,5 +1,8 @@
#pragma once #pragma once
#include "athena/DNA.hpp"
#include <cstdint>
#include <athena/DNA.hpp>
namespace GX { namespace GX {
enum AttrType { NONE, DIRECT, INDEX8, INDEX16 }; enum AttrType { NONE, DIRECT, INDEX8, INDEX16 };

23
DataSpec/DNACommon/MAPA.cpp
View File

@ -1,13 +1,16 @@
#include "MAPA.hpp" #include "DataSpec/DNACommon/MAPA.hpp"
#include "../DNAMP1/DNAMP1.hpp"
#include "../DNAMP2/DNAMP2.hpp" #include "DataSpec/DNACommon/GX.hpp"
#include "../DNAMP3/DNAMP3.hpp" #include "DataSpec/DNAMP1/DNAMP1.hpp"
#include "../DNAMP1/MAPA.hpp" #include "DataSpec/DNAMP2/DNAMP2.hpp"
#include "../DNAMP2/MAPA.hpp" #include "DataSpec/DNAMP3/DNAMP3.hpp"
#include "../DNAMP3/MAPA.hpp" #include "DataSpec/DNAMP1/MAPA.hpp"
#include "zeus/CTransform.hpp" #include "DataSpec/DNAMP2/MAPA.hpp"
#include "zeus/CAABox.hpp" #include "DataSpec/DNAMP3/MAPA.hpp"
#include "hecl/Blender/Connection.hpp"
#include <hecl/Blender/Connection.hpp>
#include <logvisor/logvisor.hpp>
#include <zeus/CAABox.hpp>
namespace DataSpec::DNAMAPA { namespace DataSpec::DNAMAPA {

15
DataSpec/DNACommon/MAPA.hpp
View File

@ -1,7 +1,18 @@
#pragma once #pragma once
#include "DNACommon.hpp" #include <memory>
#include "GX.hpp" #include <vector>
#include "DataSpec/DNACommon/DNACommon.hpp"
namespace hecl {
class ProjectPath;
}
namespace hecl::blender {
class Connection;
struct MapArea;
} // namespace hecl::blender
namespace DataSpec::DNAMAPA { namespace DataSpec::DNAMAPA {
struct MAPA : BigDNA { struct MAPA : BigDNA {

14
DataSpec/DNACommon/MAPU.cpp
View File

@ -1,9 +1,11 @@
#include "MAPU.hpp" #include "DataSpec/DNACommon/MAPU.hpp"
#include "../DNAMP1/DNAMP1.hpp"
#include "../DNAMP2/DNAMP2.hpp" #include "DataSpec/DNAMP1/DNAMP1.hpp"
#include "../DNAMP3/DNAMP3.hpp" #include "DataSpec/DNAMP2/DNAMP2.hpp"
#include "zeus/CTransform.hpp" #include "DataSpec/DNAMP3/DNAMP3.hpp"
#include "hecl/Blender/Connection.hpp"
#include <hecl/Blender/Connection.hpp>
#include <zeus/Global.hpp>
namespace DataSpec::DNAMAPU { namespace DataSpec::DNAMAPU {

13
DataSpec/DNACommon/MAPU.hpp
View File

@ -1,6 +1,17 @@
#pragma once #pragma once
#include "DNACommon.hpp" #include <cstdint>
#include "DataSpec/DNACommon/DNACommon.hpp"
namespace hecl {
class ProjectPath;
}
namespace hecl::blender {
class Connection;
struct MapUniverse;
} // namespce hecl::blender
namespace DataSpec::DNAMAPU { namespace DataSpec::DNAMAPU {
struct MAPU : BigDNA { struct MAPU : BigDNA {

13
DataSpec/DNACommon/MLVL.cpp
View File

@ -1,8 +1,11 @@
#include "MLVL.hpp" #include "DataSpec/DNACommon/MLVL.hpp"
#include "../DNAMP1/MLVL.hpp"
#include "../DNAMP2/MLVL.hpp" #include "DataSpec/DNAMP1/MLVL.hpp"
#include "../DNAMP3/MLVL.hpp" #include "DataSpec/DNAMP2/MLVL.hpp"
#include "hecl/Blender/Connection.hpp" #include "DataSpec/DNAMP3/MLVL.hpp"
#include <hecl/Blender/Connection.hpp>
#include <zeus/Global.hpp>
namespace DataSpec::DNAMLVL { namespace DataSpec::DNAMLVL {

15
DataSpec/DNACommon/MLVL.hpp
View File

@ -1,7 +1,18 @@
#pragma once #pragma once
#include "DNACommon.hpp" #include <functional>
#include "zeus/CVector3f.hpp"
#include "DataSpec/DNACommon/DNACommon.hpp"
#include <hecl/SystemChar.hpp>
namespace hecl {
class ProjectPath;
}
namespace hecl::blender {
class Connection;
}
namespace DataSpec::DNAMLVL { namespace DataSpec::DNAMLVL {

16
DataSpec/DNACommon/OBBTreeBuilder.cpp
View File

@ -1,9 +1,15 @@
#include "athena/Types.hpp" #include "DataSpec/DNACommon/OBBTreeBuilder.hpp"
#include "OBBTreeBuilder.hpp"
#include "zeus/CTransform.hpp" #include <cstddef>
#include <unordered_set>
#include <vector>
#include "DataSpec/DNAMP1/DCLN.hpp" #include "DataSpec/DNAMP1/DCLN.hpp"
#include "gmm/gmm.h"
#include "hecl/Blender/Connection.hpp" #include <athena/Types.hpp>
#include <gmm/gmm.h>
#include <hecl/Blender/Connection.hpp>
#include <zeus/CTransform.hpp>
namespace DataSpec { namespace DataSpec {

4
DataSpec/DNACommon/OBBTreeBuilder.hpp
View File

@ -1,6 +1,8 @@
#pragma once #pragma once
#include "DNACommon.hpp" #include <memory>
#include <hecl/Blender/Connection.hpp>
namespace DataSpec { namespace DataSpec {

9
DataSpec/DNACommon/PAK.cpp
View File

@ -1,7 +1,8 @@
#include "PAK.hpp" #include "DataSpec/DNACommon/PAK.hpp"
#include "../DNAMP1/DNAMP1.hpp"
#include "../DNAMP2/DNAMP2.hpp" #include "DataSpec/DNAMP1/DNAMP1.hpp"
#include "../DNAMP3/DNAMP3.hpp" #include "DataSpec/DNAMP2/DNAMP2.hpp"
#include "DataSpec/DNAMP3/DNAMP3.hpp"
namespace DataSpec { namespace DataSpec {

14
DataSpec/DNACommon/PAK.hpp
View File

@ -1,9 +1,17 @@
#pragma once #pragma once
#include "DNACommon.hpp"
#include "boo/ThreadLocalPtr.hpp"
#include <array> #include <array>
#include "zeus/CMatrix4f.hpp" #include <cstring>
#include <functional>
#include <memory>
#include <unordered_map>
#include <unordered_set>
#include "DataSpec/DNACommon/DNACommon.hpp"
#include <boo/ThreadLocalPtr.hpp>
#include <zeus/CMatrix4f.hpp>
#include <zeus/Global.hpp>
namespace DataSpec { namespace DataSpec {

4
DataSpec/DNACommon/PART.cpp
View File

@ -1,4 +1,6 @@
#include "PART.hpp" #include "DataSpec/DNACommon/PART.hpp"
#include "DataSpec/DNACommon/PAK.hpp"
namespace DataSpec::DNAParticle { namespace DataSpec::DNAParticle {

16
DataSpec/DNACommon/PART.hpp
View File

@ -1,8 +1,18 @@
#pragma once #pragma once
#include "ParticleCommon.hpp" #include <cstdint>
#include "PAK.hpp" #include <vector>
#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 { namespace DataSpec::DNAParticle {

7
DataSpec/DNACommon/ParticleCommon.hpp
View File

@ -1,6 +1,11 @@
#pragma once #pragma once
#include "DNACommon.hpp" #include <memory>
#include <vector>
#include "DataSpec/DNACommon/DNACommon.hpp"
#include <logvisor/logvisor.hpp>
namespace DataSpec::DNAParticle { namespace DataSpec::DNAParticle {
extern logvisor::Module LogModule; extern logvisor::Module LogModule;

6
DataSpec/DNACommon/RigInverter.cpp
View File

@ -1,8 +1,10 @@
#include "RigInverter.hpp" #include "DataSpec/DNACommon/RigInverter.hpp"
#include "DataSpec/DNAMP1/CINF.hpp" #include "DataSpec/DNAMP1/CINF.hpp"
#include "DataSpec/DNAMP2/CINF.hpp" #include "DataSpec/DNAMP2/CINF.hpp"
#include "DataSpec/DNAMP3/CINF.hpp" #include "DataSpec/DNAMP3/CINF.hpp"
#include "hecl/Blender/Connection.hpp"
#include <hecl/Blender/Connection.hpp>
namespace DataSpec::DNAANIM { namespace DataSpec::DNAANIM {

10
DataSpec/DNACommon/RigInverter.hpp
View File

@ -1,10 +1,12 @@
#pragma once #pragma once
#include "zeus/CVector3f.hpp" #include <string>
#include "zeus/CMatrix3f.hpp"
#include "zeus/CQuaternion.hpp"
#include "hecl/hecl.hpp"
#include <unordered_map> #include <unordered_map>
#include <vector>
#include <hecl/hecl.hpp>
#include <zeus/CQuaternion.hpp>
#include <zeus/CVector3f.hpp>
namespace DataSpec::DNAANIM { namespace DataSpec::DNAANIM {

5
DataSpec/DNACommon/SAVWCommon.hpp
View File

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "DNACommon.hpp"
#include "PAK.hpp" #include "DataSpec/DNACommon/DNACommon.hpp"
#include "DataSpec/DNACommon/PAK.hpp"
namespace DataSpec::SAVWCommon { namespace DataSpec::SAVWCommon {
enum class EScanCategory { None, Data, Lore, Creature, Research, Artifact }; enum class EScanCategory { None, Data, Lore, Creature, Research, Artifact };

11
DataSpec/DNACommon/STRG.cpp
View File

@ -1,7 +1,10 @@
#include "STRG.hpp" #include "DataSpec/DNACommon/STRG.hpp"
#include "../DNAMP1/STRG.hpp"
#include "../DNAMP2/STRG.hpp" #include "DataSpec/DNAMP1/STRG.hpp"
#include "../DNAMP3/STRG.hpp" #include "DataSpec/DNAMP2/STRG.hpp"
#include "DataSpec/DNAMP3/STRG.hpp"
#include <logvisor/logvisor.hpp>
namespace DataSpec { namespace DataSpec {

15
DataSpec/DNACommon/STRG.hpp
View File

@ -1,11 +1,18 @@
#pragma once #pragma once
#include <cstddef>
#include <cstdint>
#include <memory>
#include <string> #include <string>
#include <fstream> #include <vector>
#include "DataSpec/DNACommon/DNACommon.hpp"
#include <hecl/hecl.hpp> #include <hecl/hecl.hpp>
#include <hecl/Database.hpp>
#include <athena/FileWriter.hpp> namespace athena::io {
#include "DNACommon.hpp" class IStreamReader;
}
namespace DataSpec { namespace DataSpec {
struct ISTRG : BigDNAVYaml { struct ISTRG : BigDNAVYaml {

6
DataSpec/DNACommon/SWHC.cpp
View File

@ -1,4 +1,8 @@
#include "SWHC.hpp" #include "DataSpec/DNACommon/SWHC.hpp"
#include "DataSpec/DNACommon/PAK.hpp"
#include <logvisor/logvisor.hpp>
namespace DataSpec::DNAParticle { namespace DataSpec::DNAParticle {

15
DataSpec/DNACommon/SWHC.hpp
View File

@ -1,8 +1,17 @@
#pragma once #pragma once
#include "ParticleCommon.hpp" #include <vector>
#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 { namespace DataSpec::DNAParticle {

14
DataSpec/DNACommon/TXTR.cpp
View File

@ -1,9 +1,15 @@
#include "DataSpec/DNACommon/TXTR.hpp"
#include <cstdint>
#include <memory>
#include "DataSpec/DNACommon/PAK.hpp"
#include <athena/FileWriter.hpp>
#include <hecl/hecl.hpp>
#include <logvisor/logvisor.hpp>
#include <png.h> #include <png.h>
#include <squish.h> #include <squish.h>
#include "TXTR.hpp"
#include "PAK.hpp"
#include "athena/FileWriter.hpp"
#include "hecl/hecl.hpp"
namespace DataSpec { namespace DataSpec {

8
DataSpec/DNACommon/TXTR.hpp
View File

@ -1,6 +1,12 @@
#pragma once #pragma once
#include "DNACommon.hpp" #include <climits>
#include "DataSpec/DNACommon/DNACommon.hpp"
namespace hecl {
class ProjectPath;
}
namespace DataSpec { namespace DataSpec {
class PAKEntryReadStream; class PAKEntryReadStream;

6
DataSpec/DNACommon/WPSC.cpp
View File

@ -1,4 +1,8 @@
#include "WPSC.hpp" #include "DataSpec/DNACommon/WPSC.hpp"
#include "DataSpec/DNACommon/PAK.hpp"
#include <logvisor/logvisor.hpp>
namespace DataSpec::DNAParticle { namespace DataSpec::DNAParticle {

13
DataSpec/DNACommon/WPSC.hpp
View File

@ -1,8 +1,15 @@
#pragma once #pragma once
#include "ParticleCommon.hpp" #include "DataSpec/DNACommon/DNACommon.hpp"
#include "PAK.hpp" #include "DataSpec/DNACommon/ParticleCommon.hpp"
#include "athena/FileWriter.hpp"
namespace DataSpec {
class PAKEntryReadStream;
}
namespace hecl {
class ProjectPath;
}
namespace DataSpec::DNAParticle { namespace DataSpec::DNAParticle {
template <class IDType> template <class IDType>

1
DataSpec/DNAMP1/DeafBabe.hpp
View File

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "DataSpec/DNACommon/DeafBabe.hpp" #include "DataSpec/DNACommon/DeafBabe.hpp"
#include "DataSpec/DNACommon/DNACommon.hpp"
namespace DataSpec::DNAMP1 { namespace DataSpec::DNAMP1 {