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

ANIM fixes and explicit-endian refactor

Browse Source
This commit is contained in:
Jack Andersen
2015-08-13 17:00:51 -10:00
parent 5b38596595
commit b5d96f7040
20 changed files with 858 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
DataSpec/DNAMP3/PAK.cpp
View File

@@ -10,20 +10,19 @@ const HECL::FourCC CMPD("CMPD");
void PAK::read(Athena::io::IStreamReader& reader)
{
reader.setEndian(Athena::BigEndian);
m_header.read(reader);
if (m_header.version != 2)
Log.report(LogVisor::FatalError, "unexpected PAK magic");
reader.seek(8, Athena::Current);
atUint32 strgSz = reader.readUint32();
atUint32 strgSz = reader.readUint32Big();
reader.seek(4, Athena::Current);
atUint32 rshdSz = reader.readUint32();
atUint32 rshdSz = reader.readUint32Big();
reader.seek(44, Athena::Current);
atUint32 dataOffset = 128 + strgSz + rshdSz;
atUint64 strgBase = reader.position();
atUint32 nameCount = reader.readUint32();
atUint32 nameCount = reader.readUint32Big();
m_nameEntries.clear();
m_nameEntries.reserve(nameCount);
for (atUint32 n=0 ; n<nameCount ; ++n)
@@ -36,7 +35,7 @@ void PAK::read(Athena::io::IStreamReader& reader)
atUint64 end = reader.position();
atUint64 diff = end - start;
atUint32 count = reader.readUint32();
atUint32 count = reader.readUint32Big();
m_entries.clear();
m_entries.reserve(count);
m_idMap.clear();
@@ -61,7 +60,6 @@ void PAK::read(Athena::io::IStreamReader& reader)
}
void PAK::write(Athena::io::IStreamWriter& writer) const
{
writer.setEndian(Athena::BigEndian);
m_header.write(writer);
FourCC("STRG").write(writer);
@@ -70,13 +68,13 @@ void PAK::write(Athena::io::IStreamWriter& writer) const
strgSz += (atUint32)entry.name.size() + 13;
atUint32 strgPad = ((strgSz + 63) & ~63) - strgSz;
strgSz += strgPad;
writer.writeUint32(strgSz);
writer.writeUint32Big(strgSz);
FourCC("RSHD").write(writer);
atUint32 rshdSz = 4 + 24 * m_entries.size();
atUint32 rshdPad = ((rshdSz + 63) & ~63) - rshdSz;
rshdSz += rshdPad;
writer.writeUint32(rshdSz);
writer.writeUint32Big(rshdSz);
atUint32 dataOffset = 128 + strgSz + rshdSz;
FourCC("DATA").write(writer);
@@ -85,15 +83,15 @@ void PAK::write(Athena::io::IStreamWriter& writer) const
dataSz += (entry.size + 63) & ~63;
atUint32 dataPad = ((dataSz + 63) & ~63) - dataSz;
dataSz += dataPad;
writer.writeUint32(dataSz);
writer.writeUint32Big(dataSz);
writer.seek(36, Athena::Current);
writer.writeUint32((atUint32)m_nameEntries.size());
writer.writeUint32Big((atUint32)m_nameEntries.size());
for (const NameEntry& entry : m_nameEntries)
entry.write(writer);
writer.seek(strgPad, Athena::Current);
writer.writeUint32((atUint32)m_entries.size());
writer.writeUint32Big((atUint32)m_entries.size());
for (const Entry& entry : m_entries)
{
Entry copy = entry;

44
DataSpec/DNAMP3/STRG.cpp
View File

@@ -8,11 +8,11 @@ namespace DNAMP3
void STRG::_read(Athena::io::IStreamReader& reader)
{
atUint32 langCount = reader.readUint32();
atUint32 strCount = reader.readUint32();
atUint32 langCount = reader.readUint32Big();
atUint32 strCount = reader.readUint32Big();
atUint32 nameCount = reader.readUint32();
atUint32 nameTableSz = reader.readUint32();
atUint32 nameCount = reader.readUint32Big();
atUint32 nameTableSz = reader.readUint32Big();
if (nameTableSz)
{
std::unique_ptr<uint8_t[]> nameTableBuf(new uint8_t[nameTableSz]);
@@ -40,9 +40,9 @@ void STRG::_read(Athena::io::IStreamReader& reader)
std::unique_ptr<atUint32[]> strOffs(new atUint32[langCount * strCount]);
for (atUint32 l=0 ; l<langCount ; ++l)
{
reader.readUint32();
reader.readUint32Big();
for (atUint32 s=0 ; s<strCount ; ++s)
strOffs[l*strCount+s] = reader.readUint32();
strOffs[l*strCount+s] = reader.readUint32Big();
}
atUint64 strBase = reader.position();
@@ -54,7 +54,7 @@ void STRG::_read(Athena::io::IStreamReader& reader)
for (atUint32 s=0 ; s<strCount ; ++s)
{
reader.seek(strBase + strOffs[l*strCount+s], Athena::Begin);
atUint32 len = reader.readUint32();
atUint32 len = reader.readUint32Big();
strs.emplace_back(reader.readString(len));
}
langs.emplace_back(readLangs[l], strs);
@@ -68,15 +68,14 @@ void STRG::_read(Athena::io::IStreamReader& reader)
void STRG::read(Athena::io::IStreamReader& reader)
{
reader.setEndian(Athena::BigEndian);
atUint32 magic = reader.readUint32();
atUint32 magic = reader.readUint32Big();
if (magic != 0x87654321)
{
Log.report(LogVisor::Error, "invalid STRG magic");
return;
}
atUint32 version = reader.readUint32();
atUint32 version = reader.readUint32Big();
if (version != 3)
{
Log.report(LogVisor::Error, "invalid STRG version");
@@ -154,23 +153,22 @@ void STRG::fromYAML(Athena::io::YAMLDocReader& reader)
void STRG::write(Athena::io::IStreamWriter& writer) const
{
writer.setEndian(Athena::BigEndian);
writer.writeUint32(0x87654321);
writer.writeUint32(3);
writer.writeUint32(langs.size());
writer.writeUint32Big(0x87654321);
writer.writeUint32Big(3);
writer.writeUint32Big(langs.size());
atUint32 strCount = STRG::count();
writer.writeUint32(strCount);
writer.writeUint32Big(strCount);
atUint32 nameTableSz = names.size() * 8;
for (const auto& name : names)
nameTableSz += name.first.size() + 1;
writer.writeUint32(names.size());
writer.writeUint32(nameTableSz);
writer.writeUint32Big(names.size());
writer.writeUint32Big(nameTableSz);
atUint32 offset = names.size() * 8;
for (const auto& name : names)
{
writer.writeUint32(offset);
writer.writeInt32(name.second);
writer.writeUint32Big(offset);
writer.writeInt32Big(name.second);
offset += name.first.size() + 1;
}
for (const auto& name : names)
@@ -185,11 +183,11 @@ void STRG::write(Athena::io::IStreamWriter& writer) const
atUint32 langSz = 0;
for (const std::string& str : lang.second)
langSz += str.size() + 5;
writer.writeUint32(langSz);
writer.writeUint32Big(langSz);
for (const std::string& str : lang.second)
{
writer.writeUint32(offset);
writer.writeUint32Big(offset);
offset += str.size() + 5;
}
}
@@ -200,13 +198,13 @@ void STRG::write(Athena::io::IStreamWriter& writer) const
{
if (s >= lang.second.size())
{
writer.writeUint32(1);
writer.writeUint32Big(1);
writer.writeUByte(0);
}
else
{
const std::string& str = lang.second[s];
writer.writeUint32(str.size() + 1);
writer.writeUint32Big(str.size() + 1);
writer.writeString(str);
}
}