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

Additive animation integration

Browse Source
This commit is contained in:
Jack Andersen
2017-02-28 20:02:54 -10:00
parent 5277d445d3
commit 7334074798
26 changed files with 204 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/Character/CAnimTreeSequence.cpp
View File

@@ -33,7 +33,8 @@ std::shared_ptr<IAnimReader> CAnimTreeSequence::VGetBestUnblendedChild() const
std::shared_ptr<IAnimReader> ch = x14_child->GetBestUnblendedChild();
if (!ch)
return ch;
return std::make_shared<CAnimTreeSequence>(std::static_pointer_cast<CAnimTreeNode>(ch->Clone()),
return std::make_shared<CAnimTreeSequence>(std::static_pointer_cast<CAnimTreeNode>(
std::shared_ptr<IAnimReader>(ch->Clone())),
x28_, x18_, x4_name, x3c_fundamentals, x94_curTime);
}
@@ -88,9 +89,10 @@ u32 CAnimTreeSequence::VGetSoundPOIList(const CCharAnimTime& time, CSoundPOINode
x3c_fundamentals.GetSoundPointsOfInterest(), x94_curTime);
}
std::shared_ptr<IAnimReader> CAnimTreeSequence::VClone() const
std::unique_ptr<IAnimReader> CAnimTreeSequence::VClone() const
{
return std::make_shared<CAnimTreeSequence>(std::static_pointer_cast<CAnimTreeNode>(x14_child->Clone()),
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);
}