mirror of
https://github.com/godotengine/godot.git
synced 2025-12-07 22:00:10 +00:00
Update Jolt Physics BoxShape to allow for zero-sized boxes
This commit is contained in:
parent
b0655dc86f
commit
41afe2de56
1 changed files with 2 additions and 2 deletions
|
|
@ -59,7 +59,7 @@ BoxShape::BoxShape(const BoxShapeSettings &inSettings, ShapeResult &outResult) :
|
|||
{
|
||||
// Check convex radius
|
||||
if (inSettings.mConvexRadius < 0.0f
|
||||
|| inSettings.mHalfExtent.ReduceMin() <= inSettings.mConvexRadius)
|
||||
|| inSettings.mHalfExtent.ReduceMin() < inSettings.mConvexRadius)
|
||||
{
|
||||
outResult.SetError("Invalid convex radius");
|
||||
return;
|
||||
|
|
@ -278,7 +278,7 @@ void BoxShape::CollideSoftBodyVertices(Mat44Arg inCenterOfMassTransform, Vec3Arg
|
|||
|
||||
void BoxShape::GetTrianglesStart(GetTrianglesContext &ioContext, const AABox &inBox, Vec3Arg inPositionCOM, QuatArg inRotation, Vec3Arg inScale) const
|
||||
{
|
||||
new (&ioContext) GetTrianglesContextVertexList(inPositionCOM, inRotation, inScale, Mat44::sScale(mHalfExtent), sUnitBoxTriangles, sizeof(sUnitBoxTriangles) / sizeof(Vec3), GetMaterial());
|
||||
new (&ioContext) GetTrianglesContextVertexList(inPositionCOM, inRotation, inScale, Mat44::sScale(mHalfExtent), sUnitBoxTriangles, std::size(sUnitBoxTriangles), GetMaterial());
|
||||
}
|
||||
|
||||
int BoxShape::GetTrianglesNext(GetTrianglesContext &ioContext, int inMaxTrianglesRequested, Float3 *outTriangleVertices, const PhysicsMaterial **outMaterials) const
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue