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

update physics debug draw to avoid vector scale Transform functions

Browse Source
This commit is contained in:
greerdv
2021-05-27 15:28:28 +01:00
parent 6b7caa93b1
commit ece62c51d8
2 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/PhysX/Code/Editor/DebugDraw.cpp
+33 -20
View File
@@ -555,25 +555,37 @@ namespace PhysX
if (meshConfig.GetCachedNativeMesh())
{
const AZ::Transform scaleMatrix = AZ::Transform::CreateScale(meshScale);
debugDisplay.PushMatrix(GetColliderLocalTransform(colliderConfig) * scaleMatrix);
debugDisplay.PushMatrix(GetColliderLocalTransform(colliderConfig));
if (meshConfig.GetMeshType() == Physics::CookedMeshShapeConfiguration::MeshType::TriangleMesh)
{
DrawTriangleMesh(debugDisplay, colliderConfig, geomIndex);
DrawTriangleMesh(debugDisplay, colliderConfig, geomIndex, meshScale);
}
else
{
DrawConvexMesh(debugDisplay, colliderConfig, geomIndex);
DrawConvexMesh(debugDisplay, colliderConfig, geomIndex, meshScale);
}
debugDisplay.PopMatrix();
}
}
void Collider::DrawTriangleMesh(AzFramework::DebugDisplayRequests& debugDisplay,
const Physics::ColliderConfiguration& colliderConfig,
AZ::u32 geomIndex) const
AZStd::vector<AZ::Vector3> ScalePoints(const AZ::Vector3& scale, const AZStd::vector<AZ::Vector3>& points)
{
AZStd::vector<AZ::Vector3> scaledPoints;
scaledPoints.resize_no_construct(points.size());
AZStd::transform(
points.begin(), points.end(), scaledPoints.begin(),
[scale](const AZ::Vector3& point)
{
return scale * point;
});
return scaledPoints;
}
void Collider::DrawTriangleMesh(
AzFramework::DebugDisplayRequests& debugDisplay, const Physics::ColliderConfiguration& colliderConfig, AZ::u32 geomIndex,
const AZ::Vector3& meshScale) const
{
AZ_Assert(geomIndex < m_geometry.size(), "DrawTriangleMesh: geomIndex is out of range");
@@ -581,10 +593,10 @@ namespace PhysX
const AZStd::unordered_map<int, AZStd::vector<AZ::u32>>& triangleIndexesByMaterialSlot
= geom.m_triangleIndexesByMaterialSlot;
const AZStd::vector<AZ::Vector3>& verts = geom.m_verts;
const AZStd::vector<AZ::Vector3>& points = geom.m_points;
AZStd::vector<AZ::Vector3> scaledVerts = ScalePoints(meshScale, geom.m_verts);
AZStd::vector<AZ::Vector3> scaledPoints = ScalePoints(meshScale, geom.m_points);
if (!verts.empty())
if (!scaledVerts.empty())
{
for (const auto& element : triangleIndexesByMaterialSlot)
{
@@ -596,30 +608,31 @@ namespace PhysX
triangleMeshInfo.m_numTriangles = triangleCount;
triangleMeshInfo.m_materialSlotIndex = materialSlot;
debugDisplay.DrawTrianglesIndexed(verts, triangleIndexes
debugDisplay.DrawTrianglesIndexed(scaledVerts, triangleIndexes
, CalcDebugColor(colliderConfig, triangleMeshInfo));
}
debugDisplay.DrawLines(points, WireframeColor);
debugDisplay.DrawLines(scaledPoints, WireframeColor);
}
}
void Collider::DrawConvexMesh(AzFramework::DebugDisplayRequests& debugDisplay,
const Physics::ColliderConfiguration& colliderConfig, AZ::u32 geomIndex) const
void Collider::DrawConvexMesh(
AzFramework::DebugDisplayRequests& debugDisplay, const Physics::ColliderConfiguration& colliderConfig, AZ::u32 geomIndex,
const AZ::Vector3& meshScale) const
{
AZ_Assert(geomIndex < m_geometry.size(), "DrawConvexMesh: geomIndex is out of range");
const GeometryData& geom = m_geometry[geomIndex];
const AZStd::vector<AZ::Vector3>& verts = geom.m_verts;
const AZStd::vector<AZ::Vector3>& points = geom.m_points;
AZStd::vector<AZ::Vector3> scaledVerts = ScalePoints(meshScale, geom.m_verts);
AZStd::vector<AZ::Vector3> scaledPoints = ScalePoints(meshScale, geom.m_points);
if (!verts.empty())
if (!scaledVerts.empty())
{
const AZ::u32 triangleCount = static_cast<AZ::u32>(verts.size() / 3);
const AZ::u32 triangleCount = static_cast<AZ::u32>(scaledVerts.size() / 3);
ElementDebugInfo convexMeshInfo;
convexMeshInfo.m_numTriangles = triangleCount;
debugDisplay.DrawTriangles(verts, CalcDebugColor(colliderConfig, convexMeshInfo));
debugDisplay.DrawLines(points, WireframeColor);
debugDisplay.DrawTriangles(scaledVerts, CalcDebugColor(colliderConfig, convexMeshInfo));
debugDisplay.DrawLines(scaledPoints, WireframeColor);
}
}