Made animation parabolic
This commit is contained in:
parent
b5d7539b10
commit
932697b836
1 changed files with 2 additions and 2 deletions
|
|
@ -245,7 +245,8 @@ TimelineLayoutHelper::layout_headers_recursive(
|
||||||
|
|
||||||
// Now we have the branch_height, obscure tracks according to
|
// Now we have the branch_height, obscure tracks according to
|
||||||
// the animation state
|
// the animation state
|
||||||
offset = offset - branch_height + branch_height * animation_state / Track::MaxExpandAnimation;
|
const float a = (1.0f - (float)animation_state / (float)Track::MaxExpandAnimation);
|
||||||
|
offset = offset - branch_height * a * a;
|
||||||
|
|
||||||
TrackTree::pre_order_iterator descendant_iterator(iterator);
|
TrackTree::pre_order_iterator descendant_iterator(iterator);
|
||||||
descendant_iterator++;
|
descendant_iterator++;
|
||||||
|
|
@ -263,7 +264,6 @@ TimelineLayoutHelper::layout_headers_recursive(
|
||||||
headerBoxes.erase(track);
|
headerBoxes.erase(track);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Make sure the global animation state includes this branch's
|
// Make sure the global animation state includes this branch's
|
||||||
// animation state
|
// animation state
|
||||||
common_animation_state = max(
|
common_animation_state = max(
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue