Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.2] Add signal to inform joint that body has exited tree #44704

Merged
merged 1 commit into from
Jan 13, 2021
Merged

[3.2] Add signal to inform joint that body has exited tree #44704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/bullet/space_bullet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ void SpaceBullet::remove_rigid_body(RigidBodyBullet *p_body) {

int constraints = btBody->getNumConstraintRefs();
if (constraints > 0) {
WARN_PRINT("A body connected to joints was removed. Ensure bodies are disconnected from joints before removing them.");
ERR_PRINT("A body connected to joints was removed.");
for (int i = 0; i < constraints; i++) {
dynamicsWorld->removeConstraint(btBody->getConstraintRef(i));
}
Expand Down
45 changes: 43 additions & 2 deletions scene/2d/joints_2d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,36 @@

#include "core/engine.h"
#include "physics_body_2d.h"
#include "scene/scene_string_names.h"
#include "servers/physics_2d_server.h"

void Joint2D::_disconnect_signals() {

Node *node_a = get_node_or_null(a);
PhysicsBody2D *body_a = Object::cast_to<PhysicsBody2D>(node_a);
if (body_a)
body_a->disconnect(SceneStringNames::get_singleton()->tree_exiting, this, SceneStringNames::get_singleton()->_body_exit_tree);

Node *node_b = get_node_or_null(b);
PhysicsBody2D *body_b = Object::cast_to<PhysicsBody2D>(node_b);
if (body_b)
body_b->disconnect(SceneStringNames::get_singleton()->tree_exiting, this, SceneStringNames::get_singleton()->_body_exit_tree);
}

void Joint2D::_body_exit_tree(const ObjectID &p_body_id) {

_disconnect_signals();
Object *object = ObjectDB::get_instance(p_body_id);
PhysicsBody2D *body = Object::cast_to<PhysicsBody2D>(object);
ERR_FAIL_NULL(body);
RID body_rid = body->get_rid();
if (ba == body_rid)
a = NodePath();
if (bb == body_rid)
b = NodePath();
_update_joint();
}

void Joint2D::_update_joint(bool p_only_free) {

if (joint.is_valid()) {
Expand All @@ -51,8 +79,8 @@ void Joint2D::_update_joint(bool p_only_free) {
return;
}

Node *node_a = has_node(get_node_a()) ? get_node(get_node_a()) : (Node *)NULL;
Node *node_b = has_node(get_node_b()) ? get_node(get_node_b()) : (Node *)NULL;
Node *node_a = get_node_or_null(a);
Node *node_b = get_node_or_null(b);

PhysicsBody2D *body_a = Object::cast_to<PhysicsBody2D>(node_a);
PhysicsBody2D *body_b = Object::cast_to<PhysicsBody2D>(node_b);
Expand Down Expand Up @@ -107,6 +135,9 @@ void Joint2D::_update_joint(bool p_only_free) {
ba = body_a->get_rid();
bb = body_b->get_rid();

body_a->connect(SceneStringNames::get_singleton()->tree_exiting, this, SceneStringNames::get_singleton()->_body_exit_tree, make_binds(body_a->get_instance_id()));
body_b->connect(SceneStringNames::get_singleton()->tree_exiting, this, SceneStringNames::get_singleton()->_body_exit_tree, make_binds(body_b->get_instance_id()));

Physics2DServer::get_singleton()->joint_disable_collisions_between_bodies(joint, exclude_from_collision);
}

Expand All @@ -115,6 +146,9 @@ void Joint2D::set_node_a(const NodePath &p_node_a) {
if (a == p_node_a)
return;

if (joint.is_valid())
_disconnect_signals();

a = p_node_a;
_update_joint();
}
Expand All @@ -128,6 +162,10 @@ void Joint2D::set_node_b(const NodePath &p_node_b) {

if (b == p_node_b)
return;

if (joint.is_valid())
_disconnect_signals();

b = p_node_b;
_update_joint();
}
Expand All @@ -145,6 +183,7 @@ void Joint2D::_notification(int p_what) {
} break;
case NOTIFICATION_EXIT_TREE: {
if (joint.is_valid()) {
_disconnect_signals();
_update_joint(true);
}
} break;
Expand Down Expand Up @@ -194,6 +233,8 @@ String Joint2D::get_configuration_warning() const {

void Joint2D::_bind_methods() {

ClassDB::bind_method(D_METHOD("_body_exit_tree", "body_rid"), &Joint2D::_body_exit_tree);

ClassDB::bind_method(D_METHOD("set_node_a", "node"), &Joint2D::set_node_a);
ClassDB::bind_method(D_METHOD("get_node_a"), &Joint2D::get_node_a);

Expand Down
2 changes: 2 additions & 0 deletions scene/2d/joints_2d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ class Joint2D : public Node2D {
String warning;

protected:
void _disconnect_signals();
void _body_exit_tree(const ObjectID &p_body_id);
void _update_joint(bool p_only_free = false);

void _notification(int p_what);
Expand Down
50 changes: 47 additions & 3 deletions scene/3d/physics_joint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,35 @@

#include "physics_joint.h"

#include "scene/scene_string_names.h"

void Joint::_disconnect_signals() {

Node *node_a = get_node_or_null(a);
PhysicsBody *body_a = Object::cast_to<PhysicsBody>(node_a);
if (body_a)
body_a->disconnect(SceneStringNames::get_singleton()->tree_exiting, this, SceneStringNames::get_singleton()->_body_exit_tree);

Node *node_b = get_node_or_null(b);
PhysicsBody *body_b = Object::cast_to<PhysicsBody>(node_b);
if (body_b)
body_b->disconnect(SceneStringNames::get_singleton()->tree_exiting, this, SceneStringNames::get_singleton()->_body_exit_tree);
}

void Joint::_body_exit_tree(const ObjectID &p_body_id) {

_disconnect_signals();
Object *object = ObjectDB::get_instance(p_body_id);
PhysicsBody *body = Object::cast_to<PhysicsBody>(object);
ERR_FAIL_NULL(body);
RID body_rid = body->get_rid();
if (ba == body_rid)
a = NodePath();
if (bb == body_rid)
b = NodePath();
_update_joint();
}

void Joint::_update_joint(bool p_only_free) {

if (joint.is_valid()) {
Expand All @@ -47,8 +76,8 @@ void Joint::_update_joint(bool p_only_free) {
return;
}

Node *node_a = has_node(get_node_a()) ? get_node(get_node_a()) : (Node *)NULL;
Node *node_b = has_node(get_node_b()) ? get_node(get_node_b()) : (Node *)NULL;
Node *node_a = get_node_or_null(a);
Node *node_b = get_node_or_null(b);

PhysicsBody *body_a = Object::cast_to<PhysicsBody>(node_a);
PhysicsBody *body_b = Object::cast_to<PhysicsBody>(node_b);
Expand Down Expand Up @@ -97,8 +126,12 @@ void Joint::_update_joint(bool p_only_free) {
PhysicsServer::get_singleton()->joint_set_solver_priority(joint, solver_priority);

ba = body_a->get_rid();
if (body_b)
body_a->connect(SceneStringNames::get_singleton()->tree_exiting, this, SceneStringNames::get_singleton()->_body_exit_tree, make_binds(body_a->get_instance_id()));

if (body_b) {
bb = body_b->get_rid();
body_b->connect(SceneStringNames::get_singleton()->tree_exiting, this, SceneStringNames::get_singleton()->_body_exit_tree, make_binds(body_b->get_instance_id()));
}

PhysicsServer::get_singleton()->joint_disable_collisions_between_bodies(joint, exclude_from_collision);
}
Expand All @@ -108,6 +141,9 @@ void Joint::set_node_a(const NodePath &p_node_a) {
if (a == p_node_a)
return;

if (joint.is_valid())
_disconnect_signals();

a = p_node_a;
_update_joint();
}
Expand All @@ -121,9 +157,14 @@ void Joint::set_node_b(const NodePath &p_node_b) {

if (b == p_node_b)
return;

if (joint.is_valid())
_disconnect_signals();

b = p_node_b;
_update_joint();
}

NodePath Joint::get_node_b() const {

return b;
Expand All @@ -150,6 +191,7 @@ void Joint::_notification(int p_what) {
} break;
case NOTIFICATION_EXIT_TREE: {
if (joint.is_valid()) {
_disconnect_signals();
_update_joint(true);
}
} break;
Expand Down Expand Up @@ -185,6 +227,8 @@ String Joint::get_configuration_warning() const {

void Joint::_bind_methods() {

ClassDB::bind_method(D_METHOD("_body_exit_tree", "body_rid"), &Joint::_body_exit_tree);

ClassDB::bind_method(D_METHOD("set_node_a", "node"), &Joint::set_node_a);
ClassDB::bind_method(D_METHOD("get_node_a"), &Joint::get_node_a);

Expand Down
2 changes: 2 additions & 0 deletions scene/3d/physics_joint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ class Joint : public Spatial {
String warning;

protected:
void _disconnect_signals();
void _body_exit_tree(const ObjectID &p_body_id);
void _update_joint(bool p_only_free = false);

void _notification(int p_what);
Expand Down