diff options
Diffstat (limited to 'extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h')
| -rw-r--r-- | extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h b/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h index d5a299c606f..ac42f1313be 100644 --- a/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h +++ b/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h @@ -29,12 +29,11 @@ class btRaycastVehicle : public btActionInterface btAlignedObjectArray<btVector3> m_axle; btAlignedObjectArray<btScalar> m_forwardImpulse; btAlignedObjectArray<btScalar> m_sideImpulse; - + + ///backwards compatibility int m_userConstraintType; - int m_userConstraintId; - public: class btVehicleTuning { @@ -45,7 +44,8 @@ public: m_suspensionCompression(btScalar(0.83)), m_suspensionDamping(btScalar(0.88)), m_maxSuspensionTravelCm(btScalar(500.)), - m_frictionSlip(btScalar(10.5)) + m_frictionSlip(btScalar(10.5)), + m_maxSuspensionForce(btScalar(6000.)) { } btScalar m_suspensionStiffness; @@ -53,6 +53,7 @@ public: btScalar m_suspensionDamping; btScalar m_maxSuspensionTravelCm; btScalar m_frictionSlip; + btScalar m_maxSuspensionForce; }; private: @@ -83,6 +84,7 @@ public: ///btActionInterface interface virtual void updateAction( btCollisionWorld* collisionWorld, btScalar step) { + (void) collisionWorld; updateVehicle(step); } @@ -110,7 +112,7 @@ public: void updateWheelTransform( int wheelIndex, bool interpolatedTransform = true ); - void setRaycastWheelInfo( int wheelIndex , bool isInContact, const btVector3& hitPoint, const btVector3& hitNormal,btScalar depth); +// void setRaycastWheelInfo( int wheelIndex , bool isInContact, const btVector3& hitPoint, const btVector3& hitNormal,btScalar depth); btWheelInfo& addWheel( const btVector3& connectionPointCS0, const btVector3& wheelDirectionCS0,const btVector3& wheelAxleCS,btScalar suspensionRestLength,btScalar wheelRadius,const btVehicleTuning& tuning, bool isFrontWheel); @@ -192,6 +194,8 @@ public: m_indexForwardAxis = forwardIndex; } + + ///backwards compatibility int getUserConstraintType() const { return m_userConstraintType ; @@ -212,7 +216,6 @@ public: return m_userConstraintId; } - }; class btDefaultVehicleRaycaster : public btVehicleRaycaster |