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

* Combining single-channel animations like the previous code did, except now it has been deferred until after all nodes have been read. This makes the regression tests pass for a database created before these code changes.

Browse Source 
* Changed name of ColladaParser::RebuildRootAnimationsFromClips to ColladaParser::PostProcessRootAnimations as it now does more than it did before.
This commit is contained in:
Trond Abusdal
2016-02-10 23:57:29 +01:00
parent c34717639e
commit 7e58a47ba0
3 changed files with 45 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/ColladaParser.cpp
View File

@@ -217,6 +217,8 @@ void ColladaParser::ReadStructure()
break;
}
}
PostProcessRootAnimations();
}
// ------------------------------------------------------------------------------------------------
@@ -356,8 +358,8 @@ void ColladaParser::ReadAnimationClipLibrary()
}
// ------------------------------------------------------------------------------------------------
// Re-build animations from animation clip library, if present.
void ColladaParser::RebuildRootAnimationsFromClips()
// Re-build animations from animation clip library, if present, otherwise combine single-channel animations
void ColladaParser::PostProcessRootAnimations()
{
if (mAnimationClipLibrary.size() > 0)
{
@@ -367,8 +369,6 @@ void ColladaParser::RebuildRootAnimationsFromClips()
{
std::string clipName = it->first;
printf("Clip: %s\n", clipName.c_str());
Animation *clip = new Animation();
clip->mName = clipName;
@@ -378,8 +378,6 @@ void ColladaParser::RebuildRootAnimationsFromClips()
{
std::string animationID = *a;
printf(" Animation instance: %s\n", animationID.c_str());
AnimationLibrary::iterator animation = mAnimationLibrary.find(animationID);
if (animation != mAnimationLibrary.end())
@@ -396,6 +394,10 @@ void ColladaParser::RebuildRootAnimationsFromClips()
// Ensure no double deletes.
temp.mSubAnims.clear();
}
else
{
mAnims.CombineSingleChannelAnimations();
}
}
// ------------------------------------------------------------------------------------------------
@@ -528,9 +530,11 @@ void ColladaParser::ReadAnimation( Collada::Animation* pParent)
if( !channels.empty())
{
// FIXME: Is this essentially doing the same as "single-anim-node" codepath in
// ColladaLoader::StoreAnimations? If not, defer this to where animation
// clip instances are set up. Due to handling of <library_animation_clips>
// this cannot be done here, as the channel owner is lost.
// ColladaLoader::StoreAnimations? For now, this has been deferred to after
// all animations and all clips have been read. Due to handling of
// <library_animation_clips> this cannot be done here, as the channel owner
// is lost, and some exporters make up animations by referring to multiple
// single-channel animations from an <instance_animation>.
/*
// special filtering for stupid exporters packing each channel into a separate animation
if( channels.size() == 1)