diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-06-24 12:33:52 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-06-24 12:34:29 -0300 |
| commit | bc509ac7bdb7e252862a68c9b99717f9537c47b7 (patch) | |
| tree | ca0d35565dab03d3601f1ed19a8d9acd18ec0a43 /servers | |
| parent | cc2cd208708edfb7eeb7a6d53090c8c68f40b190 (diff) | |
Simplified 2D Kinematicbody.. 3D will wait a bit.
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/physics_2d/space_2d_sw.cpp | 1 | ||||
| -rw-r--r-- | servers/physics_2d_server.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/servers/physics_2d/space_2d_sw.cpp b/servers/physics_2d/space_2d_sw.cpp index b197ba5905..0b31ff144b 100644 --- a/servers/physics_2d/space_2d_sw.cpp +++ b/servers/physics_2d/space_2d_sw.cpp @@ -781,6 +781,7 @@ bool Space2DSW::test_body_motion(Body2DSW *p_body, const Transform2D &p_from, co r_result->collider = rcd.best_object->get_self(); r_result->collider_id = rcd.best_object->get_instance_id(); r_result->collider_shape = rcd.best_shape; + r_result->collision_local_shape = best_shape; r_result->collision_normal = rcd.best_normal; r_result->collision_point = rcd.best_contact; r_result->collider_metadata = rcd.best_object->get_shape_metadata(rcd.best_shape); diff --git a/servers/physics_2d_server.h b/servers/physics_2d_server.h index f25f05bafc..f50faa42eb 100644 --- a/servers/physics_2d_server.h +++ b/servers/physics_2d_server.h @@ -474,6 +474,7 @@ public: Vector2 collision_point; Vector2 collision_normal; Vector2 collider_velocity; + int collision_local_shape; ObjectID collider_id; RID collider; int collider_shape; |