logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

vdrift-20120722-bullet.patch (3406B)

    

  1. --- src/cardynamics.cpp	Mon Jan 19 23:26:36 1970
  2. +++ src/cardynamics.cpp	Mon Jan 19 23:26:36 1970
  3. @@ -1791,23 +1791,29 @@
  4.  
  5.  bool CARDYNAMICS::WheelContactCallback(
  6.  	btManifoldPoint& cp,
  7. -	const btCollisionObject* colObj0,
  8. -	int partId0,
  9. +	const btCollisionObjectWrapper* col0,
  10. +	int part0,
  11.  	int index0,
  12. -	const btCollisionObject* colObj1,
  13. -	int partId1,
  14. +	const btCollisionObjectWrapper* col1,
  15. +	int part1,
  16.  	int index1)
  17.  {
  18. -	// cars are fracture bodies, wheel is a cylinder shape
  19. -	const btCollisionShape* shape = colObj0->getCollisionShape();
  20. -	if ((colObj0->getInternalType() & CO_FRACTURE_TYPE) &&
  21. +#if (BT_BULLET_VERSION < 281)
  22. +	const btCollisionObject* obj = col0;
  23. +	const btCollisionShape* shape = obj->getCollisionShape();
  24. +	const btCollisionShape* rootshape = obj->getRootCollisionShape();
  25. +#else
  26. +	const btCollisionObject* obj = col0->getCollisionObject();
  27. +	const btCollisionShape* shape = col0->getCollisionShape();
  28. +	const btCollisionShape* rootshape = obj->getCollisionShape();
  29. +#endif
  30. +	if ((obj->getInternalType() & CO_FRACTURE_TYPE) &&
  31.  		(shape->getShapeType() == CYLINDER_SHAPE_PROXYTYPE))
  32.  	{
  33. -		// is contact within contact patch?
  34. -		const btCompoundShape* car = static_cast<const btCompoundShape*>(colObj0->getRootCollisionShape());
  35. -		const btCylinderShapeX* wheel = static_cast<const btCylinderShapeX*>(shape);
  36. -		btVector3 contactPoint = cp.m_localPointA - car->getChildTransform(cp.m_index0).getOrigin();
  37. -		if (-direction::up.dot(contactPoint) > 0.5 * wheel->getRadius())
  38. +		const btCompoundShape* carshape = static_cast<const btCompoundShape*>(rootshape);
  39. +		const btCylinderShapeX* wheelshape = static_cast<const btCylinderShapeX*>(shape);
  40. +		btVector3 contactPoint = cp.m_localPointA - carshape->getChildTransform(cp.m_index0).getOrigin();
  41. +		if (-direction::up.dot(contactPoint) > 0.5 * wheelshape->getRadius())
  42.  		{
  43.  			// break contact (hack)
  44.  			cp.m_normalWorldOnB = btVector3(0, 0, 0);
  45. --- src/cardynamics.h	Mon Jan 19 23:26:36 1970
  46. +++ src/cardynamics.h	Mon Jan 19 23:26:36 1970
  47. @@ -25,6 +25,12 @@
  48.  class FractureBody;
  49.  class PTree;
  50.  
  51. +#if (BT_BULLET_VERSION < 281)
  52. +#define btCollisionObjectWrapper btCollisionObject
  53. +#else
  54. +struct btCollisionObjectWrapper;
  55. +#endif
  56. +
  57.  class CARDYNAMICS : public btActionInterface
  58.  {
  59.  friend class PERFORMANCE_TESTING;
  60. @@ -151,11 +157,11 @@
  61.  
  62.  	static bool WheelContactCallback(
  63.  		btManifoldPoint& cp,
  64. -		const btCollisionObject* colObj0,
  65. -		int partId0,
  66. +		const btCollisionObjectWrapper* col0,
  67. +		int part0,
  68.  		int index0,
  69. -		const btCollisionObject* colObj1,
  70. -		int partId1,
  71. +		const btCollisionObjectWrapper* col1,
  72. +		int part1,
  73.  		int index1);
  74.  
  75.  protected:
  76. --- src/dynamicsworld.cpp	Mon Jan 19 23:26:36 1970
  77. +++ src/dynamicsworld.cpp	Mon Jan 19 23:26:36 1970
  78. @@ -105,7 +105,7 @@
  79.  	int patch_id = -1;
  80.  	const BEZIER * b = 0;
  81.  	const TRACKSURFACE * s = TRACKSURFACE::None();
  82. -	btCollisionObject * c = 0;
  83. +	const btCollisionObject * c = 0;
  84.  
  85.  	MyRayResultCallback ray(origin, p, caster);
  86.  	rayTest(origin, p, ray);
  87. @@ -221,6 +221,7 @@
  88.  
  89.  void DynamicsWorld::fractureCallback()
  90.  {
  91. +#if (BT_BULLET_VERSION < 281)
  92.  	m_activeConnections.resize(0);
  93.  
  94.  	int numManifolds = getDispatcher()->getNumManifolds();
  95. @@ -268,4 +269,5 @@
  96.  		btRigidBody* child = body->updateConnection(con_id);
  97.  		if (child) addRigidBody(child);
  98.  	}
  99. +#endif
  100.  }