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

Merge pull request #31805 from YeldhamDev/collision_object_unneeded_checks

Browse source 
Remove some unneeded checks in CollisionObject(2D)
This commit is contained in:
Rémi Verschelde 2019-08-30 20:08:33 +02:00 committed by GitHub
commit 4f6eb3610f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scene/2d/collision_object_2d.cpp
View file

@ -376,11 +376,12 @@ void CollisionObject2D::set_only_update_transform_changes(bool p_enable) {
void CollisionObject2D::_update_pickable() { void CollisionObject2D::_update_pickable() {
if (!is_inside_tree()) if (!is_inside_tree())
return; return;
bool pickable = this->pickable && is_inside_tree() && is_visible_in_tree();
bool is_pickable = pickable && is_visible_in_tree();
if (area) if (area)
Physics2DServer::get_singleton()->area_set_pickable(rid, pickable); Physics2DServer::get_singleton()->area_set_pickable(rid, is_pickable);
else else
Physics2DServer::get_singleton()->body_set_pickable(rid, pickable); Physics2DServer::get_singleton()->body_set_pickable(rid, is_pickable);
} }
String CollisionObject2D::get_configuration_warning() const { String CollisionObject2D::get_configuration_warning() const {

3
scene/3d/collision_object.cpp
View file

@ -105,7 +105,8 @@ void CollisionObject::_mouse_exit() {
void CollisionObject::_update_pickable() { void CollisionObject::_update_pickable() {
if (!is_inside_tree()) if (!is_inside_tree())
return; return;
bool pickable = ray_pickable && is_inside_tree() && is_visible_in_tree();
bool pickable = ray_pickable && is_visible_in_tree();
if (area) if (area)
PhysicsServer::get_singleton()->area_set_ray_pickable(rid, pickable); PhysicsServer::get_singleton()->area_set_ray_pickable(rid, pickable);
else else