AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-05-13 21:11:21 +00:00
Code Issues Projects Releases Wiki Activity

Decide against emitting ANIM IDs in ANCS YAML

Browse Source
This commit is contained in:
Jack Andersen 2016-04-05 17:43:14 -10:00
parent 3723076ae3
commit cd8b6b6ed4
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DataSpec/DNACommon/ANCS.hpp
View File

@ -32,20 +32,6 @@ struct AnimationResInfo
bool additive; bool additive;
}; };
static void WriteOutAnimId(athena::io::YAMLDocWriter& __dna_docout,
const UniqueID32& ancsId,
const std::string& animName)
{
__dna_docout.enterSubRecord("animId");
hecl::ProjectPath path = UniqueIDBridge::TranslatePakIdToPath(ancsId);
if (path)
{
path = path.getWithExtension(_S(".blend"));
__dna_docout.writeString(nullptr, path.getRelativePathUTF8() + _S('|') + animName);
}
__dna_docout.leaveSubRecord();
}
template <class PAKRouter, class ANCSDNA, class MaterialSet, class SurfaceHeader, atUint32 CMDLVersion> template <class PAKRouter, class ANCSDNA, class MaterialSet, class SurfaceHeader, atUint32 CMDLVersion>
bool ReadANCSToBlender(hecl::BlenderConnection& conn, bool ReadANCSToBlender(hecl::BlenderConnection& conn,
const ANCSDNA& ancs, const ANCSDNA& ancs,

11
DataSpec/DNAMP1/ANCS.hpp
View File

@ -230,8 +230,6 @@ struct ANCS : BigYAML
void read(athena::io::YAMLDocReader& __dna_docin) void read(athena::io::YAMLDocReader& __dna_docin)
{ {
/* animId */
__dna_docin.enumerate("animId", animId);
/* animIdx */ /* animIdx */
animIdx = __dna_docin.readUint32("animIdx"); animIdx = __dna_docin.readUint32("animIdx");
/* animName */ /* animName */
@ -240,12 +238,17 @@ struct ANCS : BigYAML
unk1 = __dna_docin.readFloat("unk1"); unk1 = __dna_docin.readFloat("unk1");
/* unk2 */ /* unk2 */
unk2 = __dna_docin.readUint32("unk2"); unk2 = __dna_docin.readUint32("unk2");
hecl::ProjectPath path = UniqueIDBridge::TranslatePakIdToPath(m_ancsId);
if (path)
{
hecl::SystemStringView sysView(animName);
animId = path.ensureAuxInfo(sysView.sys_str().c_str());
}
} }
void write(athena::io::YAMLDocWriter& __dna_docout) const void write(athena::io::YAMLDocWriter& __dna_docout) const
{ {
/* animId */
DNAANCS::WriteOutAnimId(__dna_docout, m_ancsId, animName);
/* animIdx */ /* animIdx */
__dna_docout.writeUint32("animIdx", animIdx); __dna_docout.writeUint32("animIdx", animIdx);
/* animName */ /* animName */