aboutsummaryrefslogtreecommitdiff
path: root/scene/animation/tween.h
diff options
context:
space:
mode:
authorRémi Verschelde2017-01-13 19:40:18 +0100
committerRémi Verschelde2017-01-13 19:40:18 +0100
commitf392b340ffa832f5395e01ff5d96ae553d0983d6 (patch)
tree3dc26858301493a8c2d68874679a9d7463999b13 /scene/animation/tween.h
parentd2aae675e92cbe99706564e2cffbc34ed7cea639 (diff)
downloadgodot-f392b340ffa832f5395e01ff5d96ae553d0983d6.tar.gz
godot-f392b340ffa832f5395e01ff5d96ae553d0983d6.tar.zst
godot-f392b340ffa832f5395e01ff5d96ae553d0983d6.zip
Diffstat (limited to 'scene/animation/tween.h')
-rw-r--r--scene/animation/tween.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/scene/animation/tween.h b/scene/animation/tween.h
index 01c5b5680..12c7aa62a 100644
--- a/scene/animation/tween.h
+++ b/scene/animation/tween.h
@@ -92,7 +92,7 @@ private:
Variant final_val;
ObjectID target_id;
StringName target_key;
- real_t times_in_sec;
+ real_t duration;
TransitionType trans_type;
EaseType ease_type;
real_t delay;
@@ -186,7 +186,7 @@ public:
, String p_property
, Variant p_initial_val
, Variant p_final_val
- , real_t p_times_in_sec
+ , real_t p_duration
, TransitionType p_trans_type
, EaseType p_ease_type
, real_t p_delay = 0
@@ -196,20 +196,20 @@ public:
, String p_method
, Variant p_initial_val
, Variant p_final_val
- , real_t p_times_in_sec
+ , real_t p_duration
, TransitionType p_trans_type
, EaseType p_ease_type
, real_t p_delay = 0
);
bool interpolate_callback(Object *p_object
- , real_t p_times_in_sec
+ , real_t p_duration
, String p_callback
, VARIANT_ARG_DECLARE
);
bool interpolate_deferred_callback(Object *p_object
- , real_t p_times_in_sec
+ , real_t p_duration
, String p_callback
, VARIANT_ARG_DECLARE
);
@@ -219,7 +219,7 @@ public:
, Variant p_initial_val
, Object *p_target
, String p_target_property
- , real_t p_times_in_sec
+ , real_t p_duration
, TransitionType p_trans_type
, EaseType p_ease_type
, real_t p_delay = 0
@@ -230,7 +230,7 @@ public:
, Variant p_initial_val
, Object *p_target
, String p_target_method
- , real_t p_times_in_sec
+ , real_t p_duration
, TransitionType p_trans_type
, EaseType p_ease_type
, real_t p_delay = 0
@@ -241,7 +241,7 @@ public:
, Object *p_initial
, String p_initial_property
, Variant p_final_val
- , real_t p_times_in_sec
+ , real_t p_duration
, TransitionType p_trans_type
, EaseType p_ease_type
, real_t p_delay = 0
@@ -252,7 +252,7 @@ public:
, Object *p_initial
, String p_initial_method
, Variant p_final_val
- , real_t p_times_in_sec
+ , real_t p_duration
, TransitionType p_trans_type
, EaseType p_ease_type
, real_t p_delay = 0