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

New code style refactor

Browse Source
This commit is contained in:
Jack Andersen
2018-12-07 19:30:43 -10:00
parent 41ae32be31
commit 636c82a568
1451 changed files with 171430 additions and 203303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
Runtime/Character/CCharacterInfo.cpp
View File

@@ -1,113 +1,98 @@
#include "CCharacterInfo.hpp"
namespace urde
{
namespace urde {
CCharacterInfo::CParticleResData::CParticleResData(CInputStream& in, u16 tableCount)
{
u32 partCount = in.readUint32Big();
x0_part.reserve(partCount);
for (u32 i=0 ; i<partCount ; ++i)
x0_part.push_back(in.readUint32Big());
CCharacterInfo::CParticleResData::CParticleResData(CInputStream& in, u16 tableCount) {
u32 partCount = in.readUint32Big();
x0_part.reserve(partCount);
for (u32 i = 0; i < partCount; ++i)
x0_part.push_back(in.readUint32Big());
u32 swhcCount = in.readUint32Big();
x10_swhc.reserve(swhcCount);
for (u32 i=0 ; i<swhcCount ; ++i)
x10_swhc.push_back(in.readUint32Big());
u32 swhcCount = in.readUint32Big();
x10_swhc.reserve(swhcCount);
for (u32 i = 0; i < swhcCount; ++i)
x10_swhc.push_back(in.readUint32Big());
u32 unkCount = in.readUint32Big();
x20_elsc.reserve(unkCount);
for (u32 i=0 ; i<unkCount ; ++i)
x20_elsc.push_back(in.readUint32Big());
u32 unkCount = in.readUint32Big();
x20_elsc.reserve(unkCount);
for (u32 i = 0; i < unkCount; ++i)
x20_elsc.push_back(in.readUint32Big());
if (tableCount > 5)
{
u32 elscCount = in.readUint32Big();
x30_elsc.reserve(elscCount);
for (u32 i=0 ; i<elscCount ; ++i)
x30_elsc.push_back(in.readUint32Big());
}
if (tableCount > 5) {
u32 elscCount = in.readUint32Big();
x30_elsc.reserve(elscCount);
for (u32 i = 0; i < elscCount; ++i)
x30_elsc.push_back(in.readUint32Big());
}
}
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;
u32 animInfoCount = in.readUint32Big();
ret.reserve(animInfoCount);
for (u32 i=0 ; i<animInfoCount ; ++i)
{
s32 idx = in.readInt32Big();
std::string a = in.readString();
std::string b = in.readString();
ret.emplace_back(idx, std::make_pair(a, b));
}
return ret;
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;
u32 animInfoCount = in.readUint32Big();
ret.reserve(animInfoCount);
for (u32 i = 0; i < animInfoCount; ++i) {
s32 idx = in.readInt32Big();
std::string a = in.readString();
std::string b = in.readString();
ret.emplace_back(idx, std::make_pair(a, 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()),
x20_animInfo(MakeAnimInfoVector(in)),
x30_pasDatabase(in),
x44_partRes(in, x0_tableCount),
x84_unk(in.readUint32Big())
{
if (x0_tableCount > 1)
{
u32 aabbCount = in.readUint32Big();
x88_aabbs.reserve(aabbCount);
for (u32 i=0 ; i<aabbCount ; ++i)
{
std::string name = in.readString();
x88_aabbs.emplace_back(name, zeus::CAABox());
x88_aabbs.back().second.readBoundingBoxBig(in);
}
: x0_tableCount(in.readUint16Big())
, x4_name(in.readString())
, x14_cmdl(in.readUint32Big())
, x18_cskr(in.readUint32Big())
, x1c_cinf(in.readUint32Big())
, x20_animInfo(MakeAnimInfoVector(in))
, x30_pasDatabase(in)
, x44_partRes(in, x0_tableCount)
, x84_unk(in.readUint32Big()) {
if (x0_tableCount > 1) {
u32 aabbCount = in.readUint32Big();
x88_aabbs.reserve(aabbCount);
for (u32 i = 0; i < aabbCount; ++i) {
std::string name = in.readString();
x88_aabbs.emplace_back(name, zeus::CAABox());
x88_aabbs.back().second.readBoundingBoxBig(in);
}
}
if (x0_tableCount > 2)
{
u32 effectCount = in.readUint32Big();
x98_effects.reserve(effectCount);
for (u32 i=0 ; i<effectCount ; ++i)
{
std::string name = in.readString();
x98_effects.emplace_back(name, std::vector<CEffectComponent>());
std::vector<CEffectComponent>& comps = x98_effects.back().second;
u32 compCount = in.readUint32Big();
comps.reserve(compCount);
for (u32 j=0 ; j<compCount ; ++j)
comps.emplace_back(in);
}
if (x0_tableCount > 2) {
u32 effectCount = in.readUint32Big();
x98_effects.reserve(effectCount);
for (u32 i = 0; i < effectCount; ++i) {
std::string name = in.readString();
x98_effects.emplace_back(name, std::vector<CEffectComponent>());
std::vector<CEffectComponent>& comps = x98_effects.back().second;
u32 compCount = in.readUint32Big();
comps.reserve(compCount);
for (u32 j = 0; j < compCount; ++j)
comps.emplace_back(in);
}
}
if (x0_tableCount > 3)
{
xa8_cmdlOverlay = in.readUint32Big();
xac_cskrOverlay = in.readUint32Big();
}
if (x0_tableCount > 3) {
xa8_cmdlOverlay = in.readUint32Big();
xac_cskrOverlay = in.readUint32Big();
}
if (x0_tableCount > 4)
{
u32 aidxCount = in.readUint32Big();
xb0_animIdxs.reserve(aidxCount);
for (u32 i=0 ; i<aidxCount ; ++i)
xb0_animIdxs.push_back(in.readInt32Big());
}
if (x0_tableCount > 4) {
u32 aidxCount = in.readUint32Big();
xb0_animIdxs.reserve(aidxCount);
for (u32 i = 0; i < aidxCount; ++i)
xb0_animIdxs.push_back(in.readInt32Big());
}
}
const s32 CCharacterInfo::GetAnimationIndex(std::string_view name) const
{
for (const auto& pair : x20_animInfo)
{
if (pair.second.second.compare(name.data()) == 0)
return pair.first;
}
const s32 CCharacterInfo::GetAnimationIndex(std::string_view name) const {
for (const auto& pair : x20_animInfo) {
if (pair.second.second.compare(name.data()) == 0)
return pair.first;
}
return -1;
return -1;
}
}
} // namespace urde