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

Animation Editor: Motion event colors aren't in sync with the event presets (#7582)

Browse Source 
The motion events in the timeview had the wrong colors assigned as they weren't correctly mapped to the given event presets.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
This commit is contained in:
Benjamin Jillich
2022-02-16 16:07:33 +01:00
committed by GitHub
parent 932f0a4d84
commit 1413977aca
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionEventPresetManager.cpp
+14 -11
View File
@@ -302,25 +302,28 @@ namespace EMStudio
}
}
// Check if motion event with this configuration exists and return color.
AZ::u32 MotionEventPresetManager::GetEventColor(const EMotionFX::EventDataSet& eventDatas) const
{
for (const MotionEventPreset* preset : m_eventPresets)
{
EMotionFX::EventDataSet commonDatas;
const EMotionFX::EventDataSet& presetDatas = preset->GetEventDatas();
const bool allMatch = AZStd::all_of(presetDatas.cbegin(), presetDatas.cend(), [eventDatas](const EMotionFX::EventDataPtr& presetData)
const size_t numEventDatas = eventDatas.size();
if (numEventDatas == presetDatas.size())
{
const auto thisPresetDataHasMatch = AZStd::find_if(eventDatas.cbegin(), eventDatas.cend(), [presetData](const EMotionFX::EventDataPtr& eventData)
for (size_t i = 0; i < numEventDatas; ++i)
{
return ((presetData && eventData && *presetData == *eventData) || (!presetData && !eventData));
});
return thisPresetDataHasMatch != eventDatas.cend();
});
if (allMatch)
{
return preset->GetEventColor();
const EMotionFX::EventDataPtr& eventData = eventDatas[i];
const EMotionFX::EventDataPtr& presetData = presetDatas[i];
if (eventData && presetData &&
eventData->RTTI_GetType() == presetData->RTTI_GetType() &&
*eventData == *presetData)
{
return preset->GetEventColor();
}
}
}
}