diff options
| author | Eric Rybicki | 2017-11-08 22:35:47 +0100 |
|---|---|---|
| committer | Eric Rybicki | 2017-11-10 22:33:54 +0100 |
| commit | bd5df841990e7410593d8aae5bee10bab16f6f43 (patch) | |
| tree | 1d1d46e94a1ee19dcced55840975ab92b7101ad3 /servers/physics/body_sw.h | |
| parent | 19b1ff0fc5f7acce23176ad6c8752604357472f0 (diff) | |
| download | godot-bd5df841990e7410593d8aae5bee10bab16f6f43.tar.gz godot-bd5df841990e7410593d8aae5bee10bab16f6f43.tar.zst godot-bd5df841990e7410593d8aae5bee10bab16f6f43.zip | |
Allow double-axis lock in RigidBody and KinematicBody
Diffstat (limited to 'servers/physics/body_sw.h')
| -rw-r--r-- | servers/physics/body_sw.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servers/physics/body_sw.h b/servers/physics/body_sw.h index 738d99c76..aab6def1a 100644 --- a/servers/physics/body_sw.h +++ b/servers/physics/body_sw.h @@ -53,7 +53,7 @@ class BodySW : public CollisionObjectSW { real_t angular_damp; real_t gravity_scale; - PhysicsServer::BodyAxisLock axis_lock; + bool locked_axis[3] = { false, false, false }; real_t kinematic_safe_margin; real_t _inv_mass; @@ -288,8 +288,8 @@ public: _FORCE_INLINE_ Vector3 get_gravity() const { return gravity; } _FORCE_INLINE_ real_t get_bounce() const { return bounce; } - _FORCE_INLINE_ void set_axis_lock(PhysicsServer::BodyAxisLock p_lock) { axis_lock = p_lock; } - _FORCE_INLINE_ PhysicsServer::BodyAxisLock get_axis_lock() const { return axis_lock; } + _FORCE_INLINE_ void set_axis_lock(int axis, bool lock) { locked_axis[axis] = lock; } + _FORCE_INLINE_ bool get_axis_lock() const { return locked_axis; } void integrate_forces(real_t p_step); void integrate_velocities(real_t p_step); |