AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-14 02:06:09 +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

57
Runtime/Character/CCharacterInfo.cpp
View File

@@ -1,76 +1,77 @@
#include "Runtime/Character/CCharacterInfo.hpp"
#include "Runtime/IOStreams.hpp"
namespace metaforce {
CCharacterInfo::CParticleResData::CParticleResData(CInputStream& in, u16 tableCount) {
const u32 partCount = in.readUint32Big();
const u32 partCount = in.ReadLong();
x0_part.reserve(partCount);
for (u32 i = 0; i < partCount; ++i) {
x0_part.emplace_back(in.readUint32Big());
x0_part.emplace_back(in.Get<CAssetId>());
}
const u32 swhcCount = in.readUint32Big();
const u32 swhcCount = in.ReadLong();
x10_swhc.reserve(swhcCount);
for (u32 i = 0; i < swhcCount; ++i) {
x10_swhc.emplace_back(in.readUint32Big());
x10_swhc.emplace_back(in.Get<CAssetId>());
}
const u32 unkCount = in.readUint32Big();
const u32 unkCount = in.ReadLong();
x20_elsc.reserve(unkCount);
for (u32 i = 0; i < unkCount; ++i) {
x20_elsc.emplace_back(in.readUint32Big());
x20_elsc.emplace_back(in.Get<CAssetId>());
}
if (tableCount > 5) {
const u32 elscCount = in.readUint32Big();
const u32 elscCount = in.ReadLong();
x30_elsc.reserve(elscCount);
for (u32 i = 0; i < elscCount; ++i) {
x30_elsc.emplace_back(in.readUint32Big());
x30_elsc.emplace_back(in.Get<CAssetId>());
}
}
}
static std::vector<std::pair<s32, std::pair<std::string, std::string>>> MakeAnimInfoVector(CInputStream& in) {
std::vector<std::pair<s32, std::pair<std::string, std::string>>> ret;
const u32 animInfoCount = in.readUint32Big();
const u32 animInfoCount = in.ReadLong();
ret.reserve(animInfoCount);
for (u32 i = 0; i < animInfoCount; ++i) {
const s32 idx = in.readInt32Big();
std::string a = in.readString();
std::string b = in.readString();
const s32 idx = in.ReadLong();
std::string a = in.Get<std::string>();
std::string b = in.Get<std::string>();
ret.emplace_back(idx, std::make_pair(std::move(a), std::move(b)));
}
return ret;
}
CCharacterInfo::CCharacterInfo(CInputStream& in)
: x0_tableCount(in.readUint16Big())
, x4_name(in.readString())
, x14_cmdl(in.readUint32Big())
, x18_cskr(in.readUint32Big())
, x1c_cinf(in.readUint32Big())
: x0_tableCount(in.ReadShort())
, x4_name(in.Get<std::string>())
, x14_cmdl(in.ReadLong())
, x18_cskr(in.ReadLong())
, x1c_cinf(in.ReadLong())
, x20_animInfo(MakeAnimInfoVector(in))
, x30_pasDatabase(in)
, x44_partRes(in, x0_tableCount)
, x84_unk(in.readUint32Big()) {
, x84_unk(in.ReadLong()) {
if (x0_tableCount > 1) {
const u32 aabbCount = in.readUint32Big();
const u32 aabbCount = in.ReadLong();
x88_aabbs.reserve(aabbCount);
for (u32 i = 0; i < aabbCount; ++i) {
std::string name = in.readString();
std::string name = in.Get<std::string>();
x88_aabbs.emplace_back(std::move(name), zeus::CAABox());
x88_aabbs.back().second.readBoundingBoxBig(in);
x88_aabbs.back().second = in.Get<zeus::CAABox>();
}
}
if (x0_tableCount > 2) {
const u32 effectCount = in.readUint32Big();
const u32 effectCount = in.ReadLong();
x98_effects.reserve(effectCount);
for (u32 i = 0; i < effectCount; ++i) {
std::string name = in.readString();
std::string name = in.Get<std::string>();
x98_effects.emplace_back(std::move(name), std::vector<CEffectComponent>());
std::vector<CEffectComponent>& comps = x98_effects.back().second;
const u32 compCount = in.readUint32Big();
const u32 compCount = in.ReadLong();
comps.reserve(compCount);
for (u32 j = 0; j < compCount; ++j) {
comps.emplace_back(in);
@@ -79,15 +80,15 @@ CCharacterInfo::CCharacterInfo(CInputStream& in)
}
if (x0_tableCount > 3) {
xa8_cmdlOverlay = in.readUint32Big();
xac_cskrOverlay = in.readUint32Big();
xa8_cmdlOverlay = in.ReadLong();
xac_cskrOverlay = in.ReadLong();
}
if (x0_tableCount > 4) {
const u32 aidxCount = in.readUint32Big();
const u32 aidxCount = in.ReadLong();
xb0_animIdxs.reserve(aidxCount);
for (u32 i = 0; i < aidxCount; ++i) {
xb0_animIdxs.push_back(in.readInt32Big());
xb0_animIdxs.push_back(in.ReadLong());
}
}
}