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

-fixed bodyenter/bodyexit callback of physics bodies, fixes #1739

Browse Source
This commit is contained in:
Juan Linietsky 2015-04-26 17:46:20 -03:00
parent 3bcb930e8a
commit 79d5b7f258
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scene/2d/physics_body_2d.cpp
View File

@ -277,6 +277,13 @@ void RigidBody2D::_body_inout(int p_status, ObjectID p_instance, int p_body_shap
Map<ObjectID,BodyState>::Element *E=contact_monitor->body_map.find(objid); Map<ObjectID,BodyState>::Element *E=contact_monitor->body_map.find(objid);
/*if (obj) {
if (body_in)
print_line("in: "+String(obj->call("get_name")));
else
print_line("out: "+String(obj->call("get_name")));
}*/
ERR_FAIL_COND(!body_in && !E); ERR_FAIL_COND(!body_in && !E);
if (body_in) { if (body_in) {
@ -386,14 +393,14 @@ void RigidBody2D::_direct_state_changed(Object *p_state) {
ObjectID obj = state->get_contact_collider_id(i); ObjectID obj = state->get_contact_collider_id(i);
int local_shape = state->get_contact_local_shape(i); int local_shape = state->get_contact_local_shape(i);
int shape = state->get_contact_collider_shape(i); int shape = state->get_contact_collider_shape(i);
toadd[i].local_shape=local_shape;
toadd[i].id=obj;
toadd[i].shape=shape;
// bool found=false; // bool found=false;
Map<ObjectID,BodyState>::Element *E=contact_monitor->body_map.find(obj); Map<ObjectID,BodyState>::Element *E=contact_monitor->body_map.find(obj);
if (!E) { if (!E) {
toadd[toadd_count].local_shape=local_shape;
toadd[toadd_count].id=obj;
toadd[toadd_count].shape=shape;
toadd_count++; toadd_count++;
continue; continue;
} }
@ -402,6 +409,9 @@ void RigidBody2D::_direct_state_changed(Object *p_state) {
int idx = E->get().shapes.find(sp); int idx = E->get().shapes.find(sp);
if (idx==-1) { if (idx==-1) {
toadd[toadd_count].local_shape=local_shape;
toadd[toadd_count].id=obj;
toadd[toadd_count].shape=shape;
toadd_count++; toadd_count++;
continue; continue;
} }

11
scene/3d/physics_body.cpp
View File

@ -338,14 +338,14 @@ void RigidBody::_direct_state_changed(Object *p_state) {
ObjectID obj = state->get_contact_collider_id(i); ObjectID obj = state->get_contact_collider_id(i);
int local_shape = state->get_contact_local_shape(i); int local_shape = state->get_contact_local_shape(i);
int shape = state->get_contact_collider_shape(i); int shape = state->get_contact_collider_shape(i);
toadd[i].local_shape=local_shape;
toadd[i].id=obj;
toadd[i].shape=shape;
bool found=false; // bool found=false;
Map<ObjectID,BodyState>::Element *E=contact_monitor->body_map.find(obj); Map<ObjectID,BodyState>::Element *E=contact_monitor->body_map.find(obj);
if (!E) { if (!E) {
toadd[toadd_count].local_shape=local_shape;
toadd[toadd_count].id=obj;
toadd[toadd_count].shape=shape;
toadd_count++; toadd_count++;
continue; continue;
} }
@ -354,6 +354,9 @@ void RigidBody::_direct_state_changed(Object *p_state) {
int idx = E->get().shapes.find(sp); int idx = E->get().shapes.find(sp);
if (idx==-1) { if (idx==-1) {
toadd[toadd_count].local_shape=local_shape;
toadd[toadd_count].id=obj;
toadd[toadd_count].shape=shape;
toadd_count++; toadd_count++;
continue; continue;
} }