godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15161 from volzhs/tween-follow

Browse Source 
Fix Tween follow not working
This commit is contained in:
Rémi Verschelde 2018-01-03 11:45:19 +01:00 committed by GitHub
commit b23f7bc923
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scene/animation/tween.cpp
View File

@ -561,17 +561,7 @@ void Tween::_tween_process(float p_delta) {
data.finish = true; data.finish = true;
} }
switch (data.type) { if (data.type == INTER_CALLBACK) {
case INTER_PROPERTY:
case INTER_METHOD: {
Variant result = _run_equation(data);
emit_signal("tween_step", object, NodePath(Vector<StringName>(), data.key, false), data.elapsed, result);
_apply_tween_value(data, result);
if (data.finish)
_apply_tween_value(data, data.final_val);
} break;
case INTER_CALLBACK:
if (data.finish) { if (data.finish) {
if (data.call_deferred) { if (data.call_deferred) {
@ -607,11 +597,14 @@ void Tween::_tween_process(float p_delta) {
object->call(data.key[0], (const Variant **)arg, data.args, error); object->call(data.key[0], (const Variant **)arg, data.args, error);
} }
} }
break; } else {
default: {} Variant result = _run_equation(data);
emit_signal("tween_step", object, NodePath(Vector<StringName>(), data.key, false), data.elapsed, result);
_apply_tween_value(data, result);
} }
if (data.finish) { if (data.finish) {
_apply_tween_value(data, data.final_val);
emit_signal("tween_completed", object, NodePath(Vector<StringName>(), data.key, false)); emit_signal("tween_completed", object, NodePath(Vector<StringName>(), data.key, false));
// not repeat mode, remove completed action // not repeat mode, remove completed action
if (!repeat) if (!repeat)