godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-14 13:41:12 +00:00
Code Releases Wiki Activity

Revert "Added toggle for loop interpolation based on adolson's code"

Browse Source 
This reverts commits 8884b8f519
bd5c8f2aa0
and 5cb31f6d5b.

<reduz> Akien, I understand the need for the second loop mode, but I think
the current UI is pretty confusing. I think this should be changed for an
enum, both there and in the animation.. otherwise we should revert it
[...]
<reduz> alternatively this could be added per track, which I think should
make it a little less confusing

Reopens #959..
This commit is contained in:
Rémi Verschelde
2016-06-26 21:19:58 +02:00
parent 10f411b47b
commit da034f324a
6 changed files with 4 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tools/editor/animation_editor.cpp
View File

@@ -2922,7 +2922,6 @@ void AnimationKeyEditor::_notification(int p_what) {
edit_button->connect("pressed",this,"_toggle_edit_curves");
loop->set_icon(get_icon("Loop","EditorIcons"));
loop_interpolation->set_icon(get_icon("LoopInterpolation","EditorIcons"));
curve_edit->connect("transition_changed",this,"_curve_transition_changed");
//edit_button->add_color_override("font_color",get_color("font_color","Tree"));
@@ -3013,7 +3012,6 @@ void AnimationKeyEditor::_update_menu() {
length->set_val(animation->get_length());
loop->set_pressed(animation->has_loop());
loop_interpolation->set_pressed(animation->has_loop_interpolation());
step->set_val(animation->get_step());
}
@@ -3469,21 +3467,6 @@ void AnimationKeyEditor::_animation_loop_changed() {
}
void AnimationKeyEditor::_animation_loop_interpolation_changed() {
if (updating)
return;
if (!animation.is_null()) {
undo_redo->create_action(TTR("Change Anim Loop Interpolation"));
undo_redo->add_do_method(animation.ptr(),"set_loop_interpolation",loop_interpolation->is_pressed());
undo_redo->add_undo_method(animation.ptr(),"set_loop_interpolation",!loop_interpolation->is_pressed());
undo_redo->commit_action();
}
}
void AnimationKeyEditor::_create_value_item(int p_type) {
@@ -3769,7 +3752,6 @@ void AnimationKeyEditor::_bind_methods() {
ObjectTypeDB::bind_method(_MD("_animation_loop_changed"),&AnimationKeyEditor::_animation_loop_changed);
ObjectTypeDB::bind_method(_MD("_animation_loop_interpolation_changed"),&AnimationKeyEditor::_animation_loop_interpolation_changed);
ObjectTypeDB::bind_method(_MD("_animation_len_changed"),&AnimationKeyEditor::_animation_len_changed);
ObjectTypeDB::bind_method(_MD("_create_value_item"),&AnimationKeyEditor::_create_value_item);
ObjectTypeDB::bind_method(_MD("_pane_drag"),&AnimationKeyEditor::_pane_drag);
@@ -3880,12 +3862,6 @@ AnimationKeyEditor::AnimationKeyEditor() {
hb->add_child(loop);
loop->set_tooltip(TTR("Enable/Disable looping in animation."));
loop_interpolation = memnew( ToolButton );
loop_interpolation->set_toggle_mode(true);
loop_interpolation->connect("pressed",this,"_animation_loop_interpolation_changed");
hb->add_child(loop_interpolation);
loop_interpolation->set_tooltip(TTR("Enable/Disable interpolation when looping animation."));
hb->add_child( memnew( VSeparator ) );
menu_add_track = memnew( MenuButton );