noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #16424 from AndreaCatania/phyj

Browse Source 
Added physics API in order to enable/disable collisions between rigidbody attached to a joint with bullet physics bullet
This commit is contained in:
Rémi Verschelde
2018-02-13 15:26:04 +01:00
committed by GitHub
parent fd871b4d4f a42765dada
commit eefb58a892
15 changed files with 121 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scene/2d/joints_2d.cpp
View File

@@ -75,8 +75,7 @@ void Joint2D::_update_joint(bool p_only_free) {
ba = body_a->get_rid();
bb = body_b->get_rid();
if (exclude_from_collision)
Physics2DServer::get_singleton()->body_add_collision_exception(body_a->get_rid(), body_b->get_rid());
Physics2DServer::get_singleton()->joint_disable_collisions_between_bodies(joint, exclude_from_collision);
}
void Joint2D::set_node_a(const NodePath &p_node_a) {

3
scene/3d/physics_joint.cpp
View File

@@ -71,8 +71,7 @@ void Joint::_update_joint(bool p_only_free) {
ba = body_a->get_rid();
bb = body_b->get_rid();
if (exclude_from_collision)
PhysicsServer::get_singleton()->body_add_collision_exception(body_a->get_rid(), body_b->get_rid());
PhysicsServer::get_singleton()->joint_disable_collisions_between_bodies(joint, exclude_from_collision);
}
void Joint::set_node_a(const NodePath &p_node_a) {