Tried to fix linking problems by moving some code into
class functions. git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10293 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
@@ -27,7 +27,7 @@
|
||||
#define ROLLING_INFLUENCE_FIX
|
||||
|
||||
|
||||
btRigidBody& btActionInterface::getFixedBody()
|
||||
btRigidBody& btKart::getFixedBody()
|
||||
{
|
||||
static btRigidBody s_fixed(0, 0,0);
|
||||
s_fixed.setMassProps(btScalar(0.),btVector3(btScalar(0.),
|
||||
@@ -555,7 +555,7 @@ struct btWheelContactPoint
|
||||
}; // struct btWheelContactPoint
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
btScalar calcRollingFriction(btWheelContactPoint& contactPoint)
|
||||
btScalar btKart::calcRollingFriction(btWheelContactPoint& contactPoint)
|
||||
{
|
||||
|
||||
btScalar j1=0.f;
|
||||
|
||||
@@ -21,6 +21,7 @@ class btDynamicsWorld;
|
||||
|
||||
class btVehicleTuning;
|
||||
class Kart;
|
||||
struct btWheelContactPoint;
|
||||
|
||||
///rayCast vehicle, very special constraint that turn a rigidbody into a vehicle.
|
||||
class btKart : public btActionInterface
|
||||
@@ -35,6 +36,9 @@ private:
|
||||
int m_userConstraintType;
|
||||
int m_userConstraintId;
|
||||
|
||||
static btRigidBody& getFixedBody();
|
||||
btScalar calcRollingFriction(btWheelContactPoint& contactPoint);
|
||||
|
||||
public:
|
||||
class btVehicleTuning
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user