diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-05-05 00:19:22 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-05-05 00:19:22 -0300 |
commit | 9b03ea903e17d133a1122aeee5ab54e22ab16110 (patch) | |
tree | b77bc59aeb98437ce16ca8a1441cf1846b19a8fe /scene/animation/tween.h | |
parent | d19e49a969aecf4ce859680da1f725029034a27d (diff) | |
parent | 6d0914dfc5d439701d93e42da26d4be95f6eda80 (diff) |
Merge pull request #1814 from sanikoyes/Pr-Tween-fix
Pr-Tween-fix
Diffstat (limited to 'scene/animation/tween.h')
-rw-r--r-- | scene/animation/tween.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/scene/animation/tween.h b/scene/animation/tween.h index 76402bcd73..d504c63d8a 100644 --- a/scene/animation/tween.h +++ b/scene/animation/tween.h @@ -110,6 +110,27 @@ private: List<InterpolateData> interpolates; + struct PendingCommand { + StringName key; + int args; + Variant arg[10]; + }; + List<PendingCommand> pending_commands; + + void _add_pending_command(StringName p_key + ,const Variant& p_arg1=Variant() + ,const Variant& p_arg2=Variant() + ,const Variant& p_arg3=Variant() + ,const Variant& p_arg4=Variant() + ,const Variant& p_arg5=Variant() + ,const Variant& p_arg6=Variant() + ,const Variant& p_arg7=Variant() + ,const Variant& p_arg8=Variant() + ,const Variant& p_arg9=Variant() + ,const Variant& p_arg10=Variant() + ); + void _process_pending_commands(); + typedef real_t (*interpolater)(real_t t, real_t b, real_t c, real_t d); static interpolater interpolaters[TRANS_COUNT][EASE_COUNT]; |