AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-13 15:16:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added support for loading meta-animations and meta-transitions (yay! animation exclusion doesn't crash anymore!)

Browse Source
This commit is contained in:
parax0
2016-10-27 07:18:59 -06:00
parent 595e4b931e
commit 040caca896
17 changed files with 692 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Scene/CCharacterNode.h
View File

@@ -33,7 +33,7 @@ public:
inline CAnimSet* Character() const { return mpCharacter; }
inline u32 ActiveCharIndex() const { return mActiveCharSet; }
inline u32 ActiveAnimIndex() const { return mActiveAnim; }
inline CAnimation* CurrentAnim() const { return (mAnimated && mpCharacter ? mpCharacter->Animation(mActiveAnim)->pAnim : nullptr); }
inline CAnimation* CurrentAnim() const { return (mAnimated && mpCharacter ? mpCharacter->FindAnimationAsset(mActiveAnim) : nullptr); }
inline bool IsAnimated() const { return (mAnimated && CurrentAnim() != nullptr); }
void SetAnimated(bool Animated) { mAnimated = Animated; SetDirty(); }

3
src/Core/Scene/CScriptNode.cpp
View File

@@ -679,8 +679,7 @@ CSkeleton* CScriptNode::ActiveSkeleton() const
CAnimation* CScriptNode::ActiveAnimation() const
{
CAnimSet *pSet = ActiveAnimSet();
if (pSet) return pSet->Animation(mAnimIndex)->pAnim;
else return nullptr;
return pSet ? pSet->FindAnimationAsset(mAnimIndex) : nullptr;
}
CTexture* CScriptNode::ActiveBillboard() const