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

Merge pull request #9518 from RandomShaper/refix-physics-2.1

Browse Source 
Fix initial collision pairs being cleared (2.1)
This commit is contained in:
Rémi Verschelde 2017-07-05 22:22:53 +02:00 committed by GitHub
commit 171d8a501f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/physics/physics_server_sw.cpp
View File

@ -232,8 +232,6 @@ void PhysicsServerSW::area_set_space(RID p_area, RID p_space) {
if (area->get_space() == space) if (area->get_space() == space)
return; //pointless return; //pointless
area->set_space(space);
for (Set<ConstraintSW *>::Element *E = area->get_constraints().front(); E; E = E->next()) { for (Set<ConstraintSW *>::Element *E = area->get_constraints().front(); E; E = E->next()) {
RID self = E->get()->get_self(); RID self = E->get()->get_self();
if (!self.is_valid()) if (!self.is_valid())
@ -241,6 +239,8 @@ void PhysicsServerSW::area_set_space(RID p_area, RID p_space) {
free(self); free(self);
} }
area->clear_constraints(); area->clear_constraints();
area->set_space(space);
}; };
RID PhysicsServerSW::area_get_space(RID p_area) const { RID PhysicsServerSW::area_get_space(RID p_area) const {
@ -486,8 +486,6 @@ void PhysicsServerSW::body_set_space(RID p_body, RID p_space) {
if (body->get_space() == space) if (body->get_space() == space)
return; //pointless return; //pointless
body->set_space(space);
for (Map<ConstraintSW *, int>::Element *E = body->get_constraint_map().front(); E; E = E->next()) { for (Map<ConstraintSW *, int>::Element *E = body->get_constraint_map().front(); E; E = E->next()) {
RID self = E->key()->get_self(); RID self = E->key()->get_self();
if (!self.is_valid()) if (!self.is_valid())
@ -495,6 +493,8 @@ void PhysicsServerSW::body_set_space(RID p_body, RID p_space) {
free(self); free(self);
} }
body->clear_constraint_map(); body->clear_constraint_map();
body->set_space(space);
}; };
RID PhysicsServerSW::body_get_space(RID p_body) const { RID PhysicsServerSW::body_get_space(RID p_body) const {

8
servers/physics_2d/physics_2d_server_sw.cpp
View File

@ -296,8 +296,6 @@ void Physics2DServerSW::area_set_space(RID p_area, RID p_space) {
if (area->get_space() == space) if (area->get_space() == space)
return; //pointless return; //pointless
area->set_space(space);
for (Set<Constraint2DSW *>::Element *E = area->get_constraints().front(); E; E = E->next()) { for (Set<Constraint2DSW *>::Element *E = area->get_constraints().front(); E; E = E->next()) {
RID self = E->get()->get_self(); RID self = E->get()->get_self();
if (!self.is_valid()) if (!self.is_valid())
@ -305,6 +303,8 @@ void Physics2DServerSW::area_set_space(RID p_area, RID p_space) {
free(self); free(self);
} }
area->clear_constraints(); area->clear_constraints();
area->set_space(space);
}; };
RID Physics2DServerSW::area_get_space(RID p_area) const { RID Physics2DServerSW::area_get_space(RID p_area) const {
@ -540,8 +540,6 @@ void Physics2DServerSW::body_set_space(RID p_body, RID p_space) {
if (body->get_space() == space) if (body->get_space() == space)
return; //pointless return; //pointless
body->set_space(space);
for (Map<Constraint2DSW *, int>::Element *E = body->get_constraint_map().front(); E; E = E->next()) { for (Map<Constraint2DSW *, int>::Element *E = body->get_constraint_map().front(); E; E = E->next()) {
RID self = E->key()->get_self(); RID self = E->key()->get_self();
if (!self.is_valid()) if (!self.is_valid())
@ -549,6 +547,8 @@ void Physics2DServerSW::body_set_space(RID p_body, RID p_space) {
free(self); free(self);
} }
body->clear_constraint_map(); body->clear_constraint_map();
body->set_space(space);
}; };
RID Physics2DServerSW::body_get_space(RID p_body) const { RID Physics2DServerSW::body_get_space(RID p_body) const {