diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-11 10:35:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-11 10:35:09 +0100 |
| commit | dfb3634c3462adb3d9f0bf1e2e7b4261c3313b80 (patch) | |
| tree | 5686d27865e80aab6d60abc2e8e34fc2138a38a9 /modules/bullet/generic_6dof_joint_bullet.h | |
| parent | 237be766d4b0247d7ded0a9b85da12a989c561c8 (diff) | |
| parent | b546cd50a36a809ba8beb8da1126d41c3b19294b (diff) | |
Merge pull request #13836 from AndreaCatania/scale
Fixed bullet scale on get_transform and joints
Diffstat (limited to 'modules/bullet/generic_6dof_joint_bullet.h')
| -rw-r--r-- | modules/bullet/generic_6dof_joint_bullet.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/modules/bullet/generic_6dof_joint_bullet.h b/modules/bullet/generic_6dof_joint_bullet.h index 0d47b823de..ba0ae08800 100644 --- a/modules/bullet/generic_6dof_joint_bullet.h +++ b/modules/bullet/generic_6dof_joint_bullet.h @@ -39,6 +39,11 @@ class RigidBodyBullet; class Generic6DOFJointBullet : public JointBullet { class btGeneric6DofConstraint *sixDOFConstraint; + // First is linear second is angular + Vector3 limits_lower[2]; + Vector3 limits_upper[2]; + bool flags[3][PhysicsServer::G6DOF_JOINT_FLAG_MAX]; + public: Generic6DOFJointBullet(RigidBodyBullet *rbA, RigidBodyBullet *rbB, const Transform &frameInA, const Transform &frameInB, bool useLinearReferenceFrameA); |