gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-18 21:01:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Take tween speed into account when calculating runtime

Browse source
This commit is contained in:
Rasmus Ketelsen 2018-05-23 13:55:15 +02:00
parent 0980991e64
commit c518b96362
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scene/animation/tween.cpp
View file

@ -886,6 +886,10 @@ real_t Tween::tell() const {
real_t Tween::get_runtime() const {
if (speed_scale == 0) {
return INFINITY;
}
pending_update++;
real_t runtime = 0;
for (const List<InterpolateData>::Element *E = interpolates.front(); E; E = E->next()) {
@ -896,7 +900,8 @@ real_t Tween::get_runtime() const {
runtime = t;
}
pending_update--;
return runtime;
return runtime / speed_scale;
}
bool Tween::_calc_delta_val(const Variant &p_initial_val, const Variant &p_final_val, Variant &p_delta_val) {