summaryrefslogtreecommitdiff
path: root/scene/2d
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-08-13 17:26:59 +0200
committerGitHub <noreply@github.com>2017-08-13 17:26:59 +0200
commit9575dbdf788e8a5154b3ec2f66913e731ac02850 (patch)
treeded30f35912c29b6c0b53223c3c52875c73772de /scene/2d
parent26137f37ebb4ddf005950b1ebd0c153738bd7fed (diff)
parentfb40846dca330015d235c5b056895e46d59fce85 (diff)
Merge pull request #10298 from nhold/kinematic-body-2d-_move-fixes-#10107
Fix missing and incorrect values in return value of _move method
Diffstat (limited to 'scene/2d')
-rw-r--r--scene/2d/physics_body_2d.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp
index 2f1e8925b8..6ec1642138 100644
--- a/scene/2d/physics_body_2d.cpp
+++ b/scene/2d/physics_body_2d.cpp
@@ -982,11 +982,12 @@ Dictionary KinematicBody2D::_move(const Vector2 &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;
d["collider_id"] = col.collider;
+ d["collider_velocity"] = col.collider_vel;
if (col.collider) {
d["collider"] = ObjectDB::get_instance(col.collider);
} else {