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

Addressed feedback from PR 4874. (#4915)

Browse Source 
* Addressed feedback from PR 4874.
* Removed second copy of HeightfieldProviderBus.h from cmake file
* Changed CookedMeshShapeConfiguration and HeightfieldShapeConfiguration to have less messy implementations, instead opting for the slightly less messy const_cast inside of Utils.cpp and DebugDraw.cpp.
* Changed InitHeightfieldShapeConfiguraiton to CreateHeightfieldShapeConfiguration with a better API signature.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fixed indentation

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
This commit is contained in:
Mike Balfour
2021-10-22 14:33:36 -05:00
committed by GitHub
parent 2fe4524458
commit 243532c5de
8 changed files with 54 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/PhysX/Code/Source/Utils.cpp
+22 -10
View File
@@ -67,7 +67,7 @@ namespace PhysX
}
void CreatePxGeometryFromHeightfield(
const Physics::HeightfieldShapeConfiguration& heightfieldConfig, physx::PxGeometryHolder& pxGeometry)
Physics::HeightfieldShapeConfiguration& heightfieldConfig, physx::PxGeometryHolder& pxGeometry)
{
physx::PxHeightField* heightfield = nullptr;
@@ -264,9 +264,14 @@ namespace PhysX
}
case Physics::ShapeType::CookedMesh:
{
const Physics::CookedMeshShapeConfiguration& cookedMeshShapeConfig =
const Physics::CookedMeshShapeConfiguration& constCookedMeshShapeConfig =
static_cast<const Physics::CookedMeshShapeConfiguration&>(shapeConfiguration);
// We are deliberately removing the const off of the ShapeConfiguration here because we're going to change the cached
// native mesh pointer that gets stored in the configuration.
Physics::CookedMeshShapeConfiguration& cookedMeshShapeConfig =
const_cast<Physics::CookedMeshShapeConfiguration&>(constCookedMeshShapeConfig);
physx::PxBase* nativeMeshObject = nullptr;
// Use the cached mesh object if it is there, otherwise create one and save in the shape configuration
@@ -303,13 +308,18 @@ namespace PhysX
return false;
}
case Physics::ShapeType::Heightfield:
{
const Physics::HeightfieldShapeConfiguration& heightfieldConfig =
static_cast<const Physics::HeightfieldShapeConfiguration&>(shapeConfiguration);
{
const Physics::HeightfieldShapeConfiguration& constHeightfieldConfig =
static_cast<const Physics::HeightfieldShapeConfiguration&>(shapeConfiguration);
CreatePxGeometryFromHeightfield(heightfieldConfig, pxGeometry);
break;
}
// We are deliberately removing the const off of the ShapeConfiguration here because we're going to change the cached
// native heightfield pointer that gets stored in the configuration.
Physics::HeightfieldShapeConfiguration& heightfieldConfig =
const_cast<Physics::HeightfieldShapeConfiguration&>(constHeightfieldConfig);
CreatePxGeometryFromHeightfield(heightfieldConfig, pxGeometry);
break;
}
default:
AZ_Warning("PhysX Rigid Body", false, "Shape not supported in PhysX. Shape Type: %d", shapeType);
return false;
@@ -1518,9 +1528,9 @@ namespace PhysX
return entityWorldTransformWithoutScale * jointLocalTransformWithoutScale;
}
void InitHeightfieldShapeConfiguration(AZ::EntityId entityId, Physics::HeightfieldShapeConfiguration& configuration)
Physics::HeightfieldShapeConfiguration CreateHeightfieldShapeConfiguration(AZ::EntityId entityId)
{
configuration = Physics::HeightfieldShapeConfiguration();
Physics::HeightfieldShapeConfiguration configuration;
AZ::Vector2 gridSpacing(1.0f);
Physics::HeightfieldProviderRequestsBus::EventResult(
@@ -1549,6 +1559,8 @@ namespace PhysX
samples, entityId, &Physics::HeightfieldProviderRequestsBus::Events::GetHeightsAndMaterials);
configuration.SetSamples(samples);
return configuration;
}
} // namespace Utils