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

All animation nodes implemented

Browse Source
This commit is contained in:
Jack Andersen
2018-01-29 15:04:01 -10:00
parent bb10423267
commit 36f1473f3e
31 changed files with 809 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Runtime/Character/CAnimTreeSequence.cpp
View File

@@ -1,6 +1,7 @@
#include "CAnimTreeSequence.hpp"
#include "IMetaAnim.hpp"
#include "CAnimSysContext.hpp"
#include "CTreeUtils.hpp"
namespace urde
{
@@ -9,7 +10,8 @@ CAnimTreeSequence::CAnimTreeSequence(const std::vector<std::shared_ptr<IMetaAnim
const CAnimSysContext& animSys,
std::string_view name)
: CAnimTreeSingleChild(seq[0]->GetAnimationTree(animSys, CMetaAnimTreeBuildOrders::NoSpecialOrders()), name),
x18_(animSys), x3c_fundamentals(CSequenceHelper(seq, animSys).ComputeSequenceFundamentals()), x94_curTime(0.f)
x18_animCtx(animSys), x28_sequence(seq),
x3c_fundamentals(CSequenceHelper(seq, animSys).ComputeSequenceFundamentals()), x94_curTime(0.f)
{
}
@@ -19,7 +21,8 @@ CAnimTreeSequence::CAnimTreeSequence(const std::shared_ptr<CAnimTreeNode>& curNo
std::string_view name,
const CSequenceFundamentals& fundamentals,
const CCharAnimTime& time)
: CAnimTreeSingleChild(curNode, name), x18_(animSys), x28_(metaAnims), x3c_fundamentals(fundamentals), x94_curTime(time)
: CAnimTreeSingleChild(curNode, name), x18_animCtx(animSys), x28_sequence(metaAnims),
x3c_fundamentals(fundamentals), x94_curTime(time)
{
}
@@ -35,17 +38,62 @@ std::shared_ptr<IAnimReader> CAnimTreeSequence::VGetBestUnblendedChild() const
return ch;
return std::make_shared<CAnimTreeSequence>(std::static_pointer_cast<CAnimTreeNode>(
std::shared_ptr<IAnimReader>(ch->Clone())),
x28_, x18_, x4_name, x3c_fundamentals, x94_curTime);
x28_sequence, x18_animCtx, x4_name, x3c_fundamentals, x94_curTime);
}
SAdvancementResults CAnimTreeSequence::VAdvanceView(const CCharAnimTime& a)
SAdvancementResults CAnimTreeSequence::VAdvanceView(const CCharAnimTime& dt)
{
return {};
CCharAnimTime totalDelta;
zeus::CVector3f posDelta;
zeus::CQuaternion rotDelta;
std::shared_ptr<CAnimTreeNode> curChild = x14_child;
if (x38_curIdx >= x28_sequence.size() && curChild->VGetTimeRemaining().EqualsZero())
{
x3c_fundamentals = CSequenceHelper(x28_sequence, x18_animCtx).ComputeSequenceFundamentals();
x38_curIdx = 0;
x14_child = CTreeUtils::GetTransitionTree(curChild, x28_sequence[x38_curIdx]->GetAnimationTree(
x18_animCtx, CMetaAnimTreeBuildOrders::NoSpecialOrders()), x18_animCtx);
curChild = x14_child;
}
CCharAnimTime remTime = dt;
while (remTime.GreaterThanZero() && x38_curIdx < x28_sequence.size())
{
CCharAnimTime chRem = curChild->VGetTimeRemaining();
if (chRem.EqualsZero())
{
++x38_curIdx;
if (x38_curIdx < x28_sequence.size())
{
x14_child = CTreeUtils::GetTransitionTree(curChild, x28_sequence[x38_curIdx]->GetAnimationTree(
x18_animCtx, CMetaAnimTreeBuildOrders::NoSpecialOrders()), x18_animCtx);
}
}
curChild = x14_child;
if (x38_curIdx < x28_sequence.size())
{
SAdvancementResults res = curChild->VAdvanceView(remTime);
if (auto simp = curChild->Simplified())
{
curChild = CAnimTreeNode::Cast(std::move(*simp));
x14_child = curChild;
}
CCharAnimTime prevRemTime = remTime;
remTime = res.x0_remTime;
totalDelta += prevRemTime - remTime;
posDelta += res.x8_deltas.x0_posDelta;
rotDelta = rotDelta * res.x8_deltas.xc_rotDelta;
}
}
x94_curTime += totalDelta;
return {dt - totalDelta, {posDelta, rotDelta}};
}
CCharAnimTime CAnimTreeSequence::VGetTimeRemaining() const
{
if (x38_curIdx == x28_.size() - 1)
if (x38_curIdx == x28_sequence.size() - 1)
return x14_child->VGetTimeRemaining();
return x3c_fundamentals.GetSteadyStateAnimInfo().GetDuration() - x94_curTime.GetSeconds();
}
@@ -87,7 +135,7 @@ std::unique_ptr<IAnimReader> CAnimTreeSequence::VClone() const
{
return std::make_unique<CAnimTreeSequence>(std::static_pointer_cast<CAnimTreeNode>(
std::shared_ptr<IAnimReader>(x14_child->Clone())),
x28_, x18_, x4_name, x3c_fundamentals, x94_curTime);
x28_sequence, x18_animCtx, x4_name, x3c_fundamentals, x94_curTime);
}
}