godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17678 from RandomShaper/fix-unilateral-joints-2.1

Browse Source 
Fix any joint requiring two bodies
This commit is contained in:
Rémi Verschelde 2018-03-21 21:55:16 +01:00 committed by GitHub
commit 3e52b31218
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scene/2d/joints_2d.cpp
View File

@ -49,13 +49,13 @@ void Joint2D::_update_joint(bool p_only_free) {
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;
if (!node_a || !node_b)
if (!node_a && !node_b)
return;
PhysicsBody2D *body_a = node_a ? node_a->cast_to<PhysicsBody2D>() : (PhysicsBody2D *)NULL;
PhysicsBody2D *body_b = node_b ? node_b->cast_to<PhysicsBody2D>() : (PhysicsBody2D *)NULL;
if (!body_a || !body_b)
if (!body_a && !body_b)
return;
if (!body_a) {
@ -70,10 +70,10 @@ void Joint2D::_update_joint(bool p_only_free) {
Physics2DServer::get_singleton()->get_singleton()->joint_set_param(joint, Physics2DServer::JOINT_PARAM_BIAS, bias);
ba = body_a->get_rid();
bb = body_b->get_rid();
bb = body_b ? body_b->get_rid() : RID();
if (exclude_from_collision)
Physics2DServer::get_singleton()->body_add_collision_exception(body_a->get_rid(), body_b->get_rid());
if (exclude_from_collision && bb.is_valid())
Physics2DServer::get_singleton()->body_add_collision_exception(ba, bb);
}
void Joint2D::set_node_a(const NodePath &p_node_a) {

10
scene/3d/physics_joint.cpp
View File

@ -47,13 +47,13 @@ void Joint::_update_joint(bool p_only_free) {
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;
if (!node_a || !node_b)
if (!node_a && !node_b)
return;
PhysicsBody *body_a = node_a ? node_a->cast_to<PhysicsBody>() : (PhysicsBody *)NULL;
PhysicsBody *body_b = node_b ? node_b->cast_to<PhysicsBody>() : (PhysicsBody *)NULL;
if (!body_a || !body_b)
if (!body_a && !body_b)
return;
if (!body_a) {
@ -68,10 +68,10 @@ void Joint::_update_joint(bool p_only_free) {
PhysicsServer::get_singleton()->joint_set_solver_priority(joint, solver_priority);
ba = body_a->get_rid();
bb = body_b->get_rid();
bb = body_b ? body_b->get_rid() : RID();
if (exclude_from_collision)
PhysicsServer::get_singleton()->body_add_collision_exception(body_a->get_rid(), body_b->get_rid());
if (exclude_from_collision && bb.is_valid())
PhysicsServer::get_singleton()->body_add_collision_exception(ba, bb);
}
void Joint::set_node_a(const NodePath &p_node_a) {