maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make it possible to call move_and_slide from _process, even if it is not recommended

Browse source 
Previously, it would reuse the _physics_process delta, causing it to move faster on faster framerates

Fixes #17516
This commit is contained in:
Bojidar Marinov 2018-03-15 14:29:22 +02:00
parent d403b4086c
commit d94c76a199
No known key found for this signature in database
GPG key ID: 4D546A8F1E091856
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scene/2d/physics_body_2d.cpp
View file

@ -1237,7 +1237,8 @@ Vector2 KinematicBody2D::move_and_slide(const Vector2 &p_linear_velocity, const
}
}
Vector2 motion = (floor_motion + p_linear_velocity) * get_physics_process_delta_time();
// Hack in order to work with calling from _process as well as from _physics_process; calling from thread is risky
Vector2 motion = (floor_motion + p_linear_velocity) * (Engine::get_singleton()->is_in_physics_frame() ? get_physics_process_delta_time() : get_process_delta_time());
Vector2 lv = p_linear_velocity;
on_floor = false;

3
scene/3d/physics_body.cpp
View file

@ -1167,7 +1167,8 @@ Vector3 KinematicBody::move_and_slide(const Vector3 &p_linear_velocity, const Ve
}
}
Vector3 motion = (floor_velocity + lv) * get_physics_process_delta_time();
// Hack in order to work with calling from _process as well as from _physics_process; calling from thread is risky
Vector3 motion = (floor_velocity + lv) * (Engine::get_singleton()->is_in_physics_frame() ? get_physics_process_delta_time() : get_process_delta_time());
on_floor = false;
on_ceiling = false;