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

Fixed issues in MP3 package list building

Browse Source
This commit is contained in:
Aruki
2017-05-09 14:16:41 -06:00
parent f72f82d519
commit 560706d285
22 changed files with 269 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -655,7 +655,7 @@ CModel* CScriptNode::ActiveModel() const
{
if (mpDisplayAsset->Type() == eModel)
return static_cast<CModel*>(mpDisplayAsset.RawPointer());
else if (mpDisplayAsset->Type() == eAnimSet)
else if (mpDisplayAsset->Type() == eAnimSet || mpDisplayAsset->Type() == eCharacter)
return static_cast<CAnimSet*>(mpDisplayAsset.RawPointer())->Character(mCharIndex)->pModel;
}
@@ -664,7 +664,7 @@ CModel* CScriptNode::ActiveModel() const
CAnimSet* CScriptNode::ActiveAnimSet() const
{
if (mpDisplayAsset && mpDisplayAsset->Type() == eAnimSet)
if (mpDisplayAsset && (mpDisplayAsset->Type() == eAnimSet || mpDisplayAsset->Type() == eCharacter))
return static_cast<CAnimSet*>(mpDisplayAsset.RawPointer());
else
return nullptr;
@@ -739,7 +739,7 @@ void CScriptNode::SetDisplayAsset(CResource *pRes)
{
mpDisplayAsset = pRes;
bool IsAnimSet = (pRes && pRes->Type() == eAnimSet);
bool IsAnimSet = (pRes && (pRes->Type() == eAnimSet || pRes->Type() == eCharacter));
mCharIndex = (IsAnimSet ? mpInstance->ActiveCharIndex() : -1);
mAnimIndex = (IsAnimSet ? mpInstance->ActiveAnimIndex() : -1);