Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Bugfix: animation scene tree is correctly created and traversed now

Browse Source 
- Bugfix: viewer should not crash anymore when loading a second asset after a first asset with bones
- deactived invalid animation filtering for the moment


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@213 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
ulfjorensen
2008-11-01 14:18:13 +00:00
parent 99e92472fc
commit c7e6fe3d73
7 changed files with 41 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tools/assimp_view/Display.cpp
View File

@@ -1830,22 +1830,19 @@ int CDisplay::RenderMaterialView()
int CDisplay::RenderNode (aiNode* piNode,const aiMatrix4x4& piMatrix,
bool bAlpha /*= false*/)
{
aiMatrix4x4 mTemp = piNode->mTransformation;
mTemp.Transpose();
aiMatrix4x4 aiMe = mTemp * piMatrix;
aiMatrix4x4 aiMe = g_pcAsset->mAnimator->GetGlobalTransform( piNode->mName.data);
aiMe.Transpose();
aiMe *= piMatrix;
bool bChangedVM = false;
if (VIEWMODE_NODE == this->m_iViewMode && this->m_pcCurrentNode)
{
if (piNode != this->m_pcCurrentNode->psNode)
{
if (0 != piNode->mNumChildren)
// directly call our children
for (unsigned int i = 0; i < piNode->mNumChildren;++i)
{
// directly call our children
for (unsigned int i = 0; i < piNode->mNumChildren;++i)
{
RenderNode(piNode->mChildren[i],aiMe,bAlpha );
}
RenderNode(piNode->mChildren[i],piMatrix,bAlpha );
}
return 1;
}
@@ -1975,7 +1972,7 @@ int CDisplay::RenderNode (aiNode* piNode,const aiMatrix4x4& piMatrix,
else if (bAlpha)continue;
// Upload bone matrices. This maybe is the wrong place to do it, but for the heck of it I don't understand this code flow
if( mesh->HasBones())
if( mesh->HasBones() && helper->piEffect)
{
static float matrices[4*4*60];
float* tempmat = matrices;
@@ -2041,7 +2038,7 @@ int CDisplay::RenderNode (aiNode* piNode,const aiMatrix4x4& piMatrix,
// render all child nodes
for (unsigned int i = 0; i < piNode->mNumChildren;++i)
{
RenderNode(piNode->mChildren[i],aiMe,bAlpha );
RenderNode(piNode->mChildren[i],piMatrix,bAlpha );
}
// need to reset the viewmode?
if (bChangedVM)