v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sub-sample axis-angle channels if the delta between two consecutive key-frame angles is >= 180 degrees. Fixes #458.

pull/502/head
Alexander Gessler 2015-03-14 19:57:13 +01:00 committed by Alexander Gessler
parent 51b790c482
commit ff4e1d9446
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
code/ColladaLoader.cpp
View File

@ -1143,6 +1143,26 @@ void ColladaLoader::CreateAnimation( aiScene* pScene, const ColladaParser& pPars
} }
++pos; ++pos;
} }
// https://github.com/assimp/assimp/issues/458
// Sub-sample axis-angle channels if the delta between two consecutive
// key-frame angles is >= 180 degrees.
if (transforms[e.mTransformIndex].mType == Collada::TF_ROTATE && e.mSubElement == 3 && pos > 0 && pos < e.mTimeAccessor->mCount) {
float cur_key_angle = ReadFloat( *e.mValueAccessor, *e.mValueData, pos, 0);
float last_key_angle = ReadFloat( *e.mValueAccessor, *e.mValueData, pos - 1, 0);
float cur_key_time = ReadFloat( *e.mTimeAccessor, *e.mTimeData, pos, 0);
float last_key_time = ReadFloat( *e.mTimeAccessor, *e.mTimeData, pos - 1, 0);
float last_eval_angle = last_key_angle + (cur_key_angle - last_key_angle) * (time - last_key_time) / (cur_key_time - last_key_time);
float delta = std::fabs(cur_key_angle-last_eval_angle);
if (delta >= 180.0f) {
int subSampleCount = static_cast<int>(std::floorf(delta / 90.0f));
if (cur_key_time != time) {
float nextSampleTime = time + (cur_key_time - time) / subSampleCount;
nextTime = std::min( nextTime, nextSampleTime);
}
}
}
} }
// no more keys on any channel after the current time -> we're done // no more keys on any channel after the current time -> we're done