birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Data integrity issue, keyframe times need to be ascending (#2130) (#2154)

Browse Source 
* User provided animation resulted in a data integrity error.
* The first track had 0.66 as max time while another had a keyframe more resulting in 0.69.
* When updating the duration before fixing up the last keyframe for each of the tracks, the duration was returned early with 0.66 while there were other tracks having a keyframe more.
* We're now crawling through all tracks to determine the maximum duration.
* This results in a correct fixup of the last frame.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
This commit is contained in:
Benjamin Jillich
2021-07-15 02:55:47 -07:00
committed by GitHub
parent fcef9333a7
commit e6ddc29cb4
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp
+7 -12
View File
@@ -412,25 +412,24 @@ namespace EMotionFX
void NonUniformMotionData::UpdateDuration()
{
m_duration = 0.0f;
for (const JointData& jointData : m_jointData)
{
if (!jointData.m_positionTrack.m_times.empty())
{
m_duration = jointData.m_positionTrack.m_times.back();
return;
m_duration = AZ::GetMax(m_duration, jointData.m_positionTrack.m_times.back());
}
if (!jointData.m_rotationTrack.m_times.empty())
{
m_duration = jointData.m_rotationTrack.m_times.back();
return;
m_duration = AZ::GetMax(m_duration, jointData.m_rotationTrack.m_times.back());
}
#ifndef EMFX_SCALE_DISABLED
if (!jointData.m_scaleTrack.m_times.empty())
{
m_duration = jointData.m_scaleTrack.m_times.back();
return;
m_duration = AZ::GetMax(m_duration, jointData.m_scaleTrack.m_times.back());
}
#endif
}
@@ -439,8 +438,7 @@ namespace EMotionFX
{
if (!morphData.m_track.m_times.empty())
{
m_duration = morphData.m_track.m_times.back();
return;
m_duration = AZ::GetMax(m_duration, morphData.m_track.m_times.back());
}
}
@@ -448,12 +446,9 @@ namespace EMotionFX
{
if (!floatData.m_track.m_times.empty())
{
m_duration = floatData.m_track.m_times.back();
return;
m_duration = AZ::GetMax(m_duration, floatData.m_track.m_times.back());
}
}
m_duration = 0.0f;
}
void NonUniformMotionData::AllocateJointPositionSamples(size_t jointDataIndex, size_t numSamples)