diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-01-13 10:49:26 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-01-13 10:49:26 -0300 |
commit | 2ef5a342e34df3863ac512bb3673eba28f15e9f4 (patch) | |
tree | edb5abbc25afce7fb23d704070d43968cf4d9b33 /scene/3d | |
parent | 30d36581100f0bf71c6d2502be9a03443bdf8708 (diff) |
-begin work on unidirectional collision detection
-fixed performance issue in new 2D engine
-texscreen() working in shader 2D
Diffstat (limited to 'scene/3d')
-rw-r--r-- | scene/3d/physics_body.cpp | 1 | ||||
-rw-r--r-- | scene/3d/physics_body.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp index f2806f2af2..940a29b5d8 100644 --- a/scene/3d/physics_body.cpp +++ b/scene/3d/physics_body.cpp @@ -92,6 +92,7 @@ void PhysicsBody::remove_collision_exception_with(Node* p_node) { PhysicsServer::get_singleton()->body_remove_collision_exception(get_rid(),physics_body->get_rid()); } + void PhysicsBody::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_layer_mask","mask"),&PhysicsBody::set_layer_mask); ObjectTypeDB::bind_method(_MD("get_layer_mask"),&PhysicsBody::get_layer_mask); diff --git a/scene/3d/physics_body.h b/scene/3d/physics_body.h index 0d1de7f236..beec01ff3a 100644 --- a/scene/3d/physics_body.h +++ b/scene/3d/physics_body.h @@ -56,6 +56,8 @@ public: void add_collision_exception_with(Node* p_node); //must be physicsbody void remove_collision_exception_with(Node* p_node); + + PhysicsBody(); }; |