summaryrefslogtreecommitdiff
path: root/scene/animation/tween.h
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-08-16 18:30:41 +0200
committerGitHub <noreply@github.com>2018-08-16 18:30:41 +0200
commita2abe760c8e494c78b34c59ce3de5144589e188d (patch)
tree29ec555752596b885911f1ee721cd584dc49ad64 /scene/animation/tween.h
parent134d071ca7f14df7158d7fb08ec8f822b72f4c03 (diff)
parent4c2f9c19b8ae801bfc1400bbe77e3be844483389 (diff)
Merge pull request #21047 from gotnospirit/fix_tween_reversed_duration
Tween: Always remove the desired InterpolateData when finished
Diffstat (limited to 'scene/animation/tween.h')
-rw-r--r--scene/animation/tween.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/scene/animation/tween.h b/scene/animation/tween.h
index 9997349c64..aa47c00717 100644
--- a/scene/animation/tween.h
+++ b/scene/animation/tween.h
@@ -100,6 +100,7 @@ private:
real_t delay;
int args;
Variant arg[5];
+ int uid;
};
String autoplay;
@@ -107,6 +108,7 @@ private:
bool repeat;
float speed_scale;
mutable int pending_update;
+ int uid;
List<InterpolateData> interpolates;
@@ -131,7 +133,8 @@ private:
bool _apply_tween_value(InterpolateData &p_data, Variant &value);
void _tween_process(float p_delta);
- void _remove(Object *p_object, StringName p_key, bool first_only);
+ void _remove_by_uid(int uid);
+ void _push_interpolate_data(InterpolateData &p_data);
protected:
bool _set(const StringName &p_name, const Variant &p_value);