diff options
| author | Oussama <o.boukhelf@gmail.com> | 2019-01-03 14:26:51 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-07 12:30:35 +0100 |
| commit | 22b7c9dfa80d0f7abca40f061865c2ab3c136a74 (patch) | |
| tree | 311cd3f22b012329160f9d43810aea429994af48 /thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3FixedConstraint.h | |
| parent | a6722cf36251ddcb538e6ebed9fa4950342b68ba (diff) | |
Update Bullet to the latest commit 126b676
Diffstat (limited to 'thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3FixedConstraint.h')
| -rw-r--r-- | thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3FixedConstraint.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3FixedConstraint.h b/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3FixedConstraint.h index e884a82912..64809666e4 100644 --- a/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3FixedConstraint.h +++ b/thirdparty/bullet/Bullet3Dynamics/ConstraintSolver/b3FixedConstraint.h @@ -4,32 +4,31 @@ #include "b3TypedConstraint.h" -B3_ATTRIBUTE_ALIGNED16(class) b3FixedConstraint : public b3TypedConstraint +B3_ATTRIBUTE_ALIGNED16(class) +b3FixedConstraint : public b3TypedConstraint { b3Vector3 m_pivotInA; b3Vector3 m_pivotInB; b3Quaternion m_relTargetAB; public: - b3FixedConstraint(int rbA,int rbB, const b3Transform& frameInA,const b3Transform& frameInB); - + b3FixedConstraint(int rbA, int rbB, const b3Transform& frameInA, const b3Transform& frameInB); + virtual ~b3FixedConstraint(); - - virtual void getInfo1 (b3ConstraintInfo1* info,const b3RigidBodyData* bodies); + virtual void getInfo1(b3ConstraintInfo1 * info, const b3RigidBodyData* bodies); - virtual void getInfo2 (b3ConstraintInfo2* info, const b3RigidBodyData* bodies); + virtual void getInfo2(b3ConstraintInfo2 * info, const b3RigidBodyData* bodies); - virtual void setParam(int num, b3Scalar value, int axis = -1) + virtual void setParam(int num, b3Scalar value, int axis = -1) { b3Assert(0); } - virtual b3Scalar getParam(int num, int axis = -1) const + virtual b3Scalar getParam(int num, int axis = -1) const { b3Assert(0); return 0.f; } - }; -#endif //B3_FIXED_CONSTRAINT_H +#endif //B3_FIXED_CONSTRAINT_H |