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

18
Runtime/Character/CAnimationSet.cpp
View File

@@ -4,13 +4,13 @@
namespace metaforce {
CAnimationSet::CAnimationSet(CInputStream& in) : x0_tableCount(in.readUint16Big()) {
u32 animationCount = in.readUint32Big();
CAnimationSet::CAnimationSet(CInputStream& in) : x0_tableCount(in.ReadShort()) {
u32 animationCount = in.ReadLong();
x4_animations.reserve(animationCount);
for (u32 i = 0; i < animationCount; ++i)
x4_animations.emplace_back(in);
u32 transitionCount = in.readUint32Big();
u32 transitionCount = in.ReadLong();
x14_transitions.reserve(transitionCount);
for (u32 i = 0; i < transitionCount; ++i)
x14_transitions.emplace_back(in);
@@ -18,28 +18,28 @@ CAnimationSet::CAnimationSet(CInputStream& in) : x0_tableCount(in.readUint16Big(
x24_defaultTransition = CMetaTransFactory::CreateMetaTrans(in);
if (x0_tableCount > 1) {
u32 additiveAnimCount = in.readUint32Big();
u32 additiveAnimCount = in.ReadLong();
x28_additiveInfo.reserve(additiveAnimCount);
for (u32 i = 0; i < additiveAnimCount; ++i) {
u32 id = in.readUint32Big();
u32 id = in.ReadLong();
x28_additiveInfo.emplace_back(id, in);
}
x38_defaultAdditiveInfo.read(in);
}
if (x0_tableCount > 2) {
u32 halfTransitionCount = in.readUint32Big();
u32 halfTransitionCount = in.ReadLong();
x40_halfTransitions.reserve(halfTransitionCount);
for (u32 i = 0; i < halfTransitionCount; ++i)
x40_halfTransitions.emplace_back(in);
}
if (x0_tableCount > 3) {
u32 animResourcesCount = in.readUint32Big();
u32 animResourcesCount = in.ReadLong();
x50_animRes.reserve(animResourcesCount);
for (u32 i = 0; i < animResourcesCount; ++i) {
CAssetId anim = in.readUint32Big();
CAssetId evnt = in.readUint32Big();
CAssetId anim = in.ReadLong();
CAssetId evnt = in.ReadLong();
x50_animRes.emplace_back(anim, evnt);
}
}