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

Reformat pass

Browse Source
This commit is contained in:
Phillip Stephens
2021-06-07 12:29:18 -07:00
parent d7559823ea
commit a9bcb7a9ce
424 changed files with 4377 additions and 4790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Runtime/Character/CMetaAnimBlend.cpp
View File

@@ -20,13 +20,12 @@ void CMetaAnimBlend::GetUniquePrimitives(std::set<CPrimitive>& primsOut) const {
std::shared_ptr<CAnimTreeNode> CMetaAnimBlend::VGetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const {
CMetaAnimTreeBuildOrders oa = CMetaAnimTreeBuildOrders::NoSpecialOrders();
CMetaAnimTreeBuildOrders ob = orders.x0_recursiveAdvance ?
CMetaAnimTreeBuildOrders::PreAdvanceForAll(*orders.x0_recursiveAdvance) :
CMetaAnimTreeBuildOrders::NoSpecialOrders();
CMetaAnimTreeBuildOrders ob = orders.x0_recursiveAdvance
? CMetaAnimTreeBuildOrders::PreAdvanceForAll(*orders.x0_recursiveAdvance)
: CMetaAnimTreeBuildOrders::NoSpecialOrders();
auto a = x4_animA->GetAnimationTree(animSys, oa);
auto b = x8_animB->GetAnimationTree(animSys, ob);
return std::make_shared<CAnimTreeBlend>(x10_, a, b, xc_blend,
CAnimTreeBlend::CreatePrimitiveName(a, b, xc_blend));
return std::make_shared<CAnimTreeBlend>(x10_, a, b, xc_blend, CAnimTreeBlend::CreatePrimitiveName(a, b, xc_blend));
}
} // namespace metaforce