diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-07-01 12:24:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-01 12:24:29 +0200 |
| commit | c9b57d4b4017a9bc25478a6334e3e1c74311f9c6 (patch) | |
| tree | 3ffca62530d97bc22d6a35736c3e08ce3d45b61a /scene/3d/physics_body.h | |
| parent | 68c106d60d66d9b685ecbed8dac6b6ce7b50f42a (diff) | |
| parent | 16cf262e34ca37c62e6d7e1b41df42f87ac0bb6b (diff) | |
Merge pull request #19884 from AndreaCatania/compfix
Fixes #19648 Kinematic body move_and_slide compatibility issue
Diffstat (limited to 'scene/3d/physics_body.h')
| -rw-r--r-- | scene/3d/physics_body.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/3d/physics_body.h b/scene/3d/physics_body.h index 17d2769c79..0190dcbfc3 100644 --- a/scene/3d/physics_body.h +++ b/scene/3d/physics_body.h @@ -303,7 +303,7 @@ public: void set_safe_margin(float p_margin); float get_safe_margin() const; - Vector3 move_and_slide(const Vector3 &p_linear_velocity, const Vector3 &p_floor_direction = Vector3(0, 0, 0), bool p_infinite_inertia = true, float p_slope_stop_min_velocity = 0.05, int p_max_slides = 4, float p_floor_max_angle = Math::deg2rad((float)45)); + Vector3 move_and_slide(const Vector3 &p_linear_velocity, const Vector3 &p_floor_direction = Vector3(0, 0, 0), float p_slope_stop_min_velocity = 0.05, int p_max_slides = 4, float p_floor_max_angle = Math::deg2rad((float)45), bool p_infinite_inertia = true); bool is_on_floor() const; bool is_on_wall() const; bool is_on_ceiling() const; |