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

RE COutput/InputStream and friends and migrate over

Browse Source 
This branch is probably still horribly broken, but it's a good first step to migrating away from having hecl embedded in the runtime
This commit is contained in:
Phillip Stephens
2022-02-17 23:37:54 -08:00
parent c679c2e0f8
commit dad7249927
172 changed files with 3629 additions and 2780 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Runtime/Character/CFBStreamedCompression.cpp
View File

@@ -23,8 +23,8 @@ void WriteValue(u8* data, T value) {
} // Anonymous namespace
CFBStreamedCompression::CFBStreamedCompression(CInputStream& in, IObjectStore& objStore, bool pc) : m_pc(pc) {
x0_scratchSize = in.readUint32Big();
x4_evnt = in.readUint32Big();
x0_scratchSize = in.ReadLong();
x4_evnt = in.ReadLong();
xc_rotsAndOffs = GetRotationsAndOffsets(x0_scratchSize / 4 + 1, in);
@@ -86,78 +86,78 @@ std::unique_ptr<u32[]> CFBStreamedCompression::GetRotationsAndOffsets(u32 words,
std::memcpy(ret.get(), &head, sizeof(head));
u32* bitmapOut = &ret[9];
const u32 bitmapBitCount = in.readUint32Big();
const u32 bitmapBitCount = in.ReadLong();
bitmapOut[0] = bitmapBitCount;
const u32 bitmapWordCount = (bitmapBitCount + 31) / 32;
for (u32 i = 0; i < bitmapWordCount; ++i) {
bitmapOut[i + 1] = in.readUint32Big();
bitmapOut[i + 1] = in.ReadLong();
}
in.readUint32Big();
in.ReadLong();
u8* chans = reinterpret_cast<u8*>(bitmapOut + bitmapWordCount + 1);
u8* bs = ReadBoneChannelDescriptors(chans, in);
const u32 bsWords = ComputeBitstreamWords(chans);
u32* bsPtr = reinterpret_cast<u32*>(bs);
for (u32 w = 0; w < bsWords; ++w)
bsPtr[w] = in.readUint32Big();
bsPtr[w] = in.ReadLong();
return ret;
}
u8* CFBStreamedCompression::ReadBoneChannelDescriptors(u8* out, CInputStream& in) const {
const u32 boneChanCount = in.readUint32Big();
const u32 boneChanCount = in.ReadLong();
WriteValue(out, boneChanCount);
out += 4;
if (m_pc) {
for (u32 b = 0; b < boneChanCount; ++b) {
WriteValue(out, in.readUint32Big());
WriteValue(out, in.ReadLong());
out += 4;
WriteValue(out, in.readUint32Big());
WriteValue(out, in.ReadLong());
out += 4;
for (int i = 0; i < 3; ++i) {
WriteValue(out, in.readUint32Big());
WriteValue(out, in.ReadLong());
out += 4;
}
const u32 tCount = in.readUint32Big();
const u32 tCount = in.ReadLong();
WriteValue(out, tCount);
out += 4;
if (tCount != 0) {
for (int i = 0; i < 3; ++i) {
WriteValue(out, in.readUint32Big());
WriteValue(out, in.ReadLong());
out += 4;
}
}
}
} else {
for (u32 b = 0; b < boneChanCount; ++b) {
WriteValue(out, in.readUint32Big());
WriteValue(out, in.ReadLong());
out += 4;
WriteValue(out, in.readUint16Big());
WriteValue(out, in.ReadShort());
out += 2;
for (int i = 0; i < 3; ++i) {
WriteValue(out, in.readInt16Big());
WriteValue(out, in.ReadShort());
out += 2;
WriteValue(out, in.readUByte());
WriteValue(out, in.ReadUint8());
out += 1;
}
const u16 tCount = in.readUint16Big();
const u16 tCount = in.ReadShort();
WriteValue(out, tCount);
out += 2;
if (tCount != 0) {
for (int i = 0; i < 3; ++i) {
WriteValue(out, in.readInt16Big());
WriteValue(out, in.ReadShort());
out += 2;
WriteValue(out, in.readUByte());
WriteValue(out, in.ReadUint8());
out += 1;
}
}