Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-26 06:03:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #19120 from Keetz/master

Browse Source 
Take tween speed into account when calculating runtime
This commit is contained in:
Max Hilbrunner 2018-05-25 16:17:55 +02:00 committed by GitHub
commit 47cfdfe2ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 { real_t Tween::get_runtime() const {
if (speed_scale == 0) {
return INFINITY;
}
pending_update++; pending_update++;
real_t runtime = 0; real_t runtime = 0;
for (const List<InterpolateData>::Element *E = interpolates.front(); E; E = E->next()) { for (const List<InterpolateData>::Element *E = interpolates.front(); E; E = E->next()) {
@ -896,7 +900,8 @@ real_t Tween::get_runtime() const {
runtime = t; runtime = t;
} }
pending_update--; 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) { bool Tween::_calc_delta_val(const Variant &p_initial_val, const Variant &p_final_val, Variant &p_delta_val) {