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

55
Runtime/Character/CMetaTransPhaseTrans.cpp
View File

@@ -4,39 +4,36 @@
#include "CAnimTreeTransition.hpp"
#include "CAnimTreeTimeScale.hpp"
namespace urde
{
namespace urde {
CMetaTransPhaseTrans::CMetaTransPhaseTrans(CInputStream& in)
{
x4_transDur = CCharAnimTime(in);
xc_ = in.readBool();
xd_runA = in.readBool();
x10_flags = in.readUint32Big();
CMetaTransPhaseTrans::CMetaTransPhaseTrans(CInputStream& in) {
x4_transDur = CCharAnimTime(in);
xc_ = in.readBool();
xd_runA = in.readBool();
x10_flags = in.readUint32Big();
}
std::shared_ptr<CAnimTreeNode>
CMetaTransPhaseTrans::VGetTransitionTree(const std::weak_ptr<CAnimTreeNode>& a,
const std::weak_ptr<CAnimTreeNode>& b,
const CAnimSysContext& animSys) const
{
std::shared_ptr<CAnimTreeNode> nA = a.lock();
CAnimTreeEffectiveContribution cA = nA->GetContributionOfHighestInfluence();
std::shared_ptr<CAnimTreeNode> nB = b.lock();
CAnimTreeEffectiveContribution cB = nB->GetContributionOfHighestInfluence();
float y2A = cA.GetSteadyStateAnimInfo().GetDuration() / cB.GetSteadyStateAnimInfo().GetDuration();
float y1B = cB.GetSteadyStateAnimInfo().GetDuration() / cA.GetSteadyStateAnimInfo().GetDuration();
std::shared_ptr<CAnimTreeNode> CMetaTransPhaseTrans::VGetTransitionTree(const std::weak_ptr<CAnimTreeNode>& a,
const std::weak_ptr<CAnimTreeNode>& b,
const CAnimSysContext& animSys) const {
std::shared_ptr<CAnimTreeNode> nA = a.lock();
CAnimTreeEffectiveContribution cA = nA->GetContributionOfHighestInfluence();
std::shared_ptr<CAnimTreeNode> nB = b.lock();
CAnimTreeEffectiveContribution cB = nB->GetContributionOfHighestInfluence();
float y2A = cA.GetSteadyStateAnimInfo().GetDuration() / cB.GetSteadyStateAnimInfo().GetDuration();
float y1B = cB.GetSteadyStateAnimInfo().GetDuration() / cA.GetSteadyStateAnimInfo().GetDuration();
nB->VSetPhase(zeus::clamp(0.f, 1.f - cA.GetTimeRemaining() / cA.GetSteadyStateAnimInfo().GetDuration(), 1.f));
auto tsA = std::make_shared<CAnimTreeTimeScale>(a,
std::make_unique<CLinearAnimationTimeScale>(CCharAnimTime{}, 1.f, x4_transDur, y2A),
x4_transDur, CAnimTreeTimeScale::CreatePrimitiveName(a, 1.f, x4_transDur, y2A));
auto tsB = std::make_shared<CAnimTreeTimeScale>(b,
std::make_unique<CLinearAnimationTimeScale>(CCharAnimTime{}, y1B, x4_transDur, 1.f),
x4_transDur, CAnimTreeTimeScale::CreatePrimitiveName(b, y1B, x4_transDur, 1.f));
nB->VSetPhase(zeus::clamp(0.f, 1.f - cA.GetTimeRemaining() / cA.GetSteadyStateAnimInfo().GetDuration(), 1.f));
auto tsA = std::make_shared<CAnimTreeTimeScale>(
a, std::make_unique<CLinearAnimationTimeScale>(CCharAnimTime{}, 1.f, x4_transDur, y2A), x4_transDur,
CAnimTreeTimeScale::CreatePrimitiveName(a, 1.f, x4_transDur, y2A));
auto tsB = std::make_shared<CAnimTreeTimeScale>(
b, std::make_unique<CLinearAnimationTimeScale>(CCharAnimTime{}, y1B, x4_transDur, 1.f), x4_transDur,
CAnimTreeTimeScale::CreatePrimitiveName(b, y1B, x4_transDur, 1.f));
return std::make_shared<CAnimTreeTransition>(xc_, tsA, tsB, x4_transDur, xd_runA, x10_flags,
CAnimTreeTransition::CreatePrimitiveName(tsA, tsB, x4_transDur.GetSeconds()));
return std::make_shared<CAnimTreeTransition>(
xc_, tsA, tsB, x4_transDur, xd_runA, x10_flags,
CAnimTreeTransition::CreatePrimitiveName(tsA, tsB, x4_transDur.GetSeconds()));
}
}
} // namespace urde