AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 05:07:43 +00:00
Code Issues Projects Releases Wiki Activity

DGRP Fixes

Browse Source
This commit is contained in:
Phillip Stephens
2016-04-12 04:37:07 -07:00
parent 497ad50fa6
commit 14e0468adf
10 changed files with 99 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DataSpec/DNACommon/DGRP.cpp
View File

@@ -5,6 +5,8 @@
namespace DataSpec
{
namespace DNADGRP
{
template <class IDType>
void DGRP<IDType>::read(athena::io::IStreamReader& __dna_reader)
{
@@ -137,5 +139,5 @@ bool WriteDGRP(const DGRP<IDType>& dgrp, const hecl::ProjectPath& outPath)
}
template bool WriteDGRP<UniqueID32>(const DGRP<UniqueID32>& dgrp, const hecl::ProjectPath& outPath);
template bool WriteDGRP<UniqueID64>(const DGRP<UniqueID64>& dgrp, const hecl::ProjectPath& outPath);
}
}

33
DataSpec/DNACommon/DGRP.hpp Normal file
View File

@@ -0,0 +1,33 @@
#ifndef __COMMON_DGRP_HPP__
#define __COMMON_DGRP_HPP__
#include "DNACommon.hpp"
#include "PAK.hpp"
namespace DataSpec
{
namespace DNADGRP
{
template <class IDType>
struct DGRP : BigYAML
{
DECL_YAML
Value<atUint32> dependCount;
struct ObjectTag : BigYAML
{
DECL_YAML
DNAFourCC type;
UniqueID32 id;
};
Vector<ObjectTag, DNA_COUNT(dependCount)> depends;
};
template <class IDType>
bool ExtractDGRP(PAKEntryReadStream& rs, const hecl::ProjectPath& outPath);
template <class IDType>
bool WriteDGRP(const DGRP<IDType>& dgrp, const hecl::ProjectPath& outPath);
}
}
#endif // __COMMON_DGRP_HPP__

2
DataSpec/DNAMP1/DNAMP1.cpp
View File

@@ -308,7 +308,7 @@ ResExtractor<PAKBridge> PAKBridge::LookupExtractor(const PAK::Entry& entry)
case SBIG('FONT'):
return {DNAFont::ExtractFONT<UniqueID32>, nullptr, {_S(".yaml")}};
case SBIG('DGRP'):
return {ExtractDGRP<UniqueID32>, nullptr, {_S(".yaml")}};
return {DNADGRP::ExtractDGRP<UniqueID32>, nullptr, {_S(".yaml")}};
}
return {};
}

2
DataSpec/DNAMP2/DNAMP2.cpp
View File

@@ -237,7 +237,7 @@ ResExtractor<PAKBridge> PAKBridge::LookupExtractor(const DNAMP1::PAK::Entry& ent
case SBIG('FONT'):
return {DNAFont::ExtractFONT<UniqueID32>, nullptr, {_S(".yaml")}};
case SBIG('DGRP'):
return {ExtractDGRP<UniqueID32>, nullptr, {_S(".yaml")}};
return {DNADGRP::ExtractDGRP<UniqueID32>, nullptr, {_S(".yaml")}};
}
return {};
}

2
DataSpec/DNAMP3/DNAMP3.cpp
View File

@@ -245,7 +245,7 @@ ResExtractor<PAKBridge> PAKBridge::LookupExtractor(const PAK::Entry& entry)
case SBIG('FONT'):
return {DNAFont::ExtractFONT<UniqueID64>, nullptr, {_S(".yaml")}};
case SBIG('DGRP'):
return {ExtractDGRP<UniqueID64>, nullptr, {_S(".yaml")}};
return {DNADGRP::ExtractDGRP<UniqueID64>, nullptr, {_S(".yaml")}};
}
return {};
}

9
DataSpec/SpecMP1.cpp
View File

@@ -15,6 +15,7 @@
#include "DNACommon/WPSC.hpp"
#include "DNACommon/CRSC.hpp"
#include "DNACommon/DPSC.hpp"
#include "DNACommon/DGRP.hpp"
#include "hecl/ClientProcess.hpp"
@@ -339,6 +340,8 @@ struct SpecMP1 : SpecBase
return true;
else if (!strcmp(classType, DNAParticle::DPSM<UniqueID32>::DNAType()))
return true;
else if (!strcmp(classType, DNADGRP::DGRP<UniqueID32>::DNAType()))
return true;
return false;
});
}
@@ -436,6 +439,12 @@ struct SpecMP1 : SpecBase
dpsm.read(reader);
DNAParticle::WriteDPSM(dpsm, out);
}
else if (!classStr.compare(DNADGRP::DGRP<UniqueID32>::DNAType()))
{
DNADGRP::DGRP<UniqueID32> dgrp;
dgrp.read(reader);
DNADGRP::WriteDGRP(dgrp, out);
}
}
progress(_S("Done"));
}