Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2046 from erwincoumans/master

Browse Source 
avoid macro redefinition
This commit is contained in:
erwincoumans
2019-01-04 10:04:45 -08:00
committed by GitHub
parent 3729b733de 01bb0c3bd7
commit c993175a58
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
View File

@@ -23,11 +23,11 @@ class btMinkowskiSumShape;
#include "LinearMath/btIDebugDraw.h" #include "LinearMath/btIDebugDraw.h"
#ifdef BT_USE_DOUBLE_PRECISION #ifdef BT_USE_DOUBLE_PRECISION
#define MAX_ITERATIONS 64 #define MAX_CONVEX_CAST_ITERATIONS 64
#define MAX_EPSILON (SIMD_EPSILON * 10) #define MAX_CONVEX_CAST_EPSILON (SIMD_EPSILON * 10)
#else #else
#define MAX_ITERATIONS 32 #define MAX_CONVEX_CAST_ITERATIONS 32
#define MAX_EPSILON btScalar(0.0001) #define MAX_CONVEX_CAST_EPSILON btScalar(0.0001)
#endif #endif
///Typically the conservative advancement reaches solution in a few iterations, clip it to 32 for degenerate cases. ///Typically the conservative advancement reaches solution in a few iterations, clip it to 32 for degenerate cases.
///See discussion about this here http://continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=565 ///See discussion about this here http://continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=565
@@ -58,8 +58,8 @@ public:
: m_fraction(btScalar(BT_LARGE_FLOAT)), : m_fraction(btScalar(BT_LARGE_FLOAT)),
m_debugDrawer(0), m_debugDrawer(0),
m_allowedPenetration(btScalar(0)), m_allowedPenetration(btScalar(0)),
m_subSimplexCastMaxIterations(MAX_ITERATIONS), m_subSimplexCastMaxIterations(MAX_CONVEX_CAST_ITERATIONS),
m_subSimplexCastEpsilon(MAX_EPSILON) m_subSimplexCastEpsilon(MAX_CONVEX_CAST_EPSILON)
{ {
} }