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

YAML RAII refactor

Browse Source
This commit is contained in:
Jack Andersen 2017-02-12 13:56:03 -10:00
parent 1b8baca988
commit 748e81ae6e
29 changed files with 1314 additions and 1842 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
DataSpec/DNACommon/CRSC.cpp
View File

@ -81,7 +81,8 @@ void CRSM<IDType>::read(athena::io::YAMLDocReader& r)
continue; continue;
} }
r.enterSubRecord(elem.first.c_str()); if (auto rec = r.enterSubRecord(elem.first.c_str()))
{
FourCC clsId(elem.first.c_str()); FourCC clsId(elem.first.c_str());
auto gen = std::find_if(GeneratorTypes.begin(), GeneratorTypes.end(), [&clsId](const FourCC& other) -> bool{ auto gen = std::find_if(GeneratorTypes.begin(), GeneratorTypes.end(), [&clsId](const FourCC& other) -> bool{
return clsId == other; return clsId == other;
@ -89,7 +90,6 @@ void CRSM<IDType>::read(athena::io::YAMLDocReader& r)
if (gen != GeneratorTypes.end()) if (gen != GeneratorTypes.end())
{ {
x0_generators[clsId].read(r); x0_generators[clsId].read(r);
r.leaveSubRecord();
continue; continue;
} }
@ -99,7 +99,6 @@ void CRSM<IDType>::read(athena::io::YAMLDocReader& r)
if (sfx != SFXTypes.end()) if (sfx != SFXTypes.end())
{ {
x10_sfx[clsId] = r.readInt32(clsId.toString().c_str()); x10_sfx[clsId] = r.readInt32(clsId.toString().c_str());
r.leaveSubRecord();
continue; continue;
} }
@ -109,15 +108,13 @@ void CRSM<IDType>::read(athena::io::YAMLDocReader& r)
if (decal != DecalTypes.end()) if (decal != DecalTypes.end())
{ {
x20_decals[clsId].read(r); x20_decals[clsId].read(r);
r.leaveSubRecord();
continue; continue;
} }
if (clsId == SBIG('RNGE')) if (clsId == SBIG('RNGE'))
x30_RNGE = r.readFloat(nullptr); x30_RNGE = r.readFloat(nullptr);
else if (clsId == SBIG('FOFF')) else if (clsId == SBIG('FOFF'))
x34_FOFF = r.readFloat(nullptr); x34_FOFF = r.readFloat(nullptr);
}
r.leaveSubRecord();
} }
} }
@ -125,30 +122,18 @@ template <class IDType>
void CRSM<IDType>::write(athena::io::YAMLDocWriter& w) const void CRSM<IDType>::write(athena::io::YAMLDocWriter& w) const
{ {
for (const auto& pair : x0_generators) for (const auto& pair : x0_generators)
{
if (pair.second) if (pair.second)
{ if (auto rec = w.enterSubRecord(pair.first.toString().c_str()))
w.enterSubRecord(pair.first.toString().c_str());
pair.second.write(w); pair.second.write(w);
w.leaveSubRecord();
}
}
for (const auto& pair : x10_sfx) for (const auto& pair : x10_sfx)
{
if (pair.second != ~0) if (pair.second != ~0)
w.writeUint32(pair.first.toString().c_str(), pair.second); w.writeUint32(pair.first.toString().c_str(), pair.second);
}
for (const auto& pair : x20_decals) for (const auto& pair : x20_decals)
{
if (pair.second) if (pair.second)
{ if (auto rec = w.enterSubRecord(pair.first.toString().c_str()))
w.enterSubRecord(pair.first.toString().c_str());
pair.second.write(w); pair.second.write(w);
w.leaveSubRecord();
}
}
if (x30_RNGE != 50.f) if (x30_RNGE != 50.f)
w.writeFloat("RNGE", x30_RNGE); w.writeFloat("RNGE", x30_RNGE);

10
DataSpec/DNACommon/DNACommon.hpp
View File

@ -63,21 +63,23 @@ public:
void read(athena::io::YAMLDocReader& reader) void read(athena::io::YAMLDocReader& reader)
{ {
size_t count; size_t count;
reader.enterSubVector(nullptr, count); if (auto v = reader.enterSubVector(nullptr, count))
{
r = (count >= 1) ? reader.readFloat(nullptr) : 0.f; r = (count >= 1) ? reader.readFloat(nullptr) : 0.f;
g = (count >= 2) ? reader.readFloat(nullptr) : 0.f; g = (count >= 2) ? reader.readFloat(nullptr) : 0.f;
b = (count >= 3) ? reader.readFloat(nullptr) : 0.f; b = (count >= 3) ? reader.readFloat(nullptr) : 0.f;
a = (count >= 4) ? reader.readFloat(nullptr) : 0.f; a = (count >= 4) ? reader.readFloat(nullptr) : 0.f;
reader.leaveSubVector(); }
} }
void write(athena::io::YAMLDocWriter& writer) const void write(athena::io::YAMLDocWriter& writer) const
{ {
writer.enterSubVector(nullptr); if (auto v = writer.enterSubVector(nullptr))
{
writer.writeFloat(nullptr, r); writer.writeFloat(nullptr, r);
writer.writeFloat(nullptr, g); writer.writeFloat(nullptr, g);
writer.writeFloat(nullptr, b); writer.writeFloat(nullptr, b);
writer.writeFloat(nullptr, a); writer.writeFloat(nullptr, a);
writer.leaveSubVector(); }
} }
size_t binarySize(size_t __isz) const size_t binarySize(size_t __isz) const
{return __isz + 4;} {return __isz + 4;}

73
DataSpec/DNACommon/DPSC.cpp
View File

@ -15,7 +15,8 @@ void DPSM<IDType>::read(athena::io::YAMLDocReader& r)
continue; continue;
} }
r.enterSubRecord(elem.first.c_str()); if (auto rec = r.enterSubRecord(elem.first.c_str()))
{
bool loadFirstDesc = false; bool loadFirstDesc = false;
uint32_t clsId = *reinterpret_cast<const uint32_t*>(elem.first.c_str()); uint32_t clsId = *reinterpret_cast<const uint32_t*>(elem.first.c_str());
switch(clsId) switch(clsId)
@ -65,8 +66,7 @@ void DPSM<IDType>::read(athena::io::YAMLDocReader& r)
x5c_25_DMOO = r.readBool(nullptr); x5c_25_DMOO = r.readBool(nullptr);
break; break;
} }
}
r.leaveSubRecord();
} }
} }
@ -77,41 +77,24 @@ void DPSM<IDType>::write(athena::io::YAMLDocWriter& w) const
writeQuadDecalInfo(w, x1c_quad, false); writeQuadDecalInfo(w, x1c_quad, false);
if (x38_DMDL) if (x38_DMDL)
{ if (auto rec = w.enterSubRecord("DMDL"))
w.enterSubRecord("DMDL");
x38_DMDL.write(w); x38_DMDL.write(w);
w.leaveSubRecord();
}
if (x48_DLFT) if (x48_DLFT)
{ if (auto rec = w.enterSubRecord("DLFT"))
w.enterSubRecord("DLFT");
x48_DLFT.write(w); x48_DLFT.write(w);
w.leaveSubRecord();
}
if (x4c_DMOP) if (x4c_DMOP)
{ if (auto rec = w.enterSubRecord("DMOP"))
w.enterSubRecord("DMOP");
x4c_DMOP.write(w); x4c_DMOP.write(w);
w.leaveSubRecord();
}
if (x50_DMRT) if (x50_DMRT)
{ if (auto rec = w.enterSubRecord("DMRT"))
w.enterSubRecord("DMRT");
x50_DMRT.write(w); x50_DMRT.write(w);
w.leaveSubRecord();
}
if (x54_DMSC) if (x54_DMSC)
{ if (auto rec = w.enterSubRecord("DMSC"))
w.enterSubRecord("DMSC");
x54_DMSC.write(w); x54_DMSC.write(w);
w.leaveSubRecord();
}
if (x58_DMCL) if (x58_DMCL)
{ if (auto rec = w.enterSubRecord("DMCL"))
w.enterSubRecord("DMCL");
x54_DMSC.write(w); x54_DMSC.write(w);
w.leaveSubRecord();
}
if (x5c_24_DMAB) if (x5c_24_DMAB)
w.writeBool("DMAB", x5c_24_DMAB); w.writeBool("DMAB", x5c_24_DMAB);
if (x5c_25_DMOO) if (x5c_25_DMOO)
@ -160,48 +143,26 @@ void DPSM<IDType>::writeQuadDecalInfo(athena::io::YAMLDocWriter& w,
const typename DPSM<IDType>::SQuadDescr& quad, bool first) const const typename DPSM<IDType>::SQuadDescr& quad, bool first) const
{ {
if (quad.x0_LFT) if (quad.x0_LFT)
{ if (auto rec = w.enterSubRecord((first ? "1LFT" : "2LFT")))
w.enterSubRecord((first ? "1LFT" : "2LFT"));
quad.x0_LFT.write(w); quad.x0_LFT.write(w);
w.leaveSubRecord();
}
if (quad.x4_SZE) if (quad.x4_SZE)
{ if (auto rec = w.enterSubRecord((first ? "1SZE" : "2SZE")))
w.enterSubRecord((first ? "1SZE" : "2SZE"));
quad.x4_SZE.write(w); quad.x4_SZE.write(w);
w.leaveSubRecord();
}
if (quad.x8_ROT) if (quad.x8_ROT)
{ if (auto rec = w.enterSubRecord((first ? "1ROT" : "2ROT")))
w.enterSubRecord((first ? "1ROT" : "2ROT"));
quad.x8_ROT.write(w); quad.x8_ROT.write(w);
w.leaveSubRecord();
}
if (quad.xc_OFF) if (quad.xc_OFF)
{ if (auto rec = w.enterSubRecord((first ? "1OFF" : "2OFF")))
w.enterSubRecord((first ? "1OFF" : "2OFF"));
quad.xc_OFF.write(w); quad.xc_OFF.write(w);
w.leaveSubRecord();
}
if (quad.x10_CLR) if (quad.x10_CLR)
{ if (auto rec = w.enterSubRecord((first ? "1CLR" : "2CLR")))
w.enterSubRecord((first ? "1CLR" : "2CLR"));
quad.x10_CLR.write(w); quad.x10_CLR.write(w);
w.leaveSubRecord();
}
if (quad.x14_TEX) if (quad.x14_TEX)
{ if (auto rec = w.enterSubRecord((first ? "1TEX" : "2TEX")))
w.enterSubRecord((first ? "1TEX" : "2TEX"));
quad.x14_TEX.write(w); quad.x14_TEX.write(w);
w.leaveSubRecord();
}
if (quad.x18_ADD) if (quad.x18_ADD)
{ if (auto rec = w.enterSubRecord((first ? "1ADD" : "2ADD")))
w.enterSubRecord((first ? "1ADD" : "2ADD"));
quad.x18_ADD.write(w); quad.x18_ADD.write(w);
w.leaveSubRecord();
}
} }
template <class IDType> template <class IDType>

100
DataSpec/DNACommon/ELSC.cpp
View File

@ -84,125 +84,65 @@ template <class IDType>
void ELSM<IDType>::write(athena::io::YAMLDocWriter& w) const void ELSM<IDType>::write(athena::io::YAMLDocWriter& w) const
{ {
if (x0_LIFE) if (x0_LIFE)
{ if (auto rec = w.enterSubRecord("LIFE"))
w.enterSubRecord("LIFE");
x0_LIFE.write(w); x0_LIFE.write(w);
w.leaveSubRecord();
}
if (x4_SLIF) if (x4_SLIF)
{ if (auto rec = w.enterSubRecord("SLIF"))
w.enterSubRecord("SLIF");
x4_SLIF.write(w); x4_SLIF.write(w);
w.leaveSubRecord();
}
if (x8_GRAT) if (x8_GRAT)
{ if (auto rec = w.enterSubRecord("GRAT"))
w.enterSubRecord("GRAT");
x8_GRAT.write(w); x8_GRAT.write(w);
w.leaveSubRecord();
}
if (xc_SCNT) if (xc_SCNT)
{ if (auto rec = w.enterSubRecord("SCNT"))
w.enterSubRecord("SCNT");
xc_SCNT.write(w); xc_SCNT.write(w);
w.leaveSubRecord();
}
if (x10_SSEG) if (x10_SSEG)
{ if (auto rec = w.enterSubRecord("SSEG"))
w.enterSubRecord("SSEG");
x10_SSEG.write(w); x10_SSEG.write(w);
w.leaveSubRecord();
}
if (x14_COLR) if (x14_COLR)
{ if (auto rec = w.enterSubRecord("COLR"))
w.enterSubRecord("COLR");
x14_COLR.write(w); x14_COLR.write(w);
w.leaveSubRecord();
}
if (x18_IEMT) if (x18_IEMT)
{ if (auto rec = w.enterSubRecord("IEMT"))
w.enterSubRecord("IEMT");
x18_IEMT.write(w); x18_IEMT.write(w);
w.leaveSubRecord();
}
if (x1c_FEMT) if (x1c_FEMT)
{ if (auto rec = w.enterSubRecord("FEMT"))
w.enterSubRecord("FEMT");
x1c_FEMT.write(w); x1c_FEMT.write(w);
w.leaveSubRecord();
}
if (x20_AMPL) if (x20_AMPL)
{ if (auto rec = w.enterSubRecord("AMPL"))
w.enterSubRecord("AMPL");
x20_AMPL.write(w); x20_AMPL.write(w);
w.leaveSubRecord();
}
if (x24_AMPD) if (x24_AMPD)
{ if (auto rec = w.enterSubRecord("AMPD"))
w.enterSubRecord("AMPD");
x24_AMPD.write(w); x24_AMPD.write(w);
w.leaveSubRecord();
}
if (x28_LWD1) if (x28_LWD1)
{ if (auto rec = w.enterSubRecord("LWD1"))
w.enterSubRecord("LWD1");
x28_LWD1.write(w); x28_LWD1.write(w);
w.leaveSubRecord();
}
if (x2c_LWD2) if (x2c_LWD2)
{ if (auto rec = w.enterSubRecord("LWD2"))
w.enterSubRecord("LWD2");
x2c_LWD2.write(w); x2c_LWD2.write(w);
w.leaveSubRecord();
}
if (x30_LWD3) if (x30_LWD3)
{ if (auto rec = w.enterSubRecord("LWD3"))
w.enterSubRecord("LWD3");
x30_LWD3.write(w); x30_LWD3.write(w);
w.leaveSubRecord();
}
if (x34_LCL1) if (x34_LCL1)
{ if (auto rec = w.enterSubRecord("LCL1"))
w.enterSubRecord("LCL1");
x34_LCL1.write(w); x34_LCL1.write(w);
w.leaveSubRecord();
}
if (x38_LCL2) if (x38_LCL2)
{ if (auto rec = w.enterSubRecord("LCL2"))
w.enterSubRecord("LCL2");
x38_LCL2.write(w); x38_LCL2.write(w);
w.leaveSubRecord();
}
if (x3c_LCL3) if (x3c_LCL3)
{ if (auto rec = w.enterSubRecord("LCL3"))
w.enterSubRecord("LCL3");
x3c_LCL3.write(w); x3c_LCL3.write(w);
w.leaveSubRecord();
}
if (x40_SSWH) if (x40_SSWH)
{ if (auto rec = w.enterSubRecord("SSWH"))
w.enterSubRecord("SSWH");
x40_SSWH.write(w); x40_SSWH.write(w);
w.leaveSubRecord();
}
if (x50_GPSM) if (x50_GPSM)
{ if (auto rec = w.enterSubRecord("GPSM"))
w.enterSubRecord("GPSM");
x50_GPSM.write(w); x50_GPSM.write(w);
w.leaveSubRecord();
}
if (x60_EPSM) if (x60_EPSM)
{ if (auto rec = w.enterSubRecord("EPSM"))
w.enterSubRecord("EPSM");
x60_EPSM.write(w); x60_EPSM.write(w);
w.leaveSubRecord();
}
if (x70_ZERY) if (x70_ZERY)
{ if (auto rec = w.enterSubRecord("ZERY"))
w.enterSubRecord("ZERY");
x70_ZERY.write(w); x70_ZERY.write(w);
w.leaveSubRecord();
}
} }
template <class IDType> template <class IDType>

18
DataSpec/DNACommon/FONT.cpp
View File

@ -186,7 +186,8 @@ void FONT<IDType>::read(athena::io::YAMLDocReader& __dna_docin)
/* glyphCount */ /* glyphCount */
/* glyphs */ /* glyphs */
size_t count; size_t count;
__dna_docin.enterSubVector("glyphs", count); if (auto v = __dna_docin.enterSubVector("glyphs", count))
{
glyphCount = count; glyphCount = count;
for (atUint32 i = 0; i < glyphCount; i++) for (atUint32 i = 0; i < glyphCount; i++)
{ {
@ -195,11 +196,10 @@ void FONT<IDType>::read(athena::io::YAMLDocReader& __dna_docin)
else else
glyphs.emplace_back(new GlyphMP2); glyphs.emplace_back(new GlyphMP2);
__dna_docin.enterSubRecord(nullptr); if (auto rec = __dna_docin.enterSubRecord(nullptr))
glyphs.back()->read(__dna_docin); glyphs.back()->read(__dna_docin);
__dna_docin.leaveSubRecord();
} }
__dna_docin.leaveSubVector(); }
/* kerningInfoCount squelched */ /* kerningInfoCount squelched */
/* kerningInfo */ /* kerningInfo */
kerningInfoCount = __dna_docin.enumerate("kerningInfo", kerningInfo); kerningInfoCount = __dna_docin.enumerate("kerningInfo", kerningInfo);
@ -234,16 +234,10 @@ void FONT<IDType>::write(athena::io::YAMLDocWriter& __dna_docout) const
__dna_docout.writeUint32("textureFormat", textureFormat); __dna_docout.writeUint32("textureFormat", textureFormat);
/* glyphCount squelched */ /* glyphCount squelched */
/* glyphs */ /* glyphs */
__dna_docout.enterSubVector("glyphs"); if (auto v = __dna_docout.enterSubVector("glyphs"))
for (const std::unique_ptr<IGlyph>& glyph : glyphs) for (const std::unique_ptr<IGlyph>& glyph : glyphs)
{ if (auto rec = __dna_docout.enterSubRecord(nullptr))
__dna_docout.enterSubRecord(nullptr);
glyph->write(__dna_docout); glyph->write(__dna_docout);
__dna_docout.leaveSubRecord();
}
__dna_docout.leaveSubVector();
/* kerningInfoCount squelched */ /* kerningInfoCount squelched */
/* kerningInfo */ /* kerningInfo */
__dna_docout.enumerate("kerningInfo", kerningInfo); __dna_docout.enumerate("kerningInfo", kerningInfo);

10
DataSpec/DNACommon/PAK.cpp
View File

@ -207,18 +207,20 @@ void PAKRouter<BRIDGETYPE>::build(std::vector<BRIDGETYPE>& bridges, std::functio
{ {
if (namedEntry.name == "holo_cinf") if (namedEntry.name == "holo_cinf")
continue; /* Problematic corner case */ continue; /* Problematic corner case */
catalogWriter.enterSubRecord(namedEntry.name.c_str()); if (auto rec = catalogWriter.enterSubRecord(namedEntry.name.c_str()))
{
hecl::ProjectPath working = getWorking(namedEntry.id); hecl::ProjectPath working = getWorking(namedEntry.id);
if (working.getAuxInfoUTF8().size()) if (working.getAuxInfoUTF8().size())
{ {
catalogWriter.enterSubVector(nullptr); if (auto v = catalogWriter.enterSubVector(nullptr))
{
catalogWriter.writeString(nullptr, working.getRelativePathUTF8().c_str()); catalogWriter.writeString(nullptr, working.getRelativePathUTF8().c_str());
catalogWriter.writeString(nullptr, working.getAuxInfoUTF8().c_str()); catalogWriter.writeString(nullptr, working.getAuxInfoUTF8().c_str());
catalogWriter.leaveSubVector(); }
} }
else else
catalogWriter.writeString(nullptr, working.getRelativePathUTF8().c_str()); catalogWriter.writeString(nullptr, working.getRelativePathUTF8().c_str());
catalogWriter.leaveSubRecord(); }
} }
/* Write catalog */ /* Write catalog */

320
DataSpec/DNACommon/PART.cpp
View File

@ -16,7 +16,8 @@ void GPSM<IDType>::read(athena::io::YAMLDocReader& r)
continue; continue;
} }
r.enterSubRecord(elem.first.c_str()); if (auto rec = r.enterSubRecord(elem.first.c_str()))
{
switch (*reinterpret_cast<const uint32_t*>(elem.first.data())) switch (*reinterpret_cast<const uint32_t*>(elem.first.data()))
{ {
case SBIG('PMCL'): case SBIG('PMCL'):
@ -262,7 +263,7 @@ void GPSM<IDType>::read(athena::io::YAMLDocReader& r)
default: default:
break; break;
} }
r.leaveSubRecord(); }
} }
} }
@ -270,107 +271,56 @@ template <class IDType>
void GPSM<IDType>::write(athena::io::YAMLDocWriter& w) const void GPSM<IDType>::write(athena::io::YAMLDocWriter& w) const
{ {
if (x0_PSIV) if (x0_PSIV)
{ if (auto rec = w.enterSubRecord("PSIV"))
w.enterSubRecord("PSIV");
x0_PSIV.write(w); x0_PSIV.write(w);
w.leaveSubRecord();
}
if (x4_PSVM) if (x4_PSVM)
{ if (auto rec = w.enterSubRecord("PSVM"))
w.enterSubRecord("PSVM");
x4_PSVM.write(w); x4_PSVM.write(w);
w.leaveSubRecord();
}
if (x8_PSOV) if (x8_PSOV)
{ if (auto rec = w.enterSubRecord("PSOV"))
w.enterSubRecord("PSOV");
x8_PSOV.write(w); x8_PSOV.write(w);
w.leaveSubRecord();
}
if (xc_PSLT) if (xc_PSLT)
{ if (auto rec = w.enterSubRecord("PSLT"))
w.enterSubRecord("PSLT");
xc_PSLT.write(w); xc_PSLT.write(w);
w.leaveSubRecord();
}
if (x10_PSWT) if (x10_PSWT)
{ if (auto rec = w.enterSubRecord("PSWT"))
w.enterSubRecord("PSWT");
x10_PSWT.write(w); x10_PSWT.write(w);
w.leaveSubRecord();
}
if (x14_PSTS) if (x14_PSTS)
{ if (auto rec = w.enterSubRecord("PSTS"))
w.enterSubRecord("PSTS");
x14_PSTS.write(w); x14_PSTS.write(w);
w.leaveSubRecord();
}
if (x18_POFS) if (x18_POFS)
{ if (auto rec = w.enterSubRecord("POFS"))
w.enterSubRecord("POFS");
x18_POFS.write(w); x18_POFS.write(w);
w.leaveSubRecord();
}
if (x1c_SEED) if (x1c_SEED)
{ if (auto rec = w.enterSubRecord("SEED"))
w.enterSubRecord("SEED");
x1c_SEED.write(w); x1c_SEED.write(w);
w.leaveSubRecord();
}
if (x20_LENG) if (x20_LENG)
{ if (auto rec = w.enterSubRecord("LENG"))
w.enterSubRecord("LENG");
x20_LENG.write(w); x20_LENG.write(w);
w.leaveSubRecord();
}
if (x24_WIDT) if (x24_WIDT)
{ if (auto rec = w.enterSubRecord("WIDT"))
w.enterSubRecord("WIDT");
x24_WIDT.write(w); x24_WIDT.write(w);
w.leaveSubRecord();
}
if (x28_MAXP) if (x28_MAXP)
{ if (auto rec = w.enterSubRecord("MAXP"))
w.enterSubRecord("MAXP");
x28_MAXP.write(w); x28_MAXP.write(w);
w.leaveSubRecord();
}
if (x2c_GRTE) if (x2c_GRTE)
{ if (auto rec = w.enterSubRecord("GRTE"))
w.enterSubRecord("GRTE");
x2c_GRTE.write(w); x2c_GRTE.write(w);
w.leaveSubRecord();
}
if (x30_COLR) if (x30_COLR)
{ if (auto rec = w.enterSubRecord("COLR"))
w.enterSubRecord("COLR");
x30_COLR.write(w); x30_COLR.write(w);
w.leaveSubRecord();
}
if (x34_LTME) if (x34_LTME)
{ if (auto rec = w.enterSubRecord("LTME"))
w.enterSubRecord("LTME");
x34_LTME.write(w); x34_LTME.write(w);
w.leaveSubRecord();
}
if (x38_ILOC) if (x38_ILOC)
{ if (auto rec = w.enterSubRecord("ILOC"))
w.enterSubRecord("ILOC");
x38_ILOC.write(w); x38_ILOC.write(w);
w.leaveSubRecord();
}
if (x3c_IVEC) if (x3c_IVEC)
{ if (auto rec = w.enterSubRecord("IVEC"))
w.enterSubRecord("IVEC");
x3c_IVEC.write(w); x3c_IVEC.write(w);
w.leaveSubRecord();
}
if (x40_EMTR) if (x40_EMTR)
{ if (auto rec = w.enterSubRecord("EMTR"))
w.enterSubRecord("EMTR");
x40_EMTR.write(w); x40_EMTR.write(w);
w.leaveSubRecord();
}
if (x44_24_LINE) if (x44_24_LINE)
w.writeBool("LINE", true); w.writeBool("LINE", true);
if (x44_25_FXLL) if (x44_25_FXLL)
@ -408,281 +358,143 @@ void GPSM<IDType>::write(athena::io::YAMLDocWriter& w) const
if (x30_31_RSOP) if (x30_31_RSOP)
w.writeBool("RSOP", true); w.writeBool("RSOP", true);
if (x48_MBSP) if (x48_MBSP)
{ if (auto rec = w.enterSubRecord("MPSB"))
w.enterSubRecord("MPSB");
x48_MBSP.write(w); x48_MBSP.write(w);
w.leaveSubRecord();
}
if (x4c_SIZE) if (x4c_SIZE)
{ if (auto rec = w.enterSubRecord("SIZE"))
w.enterSubRecord("SIZE");
x4c_SIZE.write(w); x4c_SIZE.write(w);
w.leaveSubRecord();
}
if (x50_ROTA) if (x50_ROTA)
{ if (auto rec = w.enterSubRecord("ROTA"))
w.enterSubRecord("ROTA");
x50_ROTA.write(w); x50_ROTA.write(w);
w.leaveSubRecord();
}
if (x54_TEXR) if (x54_TEXR)
{ if (auto rec = w.enterSubRecord("TEXR"))
w.enterSubRecord("TEXR");
x54_TEXR.write(w); x54_TEXR.write(w);
w.leaveSubRecord();
}
if (x58_TIND) if (x58_TIND)
{ if (auto rec = w.enterSubRecord("TIND"))
w.enterSubRecord("TIND");
x58_TIND.write(w); x58_TIND.write(w);
w.leaveSubRecord();
}
if (x5c_PMDL) if (x5c_PMDL)
{ if (auto rec = w.enterSubRecord("PMDL"))
w.enterSubRecord("PMDL");
x5c_PMDL.write(w); x5c_PMDL.write(w);
w.leaveSubRecord();
}
if (x6c_PMOP) if (x6c_PMOP)
{ if (auto rec = w.enterSubRecord("PMOP"))
w.enterSubRecord("PMOP");
x6c_PMOP.write(w); x6c_PMOP.write(w);
w.leaveSubRecord();
}
if (x70_PMRT) if (x70_PMRT)
{ if (auto rec = w.enterSubRecord("PMRT"))
w.enterSubRecord("PMRT");
x70_PMRT.write(w); x70_PMRT.write(w);
w.leaveSubRecord();
}
if (x74_PMSC) if (x74_PMSC)
{ if (auto rec = w.enterSubRecord("PMSC"))
w.enterSubRecord("PMSC");
x74_PMSC.write(w); x74_PMSC.write(w);
w.leaveSubRecord();
}
if (x78_PMCL) if (x78_PMCL)
{ if (auto rec = w.enterSubRecord("PMCL"))
w.enterSubRecord("PMCL");
x78_PMCL.write(w); x78_PMCL.write(w);
w.leaveSubRecord();
}
if (x7c_VEL1) if (x7c_VEL1)
{ if (auto rec = w.enterSubRecord("VEL1"))
w.enterSubRecord("VEL1");
x7c_VEL1.write(w); x7c_VEL1.write(w);
w.leaveSubRecord();
}
if (x80_VEL2) if (x80_VEL2)
{ if (auto rec = w.enterSubRecord("VEL2"))
w.enterSubRecord("VEL2");
x80_VEL2.write(w); x80_VEL2.write(w);
w.leaveSubRecord();
}
if (x84_VEL3) if (x84_VEL3)
{ if (auto rec = w.enterSubRecord("VEL3"))
w.enterSubRecord("VEL3");
x84_VEL3.write(w); x84_VEL3.write(w);
w.leaveSubRecord();
}
if (x88_VEL4) if (x88_VEL4)
{ if (auto rec = w.enterSubRecord("VEL4"))
w.enterSubRecord("VEL4");
x88_VEL4.write(w); x88_VEL4.write(w);
w.leaveSubRecord();
}
if (x8c_ICTS) if (x8c_ICTS)
{ if (auto rec = w.enterSubRecord("ICTS"))
w.enterSubRecord("ICTS");
x8c_ICTS.write(w); x8c_ICTS.write(w);
w.leaveSubRecord();
}
if (x9c_NCSY) if (x9c_NCSY)
{ if (auto rec = w.enterSubRecord("NCSY"))
w.enterSubRecord("NCSY");
x9c_NCSY.write(w); x9c_NCSY.write(w);
w.leaveSubRecord();
}
if (xa0_CSSD) if (xa0_CSSD)
{ if (auto rec = w.enterSubRecord("CSSD"))
w.enterSubRecord("CSSD");
xa0_CSSD.write(w); xa0_CSSD.write(w);
w.leaveSubRecord();
}
if (xa4_IDTS) if (xa4_IDTS)
{ if (auto rec = w.enterSubRecord("IDTS"))
w.enterSubRecord("IDTS");
xa4_IDTS.write(w); xa4_IDTS.write(w);
w.leaveSubRecord();
}
if (xb4_NDSY) if (xb4_NDSY)
{ if (auto rec = w.enterSubRecord("NDSY"))
w.enterSubRecord("NDSY");
xb4_NDSY.write(w); xb4_NDSY.write(w);
w.leaveSubRecord();
}
if (xb8_IITS) if (xb8_IITS)
{ if (auto rec = w.enterSubRecord("IITS"))
w.enterSubRecord("IITS");
xb8_IITS.write(w); xb8_IITS.write(w);
w.leaveSubRecord();
}
if (xc8_PISY) if (xc8_PISY)
{ if (auto rec = w.enterSubRecord("PISY"))
w.enterSubRecord("PISY");
xc8_PISY.write(w); xc8_PISY.write(w);
w.leaveSubRecord();
}
if (xcc_SISY) if (xcc_SISY)
{ if (auto rec = w.enterSubRecord("SISY"))
w.enterSubRecord("SISY");
xcc_SISY.write(w); xcc_SISY.write(w);
w.leaveSubRecord();
}
if (xd0_KSSM) if (xd0_KSSM)
{ if (auto rec = w.enterSubRecord("KSSM"))
w.enterSubRecord("KSSM");
xd0_KSSM.write(w); xd0_KSSM.write(w);
w.leaveSubRecord();
}
if (xd4_SSWH) if (xd4_SSWH)
{ if (auto rec = w.enterSubRecord("SSWH"))
w.enterSubRecord("SSWH");
xd4_SSWH.write(w); xd4_SSWH.write(w);
w.leaveSubRecord();
}
if (xd8_SELC) if (xd8_SELC)
{ if (auto rec = w.enterSubRecord("SELC"))
w.enterSubRecord("SELC");
xd8_SELC.write(w); xd8_SELC.write(w);
w.leaveSubRecord();
}
if (xe4_SSSD) if (xe4_SSSD)
{ if (auto rec = w.enterSubRecord("SSSD"))
w.enterSubRecord("SSSD");
xe4_SSSD.write(w); xe4_SSSD.write(w);
w.leaveSubRecord();
}
if (xe8_SSPO) if (xe8_SSPO)
{ if (auto rec = w.enterSubRecord("SSPO"))
w.enterSubRecord("SSPO");
xe8_SSPO.write(w); xe8_SSPO.write(w);
w.leaveSubRecord();
}
if (xf8_SESD) if (xf8_SESD)
{ if (auto rec = w.enterSubRecord("SESD"))
w.enterSubRecord("SESD");
xf8_SESD.write(w); xf8_SESD.write(w);
w.leaveSubRecord();
}
if (xfc_SEPO) if (xfc_SEPO)
{ if (auto rec = w.enterSubRecord("SEPO"))
w.enterSubRecord("SEPO");
xfc_SEPO.write(w); xfc_SEPO.write(w);
w.leaveSubRecord();
}
if (xec_PMLC) if (xec_PMLC)
{ if (auto rec = w.enterSubRecord("PMLC"))
w.enterSubRecord("PMLC");
xec_PMLC.write(w); xec_PMLC.write(w);
w.leaveSubRecord();
}
if (x100_LTYP) if (x100_LTYP)
{ if (auto rec = w.enterSubRecord("LTYP"))
w.enterSubRecord("LTYP");
x100_LTYP.write(w); x100_LTYP.write(w);
w.leaveSubRecord();
}
if (x104_LCLR) if (x104_LCLR)
{ if (auto rec = w.enterSubRecord("LCLR"))
w.enterSubRecord("LCLR");
x104_LCLR.write(w); x104_LCLR.write(w);
w.leaveSubRecord();
}
if (x108_LINT) if (x108_LINT)
{ if (auto rec = w.enterSubRecord("LINT"))
w.enterSubRecord("LINT");
x108_LINT.write(w); x108_LINT.write(w);
w.leaveSubRecord();
}
if (x10c_LOFF) if (x10c_LOFF)
{ if (auto rec = w.enterSubRecord("LOFF"))
w.enterSubRecord("LOFF");
x10c_LOFF.write(w); x10c_LOFF.write(w);
w.leaveSubRecord();
}
if (x110_LDIR) if (x110_LDIR)
{ if (auto rec = w.enterSubRecord("LDIR"))
w.enterSubRecord("LDIR");
x110_LDIR.write(w); x110_LDIR.write(w);
w.leaveSubRecord();
}
if (x114_LFOT) if (x114_LFOT)
{ if (auto rec = w.enterSubRecord("LFOT"))
w.enterSubRecord("LFOT");
x114_LFOT.write(w); x114_LFOT.write(w);
w.leaveSubRecord();
}
if (x118_LFOR) if (x118_LFOR)
{ if (auto rec = w.enterSubRecord("LFOR"))
w.enterSubRecord("LFOR");
x118_LFOR.write(w); x118_LFOR.write(w);
w.leaveSubRecord();
}
if (x11c_LSLA) if (x11c_LSLA)
{ if (auto rec = w.enterSubRecord("LSLA"))
w.enterSubRecord("LSLA");
x11c_LSLA.write(w); x11c_LSLA.write(w);
w.leaveSubRecord();
}
if (x10c_ADV1) if (x10c_ADV1)
{ if (auto rec = w.enterSubRecord("ADV1"))
w.enterSubRecord("ADV1");
x10c_ADV1.write(w); x10c_ADV1.write(w);
w.leaveSubRecord();
}
if (x110_ADV2) if (x110_ADV2)
{ if (auto rec = w.enterSubRecord("ADV2"))
w.enterSubRecord("ADV2");
x110_ADV2.write(w); x110_ADV2.write(w);
w.leaveSubRecord();
}
if (x114_ADV3) if (x114_ADV3)
{ if (auto rec = w.enterSubRecord("ADV3"))
w.enterSubRecord("ADV3");
x114_ADV3.write(w); x114_ADV3.write(w);
w.leaveSubRecord();
}
if (x118_ADV4) if (x118_ADV4)
{ if (auto rec = w.enterSubRecord("ADV4"))
w.enterSubRecord("ADV4");
x118_ADV4.write(w); x118_ADV4.write(w);
w.leaveSubRecord();
}
if (x11c_ADV5) if (x11c_ADV5)
{ if (auto rec = w.enterSubRecord("ADV5"))
w.enterSubRecord("ADV5");
x11c_ADV5.write(w); x11c_ADV5.write(w);
w.leaveSubRecord();
}
if (x120_ADV6) if (x120_ADV6)
{ if (auto rec = w.enterSubRecord("ADV6"))
w.enterSubRecord("ADV6");
x120_ADV6.write(w); x120_ADV6.write(w);
w.leaveSubRecord();
}
if (x124_ADV7) if (x124_ADV7)
{ if (auto rec = w.enterSubRecord("ADV7"))
w.enterSubRecord("ADV7");
x124_ADV7.write(w); x124_ADV7.write(w);
w.leaveSubRecord();
}
if (x128_ADV8) if (x128_ADV8)
{ if (auto rec = w.enterSubRecord("ADV8"))
w.enterSubRecord("ADV8");
x128_ADV8.write(w); x128_ADV8.write(w);
w.leaveSubRecord();
}
} }
template <class IDType> template <class IDType>

48
DataSpec/DNACommon/ParticleCommon.cpp
View File

@ -125,19 +125,15 @@ void RealElementFactory::read(athena::io::YAMLDocReader& r)
m_elem.reset(); m_elem.reset();
return; return;
} }
r.enterSubRecord(elem.first.c_str()); if (auto rec = r.enterSubRecord(elem.first.c_str()))
m_elem->read(r); m_elem->read(r);
r.leaveSubRecord();
} }
void RealElementFactory::write(athena::io::YAMLDocWriter& w) const void RealElementFactory::write(athena::io::YAMLDocWriter& w) const
{ {
if (m_elem) if (m_elem)
{ if (auto rec = w.enterSubRecord(m_elem->ClassID()))
w.enterSubRecord(m_elem->ClassID());
m_elem->write(w); m_elem->write(w);
w.leaveSubRecord();
}
} }
size_t RealElementFactory::binarySize(size_t __isz) const size_t RealElementFactory::binarySize(size_t __isz) const
@ -348,19 +344,15 @@ void IntElementFactory::read(athena::io::YAMLDocReader& r)
m_elem.reset(); m_elem.reset();
return; return;
} }
r.enterSubRecord(elem.first.c_str()); if (auto rec = r.enterSubRecord(elem.first.c_str()))
m_elem->read(r); m_elem->read(r);
r.leaveSubRecord();
} }
void IntElementFactory::write(athena::io::YAMLDocWriter& w) const void IntElementFactory::write(athena::io::YAMLDocWriter& w) const
{ {
if (m_elem) if (m_elem)
{ if (auto rec = w.enterSubRecord(m_elem->ClassID()))
w.enterSubRecord(m_elem->ClassID());
m_elem->write(w); m_elem->write(w);
w.leaveSubRecord();
}
} }
size_t IntElementFactory::binarySize(size_t __isz) const size_t IntElementFactory::binarySize(size_t __isz) const
@ -522,19 +514,15 @@ void VectorElementFactory::read(athena::io::YAMLDocReader& r)
m_elem.reset(); m_elem.reset();
return; return;
} }
r.enterSubRecord(elem.first.c_str()); if (auto rec = r.enterSubRecord(elem.first.c_str()))
m_elem->read(r); m_elem->read(r);
r.leaveSubRecord();
} }
void VectorElementFactory::write(athena::io::YAMLDocWriter& w) const void VectorElementFactory::write(athena::io::YAMLDocWriter& w) const
{ {
if (m_elem) if (m_elem)
{ if (auto rec = w.enterSubRecord(m_elem->ClassID()))
w.enterSubRecord(m_elem->ClassID());
m_elem->write(w); m_elem->write(w);
w.leaveSubRecord();
}
} }
size_t VectorElementFactory::binarySize(size_t __isz) const size_t VectorElementFactory::binarySize(size_t __isz) const
@ -664,19 +652,15 @@ void ColorElementFactory::read(athena::io::YAMLDocReader& r)
m_elem.reset(); m_elem.reset();
return; return;
} }
r.enterSubRecord(elem.first.c_str()); if (auto rec = r.enterSubRecord(elem.first.c_str()))
m_elem->read(r); m_elem->read(r);
r.leaveSubRecord();
} }
void ColorElementFactory::write(athena::io::YAMLDocWriter& w) const void ColorElementFactory::write(athena::io::YAMLDocWriter& w) const
{ {
if (m_elem) if (m_elem)
{ if (auto rec = w.enterSubRecord(m_elem->ClassID()))
w.enterSubRecord(m_elem->ClassID());
m_elem->write(w); m_elem->write(w);
w.leaveSubRecord();
}
} }
size_t ColorElementFactory::binarySize(size_t __isz) const size_t ColorElementFactory::binarySize(size_t __isz) const
@ -790,19 +774,15 @@ void ModVectorElementFactory::read(athena::io::YAMLDocReader& r)
m_elem.reset(); m_elem.reset();
return; return;
} }
r.enterSubRecord(elem.first.c_str()); if (auto rec = r.enterSubRecord(elem.first.c_str()))
m_elem->read(r); m_elem->read(r);
r.leaveSubRecord();
} }
void ModVectorElementFactory::write(athena::io::YAMLDocWriter& w) const void ModVectorElementFactory::write(athena::io::YAMLDocWriter& w) const
{ {
if (m_elem) if (m_elem)
{ if (auto rec = w.enterSubRecord(m_elem->ClassID()))
w.enterSubRecord(m_elem->ClassID());
m_elem->write(w); m_elem->write(w);
w.leaveSubRecord();
}
} }
size_t ModVectorElementFactory::binarySize(size_t __isz) const size_t ModVectorElementFactory::binarySize(size_t __isz) const
@ -909,19 +889,15 @@ void EmitterElementFactory::read(athena::io::YAMLDocReader& r)
m_elem.reset(); m_elem.reset();
return; return;
} }
r.enterSubRecord(elem.first.c_str()); if (auto rec = r.enterSubRecord(elem.first.c_str()))
m_elem->read(r); m_elem->read(r);
r.leaveSubRecord();
} }
void EmitterElementFactory::write(athena::io::YAMLDocWriter& w) const void EmitterElementFactory::write(athena::io::YAMLDocWriter& w) const
{ {
if (m_elem) if (m_elem)
{ if (auto rec = w.enterSubRecord(m_elem->ClassID()))
w.enterSubRecord(m_elem->ClassID());
m_elem->write(w); m_elem->write(w);
w.leaveSubRecord();
}
} }
size_t EmitterElementFactory::binarySize(size_t __isz) const size_t EmitterElementFactory::binarySize(size_t __isz) const

217
DataSpec/DNACommon/ParticleCommon.hpp
View File

@ -631,25 +631,21 @@ struct VEConstant : IVectorElement
void read(athena::io::YAMLDocReader& r) void read(athena::io::YAMLDocReader& r)
{ {
size_t elemCount; size_t elemCount;
r.enterSubVector(nullptr, elemCount); if (auto v = r.enterSubVector(nullptr, elemCount))
{
for (int i=0 ; i<3 && i<elemCount ; ++i) for (int i=0 ; i<3 && i<elemCount ; ++i)
{ {
r.enterSubRecord(nullptr); if (auto rec = r.enterSubRecord(nullptr))
comps[i].read(r); comps[i].read(r);
r.leaveSubRecord();
} }
r.leaveSubVector(); }
} }
void write(athena::io::YAMLDocWriter& w) const void write(athena::io::YAMLDocWriter& w) const
{ {
w.enterSubVector(nullptr); if (auto v = w.enterSubVector(nullptr))
for (int i=0 ; i<3 ; ++i) for (int i=0 ; i<3 ; ++i)
{ if (auto rec = w.enterSubRecord(nullptr))
w.enterSubRecord(nullptr);
comps[i].write(w); comps[i].write(w);
w.leaveSubRecord();
}
w.leaveSubVector();
} }
size_t binarySize(size_t __isz) const size_t binarySize(size_t __isz) const
{ {
@ -782,22 +778,15 @@ struct CEConstant : IColorElement
void read(athena::io::YAMLDocReader& r) void read(athena::io::YAMLDocReader& r)
{ {
for (int i=0 ; i<4 ; ++i) for (int i=0 ; i<4 ; ++i)
{ if (auto rec = r.enterSubRecord(nullptr))
r.enterSubRecord(nullptr);
comps[i].read(r); comps[i].read(r);
r.leaveSubRecord();
}
} }
void write(athena::io::YAMLDocWriter& w) const void write(athena::io::YAMLDocWriter& w) const
{ {
w.enterSubVector(nullptr); if (auto v = w.enterSubVector(nullptr))
for (int i=0 ; i<4 ; ++i) for (int i=0 ; i<4 ; ++i)
{ if (auto rec = w.enterSubRecord(nullptr))
w.enterSubRecord(nullptr);
comps[i].write(w); comps[i].write(w);
w.leaveSubRecord();
}
w.leaveSubVector();
} }
size_t binarySize(size_t __isz) const size_t binarySize(size_t __isz) const
{ {
@ -912,22 +901,15 @@ struct MVEConstant : IModVectorElement
void read(athena::io::YAMLDocReader& r) void read(athena::io::YAMLDocReader& r)
{ {
for (int i=0 ; i<3 ; ++i) for (int i=0 ; i<3 ; ++i)
{ if (auto rec = r.enterSubRecord(nullptr))
r.enterSubRecord(nullptr);
comps[i].read(r); comps[i].read(r);
r.leaveSubRecord();
}
} }
void write(athena::io::YAMLDocWriter& w) const void write(athena::io::YAMLDocWriter& w) const
{ {
w.enterSubVector(nullptr); if (auto v = w.enterSubVector(nullptr))
for (int i=0 ; i<3 ; ++i) for (int i=0 ; i<3 ; ++i)
{ if (auto rec = w.enterSubRecord(nullptr))
w.enterSubRecord(nullptr);
comps[i].write(w); comps[i].write(w);
w.leaveSubRecord();
}
w.leaveSubVector();
} }
size_t binarySize(size_t __isz) const size_t binarySize(size_t __isz) const
{ {
@ -1050,25 +1032,17 @@ struct EESimpleEmitterTR : EESimpleEmitter
{ {
position.m_elem.reset(); position.m_elem.reset();
velocity.m_elem.reset(); velocity.m_elem.reset();
if (r.enterSubRecord("ILOC")) if (auto rec = r.enterSubRecord("ILOC"))
{
position.read(r); position.read(r);
r.leaveSubRecord(); if (auto rec = r.enterSubRecord("IVEC"))
}
if (r.enterSubRecord("IVEC"))
{
velocity.read(r); velocity.read(r);
r.leaveSubRecord();
}
} }
void write(athena::io::YAMLDocWriter& w) const void write(athena::io::YAMLDocWriter& w) const
{ {
w.enterSubRecord("ILOC"); if (auto rec = w.enterSubRecord("ILOC"))
position.write(w); position.write(w);
w.leaveSubRecord(); if (auto rec = w.enterSubRecord("IVEC"))
w.enterSubRecord("IVEC");
velocity.write(w); velocity.write(w);
w.leaveSubRecord();
} }
size_t binarySize(size_t __isz) const size_t binarySize(size_t __isz) const
{ {
@ -1109,17 +1083,13 @@ struct UVEConstant : IUVElement
void read(athena::io::YAMLDocReader& r) void read(athena::io::YAMLDocReader& r)
{ {
tex.clear(); tex.clear();
if (r.enterSubRecord("tex")) if (auto rec = r.enterSubRecord("tex"))
{
tex.read(r); tex.read(r);
r.leaveSubRecord();
}
} }
void write(athena::io::YAMLDocWriter& w) const void write(athena::io::YAMLDocWriter& w) const
{ {
w.enterSubRecord("tex"); if (auto rec = w.enterSubRecord("tex"))
tex.write(w); tex.write(w);
w.leaveSubRecord();
} }
size_t binarySize(size_t __isz) const size_t binarySize(size_t __isz) const
{ {
@ -1160,62 +1130,35 @@ struct UVEAnimTexture : IUVElement
void read(athena::io::YAMLDocReader& r) void read(athena::io::YAMLDocReader& r)
{ {
tex.clear(); tex.clear();
if (r.enterSubRecord("tex")) if (auto rec = r.enterSubRecord("tex"))
{
tex.read(r); tex.read(r);
r.leaveSubRecord(); if (auto rec = r.enterSubRecord("tileW"))
}
if (r.enterSubRecord("tileW"))
{
tileW.read(r); tileW.read(r);
r.leaveSubRecord(); if (auto rec = r.enterSubRecord("tileH"))
}
if (r.enterSubRecord("tileH"))
{
tileH.read(r); tileH.read(r);
r.leaveSubRecord(); if (auto rec = r.enterSubRecord("strideW"))
}
if (r.enterSubRecord("strideW"))
{
strideW.read(r); strideW.read(r);
r.leaveSubRecord(); if (auto rec = r.enterSubRecord("strideH"))
}
if (r.enterSubRecord("strideH"))
{
strideH.read(r); strideH.read(r);
r.leaveSubRecord(); if (auto rec = r.enterSubRecord("cycleFrames"))
}
if (r.enterSubRecord("cycleFrames"))
{
cycleFrames.read(r); cycleFrames.read(r);
r.leaveSubRecord(); if (auto rec = r.enterSubRecord("loop"))
}
if (r.enterSubRecord("loop"))
{
loop = r.readBool(nullptr); loop = r.readBool(nullptr);
r.leaveSubRecord();
}
} }
void write(athena::io::YAMLDocWriter& w) const void write(athena::io::YAMLDocWriter& w) const
{ {
w.enterSubRecord("tex"); if (auto rec = w.enterSubRecord("tex"))
tex.write(w); tex.write(w);
w.leaveSubRecord(); if (auto rec = w.enterSubRecord("tileW"))
w.enterSubRecord("tileW");
tileW.write(w); tileW.write(w);
w.leaveSubRecord(); if (auto rec = w.enterSubRecord("tileH"))
w.enterSubRecord("tileH");
tileH.write(w); tileH.write(w);
w.leaveSubRecord(); if (auto rec = w.enterSubRecord("strideW"))
w.enterSubRecord("strideW");
strideW.write(w); strideW.write(w);
w.leaveSubRecord(); if (auto rec = w.enterSubRecord("strideH"))
w.enterSubRecord("strideH");
strideH.write(w); strideH.write(w);
w.leaveSubRecord(); if (auto rec = w.enterSubRecord("cycleFrames"))
w.enterSubRecord("cycleFrames");
cycleFrames.write(w); cycleFrames.write(w);
w.leaveSubRecord();
w.writeBool("loop", loop); w.writeBool("loop", loop);
} }
size_t binarySize(size_t __isz) const size_t binarySize(size_t __isz) const
@ -1274,17 +1217,15 @@ struct UVElementFactory : BigYAML
void read(athena::io::YAMLDocReader& r) void read(athena::io::YAMLDocReader& r)
{ {
if (r.enterSubRecord("CNST")) if (auto rec = r.enterSubRecord("CNST"))
{ {
m_elem.reset(new struct UVEConstant<IDType>); m_elem.reset(new struct UVEConstant<IDType>);
m_elem->read(r); m_elem->read(r);
r.leaveSubRecord();
} }
else if (r.enterSubRecord("ATEX")) else if (auto rec = r.enterSubRecord("ATEX"))
{ {
m_elem.reset(new struct UVEAnimTexture<IDType>); m_elem.reset(new struct UVEAnimTexture<IDType>);
m_elem->read(r); m_elem->read(r);
r.leaveSubRecord();
} }
else else
m_elem.reset(); m_elem.reset();
@ -1293,11 +1234,8 @@ struct UVElementFactory : BigYAML
void write(athena::io::YAMLDocWriter& w) const void write(athena::io::YAMLDocWriter& w) const
{ {
if (m_elem) if (m_elem)
{ if (auto rec = w.enterSubRecord(m_elem->ClassID()))
w.enterSubRecord(m_elem->ClassID());
m_elem->write(w); m_elem->write(w);
w.leaveSubRecord();
}
} }
size_t binarySize(size_t __isz) const size_t binarySize(size_t __isz) const
@ -1358,32 +1296,19 @@ struct SpawnSystemKeyframeData : BigYAML
void read(athena::io::YAMLDocReader& r) void read(athena::io::YAMLDocReader& r)
{ {
if (r.enterSubRecord("id")) if (auto rec = r.enterSubRecord("id"))
{
id.read(r); id.read(r);
r.leaveSubRecord(); if (auto rec = r.enterSubRecord("a"))
}
if (r.enterSubRecord("a"))
{
a = r.readUint32(nullptr); a = r.readUint32(nullptr);
r.leaveSubRecord(); if (auto rec = r.enterSubRecord("b"))
}
if (r.enterSubRecord("b"))
{
b = r.readUint32(nullptr); b = r.readUint32(nullptr);
r.leaveSubRecord(); if (auto rec = r.enterSubRecord("c"))
}
if (r.enterSubRecord("c"))
{
c = r.readUint32(nullptr); c = r.readUint32(nullptr);
r.leaveSubRecord();
}
} }
void write(athena::io::YAMLDocWriter& w) const void write(athena::io::YAMLDocWriter& w) const
{ {
w.enterSubRecord("id"); if (auto rec = w.enterSubRecord("id"))
id.write(w); id.write(w);
w.leaveSubRecord();
w.writeUint32("a", a); w.writeUint32("a", a);
w.writeUint32("b", b); w.writeUint32("b", b);
w.writeUint32("c", c); w.writeUint32("c", c);
@ -1412,55 +1337,39 @@ struct SpawnSystemKeyframeData : BigYAML
void read(athena::io::YAMLDocReader& r) void read(athena::io::YAMLDocReader& r)
{ {
if (r.enterSubRecord("a")) if (auto rec = r.enterSubRecord("a"))
{
a = r.readUint32(nullptr); a = r.readUint32(nullptr);
r.leaveSubRecord(); if (auto rec = r.enterSubRecord("b"))
}
if (r.enterSubRecord("b"))
{
b = r.readUint32(nullptr); b = r.readUint32(nullptr);
r.leaveSubRecord(); if (auto rec = r.enterSubRecord("endFrame"))
}
if (r.enterSubRecord("endFrame"))
{
endFrame = r.readUint32(nullptr); endFrame = r.readUint32(nullptr);
r.leaveSubRecord(); if (auto rec = r.enterSubRecord("d"))
}
if (r.enterSubRecord("d"))
{
d = r.readUint32(nullptr); d = r.readUint32(nullptr);
r.leaveSubRecord();
}
spawns.clear(); spawns.clear();
size_t spawnCount; size_t spawnCount;
if (r.enterSubVector("spawns", spawnCount)) if (auto v = r.enterSubVector("spawns", spawnCount))
{ {
spawns.reserve(spawnCount); spawns.reserve(spawnCount);
for (const auto& child : r.getCurNode()->m_seqChildren) for (const auto& child : r.getCurNode()->m_seqChildren)
{ {
if (r.enterSubRecord(nullptr)) if (auto rec = r.enterSubRecord(nullptr))
{ {
spawns.emplace_back(); spawns.emplace_back();
spawns.back().first = r.readUint32("startFrame"); spawns.back().first = r.readUint32("startFrame");
size_t systemCount; size_t systemCount;
if (r.enterSubVector("systems", systemCount)) if (auto v = r.enterSubVector("systems", systemCount))
{ {
spawns.back().second.reserve(systemCount); spawns.back().second.reserve(systemCount);
for (const auto& in : r.getCurNode()->m_seqChildren) for (const auto& in : r.getCurNode()->m_seqChildren)
{ {
spawns.back().second.emplace_back(); spawns.back().second.emplace_back();
SpawnSystemKeyframeInfo& info = spawns.back().second.back(); SpawnSystemKeyframeInfo& info = spawns.back().second.back();
r.enterSubRecord(nullptr); if (auto rec = r.enterSubRecord(nullptr))
info.read(r); info.read(r);
r.leaveSubRecord();
}
r.leaveSubVector();
}
r.leaveSubRecord();
} }
} }
r.leaveSubVector(); }
}
} }
} }
void write(athena::io::YAMLDocWriter& w) const void write(athena::io::YAMLDocWriter& w) const
@ -1471,22 +1380,20 @@ struct SpawnSystemKeyframeData : BigYAML
w.writeUint32("b", b); w.writeUint32("b", b);
w.writeUint32("endFrame", endFrame); w.writeUint32("endFrame", endFrame);
w.writeUint32("d", d); w.writeUint32("d", d);
w.enterSubVector("spawns"); if (auto v = w.enterSubVector("spawns"))
{
for (const auto& spawn : spawns) for (const auto& spawn : spawns)
{ {
w.enterSubRecord(nullptr); if (auto rec = w.enterSubRecord(nullptr))
w.writeUint32("startFrame", spawn.first);
w.enterSubVector("systems");
for (const auto& info : spawn.second)
{ {
w.enterSubRecord(nullptr); w.writeUint32("startFrame", spawn.first);
if (auto v = w.enterSubVector("systems"))
for (const auto& info : spawn.second)
if (auto rec = w.enterSubRecord(nullptr))
info.write(w); info.write(w);
w.leaveSubRecord();
} }
w.leaveSubVector();
w.leaveSubRecord();
} }
w.leaveSubVector(); }
} }
size_t binarySize(size_t __isz) const size_t binarySize(size_t __isz) const
{ {
@ -1566,20 +1473,14 @@ struct ChildResourceFactory : BigYAML
void read(athena::io::YAMLDocReader& r) void read(athena::io::YAMLDocReader& r)
{ {
id.clear(); id.clear();
if (r.enterSubRecord("CNST")) if (auto rec = r.enterSubRecord("CNST"))
{
id.read(r); id.read(r);
r.leaveSubRecord();
}
} }
void write(athena::io::YAMLDocWriter& w) const void write(athena::io::YAMLDocWriter& w) const
{ {
if (id) if (id)
{ if (auto rec = w.enterSubRecord("CNST"))
w.enterSubRecord("CNST");
id.write(w); id.write(w);
w.leaveSubRecord();
}
} }
size_t binarySize(size_t __isz) const size_t binarySize(size_t __isz) const
{ {

91
DataSpec/DNACommon/SWHC.cpp
View File

@ -16,7 +16,8 @@ void SWSH<IDType>::read(athena::io::YAMLDocReader& r)
continue; continue;
} }
r.enterSubRecord(elem.first.c_str()); if (auto rec = r.enterSubRecord(elem.first.c_str()))
{
switch(*reinterpret_cast<const uint32_t*>(elem.first.data())) switch(*reinterpret_cast<const uint32_t*>(elem.first.data()))
{ {
case SBIG('PSLT'): case SBIG('PSLT'):
@ -104,8 +105,7 @@ void SWSH<IDType>::read(athena::io::YAMLDocReader& r)
x45_26_CRND = r.readBool(nullptr); x45_26_CRND = r.readBool(nullptr);
break; break;
} }
}
r.leaveSubRecord();
} }
} }
@ -113,107 +113,56 @@ template <class IDType>
void SWSH<IDType>::write(athena::io::YAMLDocWriter& w) const void SWSH<IDType>::write(athena::io::YAMLDocWriter& w) const
{ {
if (x0_PSLT) if (x0_PSLT)
{ if (auto rec = w.enterSubRecord("PSLT"))
w.enterSubRecord("PSLT");
x0_PSLT.write(w); x0_PSLT.write(w);
w.leaveSubRecord();
}
if (x4_TIME) if (x4_TIME)
{ if (auto rec = w.enterSubRecord("TIME"))
w.enterSubRecord("TIME");
x4_TIME.write(w); x4_TIME.write(w);
w.leaveSubRecord();
}
if (x8_LRAD) if (x8_LRAD)
{ if (auto rec = w.enterSubRecord("LRAD"))
w.enterSubRecord("LRAD");
x8_LRAD.write(w); x8_LRAD.write(w);
w.leaveSubRecord();
}
if (xc_RRAD) if (xc_RRAD)
{ if (auto rec = w.enterSubRecord("RRAD"))
w.enterSubRecord("RRAD");
xc_RRAD.write(w); xc_RRAD.write(w);
w.leaveSubRecord();
}
if (x10_LENG) if (x10_LENG)
{ if (auto rec = w.enterSubRecord("LENG"))
w.enterSubRecord("LENG");
x10_LENG.write(w); x10_LENG.write(w);
w.leaveSubRecord();
}
if (x14_COLR) if (x14_COLR)
{ if (auto rec = w.enterSubRecord("COLR"))
w.enterSubRecord("COLR");
x14_COLR.write(w); x14_COLR.write(w);
w.leaveSubRecord();
}
if (x18_SIDE) if (x18_SIDE)
{ if (auto rec = w.enterSubRecord("SIDE"))
w.enterSubRecord("SIDE");
x18_SIDE.write(w); x18_SIDE.write(w);
w.leaveSubRecord();
}
if (x1c_IROT) if (x1c_IROT)
{ if (auto rec = w.enterSubRecord("IROT"))
w.enterSubRecord("IROT");
x1c_IROT.write(w); x1c_IROT.write(w);
w.leaveSubRecord();
}
if (x20_ROTM) if (x20_ROTM)
{ if (auto rec = w.enterSubRecord("ROTM"))
w.enterSubRecord("ROTM");
x20_ROTM.write(w); x20_ROTM.write(w);
w.leaveSubRecord();
}
if (x24_POFS) if (x24_POFS)
{ if (auto rec = w.enterSubRecord("POFS"))
w.enterSubRecord("POFS");
x24_POFS.write(w); x24_POFS.write(w);
w.leaveSubRecord();
}
if (x28_IVEL) if (x28_IVEL)
{ if (auto rec = w.enterSubRecord("IVEL"))
w.enterSubRecord("IVEL");
x28_IVEL.write(w); x28_IVEL.write(w);
w.leaveSubRecord();
}
if (x2c_NPOS) if (x2c_NPOS)
{ if (auto rec = w.enterSubRecord("NPOS"))
w.enterSubRecord("NPOS");
x2c_NPOS.write(w); x2c_NPOS.write(w);
w.leaveSubRecord();
}
if (x30_VELM) if (x30_VELM)
{ if (auto rec = w.enterSubRecord("VELM"))
w.enterSubRecord("VELM");
x30_VELM.write(w); x30_VELM.write(w);
w.leaveSubRecord();
}
if (x34_VLM2) if (x34_VLM2)
{ if (auto rec = w.enterSubRecord("VLM2"))
w.enterSubRecord("VLM2");
x34_VLM2.write(w); x34_VLM2.write(w);
w.leaveSubRecord();
}
if (x38_SPLN) if (x38_SPLN)
{ if (auto rec = w.enterSubRecord("SPLN"))
w.enterSubRecord("SPLN");
x38_SPLN.write(w); x38_SPLN.write(w);
w.leaveSubRecord();
}
if (x3c_TEXR) if (x3c_TEXR)
{ if (auto rec = w.enterSubRecord("TEXR"))
w.enterSubRecord("TEXR");
x3c_TEXR.write(w); x3c_TEXR.write(w);
w.leaveSubRecord();
}
if (x40_TSPN) if (x40_TSPN)
{ if (auto rec = w.enterSubRecord("TSPN"))
w.enterSubRecord("TSPN");
x40_TSPN.write(w); x40_TSPN.write(w);
w.leaveSubRecord();
}
if (x44_24_LLRD) if (x44_24_LLRD)
w.writeBool("LLRD", true); w.writeBool("LLRD", true);

172
DataSpec/DNACommon/WPSC.cpp
View File

@ -16,8 +16,8 @@ void WPSM<IDType>::read(athena::io::YAMLDocReader& r)
continue; continue;
} }
r.enterSubRecord(elem.first.c_str()); if (auto rec = r.enterSubRecord(elem.first.c_str()))
{
switch (*reinterpret_cast<const uint32_t*>(elem.first.data())) switch (*reinterpret_cast<const uint32_t*>(elem.first.data()))
{ {
case SBIG('IORN'): case SBIG('IORN'):
@ -123,8 +123,7 @@ void WPSM<IDType>::read(athena::io::YAMLDocReader& r)
xunk_SPS2.read(r); xunk_SPS2.read(r);
break; break;
} }
}
r.leaveSubRecord();
} }
} }
@ -132,205 +131,106 @@ template <class IDType>
void WPSM<IDType>::write(athena::io::YAMLDocWriter& w) const void WPSM<IDType>::write(athena::io::YAMLDocWriter& w) const
{ {
if (x0_IORN) if (x0_IORN)
{ if (auto rec = w.enterSubRecord("IORN"))
w.enterSubRecord("IORN");
x0_IORN.write(w); x0_IORN.write(w);
w.leaveSubRecord();
}
if (x4_IVEC) if (x4_IVEC)
{ if (auto rec = w.enterSubRecord("IVEC"))
w.enterSubRecord("IVEC");
x4_IVEC.write(w); x4_IVEC.write(w);
w.leaveSubRecord();
}
if (x8_PSOV) if (x8_PSOV)
{ if (auto rec = w.enterSubRecord("PSOV"))
w.enterSubRecord("PSOV");
x8_PSOV.write(w); x8_PSOV.write(w);
w.leaveSubRecord();
}
if (xc_PSVM) if (xc_PSVM)
{ if (auto rec = w.enterSubRecord("PSVM"))
w.enterSubRecord("PSVM");
xc_PSVM.write(w); xc_PSVM.write(w);
w.leaveSubRecord();
}
if (x10_VMD2) if (x10_VMD2)
{ if (auto rec = w.enterSubRecord("VMD2"))
w.enterSubRecord("VMD2");
x10_VMD2.write(w); x10_VMD2.write(w);
w.leaveSubRecord();
}
if (x14_PSLT) if (x14_PSLT)
{ if (auto rec = w.enterSubRecord("PSLT"))
w.enterSubRecord("PSLT");
x14_PSLT.write(w); x14_PSLT.write(w);
w.leaveSubRecord();
}
if (x18_PSCL) if (x18_PSCL)
{ if (auto rec = w.enterSubRecord("PSCL"))
w.enterSubRecord("PSCL");
x18_PSCL.write(w); x18_PSCL.write(w);
w.leaveSubRecord();
}
if (x1c_PCOL) if (x1c_PCOL)
{ if (auto rec = w.enterSubRecord("PCOL"))
w.enterSubRecord("PCOL");
x1c_PCOL.write(w); x1c_PCOL.write(w);
w.leaveSubRecord();
}
if (x20_POFS) if (x20_POFS)
{ if (auto rec = w.enterSubRecord("POFS"))
w.enterSubRecord("POFS");
x20_POFS.write(w); x20_POFS.write(w);
w.leaveSubRecord();
}
if (x24_OFST) if (x24_OFST)
{ if (auto rec = w.enterSubRecord("OFST"))
w.enterSubRecord("OFST");
x24_OFST.write(w); x24_OFST.write(w);
w.leaveSubRecord();
}
if (x28_APSO) if (x28_APSO)
{ if (auto rec = w.enterSubRecord("APSO"))
w.enterSubRecord("APSO");
x28_APSO.write(w); x28_APSO.write(w);
w.leaveSubRecord();
}
if (x29_HOMG) if (x29_HOMG)
{ if (auto rec = w.enterSubRecord("HOMG"))
w.enterSubRecord("HOMG");
x29_HOMG.write(w); x29_HOMG.write(w);
w.leaveSubRecord();
}
if (x2a_AP11) if (x2a_AP11)
{ if (auto rec = w.enterSubRecord("AP11"))
w.enterSubRecord("AP11");
x2a_AP11.write(w); x2a_AP11.write(w);
w.leaveSubRecord();
}
if (x2b_AP21) if (x2b_AP21)
{ if (auto rec = w.enterSubRecord("AP21"))
w.enterSubRecord("AP21");
x2b_AP21.write(w); x2b_AP21.write(w);
w.leaveSubRecord();
}
if (x2c_AS11) if (x2c_AS11)
{ if (auto rec = w.enterSubRecord("AS11"))
w.enterSubRecord("AS11");
x2c_AS11.write(w); x2c_AS11.write(w);
w.leaveSubRecord();
}
if (x2d_AS12) if (x2d_AS12)
{ if (auto rec = w.enterSubRecord("AS12"))
w.enterSubRecord("AS12");
x2d_AS12.write(w); x2d_AS12.write(w);
w.leaveSubRecord();
}
if (x2e_AS13) if (x2e_AS13)
{ if (auto rec = w.enterSubRecord("AS13"))
w.enterSubRecord("AS13");
x2e_AS13.write(w); x2e_AS13.write(w);
w.leaveSubRecord();
}
if (x30_TRAT) if (x30_TRAT)
{ if (auto rec = w.enterSubRecord("TRAT"))
w.enterSubRecord("TRAT");
x30_TRAT.write(w); x30_TRAT.write(w);
w.leaveSubRecord();
}
if (x34_APSM) if (x34_APSM)
{ if (auto rec = w.enterSubRecord("APSM"))
w.enterSubRecord("APSM");
x34_APSM.write(w); x34_APSM.write(w);
w.leaveSubRecord();
}
if (x44_APS2) if (x44_APS2)
{ if (auto rec = w.enterSubRecord("APS2"))
w.enterSubRecord("APS2");
x44_APS2.write(w); x44_APS2.write(w);
w.leaveSubRecord();
}
if (x54_ASW1) if (x54_ASW1)
{ if (auto rec = w.enterSubRecord("ASW1"))
w.enterSubRecord("ASW1");
x54_ASW1.write(w); x54_ASW1.write(w);
w.leaveSubRecord();
}
if (x64_ASW2) if (x64_ASW2)
{ if (auto rec = w.enterSubRecord("ASW2"))
w.enterSubRecord("ASW2");
x64_ASW2.write(w); x64_ASW2.write(w);
w.leaveSubRecord();
}
if (x74_ASW3) if (x74_ASW3)
{ if (auto rec = w.enterSubRecord("ASW3"))
w.enterSubRecord("ASW3");
x74_ASW3.write(w); x74_ASW3.write(w);
w.leaveSubRecord();
}
if (x84_OHEF) if (x84_OHEF)
{ if (auto rec = w.enterSubRecord("OHEF"))
w.enterSubRecord("OHEF");
x84_OHEF.write(w); x84_OHEF.write(w);
w.leaveSubRecord();
}
if (x94_COLR) if (x94_COLR)
{ if (auto rec = w.enterSubRecord("COLR"))
w.enterSubRecord("COLR");
x94_COLR.write(w); x94_COLR.write(w);
w.leaveSubRecord();
}
if (!xa4_EWTR) if (!xa4_EWTR)
{ if (auto rec = w.enterSubRecord("EWTR"))
w.enterSubRecord("EWTR");
xa4_EWTR.write(w); xa4_EWTR.write(w);
w.leaveSubRecord();
}
if (!xa5_LWTR) if (!xa5_LWTR)
{ if (auto rec = w.enterSubRecord("LWTR"))
w.enterSubRecord("LWTR");
xa5_LWTR.write(w); xa5_LWTR.write(w);
w.leaveSubRecord();
}
if (!xa6_SWTR) if (!xa6_SWTR)
{ if (auto rec = w.enterSubRecord("SWTR"))
w.enterSubRecord("SWTR");
xa6_SWTR.write(w); xa6_SWTR.write(w);
w.leaveSubRecord();
}
if (xa8_PJFX != ~0) if (xa8_PJFX != ~0)
w.writeUint32("PJFX", xa8_PJFX); w.writeUint32("PJFX", xa8_PJFX);
if (xac_RNGE) if (xac_RNGE)
{ if (auto rec = w.enterSubRecord("RNGE"))
w.enterSubRecord("RNGE");
xac_RNGE.write(w); xac_RNGE.write(w);
w.leaveSubRecord();
}
if (xb0_FOFF) if (xb0_FOFF)
{ if (auto rec = w.enterSubRecord("FOFF"))
w.enterSubRecord("FOFF");
xb0_FOFF.write(w); xb0_FOFF.write(w);
w.leaveSubRecord();
}
if (xunk_FC60) if (xunk_FC60)
{ if (auto rec = w.enterSubRecord("FC60"))
w.enterSubRecord("FC60");
xunk_FC60.write(w); xunk_FC60.write(w);
w.leaveSubRecord();
}
if (xunk_SPS1) if (xunk_SPS1)
{ if (auto rec = w.enterSubRecord("SPS1"))
w.enterSubRecord("SPS1");
xunk_SPS1.write(w); xunk_SPS1.write(w);
w.leaveSubRecord();
}
if (xunk_SPS1) if (xunk_SPS1)
{ if (auto rec = w.enterSubRecord("SPS2"))
w.enterSubRecord("SPS2");
xunk_SPS2.write(w); xunk_SPS2.write(w);
w.leaveSubRecord();
}
} }
template <class IDType> template <class IDType>

20
DataSpec/DNAMP1/ANCS.cpp
View File

@ -86,7 +86,8 @@ void ANCS::CharacterSet::CharacterInfo::PASDatabase::AnimState::ParmInfo::read(a
unk1 = reader.readUint32("unk1"); unk1 = reader.readUint32("unk1");
unk2 = reader.readFloat("unk2"); unk2 = reader.readFloat("unk2");
size_t parmValCount; size_t parmValCount;
reader.enterSubVector("parmVals", parmValCount); if (auto v = reader.enterSubVector("parmVals", parmValCount))
{
switch (DataType(parmType)) switch (DataType(parmType))
{ {
case DataType::Int32: case DataType::Int32:
@ -108,7 +109,7 @@ void ANCS::CharacterSet::CharacterInfo::PASDatabase::AnimState::ParmInfo::read(a
break; break;
default: break; default: break;
} }
reader.leaveSubVector(); }
} }
void ANCS::CharacterSet::CharacterInfo::PASDatabase::AnimState::ParmInfo::write(athena::io::YAMLDocWriter& writer) const void ANCS::CharacterSet::CharacterInfo::PASDatabase::AnimState::ParmInfo::write(athena::io::YAMLDocWriter& writer) const
@ -116,7 +117,8 @@ void ANCS::CharacterSet::CharacterInfo::PASDatabase::AnimState::ParmInfo::write(
writer.writeUint32("parmType", parmType); writer.writeUint32("parmType", parmType);
writer.writeUint32("unk1", unk1); writer.writeUint32("unk1", unk1);
writer.writeFloat("unk2", unk2); writer.writeFloat("unk2", unk2);
writer.enterSubVector("parmVals"); if (auto v = writer.enterSubVector("parmVals"))
{
switch (DataType(parmType)) switch (DataType(parmType))
{ {
case DataType::Int32: case DataType::Int32:
@ -137,7 +139,7 @@ void ANCS::CharacterSet::CharacterInfo::PASDatabase::AnimState::ParmInfo::write(
writer.writeBool(nullptr, parmVals[0].bool1); writer.writeBool(nullptr, parmVals[0].bool1);
break; break;
} }
writer.leaveSubVector(); }
} }
const char* ANCS::CharacterSet::CharacterInfo::PASDatabase::AnimState::ParmInfo::DNAType() const char* ANCS::CharacterSet::CharacterInfo::PASDatabase::AnimState::ParmInfo::DNAType()
@ -260,7 +262,8 @@ void ANCS::CharacterSet::CharacterInfo::PASDatabase::AnimState::read(athena::io:
ai.id = reader.readUint32("id"); ai.id = reader.readUint32("id");
ai.parmVals.reserve(parmInfoCount); ai.parmVals.reserve(parmInfoCount);
size_t parmValCount; size_t parmValCount;
reader.enterSubVector("parmVals", parmValCount); if (auto v = reader.enterSubVector("parms", parmValCount))
{
for (const ParmInfo& pi : parmInfos) for (const ParmInfo& pi : parmInfos)
{ {
switch (ParmInfo::DataType(pi.parmType)) switch (ParmInfo::DataType(pi.parmType))
@ -281,7 +284,7 @@ void ANCS::CharacterSet::CharacterInfo::PASDatabase::AnimState::read(athena::io:
default: break; default: break;
} }
} }
reader.leaveSubVector(); }
}); });
} }
@ -296,7 +299,8 @@ void ANCS::CharacterSet::CharacterInfo::PASDatabase::AnimState::write(athena::io
{ {
writer.writeUint32("id", ai.id); writer.writeUint32("id", ai.id);
auto it = ai.parmVals.begin(); auto it = ai.parmVals.begin();
writer.enterSubVector("parms"); if (auto v = writer.enterSubVector("parms"))
{
for (const ParmInfo& pi : parmInfos) for (const ParmInfo& pi : parmInfos)
{ {
ParmInfo::Parm pVal; ParmInfo::Parm pVal;
@ -320,7 +324,7 @@ void ANCS::CharacterSet::CharacterInfo::PASDatabase::AnimState::write(athena::io
default: break; default: break;
} }
} }
writer.leaveSubVector(); }
}); });
} }

20
DataSpec/DNAMP1/ANCS.hpp
View File

@ -499,12 +499,13 @@ struct ANCS : BigYAML
{ {
out.clear(); out.clear();
for (const AnimationSet::Animation& ai : animationSet.animations) for (const AnimationSet::Animation& ai : animationSet.animations)
ai.metaAnim.m_anim->gatherPrimitives(out); if (AnimationSet::IMetaAnim* anim = ai.metaAnim.m_anim.get())
anim->gatherPrimitives(out);
for (const AnimationSet::Transition& ti : animationSet.transitions) for (const AnimationSet::Transition& ti : animationSet.transitions)
if (ti.metaTrans.m_trans) if (AnimationSet::IMetaTrans* trans = ti.metaTrans.m_trans.get())
ti.metaTrans.m_trans->gatherPrimitives(out); trans->gatherPrimitives(out);
if (animationSet.defaultTransition.m_trans) if (AnimationSet::IMetaTrans* trans = animationSet.defaultTransition.m_trans.get())
animationSet.defaultTransition.m_trans->gatherPrimitives(out); trans->gatherPrimitives(out);
for (auto& anim : out) for (auto& anim : out)
{ {
for (const AnimationSet::AnimationResources& res : animationSet.animResources) for (const AnimationSet::AnimationResources& res : animationSet.animResources)
@ -521,10 +522,13 @@ struct ANCS : BigYAML
void enumeratePrimitives(const std::function<bool(AnimationSet::MetaAnimPrimitive& prim)>& func) void enumeratePrimitives(const std::function<bool(AnimationSet::MetaAnimPrimitive& prim)>& func)
{ {
for (const AnimationSet::Animation& ai : animationSet.animations) for (const AnimationSet::Animation& ai : animationSet.animations)
ai.metaAnim.m_anim->enumeratePrimitives(func); if (AnimationSet::IMetaAnim* anim = ai.metaAnim.m_anim.get())
anim->enumeratePrimitives(func);
for (const AnimationSet::Transition& ti : animationSet.transitions) for (const AnimationSet::Transition& ti : animationSet.transitions)
ti.metaTrans.m_trans->enumeratePrimitives(func); if (AnimationSet::IMetaTrans* trans = ti.metaTrans.m_trans.get())
animationSet.defaultTransition.m_trans->enumeratePrimitives(func); trans->enumeratePrimitives(func);
if (AnimationSet::IMetaTrans* trans = animationSet.defaultTransition.m_trans.get())
trans->enumeratePrimitives(func);
} }
static bool Extract(const SpecBase& dataSpec, static bool Extract(const SpecBase& dataSpec,

6
DataSpec/DNAMP1/CSNG.cpp
View File

@ -18,9 +18,8 @@ bool CSNG::Extract(PAKEntryReadStream& rs, const hecl::ProjectPath& outPath)
athena::io::YAMLDocWriter dw("CSNG"); athena::io::YAMLDocWriter dw("CSNG");
dw.writeUint32("midiSetupId", head.midiSetupId); dw.writeUint32("midiSetupId", head.midiSetupId);
dw.writeUint32("songGroupId", head.songGroupId); dw.writeUint32("songGroupId", head.songGroupId);
dw.enterSubRecord("agscId"); if (auto rec = dw.enterSubRecord("agscId"))
head.agscId.write(dw); head.agscId.write(dw);
dw.leaveSubRecord();
athena::io::FileWriter w(yamlPath.getAbsolutePath()); athena::io::FileWriter w(yamlPath.getAbsolutePath());
if (w.hasError()) if (w.hasError())
@ -76,9 +75,8 @@ bool CSNG::Cook(const hecl::ProjectPath& inPath, const hecl::ProjectPath& outPat
Header head; Header head;
head.midiSetupId = dr.readUint32("midiSetupId"); head.midiSetupId = dr.readUint32("midiSetupId");
head.songGroupId = dr.readUint32("songGroupId"); head.songGroupId = dr.readUint32("songGroupId");
dr.enterSubRecord("agscId"); if (auto rec = dr.enterSubRecord("agscId"))
head.agscId.read(dr); head.agscId.read(dr);
dr.leaveSubRecord();
head.sngLength = sngData.size(); head.sngLength = sngData.size();
head.write(w); head.write(w);
} }

21
DataSpec/DNAMP1/SCLY.cpp
View File

@ -143,13 +143,14 @@ void SCLY::ScriptLayer::read(athena::io::YAMLDocReader& rs)
unknown = rs.readUByte("unknown"); unknown = rs.readUByte("unknown");
size_t objCount; size_t objCount;
objects.clear(); objects.clear();
if (rs.enterSubVector("objects", objCount)) if (auto v = rs.enterSubVector("objects", objCount))
{ {
objectCount = objCount; objectCount = objCount;
objects.reserve(objCount); objects.reserve(objCount);
for (atUint32 i = 0; i < objectCount; i++) for (atUint32 i = 0; i < objectCount; i++)
{ {
rs.enterSubRecord(nullptr); if (auto rec = rs.enterSubRecord(nullptr))
{
atUint8 type = rs.readUByte("type"); atUint8 type = rs.readUByte("type");
auto iter = std::find_if(SCRIPT_OBJECT_DB.begin(), SCRIPT_OBJECT_DB.end(), [&type](const ScriptObjectSpec* obj) -> bool auto iter = std::find_if(SCRIPT_OBJECT_DB.begin(), SCRIPT_OBJECT_DB.end(), [&type](const ScriptObjectSpec* obj) -> bool
{ return obj->type == type; }); { return obj->type == type; });
@ -163,10 +164,8 @@ void SCLY::ScriptLayer::read(athena::io::YAMLDocReader& rs)
} }
else else
Log.report(logvisor::Fatal, _S("Unable to find type 0x%X in object database"), (atUint32)type); Log.report(logvisor::Fatal, _S("Unable to find type 0x%X in object database"), (atUint32)type);
rs.leaveSubRecord();
} }
rs.leaveSubVector(); }
} }
else else
objectCount = 0; objectCount = 0;
@ -203,15 +202,17 @@ size_t SCLY::ScriptLayer::binarySize(size_t __isz) const
void SCLY::ScriptLayer::write(athena::io::YAMLDocWriter& ws) const void SCLY::ScriptLayer::write(athena::io::YAMLDocWriter& ws) const
{ {
ws.writeUByte("unknown", unknown); ws.writeUByte("unknown", unknown);
ws.enterSubVector("objects"); if (auto v = ws.enterSubVector("objects"))
{
for (const std::unique_ptr<IScriptObject>& obj : objects) for (const std::unique_ptr<IScriptObject>& obj : objects)
{ {
ws.enterSubRecord(nullptr); if (auto rec = ws.enterSubRecord(nullptr))
{
ws.writeUByte("type", obj->type); ws.writeUByte("type", obj->type);
obj->write(ws); obj->write(ws);
ws.leaveSubRecord(); }
}; }
ws.leaveSubVector(); }
} }
const char* SCLY::ScriptLayer::DNAType() const char* SCLY::ScriptLayer::DNAType()

3
DataSpec/DNAMP1/STRG.cpp
View File

@ -562,10 +562,9 @@ void STRG::write(athena::io::YAMLDocWriter& writer) const
{ {
for (const auto& lang : langs) for (const auto& lang : langs)
{ {
writer.enterSubVector(lang.first.toString().c_str()); if (auto v = writer.enterSubVector(lang.first.toString().c_str()))
for (const std::u16string& str : lang.second) for (const std::u16string& str : lang.second)
writer.writeU16String(nullptr, str); writer.writeU16String(nullptr, str);
writer.leaveSubVector();
} }
} }

48
DataSpec/DNAMP1/Tweaks/CTweakBall.cpp
View File

@ -449,7 +449,8 @@ void CTweakBall::read(athena::io::YAMLDocReader& __dna_docin)
{ {
/* x4_ */ /* x4_ */
size_t __x4_Count; size_t __x4_Count;
__dna_docin.enterSubVector("x4_", __x4_Count); if (auto v = __dna_docin.enterSubVector("x4_", __x4_Count))
{
/* x4_[0] */ /* x4_[0] */
x4_[0] = __dna_docin.readFloat("x4_"); x4_[0] = __dna_docin.readFloat("x4_");
/* x4_[1] */ /* x4_[1] */
@ -466,11 +467,11 @@ void CTweakBall::read(athena::io::YAMLDocReader& __dna_docin)
x4_[6] = __dna_docin.readFloat("x4_"); x4_[6] = __dna_docin.readFloat("x4_");
/* x4_[7] */ /* x4_[7] */
x4_[7] = __dna_docin.readFloat("x4_"); x4_[7] = __dna_docin.readFloat("x4_");
/* */ }
__dna_docin.leaveSubVector();
/* x24_ */ /* x24_ */
size_t __x24_Count; size_t __x24_Count;
__dna_docin.enterSubVector("x24_", __x24_Count); if (auto v = __dna_docin.enterSubVector("x24_", __x24_Count))
{
/* x24_[0] */ /* x24_[0] */
x24_[0] = __dna_docin.readFloat("x24_"); x24_[0] = __dna_docin.readFloat("x24_");
/* x24_[1] */ /* x24_[1] */
@ -487,11 +488,11 @@ void CTweakBall::read(athena::io::YAMLDocReader& __dna_docin)
x24_[6] = __dna_docin.readFloat("x24_"); x24_[6] = __dna_docin.readFloat("x24_");
/* x24_[7] */ /* x24_[7] */
x24_[7] = __dna_docin.readFloat("x24_"); x24_[7] = __dna_docin.readFloat("x24_");
/* */ }
__dna_docin.leaveSubVector();
/* x44_ */ /* x44_ */
size_t __x44_Count; size_t __x44_Count;
__dna_docin.enterSubVector("x44_", __x44_Count); if (auto v = __dna_docin.enterSubVector("x44_", __x44_Count))
{
/* x44_[0] */ /* x44_[0] */
x44_[0] = __dna_docin.readFloat("x44_"); x44_[0] = __dna_docin.readFloat("x44_");
/* x44_[1] */ /* x44_[1] */
@ -508,8 +509,7 @@ void CTweakBall::read(athena::io::YAMLDocReader& __dna_docin)
x44_[6] = __dna_docin.readFloat("x44_"); x44_[6] = __dna_docin.readFloat("x44_");
/* x44_[7] */ /* x44_[7] */
x44_[7] = __dna_docin.readFloat("x44_"); x44_[7] = __dna_docin.readFloat("x44_");
/* */ }
__dna_docin.leaveSubVector();
/* x64_ */ /* x64_ */
x64_ = __dna_docin.readFloat("x64_"); x64_ = __dna_docin.readFloat("x64_");
/* x68_ */ /* x68_ */
@ -520,7 +520,8 @@ void CTweakBall::read(athena::io::YAMLDocReader& __dna_docin)
x70_ = __dna_docin.readFloat("x70_"); x70_ = __dna_docin.readFloat("x70_");
/* xc4_ */ /* xc4_ */
size_t __xc4_Count; size_t __xc4_Count;
__dna_docin.enterSubVector("xc4_", __xc4_Count); if (auto v = __dna_docin.enterSubVector("xc4_", __xc4_Count))
{
/* xc4_[0] */ /* xc4_[0] */
xc4_[0] = __dna_docin.readFloat("xc4_"); xc4_[0] = __dna_docin.readFloat("xc4_");
/* xc4_[1] */ /* xc4_[1] */
@ -537,8 +538,7 @@ void CTweakBall::read(athena::io::YAMLDocReader& __dna_docin)
xc4_[6] = __dna_docin.readFloat("xc4_"); xc4_[6] = __dna_docin.readFloat("xc4_");
/* xc4_[7] */ /* xc4_[7] */
xc4_[7] = __dna_docin.readFloat("xc4_"); xc4_[7] = __dna_docin.readFloat("xc4_");
/* */ }
__dna_docin.leaveSubVector();
/* xe4_ */ /* xe4_ */
xe4_ = __dna_docin.readFloat("xe4_"); xe4_ = __dna_docin.readFloat("xe4_");
/* xe8_ */ /* xe8_ */
@ -688,7 +688,8 @@ void CTweakBall::read(athena::io::YAMLDocReader& __dna_docin)
void CTweakBall::write(athena::io::YAMLDocWriter& __dna_docout) const void CTweakBall::write(athena::io::YAMLDocWriter& __dna_docout) const
{ {
/* x4_ */ /* x4_ */
__dna_docout.enterSubVector("x4_"); if (auto v = __dna_docout.enterSubVector("x4_"))
{
/* x4_[0] */ /* x4_[0] */
__dna_docout.writeFloat("x4_", x4_[0]); __dna_docout.writeFloat("x4_", x4_[0]);
/* x4_[1] */ /* x4_[1] */
@ -705,10 +706,10 @@ void CTweakBall::write(athena::io::YAMLDocWriter& __dna_docout) const
__dna_docout.writeFloat("x4_", x4_[6]); __dna_docout.writeFloat("x4_", x4_[6]);
/* x4_[7] */ /* x4_[7] */
__dna_docout.writeFloat("x4_", x4_[7]); __dna_docout.writeFloat("x4_", x4_[7]);
/* */ }
__dna_docout.leaveSubVector();
/* x24_ */ /* x24_ */
__dna_docout.enterSubVector("x24_"); if (auto v = __dna_docout.enterSubVector("x24_"))
{
/* x24_[0] */ /* x24_[0] */
__dna_docout.writeFloat("x24_", x24_[0]); __dna_docout.writeFloat("x24_", x24_[0]);
/* x24_[1] */ /* x24_[1] */
@ -725,10 +726,10 @@ void CTweakBall::write(athena::io::YAMLDocWriter& __dna_docout) const
__dna_docout.writeFloat("x24_", x24_[6]); __dna_docout.writeFloat("x24_", x24_[6]);
/* x24_[7] */ /* x24_[7] */
__dna_docout.writeFloat("x24_", x24_[7]); __dna_docout.writeFloat("x24_", x24_[7]);
/* */ }
__dna_docout.leaveSubVector();
/* x44_ */ /* x44_ */
__dna_docout.enterSubVector("x44_"); if (auto v = __dna_docout.enterSubVector("x44_"))
{
/* x44_[0] */ /* x44_[0] */
__dna_docout.writeFloat("x44_", x44_[0]); __dna_docout.writeFloat("x44_", x44_[0]);
/* x44_[1] */ /* x44_[1] */
@ -745,8 +746,7 @@ void CTweakBall::write(athena::io::YAMLDocWriter& __dna_docout) const
__dna_docout.writeFloat("x44_", x44_[6]); __dna_docout.writeFloat("x44_", x44_[6]);
/* x44_[7] */ /* x44_[7] */
__dna_docout.writeFloat("x44_", x44_[7]); __dna_docout.writeFloat("x44_", x44_[7]);
/* */ }
__dna_docout.leaveSubVector();
/* x64_ */ /* x64_ */
__dna_docout.writeFloat("x64_", x64_); __dna_docout.writeFloat("x64_", x64_);
/* x68_ */ /* x68_ */
@ -756,7 +756,8 @@ void CTweakBall::write(athena::io::YAMLDocWriter& __dna_docout) const
/* x70_ */ /* x70_ */
__dna_docout.writeFloat("x70_", x70_); __dna_docout.writeFloat("x70_", x70_);
/* xc4_ */ /* xc4_ */
__dna_docout.enterSubVector("xc4_"); if (auto v = __dna_docout.enterSubVector("xc4_"))
{
/* xc4_[0] */ /* xc4_[0] */
__dna_docout.writeFloat("xc4_", xc4_[0]); __dna_docout.writeFloat("xc4_", xc4_[0]);
/* xc4_[1] */ /* xc4_[1] */
@ -773,8 +774,7 @@ void CTweakBall::write(athena::io::YAMLDocWriter& __dna_docout) const
__dna_docout.writeFloat("xc4_", xc4_[6]); __dna_docout.writeFloat("xc4_", xc4_[6]);
/* xc4_[7] */ /* xc4_[7] */
__dna_docout.writeFloat("xc4_", xc4_[7]); __dna_docout.writeFloat("xc4_", xc4_[7]);
/* */ }
__dna_docout.leaveSubVector();
/* xe4_ */ /* xe4_ */
__dna_docout.writeFloat("xe4_", xe4_); __dna_docout.writeFloat("xe4_", xe4_);
/* xe8_ */ /* xe8_ */

180
DataSpec/DNAMP1/Tweaks/CTweakPlayer.cpp
View File

@ -889,7 +889,8 @@ void CTweakPlayer::read(athena::io::YAMLDocReader& __dna_docin)
{ {
/* x4_ */ /* x4_ */
size_t __x4_Count; size_t __x4_Count;
__dna_docin.enterSubVector("x4_", __x4_Count); if (auto v = __dna_docin.enterSubVector("x4_", __x4_Count))
{
/* x4_[0] */ /* x4_[0] */
x4_[0] = __dna_docin.readFloat("x4_"); x4_[0] = __dna_docin.readFloat("x4_");
/* x4_[1] */ /* x4_[1] */
@ -906,11 +907,11 @@ void CTweakPlayer::read(athena::io::YAMLDocReader& __dna_docin)
x4_[6] = __dna_docin.readFloat("x4_"); x4_[6] = __dna_docin.readFloat("x4_");
/* x4_[7] */ /* x4_[7] */
x4_[7] = __dna_docin.readFloat("x4_"); x4_[7] = __dna_docin.readFloat("x4_");
/* */ }
__dna_docin.leaveSubVector();
/* x24_ */ /* x24_ */
size_t __x24_Count; size_t __x24_Count;
__dna_docin.enterSubVector("x24_", __x24_Count); if (auto v = __dna_docin.enterSubVector("x24_", __x24_Count))
{
/* x24_[0] */ /* x24_[0] */
x24_[0] = __dna_docin.readFloat("x24_"); x24_[0] = __dna_docin.readFloat("x24_");
/* x24_[1] */ /* x24_[1] */
@ -927,11 +928,11 @@ void CTweakPlayer::read(athena::io::YAMLDocReader& __dna_docin)
x24_[6] = __dna_docin.readFloat("x24_"); x24_[6] = __dna_docin.readFloat("x24_");
/* x24_[7] */ /* x24_[7] */
x24_[7] = __dna_docin.readFloat("x24_"); x24_[7] = __dna_docin.readFloat("x24_");
/* */ }
__dna_docin.leaveSubVector();
/* x44_ */ /* x44_ */
size_t __x44_Count; size_t __x44_Count;
__dna_docin.enterSubVector("x44_", __x44_Count); if (auto v = __dna_docin.enterSubVector("x44_", __x44_Count))
{
/* x44_[0] */ /* x44_[0] */
x44_[0] = __dna_docin.readFloat("x44_"); x44_[0] = __dna_docin.readFloat("x44_");
/* x44_[1] */ /* x44_[1] */
@ -948,11 +949,11 @@ void CTweakPlayer::read(athena::io::YAMLDocReader& __dna_docin)
x44_[6] = __dna_docin.readFloat("x44_"); x44_[6] = __dna_docin.readFloat("x44_");
/* x44_[7] */ /* x44_[7] */
x44_[7] = __dna_docin.readFloat("x44_"); x44_[7] = __dna_docin.readFloat("x44_");
/* */ }
__dna_docin.leaveSubVector();
/* x64_ */ /* x64_ */
size_t __x64_Count; size_t __x64_Count;
__dna_docin.enterSubVector("x64_", __x64_Count); if (auto v = __dna_docin.enterSubVector("x64_", __x64_Count))
{
/* x64_[0] */ /* x64_[0] */
x64_[0] = __dna_docin.readFloat("x64_"); x64_[0] = __dna_docin.readFloat("x64_");
/* x64_[1] */ /* x64_[1] */
@ -969,11 +970,11 @@ void CTweakPlayer::read(athena::io::YAMLDocReader& __dna_docin)
x64_[6] = __dna_docin.readFloat("x64_"); x64_[6] = __dna_docin.readFloat("x64_");
/* x64_[7] */ /* x64_[7] */
x64_[7] = __dna_docin.readFloat("x64_"); x64_[7] = __dna_docin.readFloat("x64_");
/* */ }
__dna_docin.leaveSubVector();
/* x84_ */ /* x84_ */
size_t __x84_Count; size_t __x84_Count;
__dna_docin.enterSubVector("x84_", __x84_Count); if (auto v = __dna_docin.enterSubVector("x84_", __x84_Count))
{
/* x84_[0] */ /* x84_[0] */
x84_[0] = __dna_docin.readFloat("x84_"); x84_[0] = __dna_docin.readFloat("x84_");
/* x84_[1] */ /* x84_[1] */
@ -990,11 +991,11 @@ void CTweakPlayer::read(athena::io::YAMLDocReader& __dna_docin)
x84_[6] = __dna_docin.readFloat("x84_"); x84_[6] = __dna_docin.readFloat("x84_");
/* x84_[7] */ /* x84_[7] */
x84_[7] = __dna_docin.readFloat("x84_"); x84_[7] = __dna_docin.readFloat("x84_");
/* */ }
__dna_docin.leaveSubVector();
/* xa4_ */ /* xa4_ */
size_t __xa4_Count; size_t __xa4_Count;
__dna_docin.enterSubVector("xa4_", __xa4_Count); if (auto v = __dna_docin.enterSubVector("xa4_", __xa4_Count))
{
/* xa4_[0] */ /* xa4_[0] */
xa4_[0] = __dna_docin.readFloat("xa4_"); xa4_[0] = __dna_docin.readFloat("xa4_");
/* xa4_[1] */ /* xa4_[1] */
@ -1011,8 +1012,7 @@ void CTweakPlayer::read(athena::io::YAMLDocReader& __dna_docin)
xa4_[6] = __dna_docin.readFloat("xa4_"); xa4_[6] = __dna_docin.readFloat("xa4_");
/* xa4_[7] */ /* xa4_[7] */
xa4_[7] = __dna_docin.readFloat("xa4_"); xa4_[7] = __dna_docin.readFloat("xa4_");
/* */ }
__dna_docin.leaveSubVector();
/* xc4_ */ /* xc4_ */
xc4_ = __dna_docin.readFloat("xc4_"); xc4_ = __dna_docin.readFloat("xc4_");
/* xc8_ */ /* xc8_ */
@ -1163,37 +1163,37 @@ void CTweakPlayer::read(athena::io::YAMLDocReader& __dna_docin)
x268_ = __dna_docin.readFloat("x268_"); x268_ = __dna_docin.readFloat("x268_");
/* x158_ */ /* x158_ */
size_t __x158_Count; size_t __x158_Count;
__dna_docin.enterSubVector("x158_", __x158_Count); if (auto v = __dna_docin.enterSubVector("x158_", __x158_Count))
{
/* x158_[0] */ /* x158_[0] */
x158_[0] = __dna_docin.readFloat("x158_"); x158_[0] = __dna_docin.readFloat("x158_");
/* x158_[1] */ /* x158_[1] */
x158_[1] = __dna_docin.readFloat("x158_"); x158_[1] = __dna_docin.readFloat("x158_");
/* x158_[2] */ /* x158_[2] */
x158_[2] = __dna_docin.readFloat("x158_"); x158_[2] = __dna_docin.readFloat("x158_");
/* */ }
__dna_docin.leaveSubVector();
/* x164_ */ /* x164_ */
size_t __x164_Count; size_t __x164_Count;
__dna_docin.enterSubVector("x164_", __x164_Count); if (auto v = __dna_docin.enterSubVector("x164_", __x164_Count))
{
/* x164_[0] */ /* x164_[0] */
x164_[0] = __dna_docin.readFloat("x164_"); x164_[0] = __dna_docin.readFloat("x164_");
/* x164_[1] */ /* x164_[1] */
x164_[1] = __dna_docin.readFloat("x164_"); x164_[1] = __dna_docin.readFloat("x164_");
/* x164_[2] */ /* x164_[2] */
x164_[2] = __dna_docin.readFloat("x164_"); x164_[2] = __dna_docin.readFloat("x164_");
/* */ }
__dna_docin.leaveSubVector();
/* x170_ */ /* x170_ */
size_t __x170_Count; size_t __x170_Count;
__dna_docin.enterSubVector("x170_", __x170_Count); if (auto v = __dna_docin.enterSubVector("x170_", __x170_Count))
{
/* x170_[0] */ /* x170_[0] */
x170_[0] = __dna_docin.readFloat("x170_"); x170_[0] = __dna_docin.readFloat("x170_");
/* x170_[1] */ /* x170_[1] */
x170_[1] = __dna_docin.readFloat("x170_"); x170_[1] = __dna_docin.readFloat("x170_");
/* x170_[2] */ /* x170_[2] */
x170_[2] = __dna_docin.readFloat("x170_"); x170_[2] = __dna_docin.readFloat("x170_");
/* */ }
__dna_docin.leaveSubVector();
/* x17c_ */ /* x17c_ */
x17c_ = __dna_docin.readFloat("x17c_"); x17c_ = __dna_docin.readFloat("x17c_");
/* x180_ */ /* x180_ */
@ -1218,58 +1218,58 @@ void CTweakPlayer::read(athena::io::YAMLDocReader& __dna_docin)
x1a4_ = __dna_docin.readFloat("x1a4_"); x1a4_ = __dna_docin.readFloat("x1a4_");
/* x1a8_ */ /* x1a8_ */
size_t __x1a8_Count; size_t __x1a8_Count;
__dna_docin.enterSubVector("x1a8_", __x1a8_Count); if (auto v = __dna_docin.enterSubVector("x1a8_", __x1a8_Count))
{
/* x1a8_[0] */ /* x1a8_[0] */
x1a8_[0] = __dna_docin.readUint32("x1a8_"); x1a8_[0] = __dna_docin.readUint32("x1a8_");
/* x1a8_[1] */ /* x1a8_[1] */
x1a8_[1] = __dna_docin.readUint32("x1a8_"); x1a8_[1] = __dna_docin.readUint32("x1a8_");
/* */ }
__dna_docin.leaveSubVector();
/* x1b0_ */ /* x1b0_ */
size_t __x1b0_Count; size_t __x1b0_Count;
__dna_docin.enterSubVector("x1b0_", __x1b0_Count); if (auto v = __dna_docin.enterSubVector("x1b0_", __x1b0_Count))
{
/* x1b0_[0] */ /* x1b0_[0] */
x1b0_[0] = __dna_docin.readUint32("x1b0_"); x1b0_[0] = __dna_docin.readUint32("x1b0_");
/* x1b0_[1] */ /* x1b0_[1] */
x1b0_[1] = __dna_docin.readUint32("x1b0_"); x1b0_[1] = __dna_docin.readUint32("x1b0_");
/* */ }
__dna_docin.leaveSubVector();
/* x1b8_ */ /* x1b8_ */
size_t __x1b8_Count; size_t __x1b8_Count;
__dna_docin.enterSubVector("x1b8_", __x1b8_Count); if (auto v = __dna_docin.enterSubVector("x1b8_", __x1b8_Count))
{
/* x1b8_[0] */ /* x1b8_[0] */
x1b8_[0] = __dna_docin.readUint32("x1b8_"); x1b8_[0] = __dna_docin.readUint32("x1b8_");
/* x1b8_[1] */ /* x1b8_[1] */
x1b8_[1] = __dna_docin.readUint32("x1b8_"); x1b8_[1] = __dna_docin.readUint32("x1b8_");
/* */ }
__dna_docin.leaveSubVector();
/* x1c0_ */ /* x1c0_ */
size_t __x1c0_Count; size_t __x1c0_Count;
__dna_docin.enterSubVector("x1c0_", __x1c0_Count); if (auto v = __dna_docin.enterSubVector("x1c0_", __x1c0_Count))
{
/* x1c0_[0] */ /* x1c0_[0] */
x1c0_[0] = __dna_docin.readUint32("x1c0_"); x1c0_[0] = __dna_docin.readUint32("x1c0_");
/* x1c0_[1] */ /* x1c0_[1] */
x1c0_[1] = __dna_docin.readUint32("x1c0_"); x1c0_[1] = __dna_docin.readUint32("x1c0_");
/* */ }
__dna_docin.leaveSubVector();
/* x1c8_ */ /* x1c8_ */
size_t __x1c8_Count; size_t __x1c8_Count;
__dna_docin.enterSubVector("x1c8_", __x1c8_Count); if (auto v = __dna_docin.enterSubVector("x1c8_", __x1c8_Count))
{
/* x1c8_[0] */ /* x1c8_[0] */
x1c8_[0] = __dna_docin.readUint32("x1c8_"); x1c8_[0] = __dna_docin.readUint32("x1c8_");
/* x1c8_[1] */ /* x1c8_[1] */
x1c8_[1] = __dna_docin.readUint32("x1c8_"); x1c8_[1] = __dna_docin.readUint32("x1c8_");
/* */ }
__dna_docin.leaveSubVector();
/* x1d0_ */ /* x1d0_ */
size_t __x1d0_Count; size_t __x1d0_Count;
__dna_docin.enterSubVector("x1d0_", __x1d0_Count); if (auto v = __dna_docin.enterSubVector("x1d0_", __x1d0_Count))
{
/* x1d0_[0] */ /* x1d0_[0] */
x1d0_[0] = __dna_docin.readUint32("x1d0_"); x1d0_[0] = __dna_docin.readUint32("x1d0_");
/* x1d0_[1] */ /* x1d0_[1] */
x1d0_[1] = __dna_docin.readUint32("x1d0_"); x1d0_[1] = __dna_docin.readUint32("x1d0_");
/* */ }
__dna_docin.leaveSubVector();
/* x1d8_ */ /* x1d8_ */
x1d8_ = __dna_docin.readFloat("x1d8_"); x1d8_ = __dna_docin.readFloat("x1d8_");
/* x1dc_ */ /* x1dc_ */
@ -1403,7 +1403,8 @@ void CTweakPlayer::read(athena::io::YAMLDocReader& __dna_docin)
void CTweakPlayer::CTweakPlayer::write(athena::io::YAMLDocWriter& __dna_docout) const void CTweakPlayer::CTweakPlayer::write(athena::io::YAMLDocWriter& __dna_docout) const
{ {
/* x4_ */ /* x4_ */
__dna_docout.enterSubVector("x4_"); if (auto v = __dna_docout.enterSubVector("x4_"))
{
/* x4_[0] */ /* x4_[0] */
__dna_docout.writeFloat("x4_", x4_[0]); __dna_docout.writeFloat("x4_", x4_[0]);
/* x4_[1] */ /* x4_[1] */
@ -1420,10 +1421,10 @@ void CTweakPlayer::CTweakPlayer::write(athena::io::YAMLDocWriter& __dna_docout)
__dna_docout.writeFloat("x4_", x4_[6]); __dna_docout.writeFloat("x4_", x4_[6]);
/* x4_[7] */ /* x4_[7] */
__dna_docout.writeFloat("x4_", x4_[7]); __dna_docout.writeFloat("x4_", x4_[7]);
/* */ }
__dna_docout.leaveSubVector();
/* x24_ */ /* x24_ */
__dna_docout.enterSubVector("x24_"); if (auto v = __dna_docout.enterSubVector("x24_"))
{
/* x24_[0] */ /* x24_[0] */
__dna_docout.writeFloat("x24_", x24_[0]); __dna_docout.writeFloat("x24_", x24_[0]);
/* x24_[1] */ /* x24_[1] */
@ -1440,10 +1441,10 @@ void CTweakPlayer::CTweakPlayer::write(athena::io::YAMLDocWriter& __dna_docout)
__dna_docout.writeFloat("x24_", x24_[6]); __dna_docout.writeFloat("x24_", x24_[6]);
/* x24_[7] */ /* x24_[7] */
__dna_docout.writeFloat("x24_", x24_[7]); __dna_docout.writeFloat("x24_", x24_[7]);
/* */ }
__dna_docout.leaveSubVector();
/* x44_ */ /* x44_ */
__dna_docout.enterSubVector("x44_"); if (auto v = __dna_docout.enterSubVector("x44_"))
{
/* x44_[0] */ /* x44_[0] */
__dna_docout.writeFloat("x44_", x44_[0]); __dna_docout.writeFloat("x44_", x44_[0]);
/* x44_[1] */ /* x44_[1] */
@ -1460,10 +1461,10 @@ void CTweakPlayer::CTweakPlayer::write(athena::io::YAMLDocWriter& __dna_docout)
__dna_docout.writeFloat("x44_", x44_[6]); __dna_docout.writeFloat("x44_", x44_[6]);
/* x44_[7] */ /* x44_[7] */
__dna_docout.writeFloat("x44_", x44_[7]); __dna_docout.writeFloat("x44_", x44_[7]);
/* */ }
__dna_docout.leaveSubVector();
/* x64_ */ /* x64_ */
__dna_docout.enterSubVector("x64_"); if (auto v = __dna_docout.enterSubVector("x64_"))
{
/* x64_[0] */ /* x64_[0] */
__dna_docout.writeFloat("x64_", x64_[0]); __dna_docout.writeFloat("x64_", x64_[0]);
/* x64_[1] */ /* x64_[1] */
@ -1480,10 +1481,10 @@ void CTweakPlayer::CTweakPlayer::write(athena::io::YAMLDocWriter& __dna_docout)
__dna_docout.writeFloat("x64_", x64_[6]); __dna_docout.writeFloat("x64_", x64_[6]);
/* x64_[7] */ /* x64_[7] */
__dna_docout.writeFloat("x64_", x64_[7]); __dna_docout.writeFloat("x64_", x64_[7]);
/* */ }
__dna_docout.leaveSubVector();
/* x84_ */ /* x84_ */
__dna_docout.enterSubVector("x84_"); if (auto v = __dna_docout.enterSubVector("x84_"))
{
/* x84_[0] */ /* x84_[0] */
__dna_docout.writeFloat("x84_", x84_[0]); __dna_docout.writeFloat("x84_", x84_[0]);
/* x84_[1] */ /* x84_[1] */
@ -1500,10 +1501,10 @@ void CTweakPlayer::CTweakPlayer::write(athena::io::YAMLDocWriter& __dna_docout)
__dna_docout.writeFloat("x84_", x84_[6]); __dna_docout.writeFloat("x84_", x84_[6]);
/* x84_[7] */ /* x84_[7] */
__dna_docout.writeFloat("x84_", x84_[7]); __dna_docout.writeFloat("x84_", x84_[7]);
/* */ }
__dna_docout.leaveSubVector();
/* xa4_ */ /* xa4_ */
__dna_docout.enterSubVector("xa4_"); if (auto v = __dna_docout.enterSubVector("xa4_"))
{
/* xa4_[0] */ /* xa4_[0] */
__dna_docout.writeFloat("xa4_", xa4_[0]); __dna_docout.writeFloat("xa4_", xa4_[0]);
/* xa4_[1] */ /* xa4_[1] */
@ -1520,8 +1521,7 @@ void CTweakPlayer::CTweakPlayer::write(athena::io::YAMLDocWriter& __dna_docout)
__dna_docout.writeFloat("xa4_", xa4_[6]); __dna_docout.writeFloat("xa4_", xa4_[6]);
/* xa4_[7] */ /* xa4_[7] */
__dna_docout.writeFloat("xa4_", xa4_[7]); __dna_docout.writeFloat("xa4_", xa4_[7]);
/* */ }
__dna_docout.leaveSubVector();
/* xc4_ */ /* xc4_ */
__dna_docout.writeFloat("xc4_", xc4_); __dna_docout.writeFloat("xc4_", xc4_);
/* xc8_ */ /* xc8_ */
@ -1671,35 +1671,35 @@ void CTweakPlayer::CTweakPlayer::write(athena::io::YAMLDocWriter& __dna_docout)
/* x268_ */ /* x268_ */
__dna_docout.writeFloat("x268_", x268_); __dna_docout.writeFloat("x268_", x268_);
/* x158_ */ /* x158_ */
__dna_docout.enterSubVector("x158_"); if (auto v = __dna_docout.enterSubVector("x158_"))
{
/* x158_[0] */ /* x158_[0] */
__dna_docout.writeFloat("x158_", x158_[0]); __dna_docout.writeFloat("x158_", x158_[0]);
/* x158_[1] */ /* x158_[1] */
__dna_docout.writeFloat("x158_", x158_[1]); __dna_docout.writeFloat("x158_", x158_[1]);
/* x158_[2] */ /* x158_[2] */
__dna_docout.writeFloat("x158_", x158_[2]); __dna_docout.writeFloat("x158_", x158_[2]);
/* */ }
__dna_docout.leaveSubVector();
/* x164_ */ /* x164_ */
__dna_docout.enterSubVector("x164_"); if (auto v = __dna_docout.enterSubVector("x164_"))
{
/* x164_[0] */ /* x164_[0] */
__dna_docout.writeFloat("x164_", x164_[0]); __dna_docout.writeFloat("x164_", x164_[0]);
/* x164_[1] */ /* x164_[1] */
__dna_docout.writeFloat("x164_", x164_[1]); __dna_docout.writeFloat("x164_", x164_[1]);
/* x164_[2] */ /* x164_[2] */
__dna_docout.writeFloat("x164_", x164_[2]); __dna_docout.writeFloat("x164_", x164_[2]);
/* */ }
__dna_docout.leaveSubVector();
/* x170_ */ /* x170_ */
__dna_docout.enterSubVector("x170_"); if (auto v = __dna_docout.enterSubVector("x170_"))
{
/* x170_[0] */ /* x170_[0] */
__dna_docout.writeFloat("x170_", x170_[0]); __dna_docout.writeFloat("x170_", x170_[0]);
/* x170_[1] */ /* x170_[1] */
__dna_docout.writeFloat("x170_", x170_[1]); __dna_docout.writeFloat("x170_", x170_[1]);
/* x170_[2] */ /* x170_[2] */
__dna_docout.writeFloat("x170_", x170_[2]); __dna_docout.writeFloat("x170_", x170_[2]);
/* */ }
__dna_docout.leaveSubVector();
/* x17c_ */ /* x17c_ */
__dna_docout.writeFloat("x17c_", x17c_); __dna_docout.writeFloat("x17c_", x17c_);
/* x180_ */ /* x180_ */
@ -1723,53 +1723,53 @@ void CTweakPlayer::CTweakPlayer::write(athena::io::YAMLDocWriter& __dna_docout)
/* x1a4_ */ /* x1a4_ */
__dna_docout.writeFloat("x1a4_", x1a4_); __dna_docout.writeFloat("x1a4_", x1a4_);
/* x1a8_ */ /* x1a8_ */
__dna_docout.enterSubVector("x1a8_"); if (auto v = __dna_docout.enterSubVector("x1a8_"))
{
/* x1a8_[0] */ /* x1a8_[0] */
__dna_docout.writeUint32("x1a8_", x1a8_[0]); __dna_docout.writeUint32("x1a8_", x1a8_[0]);
/* x1a8_[1] */ /* x1a8_[1] */
__dna_docout.writeUint32("x1a8_", x1a8_[1]); __dna_docout.writeUint32("x1a8_", x1a8_[1]);
/* */ }
__dna_docout.leaveSubVector();
/* x1b0_ */ /* x1b0_ */
__dna_docout.enterSubVector("x1b0_"); if (auto v = __dna_docout.enterSubVector("x1b0_"))
{
/* x1b0_[0] */ /* x1b0_[0] */
__dna_docout.writeUint32("x1b0_", x1b0_[0]); __dna_docout.writeUint32("x1b0_", x1b0_[0]);
/* x1b0_[1] */ /* x1b0_[1] */
__dna_docout.writeUint32("x1b0_", x1b0_[1]); __dna_docout.writeUint32("x1b0_", x1b0_[1]);
/* */ }
__dna_docout.leaveSubVector();
/* x1b8_ */ /* x1b8_ */
__dna_docout.enterSubVector("x1b8_"); if (auto v = __dna_docout.enterSubVector("x1b8_"))
{
/* x1b8_[0] */ /* x1b8_[0] */
__dna_docout.writeUint32("x1b8_", x1b8_[0]); __dna_docout.writeUint32("x1b8_", x1b8_[0]);
/* x1b8_[1] */ /* x1b8_[1] */
__dna_docout.writeUint32("x1b8_", x1b8_[1]); __dna_docout.writeUint32("x1b8_", x1b8_[1]);
/* */ }
__dna_docout.leaveSubVector();
/* x1c0_ */ /* x1c0_ */
__dna_docout.enterSubVector("x1c0_"); if (auto v = __dna_docout.enterSubVector("x1c0_"))
{
/* x1c0_[0] */ /* x1c0_[0] */
__dna_docout.writeUint32("x1c0_", x1c0_[0]); __dna_docout.writeUint32("x1c0_", x1c0_[0]);
/* x1c0_[1] */ /* x1c0_[1] */
__dna_docout.writeUint32("x1c0_", x1c0_[1]); __dna_docout.writeUint32("x1c0_", x1c0_[1]);
/* */ }
__dna_docout.leaveSubVector();
/* x1c8_ */ /* x1c8_ */
__dna_docout.enterSubVector("x1c8_"); if (auto v = __dna_docout.enterSubVector("x1c8_"))
{
/* x1c8_[0] */ /* x1c8_[0] */
__dna_docout.writeUint32("x1c8_", x1c8_[0]); __dna_docout.writeUint32("x1c8_", x1c8_[0]);
/* x1c8_[1] */ /* x1c8_[1] */
__dna_docout.writeUint32("x1c8_", x1c8_[1]); __dna_docout.writeUint32("x1c8_", x1c8_[1]);
/* */ }
__dna_docout.leaveSubVector();
/* x1d0_ */ /* x1d0_ */
__dna_docout.enterSubVector("x1d0_"); if (auto v = __dna_docout.enterSubVector("x1d0_"))
{
/* x1d0_[0] */ /* x1d0_[0] */
__dna_docout.writeUint32("x1d0_", x1d0_[0]); __dna_docout.writeUint32("x1d0_", x1d0_[0]);
/* x1d0_[1] */ /* x1d0_[1] */
__dna_docout.writeUint32("x1d0_", x1d0_[1]); __dna_docout.writeUint32("x1d0_", x1d0_[1]);
/* */ }
__dna_docout.leaveSubVector();
/* x1d8_ */ /* x1d8_ */
__dna_docout.writeFloat("x1d8_", x1d8_); __dna_docout.writeFloat("x1d8_", x1d8_);
/* x1dc_ */ /* x1dc_ */

11
DataSpec/DNAMP2/STRG.cpp
View File

@ -229,21 +229,16 @@ void STRG::write(athena::io::YAMLDocWriter& writer) const
{ {
for (const auto& lang : langs) for (const auto& lang : langs)
{ {
writer.enterSubVector(lang.first.toString().c_str()); if (auto v = writer.enterSubVector(lang.first.toString().c_str()))
for (const std::u16string& str : lang.second) for (const std::u16string& str : lang.second)
writer.writeU16String(nullptr, str); writer.writeU16String(nullptr, str);
writer.leaveSubVector();
} }
if (names.size()) if (names.size())
{ {
writer.enterSubRecord("names"); if (auto rec = writer.enterSubRecord("names"))
for (const auto& name : names) for (const auto& name : names)
{ if (auto rec = writer.enterSubRecord(name.first.c_str()))
writer.enterSubRecord(name.first.c_str());
writer.writeInt32(nullptr, name.second); writer.writeInt32(nullptr, name.second);
writer.leaveSubRecord();
}
writer.leaveSubRecord();
} }
} }

11
DataSpec/DNAMP3/STRG.cpp
View File

@ -247,22 +247,17 @@ void STRG::write(athena::io::YAMLDocWriter& writer) const
{ {
for (const auto& item : langs) for (const auto& item : langs)
{ {
writer.enterSubVector(item.first.toString().c_str()); if (auto v = writer.enterSubVector(item.first.toString().c_str()))
for (const std::string& str : item.second) for (const std::string& str : item.second)
writer.writeString(nullptr, str); writer.writeString(nullptr, str);
writer.leaveSubVector();
} }
if (names.size()) if (names.size())
{ {
writer.enterSubRecord("names"); if (auto rec = writer.enterSubRecord("names"))
for (const auto& item : names) for (const auto& item : names)
{ if (auto rec = writer.enterSubRecord(item.first.c_str()))
writer.enterSubRecord(item.first.c_str());
writer.writeInt32(nullptr, item.second); writer.writeInt32(nullptr, item.second);
writer.leaveSubRecord();
}
writer.leaveSubRecord();
} }
} }

9
DataSpec/SpecMP1.cpp
View File

@ -676,6 +676,15 @@ struct SpecMP1 : SpecBase
void cookActor(const hecl::ProjectPath& out, const hecl::ProjectPath& in, BlendStream& ds, bool fast, void cookActor(const hecl::ProjectPath& out, const hecl::ProjectPath& in, BlendStream& ds, bool fast,
hecl::BlenderToken& btok, FCookProgress progress) hecl::BlenderToken& btok, FCookProgress progress)
{ {
/*
if (hecl::StringUtils::EndsWith(in.getAuxInfo(), _S(".CINF")))
return {SBIG('CINF'), path.hash().val32()};
else if (hecl::StringUtils::EndsWith(in.getAuxInfo(), _S(".CSKR")))
return {SBIG('CSKR'), path.hash().val32()};
else if (hecl::StringUtils::EndsWith(in.getAuxInfo(), _S(".ANIM")))
return {SBIG('ANIM'), path.hash().val32()};
*/
Actor actor = ds.compileActor(); Actor actor = ds.compileActor();
DNAMP1::ANCS::Cook(out, in, actor, ds, m_pc, [&](const hecl::ProjectPath& modelPath) -> bool { DNAMP1::ANCS::Cook(out, in, actor, ds, m_pc, [&](const hecl::ProjectPath& modelPath) -> bool {
hecl::ProjectPath cooked; hecl::ProjectPath cooked;

5
Editor/ProjectResourceFactoryBase.cpp
View File

@ -12,12 +12,13 @@ static void WriteTag(athena::io::YAMLDocWriter& cacheWriter,
{ {
char idStr[9]; char idStr[9];
snprintf(idStr, 9, "%08X", uint32_t(pathTag.id)); snprintf(idStr, 9, "%08X", uint32_t(pathTag.id));
cacheWriter.enterSubVector(idStr); if (auto v = cacheWriter.enterSubVector(idStr))
{
cacheWriter.writeString(nullptr, pathTag.type.toString().c_str()); cacheWriter.writeString(nullptr, pathTag.type.toString().c_str());
cacheWriter.writeString(nullptr, path.getAuxInfo().size() ? cacheWriter.writeString(nullptr, path.getAuxInfo().size() ?
(path.getRelativePathUTF8() + '|' + path.getAuxInfoUTF8()) : (path.getRelativePathUTF8() + '|' + path.getAuxInfoUTF8()) :
path.getRelativePathUTF8()); path.getRelativePathUTF8());
cacheWriter.leaveSubVector(); }
} }
static void WriteNameTag(athena::io::YAMLDocWriter& nameWriter, static void WriteNameTag(athena::io::YAMLDocWriter& nameWriter,

13
Editor/ProjectResourceFactoryMP1.cpp
View File

@ -118,6 +118,19 @@ void ProjectResourceFactoryMP1::IndexMP1Resources(hecl::Database::Project& proj,
m_origIds = sp.GetObj("MP1OriginalIDs"); m_origIds = sp.GetObj("MP1OriginalIDs");
} }
void ProjectResourceFactoryMP1::GetTagListForFile(const char* pakName, std::vector<SObjectTag>& out) const
{
std::string pathPrefix("MP1/");
pathPrefix += pakName;
pathPrefix += '/';
std::unique_lock<std::mutex> lk(
const_cast<ProjectResourceFactoryMP1&>(*this).m_backgroundIndexMutex);
for (const auto& tag : m_tagToPath)
if (!tag.second.getRelativePathUTF8().compare(0, pathPrefix.size(), pathPrefix))
out.push_back(tag.first);
}
void ProjectResourceFactoryMP1::Shutdown() void ProjectResourceFactoryMP1::Shutdown()
{ {
m_origIds = TLockedToken<MP1OriginalIDs>(); m_origIds = TLockedToken<MP1OriginalIDs>();

1
Editor/ProjectResourceFactoryMP1.hpp
View File

@ -15,6 +15,7 @@ class ProjectResourceFactoryMP1 : public ProjectResourceFactoryBase
public: public:
ProjectResourceFactoryMP1(hecl::ClientProcess& clientProc); ProjectResourceFactoryMP1(hecl::ClientProcess& clientProc);
void IndexMP1Resources(hecl::Database::Project& proj, CSimplePool& sp); void IndexMP1Resources(hecl::Database::Project& proj, CSimplePool& sp);
void GetTagListForFile(const char* pakName, std::vector<SObjectTag>& out) const;
void Shutdown(); void Shutdown();
ResId TranslateOriginalToNew(ResId id) const; ResId TranslateOriginalToNew(ResId id) const;

24
Editor/Space.hpp
View File

@ -173,9 +173,8 @@ public:
: RootSpace(vm) : RootSpace(vm)
{ {
m_state.read(r); m_state.read(r);
r.enterSubRecord("spaceTree"); if (auto rec = r.enterSubRecord("spaceTree"))
m_spaceTree.reset(NewSpaceFromConfigStream(vm, this, r)); m_spaceTree.reset(NewSpaceFromConfigStream(vm, this, r));
r.leaveSubRecord();
} }
void think() void think()
@ -200,12 +199,13 @@ public:
w.writeUint32("class", atUint32(m_class)); w.writeUint32("class", atUint32(m_class));
m_state.write(w); m_state.write(w);
w.enterSubRecord("spaceTree"); if (auto rec = w.enterSubRecord("spaceTree"))
{
if (m_spaceTree) if (m_spaceTree)
m_spaceTree->saveState(w); m_spaceTree->saveState(w);
else else
w.writeUint32("class", 0); w.writeUint32("class", 0);
w.leaveSubRecord(); }
} }
void setChild(std::unique_ptr<Space>&& space) void setChild(std::unique_ptr<Space>&& space)
@ -248,12 +248,10 @@ public:
: SplitSpace(vm, parent, specter::SplitView::Axis::Horizontal) : SplitSpace(vm, parent, specter::SplitView::Axis::Horizontal)
{ {
m_state.read(r); m_state.read(r);
r.enterSubRecord("slot0"); if (auto rec = r.enterSubRecord("slot0"))
m_slots[0].reset(NewSpaceFromConfigStream(vm, this, r)); m_slots[0].reset(NewSpaceFromConfigStream(vm, this, r));
r.leaveSubRecord(); if (auto rec = r.enterSubRecord("slot1"))
r.enterSubRecord("slot1");
m_slots[1].reset(NewSpaceFromConfigStream(vm, this, r)); m_slots[1].reset(NewSpaceFromConfigStream(vm, this, r));
r.leaveSubRecord();
reloadState(); reloadState();
} }
@ -300,19 +298,21 @@ public:
w.writeUint32("class", atUint32(m_class)); w.writeUint32("class", atUint32(m_class));
m_state.write(w); m_state.write(w);
w.enterSubRecord("slot0"); if (auto rec = w.enterSubRecord("slot0"))
{
if (m_slots[0]) if (m_slots[0])
m_slots[0]->saveState(w); m_slots[0]->saveState(w);
else else
w.writeUint32("class", 0); w.writeUint32("class", 0);
w.leaveSubRecord(); }
w.enterSubRecord("slot1"); if (auto rec = w.enterSubRecord("slot1"))
{
if (m_slots[1]) if (m_slots[1])
m_slots[1]->saveState(w); m_slots[1]->saveState(w);
else else
w.writeUint32("class", 0); w.writeUint32("class", 0);
w.leaveSubRecord(); }
} }
void setChildSlot(unsigned slot, std::unique_ptr<Space>&& space); void setChildSlot(unsigned slot, std::unique_ptr<Space>&& space);

2
Runtime/IFactory.hpp
View File

@ -41,6 +41,8 @@ public:
virtual std::unique_ptr<u8[]> LoadResourceSync(const urde::SObjectTag& tag)=0; virtual std::unique_ptr<u8[]> LoadResourceSync(const urde::SObjectTag& tag)=0;
virtual std::unique_ptr<u8[]> LoadResourcePartSync(const urde::SObjectTag& tag, u32 size, u32 off)=0; virtual std::unique_ptr<u8[]> LoadResourcePartSync(const urde::SObjectTag& tag, u32 size, u32 off)=0;
virtual void GetTagListForFile(const char* pakName, std::vector<SObjectTag>& out) const {}
virtual ResId TranslateOriginalToNew(ResId id) const { return -1; } virtual ResId TranslateOriginalToNew(ResId id) const { return -1; }
virtual ResId TranslateNewToOriginal(ResId id) const { return -1; } virtual ResId TranslateNewToOriginal(ResId id) const { return -1; }
}; };

34
Runtime/MP1/CMFGame.cpp
View File

@ -65,9 +65,23 @@ CMFGameLoader::CMFGameLoader() : CMFGameLoaderBase("CMFGameLoader")
} }
} }
static const char* LoadDepPAKs[] =
{
"TestAnim",
"SamusGun",
"SamGunFx",
nullptr
};
void CMFGameLoader::MakeLoadDependencyList() void CMFGameLoader::MakeLoadDependencyList()
{ {
std::vector<SObjectTag> tags;
for (int i=0 ; LoadDepPAKs[i] ; ++i)
g_ResFactory->GetTagListForFile(LoadDepPAKs[i], tags);
x1c_loadList.reserve(tags.size());
for (const SObjectTag& tag : tags)
x1c_loadList.push_back(g_SimplePool->GetObj(tag));
} }
CIOWin::EMessageReturn CMFGameLoader::OnMessage(const CArchitectureMessage& msg, CArchitectureQueue& queue) CIOWin::EMessageReturn CMFGameLoader::OnMessage(const CArchitectureMessage& msg, CArchitectureQueue& queue)
@ -124,12 +138,26 @@ CIOWin::EMessageReturn CMFGameLoader::OnMessage(const CArchitectureMessage& msg,
wldState.GetDesiredAreaAssetId()); wldState.GetDesiredAreaAssetId());
return EMessageReturn::Exit; return EMessageReturn::Exit;
} }
else
{
if (!x18_guiMgr) if (!x18_guiMgr)
{
x18_guiMgr = std::make_shared<CInGameGuiManager>(*x14_stateMgr, queue); x18_guiMgr = std::make_shared<CInGameGuiManager>(*x14_stateMgr, queue);
if (!x18_guiMgr->CheckLoadComplete(*x14_stateMgr))
return EMessageReturn::Exit;
x1c_loadList.clear();
wtMgr->StartTextFadeOut();
x2c_25_transitionFinished = wtMgr->IsTransitionFinished();
return EMessageReturn::Exit;
} }
case EArchMsgType::FrameBegin:
{
if (x2c_25_transitionFinished)
{
queue.Push(
MakeMsg::CreateCreateIOWin(EArchMsgTarget::IOWinManager, 10, 1000,
std::make_shared<CMFGame>(x14_stateMgr, x18_guiMgr, queue)));
return EMessageReturn::RemoveIOWinAndExit;
} }
} }
default: default:

2
Runtime/MP1/CMFGame.hpp
View File

@ -47,7 +47,7 @@ class CMFGameLoader : public CMFGameLoaderBase
struct struct
{ {
bool x2c_24_initialized : 1; bool x2c_24_initialized : 1;
bool x2c_25_ : 1; bool x2c_25_transitionFinished : 1;
}; };
u8 _dummy = 0; u8 _dummy = 0;
}; };

2
hecl

@ -1 +1 @@
Subproject commit e86501e66a219e5370b82be6379da449cb23381a Subproject commit bcffcf3105090648ba44b3aa69a5d906986be531