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

Animation transitions and pause screen fixes

Browse Source
This commit is contained in:
Jack Andersen
2018-01-04 17:02:30 -10:00
parent 99fc9e3598
commit a78c4c6b36
25 changed files with 179 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/Character/CAnimTreeTransition.hpp
View File

@@ -14,7 +14,7 @@ protected:
CCharAnimTime x2c_timeInTrans;
bool x34_runA;
bool x35_loopA;
bool x36_ = false;
bool x36_initialized = false;
SAdvancementResults AdvanceViewForTransitionalPeriod(const CCharAnimTime& time);
public:
static std::string CreatePrimitiveName(const std::weak_ptr<CAnimTreeNode>&, const std::weak_ptr<CAnimTreeNode>&,
@@ -23,7 +23,7 @@ public:
CAnimTreeTransition(bool b1, const std::weak_ptr<CAnimTreeNode>& a,
const std::weak_ptr<CAnimTreeNode>& b, const CCharAnimTime& transDur,
const CCharAnimTime& timeInTrans, bool runA, bool loopA, int flags,
std::string_view name, bool b4);
std::string_view name, bool initialized);
CAnimTreeTransition(bool b1, const std::weak_ptr<CAnimTreeNode>& a,
const std::weak_ptr<CAnimTreeNode>& b,
const CCharAnimTime& transDur, bool runA,
@@ -33,6 +33,7 @@ public:
CSteadyStateAnimInfo VGetSteadyStateAnimInfo() const;
std::unique_ptr<IAnimReader> VClone() const;
std::experimental::optional<std::unique_ptr<IAnimReader>> VSimplified();
std::experimental::optional<std::unique_ptr<IAnimReader>> VReverseSimplified();
SAdvancementResults VAdvanceView(const CCharAnimTime& a);
void SetBlendingWeight(float w);
float VGetBlendingWeight() const;