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

Various bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2019-03-08 22:58:27 -10:00
parent f40bf707f6
commit 2f963b9ce3
28 changed files with 283 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Runtime/Character/CMetaAnimPhaseBlend.cpp
View File

@@ -1,5 +1,7 @@
#include "CMetaAnimPhaseBlend.hpp"
#include "CMetaAnimFactory.hpp"
#include "CAnimTreeTimeScale.hpp"
#include "CAnimTreeBlend.hpp"
namespace urde {
@@ -17,7 +19,24 @@ void CMetaAnimPhaseBlend::GetUniquePrimitives(std::set<CPrimitive>& primsOut) co
std::shared_ptr<CAnimTreeNode> CMetaAnimPhaseBlend::VGetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const {
return {};
if (orders.x0_recursiveAdvance)
return GetAnimationTree(animSys, CMetaAnimTreeBuildOrders::PreAdvanceForAll(*orders.x0_recursiveAdvance));
auto a = x4_animA->GetAnimationTree(animSys, CMetaAnimTreeBuildOrders::NoSpecialOrders());
auto b = x8_animB->GetAnimationTree(animSys, CMetaAnimTreeBuildOrders::NoSpecialOrders());
auto da = a->GetContributionOfHighestInfluence().GetSteadyStateAnimInfo().GetDuration();
auto db = b->GetContributionOfHighestInfluence().GetSteadyStateAnimInfo().GetDuration();
auto dblend = da + (db - da) * xc_blend;
float fa = da / dblend;
float fb = db / dblend;
auto tsa = std::make_shared<CAnimTreeTimeScale>(a, fa,
CAnimTreeTimeScale::CreatePrimitiveName(a, fa, CCharAnimTime::Infinity(), -1.f));
auto tsb = std::make_shared<CAnimTreeTimeScale>(b, fb,
CAnimTreeTimeScale::CreatePrimitiveName(b, fb, CCharAnimTime::Infinity(), -1.f));
return std::make_shared<CAnimTreeBlend>(x10_, tsa, tsb, xc_blend,
CAnimTreeBlend::CreatePrimitiveName(tsa, tsb, xc_blend));
}
} // namespace urde