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

Merge pull request #54154 from bjauny/fix_areanotification

Browse source
This commit is contained in:
Rémi Verschelde 2021-10-27 20:38:55 +02:00 committed by GitHub
commit 187f293189
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scene/2d/collision_object_2d.cpp
View file

@ -44,7 +44,9 @@ void CollisionObject2D::_notification(int p_what) {
Physics2DServer::get_singleton()->body_set_state(rid, Physics2DServer::BODY_STATE_TRANSFORM, global_transform); Physics2DServer::get_singleton()->body_set_state(rid, Physics2DServer::BODY_STATE_TRANSFORM, global_transform);
} }
RID space = get_world_2d()->get_space(); Ref<World2D> world_ref = get_world_2d();
ERR_FAIL_COND(!world_ref.is_valid());
RID space = world_ref->get_space();
if (area) { if (area) {
Physics2DServer::get_singleton()->area_set_space(rid, space); Physics2DServer::get_singleton()->area_set_space(rid, space);
} else { } else {

5
scene/3d/collision_object.cpp
View file

@ -60,13 +60,14 @@ void CollisionObject::_notification(int p_what) {
PhysicsServer::get_singleton()->body_set_state(rid, PhysicsServer::BODY_STATE_TRANSFORM, get_global_transform()); PhysicsServer::get_singleton()->body_set_state(rid, PhysicsServer::BODY_STATE_TRANSFORM, get_global_transform());
} }
RID space = get_world()->get_space(); Ref<World> world_ref = get_world();
ERR_FAIL_COND(!world_ref.is_valid());
RID space = world_ref->get_space();
if (area) { if (area) {
PhysicsServer::get_singleton()->area_set_space(rid, space); PhysicsServer::get_singleton()->area_set_space(rid, space);
} else { } else {
PhysicsServer::get_singleton()->body_set_space(rid, space); PhysicsServer::get_singleton()->body_set_space(rid, space);
} }
_update_pickable(); _update_pickable();
//get space //get space
} break; } break;