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

TimeScale node: return +inf remaining for 0 scale. 

(cherry picked from commit 65b7791263)
This commit is contained in:
Josh Grams 2016-03-08 07:16:25 -05:00 committed by Rémi Verschelde
parent 424a104666
commit 0635a639e9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scene/animation/animation_tree_player.cpp
View File

@ -642,7 +642,10 @@ float AnimationTreePlayer::_process_node(const StringName& p_node,AnimationNode
rem = _process_node(tsn->inputs[0].node,r_prev_anim,p_weight,p_time,switched,true,p_filter,p_reverse_weight); rem = _process_node(tsn->inputs[0].node,r_prev_anim,p_weight,p_time,switched,true,p_filter,p_reverse_weight);
else else
rem = _process_node(tsn->inputs[0].node,r_prev_anim,p_weight,p_time*tsn->scale,switched,false,p_filter,p_reverse_weight); rem = _process_node(tsn->inputs[0].node,r_prev_anim,p_weight,p_time*tsn->scale,switched,false,p_filter,p_reverse_weight);
return rem / tsn->scale; if (tsn->scale == 0)
return INFINITY;
else
return rem / tsn->scale;
} break; } break;
case NODE_TIMESEEK: { case NODE_TIMESEEK: {