From 5dbf1809c6e3e905b94b8764e99491e608122261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 5 Mar 2017 16:44:50 +0100 Subject: A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code --- editor/plugins/animation_player_editor_plugin.cpp | 790 ++++++++++------------ 1 file changed, 347 insertions(+), 443 deletions(-) (limited to 'editor/plugins/animation_player_editor_plugin.cpp') diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index 2e6792bbaa..90d2847103 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -28,17 +28,17 @@ /*************************************************************************/ #include "animation_player_editor_plugin.h" +#include "editor/animation_editor.h" +#include "editor/editor_settings.h" #include "global_config.h" #include "io/resource_loader.h" #include "io/resource_saver.h" #include "os/keyboard.h" -#include "editor/editor_settings.h" -#include "editor/animation_editor.h" void AnimationPlayerEditor::_node_removed(Node *p_node) { if (player && player == p_node) { - player=NULL; + player = NULL; set_process(false); @@ -47,18 +47,15 @@ void AnimationPlayerEditor::_node_removed(Node *p_node) { key_editor->show_select_node_warning(true); _update_player(); //editor->animation_editor_make_visible(false); - } } void AnimationPlayerEditor::_gui_input(InputEvent p_event) { - - } void AnimationPlayerEditor::_notification(int p_what) { - if (p_what==NOTIFICATION_PROCESS) { + if (p_what == NOTIFICATION_PROCESS) { if (!player) return; @@ -68,7 +65,7 @@ void AnimationPlayerEditor::_notification(int p_what) { if (player->is_playing()) { { - String animname=player->get_current_animation(); + String animname = player->get_current_animation(); if (player->has_animation(animname)) { Ref anim = player->get_animation(animname); @@ -88,41 +85,41 @@ void AnimationPlayerEditor::_notification(int p_what) { frame->set_value(player->get_current_animation_pos()); } - last_active=player->is_playing(); + last_active = player->is_playing(); //seek->set_val(player->get_pos()); updating = false; } - if (p_what==NOTIFICATION_ENTER_TREE) { + if (p_what == NOTIFICATION_ENTER_TREE) { //editor->connect("hide_animation_player_editors",this,"_hide_anim_editors"); - add_anim->set_icon( get_icon("New","EditorIcons") ); - rename_anim->set_icon( get_icon("Rename","EditorIcons") ); - duplicate_anim->set_icon( get_icon("Duplicate","EditorIcons") ); - autoplay->set_icon( get_icon("AutoPlay","EditorIcons") ); - load_anim->set_icon( get_icon("Folder","EditorIcons") ); + add_anim->set_icon(get_icon("New", "EditorIcons")); + rename_anim->set_icon(get_icon("Rename", "EditorIcons")); + duplicate_anim->set_icon(get_icon("Duplicate", "EditorIcons")); + autoplay->set_icon(get_icon("AutoPlay", "EditorIcons")); + load_anim->set_icon(get_icon("Folder", "EditorIcons")); save_anim->set_icon(get_icon("Save", "EditorIcons")); save_anim->get_popup()->connect("id_pressed", this, "_animation_save_menu"); - remove_anim->set_icon( get_icon("Remove","EditorIcons") ); + remove_anim->set_icon(get_icon("Remove", "EditorIcons")); - blend_anim->set_icon( get_icon("Blend","EditorIcons") ); - play->set_icon( get_icon("PlayStart","EditorIcons") ); - play_from->set_icon( get_icon("Play","EditorIcons") ); - play_bw->set_icon( get_icon("PlayStartBackwards","EditorIcons") ); - play_bw_from->set_icon( get_icon("PlayBackwards","EditorIcons") ); + blend_anim->set_icon(get_icon("Blend", "EditorIcons")); + play->set_icon(get_icon("PlayStart", "EditorIcons")); + play_from->set_icon(get_icon("Play", "EditorIcons")); + play_bw->set_icon(get_icon("PlayStartBackwards", "EditorIcons")); + play_bw_from->set_icon(get_icon("PlayBackwards", "EditorIcons")); - autoplay_icon=get_icon("AutoPlay","EditorIcons"); - stop->set_icon( get_icon("Stop","EditorIcons") ); - resource_edit_anim->set_icon( get_icon("EditResource","EditorIcons") ); - pin->set_icon(get_icon("Pin","EditorIcons") ); - tool_anim->set_icon(get_icon("Tools","EditorIcons")); - tool_anim->get_popup()->connect("id_pressed",this,"_animation_tool_menu"); + autoplay_icon = get_icon("AutoPlay", "EditorIcons"); + stop->set_icon(get_icon("Stop", "EditorIcons")); + resource_edit_anim->set_icon(get_icon("EditResource", "EditorIcons")); + pin->set_icon(get_icon("Pin", "EditorIcons")); + tool_anim->set_icon(get_icon("Tools", "EditorIcons")); + tool_anim->get_popup()->connect("id_pressed", this, "_animation_tool_menu"); blend_editor.next->connect("item_selected", this, "_blend_editor_next_changed"); - nodename->set_icon(get_icon("AnimationPlayer","EditorIcons")); + nodename->set_icon(get_icon("AnimationPlayer", "EditorIcons")); -/* + /* anim_editor_load->set_normal_texture( get_icon("AnimGet","EditorIcons")); anim_editor_store->set_normal_texture( get_icon("AnimSet","EditorIcons")); anim_editor_load->set_pressed_texture( get_icon("AnimGet","EditorIcons")); @@ -131,7 +128,7 @@ void AnimationPlayerEditor::_notification(int p_what) { anim_editor_store->set_hover_texture( get_icon("AnimSetHl","EditorIcons")); */ - get_tree()->connect("node_removed",this,"_node_removed"); + get_tree()->connect("node_removed", this, "_node_removed"); } } @@ -139,46 +136,44 @@ void AnimationPlayerEditor::_autoplay_pressed() { if (updating) return; - if (animation->get_item_count()==0) { + if (animation->get_item_count() == 0) { return; } - String current = animation->get_item_text( animation->get_selected() ); - if (player->get_autoplay()==current) { + String current = animation->get_item_text(animation->get_selected()); + if (player->get_autoplay() == current) { //unset undo_redo->create_action(TTR("Toggle Autoplay")); - undo_redo->add_do_method(player,"set_autoplay",""); - undo_redo->add_undo_method(player,"set_autoplay",player->get_autoplay()); - undo_redo->add_do_method(this,"_animation_player_changed",player); - undo_redo->add_undo_method(this,"_animation_player_changed",player); + undo_redo->add_do_method(player, "set_autoplay", ""); + undo_redo->add_undo_method(player, "set_autoplay", player->get_autoplay()); + undo_redo->add_do_method(this, "_animation_player_changed", player); + undo_redo->add_undo_method(this, "_animation_player_changed", player); undo_redo->commit_action(); - } else { //set undo_redo->create_action(TTR("Toggle Autoplay")); - undo_redo->add_do_method(player,"set_autoplay",current); - undo_redo->add_undo_method(player,"set_autoplay",player->get_autoplay()); - undo_redo->add_do_method(this,"_animation_player_changed",player); - undo_redo->add_undo_method(this,"_animation_player_changed",player); + undo_redo->add_do_method(player, "set_autoplay", current); + undo_redo->add_undo_method(player, "set_autoplay", player->get_autoplay()); + undo_redo->add_do_method(this, "_animation_player_changed", player); + undo_redo->add_undo_method(this, "_animation_player_changed", player); undo_redo->commit_action(); } - } void AnimationPlayerEditor::_play_pressed() { String current; - if (animation->get_selected()>=0 && animation->get_selected()get_item_count()) { + if (animation->get_selected() >= 0 && animation->get_selected() < animation->get_item_count()) { - current = animation->get_item_text( animation->get_selected() ); + current = animation->get_item_text(animation->get_selected()); } - if (current!="") { + if (current != "") { - if (current==player->get_current_animation()) + if (current == player->get_current_animation()) player->stop(); //so it wont blend with itself - player->play(current ); + player->play(current); } //unstop @@ -190,21 +185,21 @@ void AnimationPlayerEditor::_play_pressed() { void AnimationPlayerEditor::_play_from_pressed() { String current; - if (animation->get_selected()>=0 && animation->get_selected()get_item_count()) { + if (animation->get_selected() >= 0 && animation->get_selected() < animation->get_item_count()) { - current = animation->get_item_text( animation->get_selected() ); + current = animation->get_item_text(animation->get_selected()); } - if (current!="") { + if (current != "") { float time = player->get_current_animation_pos(); - if (current==player->get_current_animation() && player->is_playing()) { + if (current == player->get_current_animation() && player->is_playing()) { player->stop(); //so it wont blend with itself } - player->play( current ); + player->play(current); player->seek(time); } @@ -214,20 +209,19 @@ void AnimationPlayerEditor::_play_from_pressed() { //pause->set_pressed(false); } - void AnimationPlayerEditor::_play_bw_pressed() { String current; - if (animation->get_selected()>=0 && animation->get_selected()get_item_count()) { + if (animation->get_selected() >= 0 && animation->get_selected() < animation->get_item_count()) { - current = animation->get_item_text( animation->get_selected() ); + current = animation->get_item_text(animation->get_selected()); } - if (current!="") { + if (current != "") { - if (current==player->get_current_animation()) + if (current == player->get_current_animation()) player->stop(); //so it wont blend with itself - player->play(current,-1,-1,true); + player->play(current, -1, -1, true); } //unstop @@ -239,18 +233,18 @@ void AnimationPlayerEditor::_play_bw_pressed() { void AnimationPlayerEditor::_play_bw_from_pressed() { String current; - if (animation->get_selected()>=0 && animation->get_selected()get_item_count()) { + if (animation->get_selected() >= 0 && animation->get_selected() < animation->get_item_count()) { - current = animation->get_item_text( animation->get_selected() ); + current = animation->get_item_text(animation->get_selected()); } - if (current!="") { + if (current != "") { float time = player->get_current_animation_pos(); - if (current==player->get_current_animation()) + if (current == player->get_current_animation()) player->stop(); //so it wont blend with itself - player->play(current,-1,-1,true); + player->play(current, -1, -1, true); player->seek(time); } @@ -279,17 +273,16 @@ void AnimationPlayerEditor::_animation_selected(int p_which) { // when selecting an animation, the idea is that the only interesting behavior // ui-wise is that it should play/blend the next one if currently playing String current; - if (animation->get_selected()>=0 && animation->get_selected()get_item_count()) { + if (animation->get_selected() >= 0 && animation->get_selected() < animation->get_item_count()) { - current = animation->get_item_text( animation->get_selected() ); + current = animation->get_item_text(animation->get_selected()); } - if (current!="") { - + if (current != "") { - player->set_current_animation( current ); + player->set_current_animation(current); - Ref anim = player->get_animation(current); + Ref anim = player->get_animation(current); { key_editor->set_animation(anim); @@ -304,76 +297,69 @@ void AnimationPlayerEditor::_animation_selected(int p_which) { else frame->set_step(0.00001); - - } else { key_editor->set_animation(Ref()); key_editor->set_root(NULL); - } - - autoplay->set_pressed(current==player->get_autoplay()); + autoplay->set_pressed(current == player->get_autoplay()); } void AnimationPlayerEditor::_animation_new() { - renaming=false; + renaming = false; name_title->set_text(TTR("New Animation Name:")); - int count=1; - String base=TTR("New Anim"); - while(true) { - String attempt = base; - if (count>1) - attempt+=" ("+itos(count)+")"; + int count = 1; + String base = TTR("New Anim"); + while (true) { + String attempt = base; + if (count > 1) + attempt += " (" + itos(count) + ")"; if (player->has_animation(attempt)) { count++; continue; } - base=attempt; + base = attempt; break; } name->set_text(base); - name_dialog->popup_centered(Size2(300,90)); + name_dialog->popup_centered(Size2(300, 90)); name->select_all(); name->grab_focus(); } void AnimationPlayerEditor::_animation_rename() { - if (animation->get_item_count()==0) + if (animation->get_item_count() == 0) return; int selected = animation->get_selected(); String selected_name = animation->get_item_text(selected); name_title->set_text(TTR("Change Animation Name:")); name->set_text(selected_name); - renaming=true; - name_dialog->popup_centered(Size2(300,90)); + renaming = true; + name_dialog->popup_centered(Size2(300, 90)); name->select_all(); name->grab_focus(); - } void AnimationPlayerEditor::_animation_load() { ERR_FAIL_COND(!player); - file->set_mode( EditorFileDialog::MODE_OPEN_FILE ); + file->set_mode(EditorFileDialog::MODE_OPEN_FILE); file->clear_filters(); List extensions; - ResourceLoader::get_recognized_extensions_for_type("Animation",&extensions); - for (List::Element *E=extensions.front();E;E=E->next()) { - - file->add_filter("*."+E->get()+" ; "+E->get().to_upper() ); + ResourceLoader::get_recognized_extensions_for_type("Animation", &extensions); + for (List::Element *E = extensions.front(); E; E = E->next()) { + file->add_filter("*." + E->get() + " ; " + E->get().to_upper()); } file->popup_centered_ratio(); current_option = RESOURCE_LOAD; } - -void AnimationPlayerEditor::_animation_save_in_path(const Ref& p_resource, const String& p_path) { +void AnimationPlayerEditor::_animation_save_in_path(const Ref &p_resource, const String &p_path) { int flg = 0; if (EditorSettings::get_singleton()->get("filesystem/on_save/compress_binary_resources")) @@ -393,29 +379,27 @@ void AnimationPlayerEditor::_animation_save_in_path(const Ref& p_resou } //EditorFileSystem::get_singleton()->update_file(path,p_resource->get_type()); - ((Resource*)p_resource.ptr())->set_path(path); + ((Resource *)p_resource.ptr())->set_path(path); editor->emit_signal("resource_saved", p_resource); - } -void AnimationPlayerEditor::_animation_save(const Ref& p_resource) { +void AnimationPlayerEditor::_animation_save(const Ref &p_resource) { if (p_resource->get_path().is_resource_file()) { _animation_save_in_path(p_resource, p_resource->get_path()); - } - else { + } else { _animation_save_as(p_resource); } } -void AnimationPlayerEditor::_animation_save_as(const Ref& p_resource) { +void AnimationPlayerEditor::_animation_save_as(const Ref &p_resource) { file->set_mode(EditorFileDialog::MODE_SAVE_FILE); List extensions; ResourceSaver::get_recognized_extensions(p_resource, &extensions); file->clear_filters(); - for (int i = 0; iadd_filter("*." + extensions[i] + " ; " + extensions[i].to_upper()); } @@ -429,20 +413,17 @@ void AnimationPlayerEditor::_animation_save_as(const Ref& p_resource) file->set_current_path(p_resource->get_path().replacen("." + ext, "." + extensions.front()->get())); } } - } - else { + } else { String existing; if (extensions.size()) { - if( p_resource->get_name() != "" ) { + if (p_resource->get_name() != "") { existing = p_resource->get_name() + "." + extensions.front()->get().to_lower(); - } - else { + } else { existing = "new_" + p_resource->get_class().to_lower() + "." + extensions.front()->get().to_lower(); } } file->set_current_path(existing); - } file->popup_centered_ratio(); file->set_title(TTR("Save Resource As..")); @@ -471,25 +452,23 @@ void AnimationPlayerEditor::_animation_remove_confirmed() { undo_redo->commit_action(); } -void AnimationPlayerEditor::_select_anim_by_name(const String& p_anim) { +void AnimationPlayerEditor::_select_anim_by_name(const String &p_anim) { - int idx=-1; - for(int i=0;iget_item_count();i++) { + int idx = -1; + for (int i = 0; i < animation->get_item_count(); i++) { - if (animation->get_item_text(i)==p_anim) { + if (animation->get_item_text(i) == p_anim) { - idx=i; + idx = i; break; } } - ERR_FAIL_COND(idx==-1); - + ERR_FAIL_COND(idx == -1); animation->select(idx); _animation_selected(idx); - } void AnimationPlayerEditor::_animation_name_edited() { @@ -497,13 +476,13 @@ void AnimationPlayerEditor::_animation_name_edited() { player->stop(); String new_name = name->get_text(); - if (new_name=="" || new_name.find(":")!=-1 || new_name.find("/")!=-1) { + if (new_name == "" || new_name.find(":") != -1 || new_name.find("/") != -1) { error_dialog->set_text(TTR("ERROR: Invalid animation name!")); error_dialog->popup_centered_minsize(); return; } - if (renaming && animation->get_item_count()>0 && animation->get_item_text(animation->get_selected())==new_name) { + if (renaming && animation->get_item_count() > 0 && animation->get_item_text(animation->get_selected()) == new_name) { name_dialog->hide(); return; } @@ -516,51 +495,49 @@ void AnimationPlayerEditor::_animation_name_edited() { if (renaming) { String current = animation->get_item_text(animation->get_selected()); - Ref anim = player->get_animation(current); + Ref anim = player->get_animation(current); undo_redo->create_action(TTR("Rename Animation")); - undo_redo->add_do_method(player,"rename_animation",current,new_name); - undo_redo->add_do_method(anim.ptr(),"set_name",new_name); - undo_redo->add_undo_method(player,"rename_animation",new_name,current); - undo_redo->add_undo_method(anim.ptr(),"set_name",current); - undo_redo->add_do_method(this,"_animation_player_changed",player); - undo_redo->add_undo_method(this,"_animation_player_changed",player); + undo_redo->add_do_method(player, "rename_animation", current, new_name); + undo_redo->add_do_method(anim.ptr(), "set_name", new_name); + undo_redo->add_undo_method(player, "rename_animation", new_name, current); + undo_redo->add_undo_method(anim.ptr(), "set_name", current); + undo_redo->add_do_method(this, "_animation_player_changed", player); + undo_redo->add_undo_method(this, "_animation_player_changed", player); undo_redo->commit_action(); _select_anim_by_name(new_name); } else { - Ref new_anim = Ref(memnew( Animation )); + Ref new_anim = Ref(memnew(Animation)); new_anim->set_name(new_name); undo_redo->create_action(TTR("Add Animation")); - undo_redo->add_do_method(player,"add_animation",new_name,new_anim); - undo_redo->add_undo_method(player,"remove_animation",new_name); - undo_redo->add_do_method(this,"_animation_player_changed",player); - undo_redo->add_undo_method(this,"_animation_player_changed",player); + undo_redo->add_do_method(player, "add_animation", new_name, new_anim); + undo_redo->add_undo_method(player, "remove_animation", new_name); + undo_redo->add_do_method(this, "_animation_player_changed", player); + undo_redo->add_undo_method(this, "_animation_player_changed", player); undo_redo->commit_action(); _select_anim_by_name(new_name); - } name_dialog->hide(); } - void AnimationPlayerEditor::_blend_editor_next_changed(const int p_idx) { - if (animation->get_item_count()==0) + if (animation->get_item_count() == 0) return; String current = animation->get_item_text(animation->get_selected()); undo_redo->create_action(TTR("Blend Next Changed")); - undo_redo->add_do_method(player,"animation_set_next",current,blend_editor.next->get_item_text(p_idx)); - undo_redo->add_undo_method(player,"animation_set_next",current,player->animation_get_next(current)); - undo_redo->add_do_method(this,"_animation_player_changed",player); - undo_redo->add_undo_method(this,"_animation_player_changed",player); + undo_redo->add_do_method(player, "animation_set_next", current, blend_editor.next->get_item_text(p_idx)); + undo_redo->add_undo_method(player, "animation_set_next", current, player->animation_get_next(current)); + undo_redo->add_do_method(this, "_animation_player_changed", player); + undo_redo->add_undo_method(this, "_animation_player_changed", player); undo_redo->commit_action(); } @@ -571,37 +548,37 @@ void AnimationPlayerEditor::_animation_blend() { blend_editor.tree->clear(); - if (animation->get_item_count()==0) + if (animation->get_item_count() == 0) return; String current = animation->get_item_text(animation->get_selected()); - blend_editor.dialog->popup_centered(Size2(400,400)); + blend_editor.dialog->popup_centered(Size2(400, 400)); blend_editor.tree->set_hide_root(true); - blend_editor.tree->set_column_min_width(0,10); - blend_editor.tree->set_column_min_width(1,3); + blend_editor.tree->set_column_min_width(0, 10); + blend_editor.tree->set_column_min_width(1, 3); List anims; player->get_animation_list(&anims); TreeItem *root = blend_editor.tree->create_item(); - updating_blends=true; + updating_blends = true; int i = 0; bool anim_found = false; blend_editor.next->clear(); blend_editor.next->add_item("", i); - for(List::Element *E=anims.front();E;E=E->next()) { + for (List::Element *E = anims.front(); E; E = E->next()) { - String to=E->get(); - TreeItem *blend=blend_editor.tree->create_item(root); - blend->set_editable(0,false); - blend->set_editable(1,true); - blend->set_text(0,to); - blend->set_cell_mode(1,TreeItem::CELL_MODE_RANGE); - blend->set_range_config(1,0,3600,0.001); - blend->set_range(1,player->get_blend_time(current,to)); + String to = E->get(); + TreeItem *blend = blend_editor.tree->create_item(root); + blend->set_editable(0, false); + blend->set_editable(1, true); + blend->set_text(0, to); + blend->set_cell_mode(1, TreeItem::CELL_MODE_RANGE); + blend->set_range_config(1, 0, 3600, 0.001); + blend->set_range(1, player->get_blend_time(current, to)); i++; blend_editor.next->add_item(to, i); @@ -617,7 +594,7 @@ void AnimationPlayerEditor::_animation_blend() { player->animation_set_next(current, blend_editor.next->get_item_text(0)); } - updating_blends=false; + updating_blends = false; } void AnimationPlayerEditor::_blend_edited() { @@ -625,7 +602,7 @@ void AnimationPlayerEditor::_blend_edited() { if (updating_blends) return; - if (animation->get_item_count()==0) + if (animation->get_item_count() == 0) return; String current = animation->get_item_text(animation->get_selected()); @@ -634,18 +611,18 @@ void AnimationPlayerEditor::_blend_edited() { if (!selected) return; - updating_blends=true; - String to=selected->get_text(0); + updating_blends = true; + String to = selected->get_text(0); float blend_time = selected->get_range(1); - float prev_blend_time = player->get_blend_time(current,to); + float prev_blend_time = player->get_blend_time(current, to); undo_redo->create_action(TTR("Change Blend Time")); - undo_redo->add_do_method(player,"set_blend_time",current,to,blend_time); - undo_redo->add_undo_method(player,"set_blend_time",current,to,prev_blend_time); - undo_redo->add_do_method(this,"_animation_player_changed",player); - undo_redo->add_undo_method(this,"_animation_player_changed",player); + undo_redo->add_do_method(player, "set_blend_time", current, to, blend_time); + undo_redo->add_undo_method(player, "set_blend_time", current, to, prev_blend_time); + undo_redo->add_do_method(this, "_animation_player_changed", player); + undo_redo->add_undo_method(this, "_animation_player_changed", player); undo_redo->commit_action(); - updating_blends=false; + updating_blends = false; } void AnimationPlayerEditor::ensure_visibility() { @@ -658,20 +635,17 @@ void AnimationPlayerEditor::ensure_visibility() { Dictionary AnimationPlayerEditor::get_state() const { - Dictionary d; - d["visible"]=is_visible_in_tree(); + d["visible"] = is_visible_in_tree(); if (EditorNode::get_singleton()->get_edited_scene() && is_visible_in_tree() && player) { - d["player"]=EditorNode::get_singleton()->get_edited_scene()->get_path_to(player); - d["animation"]=player->get_current_animation(); - + d["player"] = EditorNode::get_singleton()->get_edited_scene()->get_path_to(player); + d["animation"] = player->get_current_animation(); } return d; - } -void AnimationPlayerEditor::set_state(const Dictionary& p_state) { +void AnimationPlayerEditor::set_state(const Dictionary &p_state) { if (p_state.has("visible") && p_state["visible"]) { @@ -680,7 +654,7 @@ void AnimationPlayerEditor::set_state(const Dictionary& p_state) { Node *n = EditorNode::get_singleton()->get_edited_scene()->get_node(p_state["player"]); if (n && n->cast_to() && EditorNode::get_singleton()->get_editor_selection()->is_selected(n)) { - player=n->cast_to(); + player = n->cast_to(); _update_player(); show(); set_process(true); @@ -692,28 +666,24 @@ void AnimationPlayerEditor::set_state(const Dictionary& p_state) { _select_anim_by_name(anim); _animation_edit(); } - } } - } - void AnimationPlayerEditor::_animation_resource_edit() { if (animation->get_item_count()) { String current = animation->get_item_text(animation->get_selected()); - Ref anim = player->get_animation(current); + Ref anim = player->get_animation(current); editor->edit_resource(anim); } - } void AnimationPlayerEditor::_animation_edit() { if (animation->get_item_count()) { String current = animation->get_item_text(animation->get_selected()); - Ref anim = player->get_animation(current); + Ref anim = player->get_animation(current); key_editor->set_animation(anim); Node *root = player->get_node(player->get_root()); if (root) { @@ -724,9 +694,7 @@ void AnimationPlayerEditor::_animation_edit() { key_editor->set_animation(Ref()); key_editor->set_root(NULL); - } - } void AnimationPlayerEditor::_dialog_action(String p_file) { @@ -740,12 +708,10 @@ void AnimationPlayerEditor::_dialog_action(String p_file) { if (p_file.find_last("/") != -1) { p_file = p_file.substr(p_file.find_last("/") + 1, p_file.length()); - } if (p_file.find_last("\\") != -1) { p_file = p_file.substr(p_file.find_last("\\") + 1, p_file.length()); - } if (p_file.find(".") != -1) @@ -756,7 +722,6 @@ void AnimationPlayerEditor::_dialog_action(String p_file) { undo_redo->add_undo_method(player, "remove_animation", p_file); if (player->has_animation(p_file)) { undo_redo->add_undo_method(player, "add_animation", p_file, player->get_animation(p_file)); - } undo_redo->add_do_method(this, "_animation_player_changed", player); undo_redo->add_undo_method(this, "_animation_player_changed", player); @@ -771,7 +736,7 @@ void AnimationPlayerEditor::_dialog_action(String p_file) { ERR_FAIL_COND(!anim->cast_to()) - RES current_res = RES(anim->cast_to()); + RES current_res = RES(anim->cast_to()); _animation_save_in_path(current_res, p_file); } @@ -779,7 +744,7 @@ void AnimationPlayerEditor::_dialog_action(String p_file) { } } -void AnimationPlayerEditor::_scale_changed(const String& p_scale) { +void AnimationPlayerEditor::_scale_changed(const String &p_scale) { player->set_speed_scale(p_scale.to_double()); } @@ -789,8 +754,7 @@ void AnimationPlayerEditor::_update_animation() { // the purpose of _update_animation is to reflect the current state // of the animation player in the current editor.. - updating=true; - + updating = true; if (player->is_playing()) { @@ -803,24 +767,23 @@ void AnimationPlayerEditor::_update_animation() { stop->set_pressed(true); } - scale->set_text( String::num(player->get_speed_scale(),2) ); - String current=player->get_current_animation(); + scale->set_text(String::num(player->get_speed_scale(), 2)); + String current = player->get_current_animation(); - for (int i=0;iget_item_count();i++) { + for (int i = 0; i < animation->get_item_count(); i++) { - if (animation->get_item_text(i)==current) { + if (animation->get_item_text(i) == current) { animation->select(i); break; } } - updating=false; + updating = false; } void AnimationPlayerEditor::_update_player() { - - updating=true; + updating = true; List animlist; if (player) player->get_animation_list(&animlist); @@ -831,78 +794,70 @@ void AnimationPlayerEditor::_update_player() { else nodename->set_text(""); - - add_anim->set_disabled(player==NULL); - load_anim->set_disabled(player==NULL); - stop->set_disabled(animlist.size()==0); - play->set_disabled(animlist.size()==0); - play_bw->set_disabled(animlist.size()==0); - play_bw_from->set_disabled(animlist.size()==0); - play_from->set_disabled(animlist.size()==0); - autoplay->set_disabled(animlist.size()==0); - duplicate_anim->set_disabled(animlist.size()==0); - rename_anim->set_disabled(animlist.size()==0); - blend_anim->set_disabled(animlist.size()==0); - remove_anim->set_disabled(animlist.size()==0); - resource_edit_anim->set_disabled(animlist.size()==0); + add_anim->set_disabled(player == NULL); + load_anim->set_disabled(player == NULL); + stop->set_disabled(animlist.size() == 0); + play->set_disabled(animlist.size() == 0); + play_bw->set_disabled(animlist.size() == 0); + play_bw_from->set_disabled(animlist.size() == 0); + play_from->set_disabled(animlist.size() == 0); + autoplay->set_disabled(animlist.size() == 0); + duplicate_anim->set_disabled(animlist.size() == 0); + rename_anim->set_disabled(animlist.size() == 0); + blend_anim->set_disabled(animlist.size() == 0); + remove_anim->set_disabled(animlist.size() == 0); + resource_edit_anim->set_disabled(animlist.size() == 0); save_anim->set_disabled(animlist.size() == 0); - tool_anim->set_disabled(player==NULL); + tool_anim->set_disabled(player == NULL); + int active_idx = -1; + for (List::Element *E = animlist.front(); E; E = E->next()) { - int active_idx=-1; - for (List::Element *E=animlist.front();E;E=E->next()) { - - if (player->get_autoplay()==E->get()) - animation->add_icon_item(autoplay_icon,E->get()); + if (player->get_autoplay() == E->get()) + animation->add_icon_item(autoplay_icon, E->get()); else animation->add_item(E->get()); - if (player->get_current_animation()==E->get()) - active_idx=animation->get_item_count()-1; - + if (player->get_current_animation() == E->get()) + active_idx = animation->get_item_count() - 1; } if (!player) return; - updating=false; - if (active_idx!=-1) { + updating = false; + if (active_idx != -1) { animation->select(active_idx); - autoplay->set_pressed(animation->get_item_text(active_idx)==player->get_autoplay()); + autoplay->set_pressed(animation->get_item_text(active_idx) == player->get_autoplay()); _animation_selected(active_idx); - } else if (animation->get_item_count()>0){ + } else if (animation->get_item_count() > 0) { animation->select(0); - autoplay->set_pressed(animation->get_item_text(0)==player->get_autoplay()); + autoplay->set_pressed(animation->get_item_text(0) == player->get_autoplay()); _animation_selected(0); } //pause->set_pressed(player->is_paused()); - if (animation->get_item_count()) { String current = animation->get_item_text(animation->get_selected()); - Ref anim = player->get_animation(current); + Ref anim = player->get_animation(current); key_editor->set_animation(anim); Node *root = player->get_node(player->get_root()); if (root) { key_editor->set_root(root); } - } _update_animation(); } - - void AnimationPlayerEditor::edit(AnimationPlayer *p_player) { - if (player && pin->is_pressed()) return; //ignore, pinned - player=p_player; + player = p_player; if (player) { _update_player(); @@ -911,29 +866,25 @@ void AnimationPlayerEditor::edit(AnimationPlayer *p_player) { key_editor->show_select_node_warning(true); //hide(); - } - } - void AnimationPlayerEditor::_animation_duplicate() { - if (!animation->get_item_count()) return; String current = animation->get_item_text(animation->get_selected()); - Ref anim = player->get_animation(current); + Ref anim = player->get_animation(current); if (!anim.is_valid()) return; - Ref new_anim = memnew( Animation ); + Ref new_anim = memnew(Animation); List plist; anim->get_property_list(&plist); - for (List::Element *E=plist.front();E;E=E->next()) { + for (List::Element *E = plist.front(); E; E = E->next()) { - if (E->get().usage&PROPERTY_USAGE_STORAGE) { + if (E->get().usage & PROPERTY_USAGE_STORAGE) { new_anim->set(E->get().name, anim->get(E->get().name)); } @@ -941,78 +892,73 @@ void AnimationPlayerEditor::_animation_duplicate() { new_anim->set_path(""); String new_name = current; - while(player->has_animation(new_name)) { + while (player->has_animation(new_name)) { - new_name=new_name+" (copy)"; + new_name = new_name + " (copy)"; } - undo_redo->create_action(TTR("Duplicate Animation")); - undo_redo->add_do_method(player,"add_animation",new_name,new_anim); - undo_redo->add_undo_method(player,"remove_animation",new_name); - undo_redo->add_do_method(player,"animation_set_next",new_name,player->animation_get_next(current)); - undo_redo->add_do_method(this,"_animation_player_changed",player); - undo_redo->add_undo_method(this,"_animation_player_changed",player); + undo_redo->add_do_method(player, "add_animation", new_name, new_anim); + undo_redo->add_undo_method(player, "remove_animation", new_name); + undo_redo->add_do_method(player, "animation_set_next", new_name, player->animation_get_next(current)); + undo_redo->add_do_method(this, "_animation_player_changed", player); + undo_redo->add_undo_method(this, "_animation_player_changed", player); undo_redo->commit_action(); + for (int i = 0; i < animation->get_item_count(); i++) { - for(int i=0;iget_item_count();i++) { - - if (animation->get_item_text(i)==new_name) { + if (animation->get_item_text(i) == new_name) { animation->select(i); _animation_selected(i); return; } } - } -void AnimationPlayerEditor::_seek_value_changed(float p_value,bool p_set) { +void AnimationPlayerEditor::_seek_value_changed(float p_value, bool p_set) { if (updating || !player || player->is_playing()) { return; }; - - updating=true; - String current=player->get_current_animation(); //animation->get_item_text( animation->get_selected() ); + updating = true; + String current = player->get_current_animation(); //animation->get_item_text( animation->get_selected() ); if (current == "" || !player->has_animation(current)) { - updating=false; - current=""; + updating = false; + current = ""; return; }; Ref anim; - anim=player->get_animation(current); + anim = player->get_animation(current); float pos = anim->get_length() * (p_value / frame->get_max()); float step = anim->get_step(); if (step) { - pos=Math::stepify(pos, step); - if (pos<0) - pos=0; - if (pos>=anim->get_length()) - pos=anim->get_length(); + pos = Math::stepify(pos, step); + if (pos < 0) + pos = 0; + if (pos >= anim->get_length()) + pos = anim->get_length(); } if (player->is_valid() && !p_set) { float cpos = player->get_current_animation_pos(); - player->seek_delta(pos,pos-cpos); + player->seek_delta(pos, pos - cpos); } else { - player->seek(pos,true); + player->seek(pos, true); } - key_editor->set_anim_pos(pos); - updating=true; + updating = true; }; void AnimationPlayerEditor::_animation_player_changed(Object *p_pl) { - if (player==p_pl && is_visible_in_tree()) { + if (player == p_pl && is_visible_in_tree()) { _update_player(); if (blend_editor.dialog->is_visible_in_tree()) @@ -1020,11 +966,9 @@ void AnimationPlayerEditor::_animation_player_changed(Object *p_pl) { } } - - void AnimationPlayerEditor::_list_changed() { - if(is_visible_in_tree()) + if (is_visible_in_tree()) _update_player(); } #if 0 @@ -1095,9 +1039,7 @@ void AnimationPlayerEditor::_editor_load(){ void AnimationPlayerEditor::_animation_key_editor_anim_len_changed(float p_len) { - frame->set_max(p_len); - } void AnimationPlayerEditor::_animation_key_editor_anim_step_changed(float p_len) { @@ -1106,49 +1048,43 @@ void AnimationPlayerEditor::_animation_key_editor_anim_step_changed(float p_len) frame->set_step(p_len); else frame->set_step(0.00001); - } - -void AnimationPlayerEditor::_animation_key_editor_seek(float p_pos,bool p_drag) { +void AnimationPlayerEditor::_animation_key_editor_seek(float p_pos, bool p_drag) { if (!is_visible_in_tree()) return; if (!player) return; - if (player->is_playing() ) + if (player->is_playing()) return; - updating=true; - frame->set_value(p_pos); - updating=false; - _seek_value_changed(p_pos,!p_drag); + updating = true; + frame->set_value(p_pos); + updating = false; + _seek_value_changed(p_pos, !p_drag); EditorNode::get_singleton()->get_property_editor()->refresh(); - - //seekit } void AnimationPlayerEditor::_hide_anim_editors() { - player=NULL; + player = NULL; hide(); set_process(false); key_editor->set_animation(Ref()); key_editor->set_root(NULL); key_editor->show_select_node_warning(true); - //editor->animation_editor_make_visible(false); - + //editor->animation_editor_make_visible(false); } - void AnimationPlayerEditor::_animation_tool_menu(int p_option) { - switch(p_option) { + switch (p_option) { case TOOL_COPY_ANIM: { @@ -1159,7 +1095,7 @@ void AnimationPlayerEditor::_animation_tool_menu(int p_option) { } String current = animation->get_item_text(animation->get_selected()); - Ref anim = player->get_animation(current); + Ref anim = player->get_animation(current); //editor->edit_resource(anim); EditorSettings::get_singleton()->set_resource_clipboard(anim); @@ -1174,28 +1110,27 @@ void AnimationPlayerEditor::_animation_tool_menu(int p_option) { } String name = anim->get_name(); - if (name=="") { - name=TTR("Pasted Animation"); + if (name == "") { + name = TTR("Pasted Animation"); } - int idx=1; + int idx = 1; String base = name; while (player->has_animation(name)) { idx++; - name=base+" "+itos(idx); + name = base + " " + itos(idx); } undo_redo->create_action(TTR("Paste Animation")); - undo_redo->add_do_method(player,"add_animation",name,anim); - undo_redo->add_undo_method(player,"remove_animation",name); - undo_redo->add_do_method(this,"_animation_player_changed",player); - undo_redo->add_undo_method(this,"_animation_player_changed",player); + undo_redo->add_do_method(player, "add_animation", name, anim); + undo_redo->add_undo_method(player, "remove_animation", name); + undo_redo->add_do_method(this, "_animation_player_changed", player); + undo_redo->add_undo_method(this, "_animation_player_changed", player); undo_redo->commit_action(); _select_anim_by_name(name); - } break; case TOOL_EDIT_RESOURCE: { @@ -1206,11 +1141,10 @@ void AnimationPlayerEditor::_animation_tool_menu(int p_option) { } String current = animation->get_item_text(animation->get_selected()); - Ref anim = player->get_animation(current); + Ref anim = player->get_animation(current); editor->edit_resource(anim); } break; - } } @@ -1221,21 +1155,21 @@ void AnimationPlayerEditor::_animation_save_menu(int p_option) { Ref anim = player->get_animation(current); switch (p_option) { - case ANIM_SAVE: - _animation_save(anim); - break; - case ANIM_SAVE_AS: - _animation_save_as(anim); - break; + case ANIM_SAVE: + _animation_save(anim); + break; + case ANIM_SAVE_AS: + _animation_save_as(anim); + break; } } } -void AnimationPlayerEditor::_unhandled_key_input(const InputEvent& p_ev) { +void AnimationPlayerEditor::_unhandled_key_input(const InputEvent &p_ev) { - if (is_visible_in_tree() && p_ev.type==InputEvent::KEY && p_ev.key.pressed && !p_ev.key.echo && !p_ev.key.mod.alt && !p_ev.key.mod.control && !p_ev.key.mod.meta) { + if (is_visible_in_tree() && p_ev.type == InputEvent::KEY && p_ev.key.pressed && !p_ev.key.echo && !p_ev.key.mod.alt && !p_ev.key.mod.control && !p_ev.key.mod.meta) { - switch(p_ev.key.scancode) { + switch (p_ev.key.scancode) { case KEY_A: { if (!p_ev.key.mod.shift) @@ -1258,130 +1192,119 @@ void AnimationPlayerEditor::_unhandled_key_input(const InputEvent& p_ev) { void AnimationPlayerEditor::_bind_methods() { - ClassDB::bind_method(D_METHOD("_gui_input"),&AnimationPlayerEditor::_gui_input); - ClassDB::bind_method(D_METHOD("_node_removed"),&AnimationPlayerEditor::_node_removed); - ClassDB::bind_method(D_METHOD("_play_pressed"),&AnimationPlayerEditor::_play_pressed); - ClassDB::bind_method(D_METHOD("_play_from_pressed"),&AnimationPlayerEditor::_play_from_pressed); - ClassDB::bind_method(D_METHOD("_play_bw_pressed"),&AnimationPlayerEditor::_play_bw_pressed); - ClassDB::bind_method(D_METHOD("_play_bw_from_pressed"),&AnimationPlayerEditor::_play_bw_from_pressed); - ClassDB::bind_method(D_METHOD("_stop_pressed"),&AnimationPlayerEditor::_stop_pressed); - ClassDB::bind_method(D_METHOD("_autoplay_pressed"),&AnimationPlayerEditor::_autoplay_pressed); - ClassDB::bind_method(D_METHOD("_pause_pressed"),&AnimationPlayerEditor::_pause_pressed); - ClassDB::bind_method(D_METHOD("_animation_selected"),&AnimationPlayerEditor::_animation_selected); - ClassDB::bind_method(D_METHOD("_animation_name_edited"),&AnimationPlayerEditor::_animation_name_edited); - ClassDB::bind_method(D_METHOD("_animation_new"),&AnimationPlayerEditor::_animation_new); - ClassDB::bind_method(D_METHOD("_animation_rename"),&AnimationPlayerEditor::_animation_rename); - ClassDB::bind_method(D_METHOD("_animation_load"),&AnimationPlayerEditor::_animation_load); - ClassDB::bind_method(D_METHOD("_animation_remove"),&AnimationPlayerEditor::_animation_remove); - ClassDB::bind_method(D_METHOD("_animation_remove_confirmed"),&AnimationPlayerEditor::_animation_remove_confirmed); - ClassDB::bind_method(D_METHOD("_animation_blend"),&AnimationPlayerEditor::_animation_blend); - ClassDB::bind_method(D_METHOD("_animation_edit"),&AnimationPlayerEditor::_animation_edit); - ClassDB::bind_method(D_METHOD("_animation_resource_edit"),&AnimationPlayerEditor::_animation_resource_edit); - ClassDB::bind_method(D_METHOD("_dialog_action"),&AnimationPlayerEditor::_dialog_action); - ClassDB::bind_method(D_METHOD("_seek_value_changed"),&AnimationPlayerEditor::_seek_value_changed,DEFVAL(true)); - ClassDB::bind_method(D_METHOD("_animation_player_changed"),&AnimationPlayerEditor::_animation_player_changed); - ClassDB::bind_method(D_METHOD("_blend_edited"),&AnimationPlayerEditor::_blend_edited); + ClassDB::bind_method(D_METHOD("_gui_input"), &AnimationPlayerEditor::_gui_input); + ClassDB::bind_method(D_METHOD("_node_removed"), &AnimationPlayerEditor::_node_removed); + ClassDB::bind_method(D_METHOD("_play_pressed"), &AnimationPlayerEditor::_play_pressed); + ClassDB::bind_method(D_METHOD("_play_from_pressed"), &AnimationPlayerEditor::_play_from_pressed); + ClassDB::bind_method(D_METHOD("_play_bw_pressed"), &AnimationPlayerEditor::_play_bw_pressed); + ClassDB::bind_method(D_METHOD("_play_bw_from_pressed"), &AnimationPlayerEditor::_play_bw_from_pressed); + ClassDB::bind_method(D_METHOD("_stop_pressed"), &AnimationPlayerEditor::_stop_pressed); + ClassDB::bind_method(D_METHOD("_autoplay_pressed"), &AnimationPlayerEditor::_autoplay_pressed); + ClassDB::bind_method(D_METHOD("_pause_pressed"), &AnimationPlayerEditor::_pause_pressed); + ClassDB::bind_method(D_METHOD("_animation_selected"), &AnimationPlayerEditor::_animation_selected); + ClassDB::bind_method(D_METHOD("_animation_name_edited"), &AnimationPlayerEditor::_animation_name_edited); + ClassDB::bind_method(D_METHOD("_animation_new"), &AnimationPlayerEditor::_animation_new); + ClassDB::bind_method(D_METHOD("_animation_rename"), &AnimationPlayerEditor::_animation_rename); + ClassDB::bind_method(D_METHOD("_animation_load"), &AnimationPlayerEditor::_animation_load); + ClassDB::bind_method(D_METHOD("_animation_remove"), &AnimationPlayerEditor::_animation_remove); + ClassDB::bind_method(D_METHOD("_animation_remove_confirmed"), &AnimationPlayerEditor::_animation_remove_confirmed); + ClassDB::bind_method(D_METHOD("_animation_blend"), &AnimationPlayerEditor::_animation_blend); + ClassDB::bind_method(D_METHOD("_animation_edit"), &AnimationPlayerEditor::_animation_edit); + ClassDB::bind_method(D_METHOD("_animation_resource_edit"), &AnimationPlayerEditor::_animation_resource_edit); + ClassDB::bind_method(D_METHOD("_dialog_action"), &AnimationPlayerEditor::_dialog_action); + ClassDB::bind_method(D_METHOD("_seek_value_changed"), &AnimationPlayerEditor::_seek_value_changed, DEFVAL(true)); + ClassDB::bind_method(D_METHOD("_animation_player_changed"), &AnimationPlayerEditor::_animation_player_changed); + ClassDB::bind_method(D_METHOD("_blend_edited"), &AnimationPlayerEditor::_blend_edited); //ClassDB::bind_method(D_METHOD("_seek_frame_changed"),&AnimationPlayerEditor::_seek_frame_changed); - ClassDB::bind_method(D_METHOD("_scale_changed"),&AnimationPlayerEditor::_scale_changed); + ClassDB::bind_method(D_METHOD("_scale_changed"), &AnimationPlayerEditor::_scale_changed); //ClassDB::bind_method(D_METHOD("_editor_store_all"),&AnimationPlayerEditor::_editor_store_all); //ClassDB::bind_method(D_METHOD("_editor_load_all"),&AnimationPlayerEditor::_editor_load_all); - ClassDB::bind_method(D_METHOD("_list_changed"),&AnimationPlayerEditor::_list_changed); - ClassDB::bind_method(D_METHOD("_animation_key_editor_seek"),&AnimationPlayerEditor::_animation_key_editor_seek); - ClassDB::bind_method(D_METHOD("_animation_key_editor_anim_len_changed"),&AnimationPlayerEditor::_animation_key_editor_anim_len_changed); - ClassDB::bind_method(D_METHOD("_animation_key_editor_anim_step_changed"),&AnimationPlayerEditor::_animation_key_editor_anim_step_changed); - ClassDB::bind_method(D_METHOD("_hide_anim_editors"),&AnimationPlayerEditor::_hide_anim_editors); - ClassDB::bind_method(D_METHOD("_animation_duplicate"),&AnimationPlayerEditor::_animation_duplicate); - ClassDB::bind_method(D_METHOD("_blend_editor_next_changed"),&AnimationPlayerEditor::_blend_editor_next_changed); - ClassDB::bind_method(D_METHOD("_unhandled_key_input"),&AnimationPlayerEditor::_unhandled_key_input); - ClassDB::bind_method(D_METHOD("_animation_tool_menu"),&AnimationPlayerEditor::_animation_tool_menu); + ClassDB::bind_method(D_METHOD("_list_changed"), &AnimationPlayerEditor::_list_changed); + ClassDB::bind_method(D_METHOD("_animation_key_editor_seek"), &AnimationPlayerEditor::_animation_key_editor_seek); + ClassDB::bind_method(D_METHOD("_animation_key_editor_anim_len_changed"), &AnimationPlayerEditor::_animation_key_editor_anim_len_changed); + ClassDB::bind_method(D_METHOD("_animation_key_editor_anim_step_changed"), &AnimationPlayerEditor::_animation_key_editor_anim_step_changed); + ClassDB::bind_method(D_METHOD("_hide_anim_editors"), &AnimationPlayerEditor::_hide_anim_editors); + ClassDB::bind_method(D_METHOD("_animation_duplicate"), &AnimationPlayerEditor::_animation_duplicate); + ClassDB::bind_method(D_METHOD("_blend_editor_next_changed"), &AnimationPlayerEditor::_blend_editor_next_changed); + ClassDB::bind_method(D_METHOD("_unhandled_key_input"), &AnimationPlayerEditor::_unhandled_key_input); + ClassDB::bind_method(D_METHOD("_animation_tool_menu"), &AnimationPlayerEditor::_animation_tool_menu); ClassDB::bind_method(D_METHOD("_animation_save_menu"), &AnimationPlayerEditor::_animation_save_menu); - - - - } -AnimationPlayerEditor *AnimationPlayerEditor::singleton=NULL; +AnimationPlayerEditor *AnimationPlayerEditor::singleton = NULL; AnimationPlayer *AnimationPlayerEditor::get_player() const { return player; } AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) { - editor=p_editor; - singleton=this; + editor = p_editor; + singleton = this; - updating=false; + updating = false; set_focus_mode(FOCUS_ALL); - player=NULL; - add_style_override("panel", get_stylebox("panel","Panel")); - + player = NULL; + add_style_override("panel", get_stylebox("panel", "Panel")); - Label * l; + Label *l; /*l= memnew( Label ); l->set_text("Animation Player:"); add_child(l);*/ - HBoxContainer *hb = memnew( HBoxContainer ); + HBoxContainer *hb = memnew(HBoxContainer); add_child(hb); - - play_bw_from = memnew( ToolButton ); + play_bw_from = memnew(ToolButton); play_bw_from->set_tooltip(TTR("Play selected animation backwards from current pos. (A)")); hb->add_child(play_bw_from); - play_bw = memnew( ToolButton ); + play_bw = memnew(ToolButton); play_bw->set_tooltip(TTR("Play selected animation backwards from end. (Shift+A)")); hb->add_child(play_bw); - stop = memnew( ToolButton ); + stop = memnew(ToolButton); stop->set_toggle_mode(true); hb->add_child(stop); stop->set_tooltip(TTR("Stop animation playback. (S)")); - play = memnew( ToolButton ); + play = memnew(ToolButton); play->set_tooltip(TTR("Play selected animation from start. (Shift+D)")); hb->add_child(play); - - play_from = memnew( ToolButton ); + play_from = memnew(ToolButton); play_from->set_tooltip(TTR("Play selected animation from current pos. (D)")); hb->add_child(play_from); - - //pause = memnew( Button ); //pause->set_toggle_mode(true); //hb->add_child(pause); - frame = memnew( SpinBox ); + frame = memnew(SpinBox); hb->add_child(frame); - frame->set_custom_minimum_size(Size2(60,0)); + frame->set_custom_minimum_size(Size2(60, 0)); frame->set_stretch_ratio(2); frame->set_tooltip(TTR("Animation position (in seconds).")); - hb->add_child( memnew( VSeparator)); + hb->add_child(memnew(VSeparator)); - scale = memnew( LineEdit ); + scale = memnew(LineEdit); hb->add_child(scale); scale->set_h_size_flags(SIZE_EXPAND_FILL); scale->set_stretch_ratio(1); scale->set_tooltip(TTR("Scale animation playback globally for the node.")); scale->hide(); - - add_anim = memnew( ToolButton ); + add_anim = memnew(ToolButton); ED_SHORTCUT("animation_player_editor/add_animation", TTR("Create new animation in player.")); add_anim->set_shortcut(ED_GET_SHORTCUT("animation_player_editor/add_animation")); add_anim->set_tooltip(TTR("Create new animation in player.")); hb->add_child(add_anim); - - load_anim = memnew( ToolButton ); + load_anim = memnew(ToolButton); ED_SHORTCUT("animation_player_editor/load_from_disk", TTR("Load animation from disk.")); add_anim->set_shortcut(ED_GET_SHORTCUT("animation_player_editor/load_from_disk")); load_anim->set_tooltip(TTR("Load an animation from disk.")); @@ -1402,159 +1325,146 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) { add_child(delete_dialog); delete_dialog->connect("confirmed", this, "_animation_remove_confirmed"); - duplicate_anim = memnew( ToolButton ); + duplicate_anim = memnew(ToolButton); hb->add_child(duplicate_anim); ED_SHORTCUT("animation_player_editor/duplicate_animation", TTR("Duplicate Animation")); duplicate_anim->set_shortcut(ED_GET_SHORTCUT("animation_player_editor/duplicate_animation")); duplicate_anim->set_tooltip(TTR("Duplicate Animation")); - rename_anim = memnew( ToolButton ); + rename_anim = memnew(ToolButton); hb->add_child(rename_anim); ED_SHORTCUT("animation_player_editor/rename_animation", TTR("Rename Animation")); rename_anim->set_shortcut(ED_GET_SHORTCUT("animation_player_editor/rename_animation")); rename_anim->set_tooltip(TTR("Rename Animation")); - remove_anim = memnew( ToolButton ); + remove_anim = memnew(ToolButton); hb->add_child(remove_anim); ED_SHORTCUT("animation_player_editor/remove_animation", TTR("Remove Animation")); remove_anim->set_shortcut(ED_GET_SHORTCUT("animation_player_editor/remove_animation")); remove_anim->set_tooltip(TTR("Remove Animation")); - - animation = memnew( OptionButton ); + animation = memnew(OptionButton); hb->add_child(animation); animation->set_h_size_flags(SIZE_EXPAND_FILL); animation->set_tooltip(TTR("Display list of animations in player.")); animation->set_clip_text(true); - autoplay = memnew( ToolButton ); + autoplay = memnew(ToolButton); hb->add_child(autoplay); autoplay->set_tooltip(TTR("Autoplay on Load")); - - - blend_anim = memnew( ToolButton ); + blend_anim = memnew(ToolButton); hb->add_child(blend_anim); blend_anim->set_tooltip(TTR("Edit Target Blend Times")); - tool_anim = memnew( MenuButton); + tool_anim = memnew(MenuButton); //tool_anim->set_flat(false); tool_anim->set_tooltip(TTR("Animation Tools")); - tool_anim->get_popup()->add_shortcut(ED_SHORTCUT("animation_player_editor/copy_animation", TTR("Copy Animation")),TOOL_COPY_ANIM); - tool_anim->get_popup()->add_shortcut(ED_SHORTCUT("animation_player_editor/paste_animation", TTR("Paste Animation")),TOOL_PASTE_ANIM); + tool_anim->get_popup()->add_shortcut(ED_SHORTCUT("animation_player_editor/copy_animation", TTR("Copy Animation")), TOOL_COPY_ANIM); + tool_anim->get_popup()->add_shortcut(ED_SHORTCUT("animation_player_editor/paste_animation", TTR("Paste Animation")), TOOL_PASTE_ANIM); //tool_anim->get_popup()->add_separator(); //tool_anim->get_popup()->add_item("Edit Anim Resource",TOOL_PASTE_ANIM); hb->add_child(tool_anim); - nodename = memnew( Button ); + nodename = memnew(Button); hb->add_child(nodename); - pin = memnew( ToolButton ); + pin = memnew(ToolButton); pin->set_toggle_mode(true); hb->add_child(pin); - - - resource_edit_anim= memnew( Button ); + resource_edit_anim = memnew(Button); hb->add_child(resource_edit_anim); resource_edit_anim->hide(); - file = memnew(EditorFileDialog); add_child(file); - name_dialog = memnew( ConfirmationDialog ); + name_dialog = memnew(ConfirmationDialog); name_dialog->set_title(TTR("Create New Animation")); name_dialog->set_hide_on_ok(false); add_child(name_dialog); - name = memnew( LineEdit ); + name = memnew(LineEdit); name_dialog->add_child(name); - name->set_pos(Point2(18,30)); - name->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,10); + name->set_pos(Point2(18, 30)); + name->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, 10); name_dialog->register_text_enter(name); - - l = memnew( Label ); + l = memnew(Label); l->set_text(TTR("Animation Name:")); - l->set_pos( Point2(10,10) ); + l->set_pos(Point2(10, 10)); name_dialog->add_child(l); - name_title=l; + name_title = l; - error_dialog = memnew( ConfirmationDialog ); + error_dialog = memnew(ConfirmationDialog); error_dialog->get_ok()->set_text(TTR("Close")); //error_dialog->get_cancel()->set_text("Close"); error_dialog->set_text(TTR("Error!")); add_child(error_dialog); - name_dialog->connect("confirmed", this,"_animation_name_edited"); + name_dialog->connect("confirmed", this, "_animation_name_edited"); - blend_editor.dialog = memnew( AcceptDialog ); + blend_editor.dialog = memnew(AcceptDialog); add_child(blend_editor.dialog); blend_editor.dialog->get_ok()->set_text(TTR("Close")); blend_editor.dialog->set_hide_on_ok(true); - VBoxContainer *blend_vb = memnew( VBoxContainer); + VBoxContainer *blend_vb = memnew(VBoxContainer); blend_editor.dialog->add_child(blend_vb); //blend_editor.dialog->set_child_rect(blend_vb); - blend_editor.tree = memnew( Tree ); + blend_editor.tree = memnew(Tree); blend_editor.tree->set_columns(2); - blend_vb->add_margin_child(TTR("Blend Times:"),blend_editor.tree,true); - blend_editor.next = memnew( OptionButton ); - blend_vb->add_margin_child(TTR("Next (Auto Queue):"),blend_editor.next); + blend_vb->add_margin_child(TTR("Blend Times:"), blend_editor.tree, true); + blend_editor.next = memnew(OptionButton); + blend_vb->add_margin_child(TTR("Next (Auto Queue):"), blend_editor.next); blend_editor.dialog->set_title(TTR("Cross-Animation Blend Times")); - updating_blends=false; + updating_blends = false; - blend_editor.tree->connect("item_edited",this,"_blend_edited"); + blend_editor.tree->connect("item_edited", this, "_blend_edited"); - - autoplay->connect("pressed", this,"_autoplay_pressed"); + autoplay->connect("pressed", this, "_autoplay_pressed"); autoplay->set_toggle_mode(true); - play->connect("pressed", this,"_play_pressed"); - play_from->connect("pressed", this,"_play_from_pressed"); - play_bw->connect("pressed", this,"_play_bw_pressed"); - play_bw_from->connect("pressed", this,"_play_bw_from_pressed"); - stop->connect("pressed", this,"_stop_pressed"); + play->connect("pressed", this, "_play_pressed"); + play_from->connect("pressed", this, "_play_from_pressed"); + play_bw->connect("pressed", this, "_play_bw_pressed"); + play_bw_from->connect("pressed", this, "_play_bw_from_pressed"); + stop->connect("pressed", this, "_stop_pressed"); //pause->connect("pressed", this,"_pause_pressed"); - add_anim->connect("pressed", this,"_animation_new"); - rename_anim->connect("pressed", this,"_animation_rename"); - load_anim->connect("pressed", this,"_animation_load"); - duplicate_anim->connect("pressed", this,"_animation_duplicate"); + add_anim->connect("pressed", this, "_animation_new"); + rename_anim->connect("pressed", this, "_animation_rename"); + load_anim->connect("pressed", this, "_animation_load"); + duplicate_anim->connect("pressed", this, "_animation_duplicate"); //frame->connect("text_entered", this,"_seek_frame_changed"); - blend_anim->connect("pressed", this,"_animation_blend"); - remove_anim->connect("pressed", this,"_animation_remove"); - animation->connect("item_selected", this,"_animation_selected",Vector(),true); - resource_edit_anim->connect("pressed", this,"_animation_resource_edit"); - file->connect("file_selected", this,"_dialog_action"); - frame->connect("value_changed", this, "_seek_value_changed",Vector(),true); - scale->connect("text_entered", this, "_scale_changed",Vector(),true); - + blend_anim->connect("pressed", this, "_animation_blend"); + remove_anim->connect("pressed", this, "_animation_remove"); + animation->connect("item_selected", this, "_animation_selected", Vector(), true); + resource_edit_anim->connect("pressed", this, "_animation_resource_edit"); + file->connect("file_selected", this, "_dialog_action"); + frame->connect("value_changed", this, "_seek_value_changed", Vector(), true); + scale->connect("text_entered", this, "_scale_changed", Vector(), true); - - renaming=false; - last_active=false; + renaming = false; + last_active = false; set_process_unhandled_key_input(true); - key_editor = memnew( AnimationKeyEditor); + key_editor = memnew(AnimationKeyEditor); add_child(key_editor); - add_constant_override("separation",get_constant("separation","VBoxContainer")); + add_constant_override("separation", get_constant("separation", "VBoxContainer")); key_editor->set_v_size_flags(SIZE_EXPAND_FILL); - key_editor->connect("timeline_changed",this,"_animation_key_editor_seek"); - key_editor->connect("animation_len_changed",this,"_animation_key_editor_anim_len_changed"); - key_editor->connect("animation_step_changed",this,"_animation_key_editor_anim_step_changed"); + key_editor->connect("timeline_changed", this, "_animation_key_editor_seek"); + key_editor->connect("animation_len_changed", this, "_animation_key_editor_anim_len_changed"); + key_editor->connect("animation_step_changed", this, "_animation_key_editor_anim_step_changed"); _update_player(); } - void AnimationPlayerEditorPlugin::edit(Object *p_object) { anim_editor->set_undo_redo(&get_undo_redo()); if (!p_object) return; anim_editor->edit(p_object->cast_to()); - - } bool AnimationPlayerEditorPlugin::handles(Object *p_object) const { @@ -1575,16 +1485,15 @@ void AnimationPlayerEditorPlugin::make_visible(bool p_visible) { //anim_editor->hide(); //anim_editor->set_idle_process(false); } - } AnimationPlayerEditorPlugin::AnimationPlayerEditorPlugin(EditorNode *p_node) { - editor=p_node; - anim_editor = memnew( AnimationPlayerEditor(editor) ); + editor = p_node; + anim_editor = memnew(AnimationPlayerEditor(editor)); anim_editor->set_undo_redo(editor->get_undo_redo()); - editor->add_bottom_panel_item(TTR("Animation"),anim_editor); + editor->add_bottom_panel_item(TTR("Animation"), anim_editor); /* editor->get_viewport()->add_child(anim_editor); anim_editor->set_area_as_parent_rect(); @@ -1593,12 +1502,7 @@ AnimationPlayerEditorPlugin::AnimationPlayerEditorPlugin(EditorNode *p_node) { anim_editor->set_anchor( MARGIN_RIGHT, Control::ANCHOR_END); anim_editor->set_margin( MARGIN_RIGHT, 0 );*/ anim_editor->hide(); - - - } - -AnimationPlayerEditorPlugin::~AnimationPlayerEditorPlugin() -{ +AnimationPlayerEditorPlugin::~AnimationPlayerEditorPlugin() { } -- cgit v1.2.3