summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Beedie <jellonator00@gmail.com>2017-08-31 09:51:36 -0400
committerJames Beedie <jellonator00@gmail.com>2017-08-31 10:46:21 -0400
commit6fc5d1cd370bc16e9e4fd50733393497211f86b6 (patch)
tree61ca7c6c4025e471dee8b1a05222265223137c69
parentcaf1447befba37e87bfef31192b98b9fbe2306b1 (diff)
Fixed return of KinematicBody::_move
Fixed incorrect normal Added missing collider velocity
-rw-r--r--scene/3d/physics_body.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp
index a0a393e8ed..9590394211 100644
--- a/scene/3d/physics_body.cpp
+++ b/scene/3d/physics_body.cpp
@@ -918,7 +918,7 @@ Dictionary KinematicBody::_move(const Vector3 &p_motion) {
if (move(p_motion, col)) {
Dictionary d;
d["position"] = col.collision;
- d["normal"] = col.collision;
+ d["normal"] = col.normal;
d["local_shape"] = col.local_shape;
d["travel"] = col.travel;
d["remainder"] = col.remainder;
@@ -929,6 +929,7 @@ Dictionary KinematicBody::_move(const Vector3 &p_motion) {
d["collider"] = Variant();
}
+ d["collider_velocity"] = col.collider_vel;
d["collider_shape_index"] = col.collider_shape;
d["collider_metadata"] = col.collider_metadata;