sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed mesh animating modifying template skeleton

Browse Source 
Former-commit-id: d70bd2ed7c8a38f879641a4b22be4876f6825edb
This commit is contained in:
Lynix
2012-12-09 01:45:34 +01:00
parent b652bada13
commit 37d6b71036
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Nazara/Utility/Mesh.cpp
View File

@@ -128,7 +128,7 @@ bool NzMesh::AddSubMesh(const NzString& identifier, NzSubMesh* subMesh)
return true;
}
void NzMesh::Animate(const NzAnimation* animation, unsigned int frameA, unsigned int frameB, float interpolation) const
void NzMesh::Animate(const NzAnimation* animation, unsigned int frameA, unsigned int frameB, float interpolation, NzSkeleton* skeleton) const
{
#if NAZARA_UTILITY_SAFE
if (!m_impl)
@@ -182,11 +182,19 @@ void NzMesh::Animate(const NzAnimation* animation, unsigned int frameA, unsigned
break;
case nzAnimationType_Skeletal:
animation->AnimateSkeleton(&m_impl->skeleton, frameA, frameB, interpolation);
#if NAZARA_UTILITY_SAFE
if (!skeleton)
{
NazaraError("Skeleton must be valid for skeletal animation");
return;
}
#endif
animation->AnimateSkeleton(skeleton, frameA, frameB, interpolation);
for (NzSubMesh* subMesh : m_impl->subMeshes)
{
NzSkeletalMesh* skeletalMesh = static_cast<NzSkeletalMesh*>(subMesh);
skeletalMesh->Skin(&m_impl->skeleton);
skeletalMesh->Skin(skeleton);
}
break;