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

Fixed the crash by clear out the item and map array (#4162)

Browse Source 
* Fixed the crash by clear out the item and map array

Signed-off-by: rhhong <rhhong@amazon.com>

* emplace is doing an insert which is not expected.

Signed-off-by: rhhong <rhhong@amazon.com>
This commit is contained in:
Roman
2021-09-17 04:06:19 -07:00
committed by GitHub
parent 453dfd6f34
commit f5bd450673
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/EMotionFX/Source/Recorder.cpp
+8 -11
View File
@@ -1421,17 +1421,16 @@ namespace EMotionFX
// extract sorted active items
void Recorder::ExtractNodeHistoryItems(const ActorInstanceData& actorInstanceData, float timeValue, bool sort, EValueType valueType, AZStd::vector<ExtractedNodeHistoryItem>* outItems, AZStd::vector<size_t>* outMap) const
{
// clear the map array
// Reinit the item array.
const size_t maxIndex = CalcMaxNodeHistoryTrackIndex(actorInstanceData);
outItems->resize(maxIndex + 1);
for (size_t i = 0; i <= maxIndex; ++i)
{
ExtractedNodeHistoryItem item;
item.m_trackIndex = i;
item.m_value = 0.0f;
ExtractedNodeHistoryItem& item = (*outItems)[i];
item.m_nodeHistoryItem = nullptr;
item.m_trackIndex = i;
item.m_keyTrackSampleTime = 0.0f;
item.m_nodeHistoryItem = nullptr;
outItems->emplace(AZStd::next(begin(*outItems), i), AZStd::move(item));
item.m_value = 0.0f;
}
// find all node history items
@@ -1440,7 +1439,7 @@ namespace EMotionFX
{
if (curItem->m_startTime <= timeValue && curItem->m_endTime > timeValue)
{
ExtractedNodeHistoryItem item;
ExtractedNodeHistoryItem& item = (*outItems)[curItem->m_trackIndex];
item.m_trackIndex = curItem->m_trackIndex;
item.m_keyTrackSampleTime = timeValue - curItem->m_startTime;
item.m_nodeHistoryItem = curItem;
@@ -1463,8 +1462,6 @@ namespace EMotionFX
MCORE_ASSERT(false); // unsupported mode
item.m_value = curItem->m_globalWeights.GetValueAtTime(item.m_keyTrackSampleTime, nullptr, nullptr, m_recordSettings.m_interpolate);
}
outItems->emplace(AZStd::next(begin(*outItems), curItem->m_trackIndex), item);
}
}
@@ -1472,7 +1469,7 @@ namespace EMotionFX
outMap->resize(maxIndex + 1);
for (size_t i = 0; i <= maxIndex; ++i)
{
outMap->emplace(AZStd::next(begin(*outMap), i), i);
(*outMap)[i] = i;
}
// sort if desired
@@ -1482,7 +1479,7 @@ namespace EMotionFX
for (size_t i = 0; i <= maxIndex; ++i)
{
outMap->emplace(AZStd::next(begin(*outMap), outItems->at(i).m_trackIndex), i);
(*outMap)[outItems->at(i).m_trackIndex] = i;
}
}
}
Gems/EMotionFX/Code/EMotionFX/Source/Recorder.h
+4 -4
View File
@@ -168,10 +168,10 @@ namespace EMotionFX
struct EMFX_API ExtractedNodeHistoryItem
{
NodeHistoryItem* m_nodeHistoryItem;
size_t m_trackIndex;
float m_value;
float m_keyTrackSampleTime;
NodeHistoryItem* m_nodeHistoryItem = nullptr;
size_t m_trackIndex = 0;
float m_value = 0.0f;
float m_keyTrackSampleTime = 0.0f;
friend bool operator< (const ExtractedNodeHistoryItem& a, const ExtractedNodeHistoryItem& b) { return (a.m_value > b.m_value); }
friend bool operator==(const ExtractedNodeHistoryItem& a, const ExtractedNodeHistoryItem& b) { return (a.m_value == b.m_value); }