diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-09 13:01:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-09 13:01:41 +0100 |
| commit | 25b36f18d38c222fb8d115a40ef1de07445e6bf8 (patch) | |
| tree | 9c1795e49d29e9f6ff1c1490ac32aaffd608b17c /modules/bullet/rigid_body_bullet.h | |
| parent | 3fd1c0c76b61173c5d611b14b5b137fb61654f08 (diff) | |
| parent | bd5df841990e7410593d8aae5bee10bab16f6f43 (diff) | |
| download | redot-engine-25b36f18d38c222fb8d115a40ef1de07445e6bf8.tar.gz | |
Merge pull request #12756 from Stratos695/master
Allowing double-axis lock in RigidBody & KinematicBody (Fixes #12500)
Diffstat (limited to 'modules/bullet/rigid_body_bullet.h')
| -rw-r--r-- | modules/bullet/rigid_body_bullet.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/bullet/rigid_body_bullet.h b/modules/bullet/rigid_body_bullet.h index c54b5784b5..fde8b21e17 100644 --- a/modules/bullet/rigid_body_bullet.h +++ b/modules/bullet/rigid_body_bullet.h @@ -184,7 +184,7 @@ private: KinematicUtilities *kinematic_utilities; PhysicsServer::BodyMode mode; - PhysicsServer::BodyAxisLock axis_lock; + bool locked_axis[3] = { false, false, false }; GodotMotionState *godotMotionState; btRigidBody *btBody; real_t mass; @@ -269,8 +269,8 @@ public: void set_applied_torque(const Vector3 &p_torque); Vector3 get_applied_torque() const; - void set_axis_lock(PhysicsServer::BodyAxisLock p_lock); - PhysicsServer::BodyAxisLock get_axis_lock() const; + void set_axis_lock(int axis, bool p_lock); + bool get_axis_lock() const; /// Doc: /// http://www.bulletphysics.org/mediawiki-1.5.8/index.php?title=Anti_tunneling_by_Motion_Clamping |