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

Convert EMotionFX editor uint32 -> size_t

Browse Source 
Signed-off-by: Chris Burel <burelc@amazon.com>
This commit is contained in:
Chris Burel
2021-06-02 16:33:36 -07:00
parent 4034195bdc
commit 120ee64144
125 changed files with 1503 additions and 2128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/Source/Editor/SimulatedObjectHelpers.cpp
+4 -4
View File
@@ -45,7 +45,7 @@ namespace EMotionFX
}
const Actor* actor = modelIndices[0].data(SkeletonModel::ROLE_ACTOR_POINTER).value<Actor*>();
AZStd::vector<AZ::u32> jointIndices;
AZStd::vector<size_t> jointIndices;
for (const QModelIndex& selectedIndex : modelIndices)
{
@@ -68,7 +68,7 @@ namespace EMotionFX
void SimulatedObjectHelpers::RemoveSimulatedJoints(const QModelIndexList& modelIndices, bool removeChildren)
{
AZStd::unordered_map<size_t, AZStd::pair<const Actor*, AZStd::vector<AZ::u32>>> objectToSkeletonJointIndices;
AZStd::unordered_map<size_t, AZStd::pair<const Actor*, AZStd::vector<size_t>>> objectToSkeletonJointIndices;
for (const QModelIndex& index : modelIndices)
{
@@ -80,7 +80,7 @@ namespace EMotionFX
}
const Actor* actor = index.data(SimulatedObjectModel::ROLE_ACTOR_PTR).value<Actor*>();
const size_t objectIndex = static_cast<size_t>(index.data(SimulatedObjectModel::ROLE_OBJECT_INDEX).toInt());
const AZ::u32 jointIndex = index.data(SimulatedObjectModel::ROLE_JOINT_PTR).value<SimulatedJoint*>()->GetSkeletonJointIndex();
const size_t jointIndex = index.data(SimulatedObjectModel::ROLE_JOINT_PTR).value<SimulatedJoint*>()->GetSkeletonJointIndex();
objectToSkeletonJointIndices[objectIndex].first = actor;
objectToSkeletonJointIndices[objectIndex].second.emplace_back(jointIndex);
}
@@ -92,7 +92,7 @@ namespace EMotionFX
{
const size_t objectIndex = objectIndexAndJointIndices.first;
const Actor* actor = objectIndexAndJointIndices.second.first;
const AZStd::vector<AZ::u32> jointIndices = objectIndexAndJointIndices.second.second;
const AZStd::vector<size_t> jointIndices = objectIndexAndJointIndices.second.second;
CommandSimulatedObjectHelpers::RemoveSimulatedJoints(actor->GetID(), jointIndices, objectIndex, removeChildren, &commandGroup);
}