Removed tabs.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4318 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
@@ -30,10 +30,10 @@ class btRigidBody;
|
||||
class btUprightConstraintLimit
|
||||
{
|
||||
public:
|
||||
btVector3 m_axis;
|
||||
btScalar m_angle;
|
||||
btScalar m_accumulatedImpulse;
|
||||
btScalar m_currentLimitError;
|
||||
btVector3 m_axis;
|
||||
btScalar m_angle;
|
||||
btScalar m_accumulatedImpulse;
|
||||
btScalar m_currentLimitError;
|
||||
};
|
||||
|
||||
class btUprightConstraint : public btTypedConstraint
|
||||
@@ -43,7 +43,7 @@ protected:
|
||||
//! relative_frames
|
||||
|
||||
//!@{
|
||||
btTransform m_frameInA;//!< the constraint space w.r.t body A
|
||||
btTransform m_frameInA;//!< the constraint space w.r.t body A
|
||||
//!@}
|
||||
|
||||
//! Jacobians
|
||||
@@ -55,17 +55,17 @@ protected:
|
||||
|
||||
//! temporal variables
|
||||
//!@{
|
||||
btScalar m_timeStep;
|
||||
btScalar m_ERP;
|
||||
btScalar m_bounce;
|
||||
btScalar m_damping;
|
||||
btScalar m_maxLimitForce;
|
||||
btScalar m_limitSoftness;
|
||||
btScalar m_hiLimit;
|
||||
btScalar m_loLimit;
|
||||
btScalar m_timeStep;
|
||||
btScalar m_ERP;
|
||||
btScalar m_bounce;
|
||||
btScalar m_damping;
|
||||
btScalar m_maxLimitForce;
|
||||
btScalar m_limitSoftness;
|
||||
btScalar m_hiLimit;
|
||||
btScalar m_loLimit;
|
||||
btScalar m_disable_time;
|
||||
|
||||
btUprightConstraintLimit m_limit[ 2 ];
|
||||
btUprightConstraintLimit m_limit[ 2 ];
|
||||
|
||||
//!@}
|
||||
|
||||
@@ -79,7 +79,7 @@ protected:
|
||||
void buildAngularJacobian(btJacobianEntry & jacAngular,const btVector3 & jointAxisW);
|
||||
|
||||
void solveAngularLimit(
|
||||
btUprightConstraintLimit *limit,
|
||||
btUprightConstraintLimit *limit,
|
||||
btScalar timeStep, btScalar jacDiagABInv,
|
||||
btRigidBody * body0 );
|
||||
|
||||
@@ -87,38 +87,38 @@ public:
|
||||
|
||||
btUprightConstraint(btRigidBody& rbA, const btTransform& frameInA );
|
||||
|
||||
// -PI,+PI is the full range
|
||||
// 0,0 is no rotation around x or z
|
||||
// -PI*0.2,+PI*0.2 is a nice bit of tilt
|
||||
void setLimit( btScalar range )
|
||||
{
|
||||
m_loLimit = -range;
|
||||
m_hiLimit = +range;
|
||||
}
|
||||
// -PI,+PI is the full range
|
||||
// 0,0 is no rotation around x or z
|
||||
// -PI*0.2,+PI*0.2 is a nice bit of tilt
|
||||
void setLimit( btScalar range )
|
||||
{
|
||||
m_loLimit = -range;
|
||||
m_hiLimit = +range;
|
||||
}
|
||||
|
||||
// Error correction scaling
|
||||
// 0 - 1
|
||||
//
|
||||
void setErp( btScalar erp )
|
||||
{
|
||||
m_ERP = erp;
|
||||
}
|
||||
void setBounce( btScalar bounce )
|
||||
{
|
||||
m_bounce = bounce;
|
||||
}
|
||||
void setMaxLimitForce( btScalar force )
|
||||
{
|
||||
m_maxLimitForce = force;
|
||||
}
|
||||
void setLimitSoftness( btScalar softness )
|
||||
{
|
||||
m_limitSoftness = softness;
|
||||
}
|
||||
void setDamping( btScalar damping )
|
||||
{
|
||||
m_damping = damping;
|
||||
}
|
||||
// Error correction scaling
|
||||
// 0 - 1
|
||||
//
|
||||
void setErp( btScalar erp )
|
||||
{
|
||||
m_ERP = erp;
|
||||
}
|
||||
void setBounce( btScalar bounce )
|
||||
{
|
||||
m_bounce = bounce;
|
||||
}
|
||||
void setMaxLimitForce( btScalar force )
|
||||
{
|
||||
m_maxLimitForce = force;
|
||||
}
|
||||
void setLimitSoftness( btScalar softness )
|
||||
{
|
||||
m_limitSoftness = softness;
|
||||
}
|
||||
void setDamping( btScalar damping )
|
||||
{
|
||||
m_damping = damping;
|
||||
}
|
||||
void setDisableTime( btScalar t )
|
||||
{
|
||||
m_disable_time = t;
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
class KartMotionState : public btMotionState
|
||||
{
|
||||
private:
|
||||
btTransform m_center_of_mass;
|
||||
btTransform m_center_of_mass;
|
||||
|
||||
public:
|
||||
/** Constructor.
|
||||
|
||||
@@ -36,8 +36,8 @@ class ThreeDAnimation;
|
||||
class UserPointer
|
||||
{
|
||||
public:
|
||||
/** List of all possibles STK objects that are represented in the
|
||||
* physics. */
|
||||
/** List of all possibles STK objects that are represented in the
|
||||
* physics. */
|
||||
enum UserPointerType {UP_UNDEF, UP_KART, UP_FLYABLE, UP_TRACK,
|
||||
UP_PHYSICAL_OBJECT, UP_ANIMATION};
|
||||
private:
|
||||
@@ -50,7 +50,7 @@ public:
|
||||
Flyable* getPointerFlyable() const {return (Flyable*)m_pointer; }
|
||||
Kart* getPointerKart() const {return (Kart*)m_pointer; }
|
||||
PhysicalObject *getPointerPhysicalObject() const {return (PhysicalObject*)m_pointer; }
|
||||
ThreeDAnimation*getPointerAnimation() const {return (ThreeDAnimation*)m_pointer;}
|
||||
ThreeDAnimation*getPointerAnimation() const {return (ThreeDAnimation*)m_pointer;}
|
||||
void set(PhysicalObject* p) { m_user_pointer_type=UP_PHYSICAL_OBJECT;
|
||||
m_pointer =p; }
|
||||
void set(Kart* p) { m_user_pointer_type=UP_KART;
|
||||
@@ -59,7 +59,7 @@ public:
|
||||
m_pointer =p; }
|
||||
void set(TriangleMesh* p) { m_user_pointer_type=UP_TRACK;
|
||||
m_pointer =p; }
|
||||
void set(ThreeDAnimation* p){ m_user_pointer_type=UP_ANIMATION;
|
||||
void set(ThreeDAnimation* p){ m_user_pointer_type=UP_ANIMATION;
|
||||
m_pointer =p; }
|
||||
UserPointer() { zero(); }
|
||||
void zero() { m_user_pointer_type=UP_UNDEF;
|
||||
|
||||
Reference in New Issue
Block a user