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

some physx fixes

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
pappeste
2021-06-17 09:31:15 -07:00
committed by Esteban Papp
parent 909384bd34
commit 5e863f810d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/PhysX/Code/Source/Material.cpp
+3 -3
View File
@@ -420,14 +420,14 @@ namespace PhysX
if (physicsMaterialNameFromPhysicsAsset.empty() ||
physicsMaterialNameFromPhysicsAsset == Physics::DefaultPhysicsMaterialLabel)
{
materialSelection.SetMaterialId(Physics::MaterialId(), slotIndex);
materialSelection.SetMaterialId(Physics::MaterialId(), static_cast<int>(slotIndex));
continue;
}
if (auto it = FindOrCreateMaterial(physicsMaterialNameFromPhysicsAsset);
it != m_materials.end())
{
materialSelection.SetMaterialId(Physics::MaterialId::FromUUID(it->first), slotIndex);
materialSelection.SetMaterialId(Physics::MaterialId::FromUUID(it->first), static_cast<int>(slotIndex));
}
else
{
@@ -435,7 +435,7 @@ namespace PhysX
"UpdateMaterialSelectionFromPhysicsAsset: Physics material '%s' not found in the material library. Mesh material '%s' will use the default physics material.",
physicsMaterialNameFromPhysicsAsset.c_str(),
meshAsset->m_assetData.m_materialNames[slotIndex].c_str());
materialSelection.SetMaterialId(Physics::MaterialId(), slotIndex);
materialSelection.SetMaterialId(Physics::MaterialId(), static_cast<int>(slotIndex));
}
}
}
Gems/PhysX/Code/Source/Scene/PhysXScene.cpp
+1 -1
View File
@@ -680,7 +680,7 @@ namespace PhysX
if (m_freeSceneSlots.empty())
{
m_simulatedBodies.emplace_back(newBodyCrc, newBody);
index = m_simulatedBodies.size() - 1;
index = static_cast<AzPhysics::SimulatedBodyIndex>(m_simulatedBodies.size() - 1);
}
else
{