mrq/reactphysics3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename NarrowPhaseAlgorithmType::None to NONE

Browse Source
This commit is contained in:
Saeun Acreat 2023-01-16 21:55:00 +13:00
parent 17dd22e677
commit d6d607dda0
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/reactphysics3d/collision/narrowphase/CollisionDispatch.h
View File

@ -40,7 +40,7 @@ namespace reactphysics3d {
/// Enumeration for the type of narrow-phase /// Enumeration for the type of narrow-phase
/// collision detection algorithm /// collision detection algorithm
enum class NarrowPhaseAlgorithmType { enum class NarrowPhaseAlgorithmType {
None, NONE,
SphereVsSphere, SphereVsSphere,
SphereVsCapsule, SphereVsCapsule,
CapsuleVsCapsule, CapsuleVsCapsule,

2
include/reactphysics3d/collision/narrowphase/NarrowPhaseInput.h
View File

@ -152,7 +152,7 @@ RP3D_FORCE_INLINE void NarrowPhaseInput::addNarrowPhaseTest(uint64 pairId, Entit
case NarrowPhaseAlgorithmType::ConvexPolyhedronVsConvexPolyhedron: case NarrowPhaseAlgorithmType::ConvexPolyhedronVsConvexPolyhedron:
mConvexPolyhedronVsConvexPolyhedronBatch.addNarrowPhaseInfo(pairId, collider1, collider2, shape1, shape2, shape1Transform, shape2Transform, reportContacts, lastFrameInfo, shapeAllocator); mConvexPolyhedronVsConvexPolyhedronBatch.addNarrowPhaseInfo(pairId, collider1, collider2, shape1, shape2, shape1Transform, shape2Transform, reportContacts, lastFrameInfo, shapeAllocator);
break; break;
case NarrowPhaseAlgorithmType::None: case NarrowPhaseAlgorithmType::NONE:
// Must never happen // Must never happen
assert(false); assert(false);
break; break;

4
src/collision/narrowphase/CollisionDispatch.cpp
View File

@ -75,7 +75,7 @@ NarrowPhaseAlgorithmType CollisionDispatch::selectAlgorithm(int type1, int type2
CollisionShapeType shape2Type = static_cast<CollisionShapeType>(type2); CollisionShapeType shape2Type = static_cast<CollisionShapeType>(type2);
if (type1 > type2) { if (type1 > type2) {
return NarrowPhaseAlgorithmType::None; return NarrowPhaseAlgorithmType::NONE;
} }
// Sphere vs Sphere algorithm // Sphere vs Sphere algorithm
if (shape1Type == CollisionShapeType::SPHERE && shape2Type == CollisionShapeType::SPHERE) { if (shape1Type == CollisionShapeType::SPHERE && shape2Type == CollisionShapeType::SPHERE) {
@ -103,7 +103,7 @@ NarrowPhaseAlgorithmType CollisionDispatch::selectAlgorithm(int type1, int type2
return NarrowPhaseAlgorithmType::ConvexPolyhedronVsConvexPolyhedron; return NarrowPhaseAlgorithmType::ConvexPolyhedronVsConvexPolyhedron;
} }
return NarrowPhaseAlgorithmType::None; return NarrowPhaseAlgorithmType::NONE;
} }
// Set the Sphere vs Sphere narrow-phase collision detection algorithm // Set the Sphere vs Sphere narrow-phase collision detection algorithm

2
src/systems/CollisionDetectionSystem.cpp
View File

@ -478,7 +478,7 @@ void CollisionDetectionSystem::computeConvexVsConcaveMiddlePhase(OverlappingPair
assert(convexShape->isConvex()); assert(convexShape->isConvex());
assert(!concaveShape->isConvex()); assert(!concaveShape->isConvex());
assert(overlappingPair.narrowPhaseAlgorithmType != NarrowPhaseAlgorithmType::None); assert(overlappingPair.narrowPhaseAlgorithmType != NarrowPhaseAlgorithmType::NONE);
// Compute the convex shape AABB in the local-space of the concave shape // Compute the convex shape AABB in the local-space of the concave shape
AABB aabb; AABB aabb;