1 files changed, 16 insertions, 11 deletions

diff --git a/scene/3d/physics_body.h b/scene/3d/physics_body.h
index f88b3860dc..57b120ef63 100644
--- a/scene/3d/physics_body.h
+++ b/scene/3d/physics_body.h
@@ -114,13 +114,6 @@ public:
 		MODE_KINEMATIC,
 	};
 
-	enum AxisLock {
-		AXIS_LOCK_DISABLED,
-		AXIS_LOCK_X,
-		AXIS_LOCK_Y,
-		AXIS_LOCK_Z,
-	};
-
 private:
 	bool can_sleep;
 	PhysicsDirectBodyState *state;
@@ -139,7 +132,7 @@ private:
 	bool sleeping;
 	bool ccd;
 
-	AxisLock axis_lock;
+	bool locked_axis[3] = { false, false, false };
 
 	int max_contacts_reported;
 
@@ -245,8 +238,12 @@ public:
 	void set_use_continuous_collision_detection(bool p_enable);
 	bool is_using_continuous_collision_detection() const;
 
-	void set_axis_lock(AxisLock p_lock);
-	AxisLock get_axis_lock() const;
+	void set_axis_lock_x(bool p_lock);
+	void set_axis_lock_y(bool p_lock);
+	void set_axis_lock_z(bool p_lock);
+	bool get_axis_lock_x() const;
+	bool get_axis_lock_y() const;
+	bool get_axis_lock_z() const;
 
 	Array get_colliding_bodies() const;
 
@@ -259,7 +256,6 @@ public:
 };
 
 VARIANT_ENUM_CAST(RigidBody::Mode);
-VARIANT_ENUM_CAST(RigidBody::AxisLock);
 
 class KinematicCollision;
 
@@ -281,6 +277,8 @@ public:
 	};
 
 private:
+	bool locked_axis[3] = { false, false, false };
+
 	float margin;
 
 	Vector3 floor_velocity;
@@ -303,6 +301,13 @@ public:
 	bool move_and_collide(const Vector3 &p_motion, Collision &r_collision);
 	bool test_move(const Transform &p_from, const Vector3 &p_motion);
 
+	void set_axis_lock_x(bool p_lock);
+	void set_axis_lock_y(bool p_lock);
+	void set_axis_lock_z(bool p_lock);
+	bool get_axis_lock_x() const;
+	bool get_axis_lock_y() const;
+	bool get_axis_lock_z() const;
+
 	void set_safe_margin(float p_margin);
 	float get_safe_margin() const;