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

74
Runtime/Character/IMetaAnim.cpp
View File

@@ -4,55 +4,45 @@
#include "CBoolPOINode.hpp"
#include "CAnimTreeNode.hpp"
namespace urde
{
namespace urde {
std::shared_ptr<CAnimTreeNode>
IMetaAnim::GetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
if (orders.x44_singleAdvance)
{
std::shared_ptr<CAnimTreeNode> tree =
VGetAnimationTree(animSys, CMetaAnimTreeBuildOrders::NoSpecialOrders());
if (orders.x44_singleAdvance->IsTime() || orders.x44_singleAdvance->IsString())
{
CCharAnimTime time = GetTime(*orders.x44_singleAdvance, *tree);
AdvanceAnim(*tree, time);
}
return tree;
std::shared_ptr<CAnimTreeNode> IMetaAnim::GetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const {
if (orders.x44_singleAdvance) {
std::shared_ptr<CAnimTreeNode> tree = VGetAnimationTree(animSys, CMetaAnimTreeBuildOrders::NoSpecialOrders());
if (orders.x44_singleAdvance->IsTime() || orders.x44_singleAdvance->IsString()) {
CCharAnimTime time = GetTime(*orders.x44_singleAdvance, *tree);
AdvanceAnim(*tree, time);
}
return VGetAnimationTree(animSys, CMetaAnimTreeBuildOrders::NoSpecialOrders());
return tree;
}
return VGetAnimationTree(animSys, CMetaAnimTreeBuildOrders::NoSpecialOrders());
}
void IMetaAnim::AdvanceAnim(IAnimReader& anim, const CCharAnimTime& dt)
{
CCharAnimTime remDt = dt;
while (remDt > CCharAnimTime())
{
SAdvancementResults res = anim.VAdvanceView(remDt);
remDt = res.x0_remTime;
}
void IMetaAnim::AdvanceAnim(IAnimReader& anim, const CCharAnimTime& dt) {
CCharAnimTime remDt = dt;
while (remDt > CCharAnimTime()) {
SAdvancementResults res = anim.VAdvanceView(remDt);
remDt = res.x0_remTime;
}
}
CCharAnimTime IMetaAnim::GetTime(const CPreAdvanceIndicator& ind, const IAnimReader& anim)
{
if (ind.IsTime())
return ind.GetTime();
CCharAnimTime IMetaAnim::GetTime(const CPreAdvanceIndicator& ind, const IAnimReader& anim) {
if (ind.IsTime())
return ind.GetTime();
CBoolPOINode nodes[64];
CCharAnimTime rem = anim.VGetTimeRemaining();
u32 count = anim.VGetBoolPOIList(rem, nodes, 64, 0, 0);
const char* cmpStr = ind.GetString();
for (u32 i=0 ; i<count ; ++i)
{
CBoolPOINode& node = nodes[i];
if (node.GetString().compare(cmpStr) || !node.GetValue())
continue;
return node.GetTime();
}
CBoolPOINode nodes[64];
CCharAnimTime rem = anim.VGetTimeRemaining();
u32 count = anim.VGetBoolPOIList(rem, nodes, 64, 0, 0);
const char* cmpStr = ind.GetString();
for (u32 i = 0; i < count; ++i) {
CBoolPOINode& node = nodes[i];
if (node.GetString().compare(cmpStr) || !node.GetValue())
continue;
return node.GetTime();
}
return {};
return {};
}
}
} // namespace urde