Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove some un-used data from b3Generic6DofConstraint

Browse Source 
add GLRenderToTexture helper class
enable OpenGLTrueTypeFont test
This commit is contained in:
erwin coumans
2013-06-26 16:09:40 -07:00
parent 34394526f8
commit bb723f9fd1
7 changed files with 119 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Bullet3Dynamics/ConstraintSolver/b3Generic6DofConstraint.h
View File

@@ -137,19 +137,19 @@ public:
b3Vector3 m_accumulatedImpulse;
//! Linear_Limit_parameters
//!@{
b3Scalar m_limitSoftness;//!< Softness for linear limit
b3Scalar m_damping;//!< Damping for linear limit
b3Scalar m_restitution;//! Bounce parameter for linear limit
b3Vector3 m_normalCFM;//!< Constraint force mixing factor
b3Vector3 m_stopERP;//!< Error tolerance factor when joint is at limit
b3Vector3 m_stopCFM;//!< Constraint force mixing factor when joint is at limit
//!@}
bool m_enableMotor[3];
b3Vector3 m_targetVelocity;//!< target motor velocity
b3Vector3 m_maxMotorForce;//!< max force on motor
b3Vector3 m_currentLimitError;//! How much is violated this limit
b3Vector3 m_currentLinearDiff;//! Current relative offset of constraint frames
int m_currentLimit[3];//!< 0=free, 1=at lower limit, 2=at upper limit
b3Scalar m_limitSoftness;//!< Softness for linear limit
b3Scalar m_damping;//!< Damping for linear limit
b3Scalar m_restitution;//! Bounce parameter for linear limit
//!@}
bool m_enableMotor[3];
int m_currentLimit[3];//!< 0=free, 1=at lower limit, 2=at upper limit
b3TranslationalLimitMotor()
{
@@ -280,8 +280,8 @@ protected:
//! Jacobians
//!@{
b3JacobianEntry m_jacLinear[3];//!< 3 orthogonal linear constraints
b3JacobianEntry m_jacAng[3];//!< 3 orthogonal angular constraints
// b3JacobianEntry m_jacLinear[3];//!< 3 orthogonal linear constraints
// b3JacobianEntry m_jacAng[3];//!< 3 orthogonal angular constraints
//!@}
//! Linear_Limit_parameters