1 files changed, 22 insertions, 24 deletions
diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
index f2ed0cd39c..2d0df718a2 100644
--- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
+++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
@@ -21,35 +21,34 @@ subject to the following restrictions:
 struct btBroadphaseProxy;
 class btConvexShape;
 
-class  btTriangleRaycastCallback: public btTriangleCallback
+class btTriangleRaycastCallback : public btTriangleCallback
 {
 public:
-
 	//input
 	btVector3 m_from;
 	btVector3 m_to;
 
-   //@BP Mod - allow backface filtering and unflipped normals
-   enum EFlags
-   {
-	  kF_None                 = 0,
-      kF_FilterBackfaces      = 1 << 0,
-      kF_KeepUnflippedNormal  = 1 << 1,   // Prevents returned face normal getting flipped when a ray hits a back-facing triangle
-		///SubSimplexConvexCastRaytest is the default, even if kF_None is set.
-	  kF_UseSubSimplexConvexCastRaytest = 1 << 2,   // Uses an approximate but faster ray versus convex intersection algorithm
-	  kF_UseGjkConvexCastRaytest = 1 << 3,
-      kF_Terminator        = 0xFFFFFFFF
-   };
-   unsigned int m_flags;
+	//@BP Mod - allow backface filtering and unflipped normals
+	enum EFlags
+	{
+		kF_None = 0,
+		kF_FilterBackfaces = 1 << 0,
+		kF_KeepUnflippedNormal = 1 << 1,             // Prevents returned face normal getting flipped when a ray hits a back-facing triangle
+													 ///SubSimplexConvexCastRaytest is the default, even if kF_None is set.
+		kF_UseSubSimplexConvexCastRaytest = 1 << 2,  // Uses an approximate but faster ray versus convex intersection algorithm
+		kF_UseGjkConvexCastRaytest = 1 << 3,
+		kF_DisableHeightfieldAccelerator  = 1 << 4, //don't use the heightfield raycast accelerator. See https://github.com/bulletphysics/bullet3/pull/2062
+		kF_Terminator = 0xFFFFFFFF
+	};
+	unsigned int m_flags;
+
+	btScalar m_hitFraction;
 
-	btScalar	m_hitFraction;
+	btTriangleRaycastCallback(const btVector3& from, const btVector3& to, unsigned int flags = 0);
 
-	btTriangleRaycastCallback(const btVector3& from,const btVector3& to, unsigned int flags=0);
-	
 	virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex);
 
-	virtual btScalar reportHit(const btVector3& hitNormalLocal, btScalar hitFraction, int partId, int triangleIndex ) = 0;
-	
+	virtual btScalar reportHit(const btVector3& hitNormalLocal, btScalar hitFraction, int partId, int triangleIndex) = 0;
 };
 
 class btTriangleConvexcastCallback : public btTriangleCallback
@@ -63,12 +62,11 @@ public:
 	btScalar m_triangleCollisionMargin;
 	btScalar m_allowedPenetration;
 
-	btTriangleConvexcastCallback (const btConvexShape* convexShape, const btTransform& convexShapeFrom, const btTransform& convexShapeTo, const btTransform& triangleToWorld, const btScalar triangleCollisionMargin);
+	btTriangleConvexcastCallback(const btConvexShape* convexShape, const btTransform& convexShapeFrom, const btTransform& convexShapeTo, const btTransform& triangleToWorld, const btScalar triangleCollisionMargin);
 
-	virtual void processTriangle (btVector3* triangle, int partId, int triangleIndex);
+	virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex);
 
-	virtual btScalar reportHit (const btVector3& hitNormalLocal, const btVector3& hitPointLocal, btScalar hitFraction, int partId, int triangleIndex) = 0;
+	virtual btScalar reportHit(const btVector3& hitNormalLocal, const btVector3& hitPointLocal, btScalar hitFraction, int partId, int triangleIndex) = 0;
 };
 
-#endif //BT_RAYCAST_TRI_CALLBACK_H
-
+#endif  //BT_RAYCAST_TRI_CALLBACK_H