asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #57792 from timothyqiu/raycast-clear-except-3.x

Browse source
This commit is contained in:
Rémi Verschelde 2022-02-08 10:50:27 +01:00 committed by GitHub
commit 69c15c7ab8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scene/2d/ray_cast_2d.cpp
View file

@ -258,6 +258,13 @@ void RayCast2D::remove_exception(const Object *p_object) {
void RayCast2D::clear_exceptions() {
exclude.clear();
if (exclude_parent_body && is_inside_tree()) {
CollisionObject2D *parent = Object::cast_to<CollisionObject2D>(get_parent());
if (parent) {
exclude.insert(parent->get_rid());
}
}
}
void RayCast2D::set_collide_with_areas(bool p_clip) {

7
scene/3d/ray_cast.cpp
View file

@ -256,6 +256,13 @@ void RayCast::remove_exception(const Object *p_object) {
void RayCast::clear_exceptions() {
exclude.clear();
if (exclude_parent_body && is_inside_tree()) {
CollisionObject *parent = Object::cast_to<CollisionObject>(get_parent());
if (parent) {
exclude.insert(parent->get_rid());
}
}
}
void RayCast::set_collide_with_areas(bool p_clip) {