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

Merge pull request #2812 from eska014/split-anim-tracks-button 

Split up AnimationPlayer tracks editor `Tracks` button
This commit is contained in:
Juan Linietsky 2015-11-18 19:25:16 -03:00
parent 5fb95859e1 7f5cb7512d
commit 18ab04c102
2 changed files with 52 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
tools/editor/animation_editor.cpp
View File

@ -627,22 +627,21 @@ public:
}; };
void AnimationKeyEditor::_menu_track(int p_type) { void AnimationKeyEditor::_menu_add_track(int p_type) {
ERR_FAIL_COND(!animation.is_valid()); ERR_FAIL_COND(!animation.is_valid());
last_menu_track_opt=p_type;
switch(p_type) { switch(p_type) {
case TRACK_MENU_ADD_CALL_TRACK: { case ADD_TRACK_MENU_ADD_CALL_TRACK: {
if (root) { if (root) {
call_select->popup_centered_ratio(); call_select->popup_centered_ratio();
break; break;
} }
} break; } break;
case TRACK_MENU_ADD_VALUE_TRACK: case ADD_TRACK_MENU_ADD_VALUE_TRACK:
case TRACK_MENU_ADD_TRANSFORM_TRACK: { case ADD_TRACK_MENU_ADD_TRANSFORM_TRACK: {
undo_redo->create_action("Anim Add Track"); undo_redo->create_action("Anim Add Track");
undo_redo->add_do_method(animation.ptr(),"add_track",p_type); undo_redo->add_do_method(animation.ptr(),"add_track",p_type);
@ -652,6 +651,17 @@ void AnimationKeyEditor::_menu_track(int p_type) {
} break; } break;
}
}
void AnimationKeyEditor::_menu_track(int p_type) {
ERR_FAIL_COND(!animation.is_valid());
last_menu_track_opt=p_type;
switch(p_type) {
case TRACK_MENU_SCALE: case TRACK_MENU_SCALE:
case TRACK_MENU_SCALE_PIVOT: { case TRACK_MENU_SCALE_PIVOT: {
@ -999,6 +1009,7 @@ void AnimationKeyEditor::_track_editor_draw() {
if (!animation.is_valid()) { if (!animation.is_valid()) {
v_scroll->hide(); v_scroll->hide();
h_scroll->hide(); h_scroll->hide();
menu_add_track->set_disabled(true);
menu_track->set_disabled(true); menu_track->set_disabled(true);
edit_button->set_disabled(true); edit_button->set_disabled(true);
key_editor_tab->hide(); key_editor_tab->hide();
@ -1008,6 +1019,7 @@ void AnimationKeyEditor::_track_editor_draw() {
return; return;
} }
menu_add_track->set_disabled(false);
menu_track->set_disabled(false); menu_track->set_disabled(false);
edit_button->set_disabled(false); edit_button->set_disabled(false);
move_up_button->set_disabled(false); move_up_button->set_disabled(false);
@ -2660,11 +2672,13 @@ void AnimationKeyEditor::_notification(int p_what) {
case NOTIFICATION_ENTER_TREE: { case NOTIFICATION_ENTER_TREE: {
zoomicon->set_texture( get_icon("Zoom","EditorIcons") ); zoomicon->set_texture( get_icon("Zoom","EditorIcons") );
//menu_track->set_icon(get_icon("AddTrack","EditorIcons"));
menu_track->get_popup()->add_icon_item(get_icon("KeyValue","EditorIcons"),"Add Normal Track",TRACK_MENU_ADD_VALUE_TRACK); menu_add_track->set_icon(get_icon("AddTrack","EditorIcons"));
menu_track->get_popup()->add_icon_item(get_icon("KeyXform","EditorIcons"),"Add Transform Track",TRACK_MENU_ADD_TRANSFORM_TRACK); menu_add_track->get_popup()->add_icon_item(get_icon("KeyValue","EditorIcons"),"Add Normal Track",ADD_TRACK_MENU_ADD_VALUE_TRACK);
menu_track->get_popup()->add_icon_item(get_icon("KeyCall","EditorIcons"),"Add Call Func Track",TRACK_MENU_ADD_CALL_TRACK); menu_add_track->get_popup()->add_icon_item(get_icon("KeyXform","EditorIcons"),"Add Transform Track",ADD_TRACK_MENU_ADD_TRANSFORM_TRACK);
menu_track->get_popup()->add_separator(); menu_add_track->get_popup()->add_icon_item(get_icon("KeyCall","EditorIcons"),"Add Call Func Track",ADD_TRACK_MENU_ADD_CALL_TRACK);
menu_track->set_icon(get_icon("Tools","EditorIcons"));
menu_track->get_popup()->add_item("Scale Selection",TRACK_MENU_SCALE); menu_track->get_popup()->add_item("Scale Selection",TRACK_MENU_SCALE);
menu_track->get_popup()->add_item("Scale From Cursor",TRACK_MENU_SCALE_PIVOT); menu_track->get_popup()->add_item("Scale From Cursor",TRACK_MENU_SCALE_PIVOT);
menu_track->get_popup()->add_separator(); menu_track->get_popup()->add_separator();
@ -3511,6 +3525,7 @@ void AnimationKeyEditor::_bind_methods() {
ObjectTypeDB::bind_method(_MD("_track_editor_input_event"),&AnimationKeyEditor::_track_editor_input_event); ObjectTypeDB::bind_method(_MD("_track_editor_input_event"),&AnimationKeyEditor::_track_editor_input_event);
ObjectTypeDB::bind_method(_MD("_track_name_changed"),&AnimationKeyEditor::_track_name_changed); ObjectTypeDB::bind_method(_MD("_track_name_changed"),&AnimationKeyEditor::_track_name_changed);
ObjectTypeDB::bind_method(_MD("_track_menu_selected"),&AnimationKeyEditor::_track_menu_selected); ObjectTypeDB::bind_method(_MD("_track_menu_selected"),&AnimationKeyEditor::_track_menu_selected);
ObjectTypeDB::bind_method(_MD("_menu_add_track"),&AnimationKeyEditor::_menu_add_track);
ObjectTypeDB::bind_method(_MD("_menu_track"),&AnimationKeyEditor::_menu_track); ObjectTypeDB::bind_method(_MD("_menu_track"),&AnimationKeyEditor::_menu_track);
ObjectTypeDB::bind_method(_MD("_clear_selection_for_anim"),&AnimationKeyEditor::_clear_selection_for_anim); ObjectTypeDB::bind_method(_MD("_clear_selection_for_anim"),&AnimationKeyEditor::_clear_selection_for_anim);
ObjectTypeDB::bind_method(_MD("_select_at_anim"),&AnimationKeyEditor::_select_at_anim); ObjectTypeDB::bind_method(_MD("_select_at_anim"),&AnimationKeyEditor::_select_at_anim);
@ -3563,15 +3578,6 @@ AnimationKeyEditor::AnimationKeyEditor(UndoRedo *p_undo_redo, EditorHistory *p_h
//menu->set_pos(Point2()); //menu->set_pos(Point2());
//add_child(menu); //add_child(menu);
menu_track = memnew( MenuButton );
menu_track->set_text("Tracks");
hb->add_child(menu_track);
menu_track->get_popup()->connect("item_pressed",this,"_menu_track");
hb->add_child( memnew( VSeparator ) );
zoomicon = memnew( TextureFrame ); zoomicon = memnew( TextureFrame );
hb->add_child(zoomicon); hb->add_child(zoomicon);
zoomicon->set_tooltip("Animation zoom."); zoomicon->set_tooltip("Animation zoom.");
@ -3629,6 +3635,10 @@ AnimationKeyEditor::AnimationKeyEditor(UndoRedo *p_undo_redo, EditorHistory *p_h
hb->add_child( memnew( VSeparator ) ); hb->add_child( memnew( VSeparator ) );
menu_add_track = memnew( MenuButton );
hb->add_child(menu_add_track);
menu_add_track->get_popup()->connect("item_pressed",this,"_menu_add_track");
menu_add_track->set_tooltip("Add new tracks.");
move_up_button = memnew( ToolButton ); move_up_button = memnew( ToolButton );
hb->add_child(move_up_button); hb->add_child(move_up_button);
@ -3653,6 +3663,11 @@ AnimationKeyEditor::AnimationKeyEditor(UndoRedo *p_undo_redo, EditorHistory *p_h
hb->add_child(memnew( VSeparator )); hb->add_child(memnew( VSeparator ));
menu_track = memnew( MenuButton );
hb->add_child(menu_track);
menu_track->get_popup()->connect("item_pressed",this,"_menu_track");
menu_track->set_tooltip("Track tools");
edit_button = memnew( ToolButton ); edit_button = memnew( ToolButton );
edit_button->set_toggle_mode(true); edit_button->set_toggle_mode(true);
edit_button->set_focus_mode(FOCUS_NONE); edit_button->set_focus_mode(FOCUS_NONE);

8
tools/editor/animation_editor.h
View File

@ -70,9 +70,9 @@ class AnimationKeyEditor : public VBoxContainer {
enum { enum {
TRACK_MENU_ADD_VALUE_TRACK, ADD_TRACK_MENU_ADD_VALUE_TRACK,
TRACK_MENU_ADD_TRANSFORM_TRACK, ADD_TRACK_MENU_ADD_TRANSFORM_TRACK,
TRACK_MENU_ADD_CALL_TRACK, ADD_TRACK_MENU_ADD_CALL_TRACK,
TRACK_MENU_SCALE, TRACK_MENU_SCALE,
TRACK_MENU_SCALE_PIVOT, TRACK_MENU_SCALE_PIVOT,
TRACK_MENU_MOVE_UP, TRACK_MENU_MOVE_UP,
@ -192,6 +192,7 @@ class AnimationKeyEditor : public VBoxContainer {
SpinBox *step; SpinBox *step;
MenuButton *menu_add_track;
MenuButton *menu_track; MenuButton *menu_track;
HScrollBar *h_scroll; HScrollBar *h_scroll;
@ -286,6 +287,7 @@ class AnimationKeyEditor : public VBoxContainer {
void _scroll_changed(double); void _scroll_changed(double);
void _menu_add_track(int p_type);
void _menu_track(int p_type); void _menu_track(int p_type);
void _clear_selection_for_anim(const Ref<Animation>& p_anim); void _clear_selection_for_anim(const Ref<Animation>& p_anim);