Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update Jolt Physics BoxShape to allow for zero-sized boxes

Browse source
This commit is contained in:
Mikael Hermansson 2025-01-22 23:46:28 +01:00
parent b0655dc86f
commit 41afe2de56
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/BoxShape.cpp vendored
View file

@ -59,7 +59,7 @@ BoxShape::BoxShape(const BoxShapeSettings &inSettings, ShapeResult &outResult) :
{ {
// Check convex radius // Check convex radius
if (inSettings.mConvexRadius < 0.0f if (inSettings.mConvexRadius < 0.0f
|| inSettings.mHalfExtent.ReduceMin() <= inSettings.mConvexRadius) || inSettings.mHalfExtent.ReduceMin() < inSettings.mConvexRadius)
{ {
outResult.SetError("Invalid convex radius"); outResult.SetError("Invalid convex radius");
return; 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 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 int BoxShape::GetTrianglesNext(GetTrianglesContext &ioContext, int inMaxTrianglesRequested, Float3 *outTriangleVertices, const PhysicsMaterial **outMaterials) const