فهرست منبع

Merge pull request #37826 from nekomatata/direct-body-state-sleep

Fix set_sleep_state in Bullet body direct state
Rémi Verschelde 5 سال پیش
والد
کامیت
e0eb9a8ae4
4فایلهای تغییر یافته به همراه5 افزوده شده و 5 حذف شده
  1. 2 2
      modules/bullet/rigid_body_bullet.cpp
  2. 1 1
      modules/bullet/rigid_body_bullet.h
  3. 1 1
      servers/physics_3d/body_3d_sw.h
  4. 1 1
      servers/physics_server_3d.h

+ 2 - 2
modules/bullet/rigid_body_bullet.cpp

@@ -138,8 +138,8 @@ void BulletPhysicsDirectBodyState3D::apply_torque_impulse(const Vector3 &p_impul
 	body->apply_torque_impulse(p_impulse);
 }
 
-void BulletPhysicsDirectBodyState3D::set_sleep_state(bool p_enable) {
-	body->set_activation_state(p_enable);
+void BulletPhysicsDirectBodyState3D::set_sleep_state(bool p_sleep) {
+	body->set_activation_state(!p_sleep);
 }
 
 bool BulletPhysicsDirectBodyState3D::is_sleeping() const {

+ 1 - 1
modules/bullet/rigid_body_bullet.h

@@ -117,7 +117,7 @@ public:
 	virtual void apply_impulse(const Vector3 &p_pos, const Vector3 &p_impulse);
 	virtual void apply_torque_impulse(const Vector3 &p_impulse);
 
-	virtual void set_sleep_state(bool p_enable);
+	virtual void set_sleep_state(bool p_sleep);
 	virtual bool is_sleeping() const;
 
 	virtual int get_contact_count() const;

+ 1 - 1
servers/physics_3d/body_3d_sw.h

@@ -421,7 +421,7 @@ public:
 	virtual void apply_impulse(const Vector3 &p_pos, const Vector3 &p_j) { body->apply_impulse(p_pos, p_j); }
 	virtual void apply_torque_impulse(const Vector3 &p_j) { body->apply_torque_impulse(p_j); }
 
-	virtual void set_sleep_state(bool p_enable) { body->set_active(!p_enable); }
+	virtual void set_sleep_state(bool p_sleep) { body->set_active(!p_sleep); }
 	virtual bool is_sleeping() const { return !body->is_active(); }
 
 	virtual int get_contact_count() const { return body->contact_count; }

+ 1 - 1
servers/physics_server_3d.h

@@ -70,7 +70,7 @@ public:
 	virtual void apply_impulse(const Vector3 &p_pos, const Vector3 &p_j) = 0;
 	virtual void apply_torque_impulse(const Vector3 &p_j) = 0;
 
-	virtual void set_sleep_state(bool p_enable) = 0;
+	virtual void set_sleep_state(bool p_sleep) = 0;
 	virtual bool is_sleeping() const = 0;
 
 	virtual int get_contact_count() const = 0;