summaryrefslogtreecommitdiffstats
path: root/scene/animation/tween.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-13 19:36:04 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-13 19:36:04 -0300
commit00ec16e3f3a98339ec7462675fa41b3dd240861b (patch)
treebf2b76e70583a0b94ace525cc612b267b3d9d488 /scene/animation/tween.cpp
parenta97551902e24ef1ac8fd709d77a5195b73c6c1ae (diff)
downloadredot-engine-00ec16e3f3a98339ec7462675fa41b3dd240861b.tar.gz
renamed tween animationplayer scale functions to speed_scale
Diffstat (limited to 'scene/animation/tween.cpp')
-rw-r--r--scene/animation/tween.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/scene/animation/tween.cpp b/scene/animation/tween.cpp
index 62a8286041..0916119db3 100644
--- a/scene/animation/tween.cpp
+++ b/scene/animation/tween.cpp
@@ -109,7 +109,7 @@ bool Tween::_set(const StringName& p_name, const Variant& p_value) {
String name=p_name;
if (name=="playback/speed" || name=="speed") { //bw compatibility
- set_speed(p_value);
+ set_speed_scale(p_value);
} else if (name=="playback/active") {
set_active(p_value);
@@ -192,8 +192,8 @@ void Tween::_bind_methods() {
ClassDB::bind_method(_MD("is_repeat"),&Tween::is_repeat );
ClassDB::bind_method(_MD("set_repeat","repeat"),&Tween::set_repeat );
- ClassDB::bind_method(_MD("set_speed","speed"),&Tween::set_speed);
- ClassDB::bind_method(_MD("get_speed"),&Tween::get_speed);
+ ClassDB::bind_method(_MD("set_speed_scale","speed"),&Tween::set_speed_scale);
+ ClassDB::bind_method(_MD("get_speed_scale"),&Tween::get_speed_scale);
ClassDB::bind_method(_MD("set_tween_process_mode","mode"),&Tween::set_tween_process_mode);
ClassDB::bind_method(_MD("get_tween_process_mode"),&Tween::get_tween_process_mode);
@@ -697,12 +697,12 @@ void Tween::set_repeat(bool p_repeat) {
repeat = p_repeat;
}
-void Tween::set_speed(float p_speed) {
+void Tween::set_speed_scale(float p_speed) {
speed_scale=p_speed;
}
-float Tween::get_speed() const {
+float Tween::get_speed_scale() const {
return speed_scale;
}