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

Change RayCast2D 'Exclude Parent' to include Area2D

This commit is contained in:
Chris Bradfield 2017-11-28 22:06:49 -08:00
parent edde7190ab
commit ee14b17201
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scene/2d/ray_cast_2d.cpp
View File

@ -120,11 +120,11 @@ void RayCast2D::set_exclude_parent_body(bool p_exclude_parent_body) {
if (!is_inside_tree())
return;
if (Object::cast_to<PhysicsBody2D>(get_parent())) {
if (Object::cast_to<CollisionObject2D>(get_parent())) {
if (exclude_parent_body)
exclude.insert(Object::cast_to<PhysicsBody2D>(get_parent())->get_rid());
exclude.insert(Object::cast_to<CollisionObject2D>(get_parent())->get_rid());
else
exclude.erase(Object::cast_to<PhysicsBody2D>(get_parent())->get_rid());
exclude.erase(Object::cast_to<CollisionObject2D>(get_parent())->get_rid());
}
}
@ -144,11 +144,11 @@ void RayCast2D::_notification(int p_what) {
else
set_physics_process(false);
if (Object::cast_to<PhysicsBody2D>(get_parent())) {
if (Object::cast_to<CollisionObject2D>(get_parent())) {
if (exclude_parent_body)
exclude.insert(Object::cast_to<PhysicsBody2D>(get_parent())->get_rid());
exclude.insert(Object::cast_to<CollisionObject2D>(get_parent())->get_rid());
else
exclude.erase(Object::cast_to<PhysicsBody2D>(get_parent())->get_rid());
exclude.erase(Object::cast_to<CollisionObject2D>(get_parent())->get_rid());
}
} break;
case NOTIFICATION_EXIT_TREE: {