diff options
Diffstat (limited to 'editor/plugins/sprite_frames_editor_plugin.cpp')
-rw-r--r-- | editor/plugins/sprite_frames_editor_plugin.cpp | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp index 34ff34d45b..4162778fb9 100644 --- a/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/editor/plugins/sprite_frames_editor_plugin.cpp @@ -41,7 +41,6 @@ void SpriteFramesEditor::_gui_input(Ref<InputEvent> p_event) { } void SpriteFramesEditor::_open_sprite_sheet() { - file_split_sheet->clear_filters(); List<String> extensions; ResourceLoader::get_recognized_extensions_for_type("Texture2D", &extensions); @@ -53,7 +52,6 @@ void SpriteFramesEditor::_open_sprite_sheet() { } void SpriteFramesEditor::_sheet_preview_draw() { - Size2i size = split_sheet_preview->get_size(); int h = split_sheet_h->get_value(); int v = split_sheet_v->get_value(); @@ -61,13 +59,11 @@ void SpriteFramesEditor::_sheet_preview_draw() { int height = size.height / v; const float a = 0.3; for (int i = 1; i < h; i++) { - int x = i * width; split_sheet_preview->draw_line(Point2(x, 0), Point2(x, size.height), Color(1, 1, 1, a)); split_sheet_preview->draw_line(Point2(x + 1, 0), Point2(x + 1, size.height), Color(0, 0, 0, a)); for (int j = 1; j < v; j++) { - int y = j * height; split_sheet_preview->draw_line(Point2(0, y), Point2(size.width, y), Color(1, 1, 1, a)); @@ -103,7 +99,6 @@ void SpriteFramesEditor::_sheet_preview_draw() { split_sheet_dialog->get_ok()->set_text(vformat(TTR("Add %d Frame(s)"), frames_selected.size())); } void SpriteFramesEditor::_sheet_preview_input(const Ref<InputEvent> &p_event) { - Ref<InputEventMouseButton> mb = p_event; if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) { @@ -145,7 +140,6 @@ void SpriteFramesEditor::_sheet_preview_input(const Ref<InputEvent> &p_event) { } void SpriteFramesEditor::_sheet_add_frames() { - Size2i size = split_sheet_preview->get_size(); int h = split_sheet_h->get_value(); int v = split_sheet_v->get_value(); @@ -185,7 +179,6 @@ void SpriteFramesEditor::_sheet_add_frames() { } void SpriteFramesEditor::_sheet_select_clear_all_frames() { - bool should_clear = true; for (int i = 0; i < split_sheet_h->get_value() * split_sheet_v->get_value(); i++) { if (!frames_selected.has(i)) { @@ -201,14 +194,12 @@ void SpriteFramesEditor::_sheet_select_clear_all_frames() { } void SpriteFramesEditor::_sheet_spin_changed(double) { - frames_selected.clear(); last_frame_selected = -1; split_sheet_preview->update(); } void SpriteFramesEditor::_prepare_sprite_sheet(const String &p_file) { - Ref<Resource> texture = ResourceLoader::load(p_file); if (!texture.is_valid()) { EditorNode::get_singleton()->show_warning(TTR("Unable to load images")); @@ -227,7 +218,6 @@ void SpriteFramesEditor::_prepare_sprite_sheet(const String &p_file) { } void SpriteFramesEditor::_notification(int p_what) { - switch (p_what) { case NOTIFICATION_ENTER_TREE: { load->set_icon(get_theme_icon("Load", "EditorIcons")); @@ -253,13 +243,11 @@ void SpriteFramesEditor::_notification(int p_what) { } void SpriteFramesEditor::_file_load_request(const Vector<String> &p_path, int p_at_pos) { - ERR_FAIL_COND(!frames->has_animation(edited_anim)); List<Ref<Texture2D>> resources; for (int i = 0; i < p_path.size(); i++) { - Ref<Texture2D> resource; resource = ResourceLoader::load(p_path[i]); @@ -286,7 +274,6 @@ void SpriteFramesEditor::_file_load_request(const Vector<String> &p_path, int p_ int count = 0; for (List<Ref<Texture2D>>::Element *E = resources.front(); E; E = E->next()) { - undo_redo->add_do_method(frames, "add_frame", edited_anim, E->get(), p_at_pos == -1 ? -1 : p_at_pos + count); undo_redo->add_undo_method(frames, "remove_frame", edited_anim, p_at_pos == -1 ? fc : p_at_pos); count++; @@ -298,7 +285,6 @@ void SpriteFramesEditor::_file_load_request(const Vector<String> &p_path, int p_ } void SpriteFramesEditor::_load_pressed() { - ERR_FAIL_COND(!frames->has_animation(edited_anim)); loading_scene = false; @@ -314,7 +300,6 @@ void SpriteFramesEditor::_load_pressed() { } void SpriteFramesEditor::_paste_pressed() { - ERR_FAIL_COND(!frames->has_animation(edited_anim)); Ref<Texture2D> r = EditorSettings::get_singleton()->get_resource_clipboard(); @@ -349,13 +334,11 @@ void SpriteFramesEditor::_copy_pressed() { } void SpriteFramesEditor::_empty_pressed() { - ERR_FAIL_COND(!frames->has_animation(edited_anim)); int from = -1; if (tree->get_current() >= 0) { - from = tree->get_current(); sel = from; @@ -374,13 +357,11 @@ void SpriteFramesEditor::_empty_pressed() { } void SpriteFramesEditor::_empty2_pressed() { - ERR_FAIL_COND(!frames->has_animation(edited_anim)); int from = -1; if (tree->get_current() >= 0) { - from = tree->get_current(); sel = from; @@ -399,7 +380,6 @@ void SpriteFramesEditor::_empty2_pressed() { } void SpriteFramesEditor::_up_pressed() { - ERR_FAIL_COND(!frames->has_animation(edited_anim)); if (tree->get_current() < 0) @@ -423,7 +403,6 @@ void SpriteFramesEditor::_up_pressed() { } void SpriteFramesEditor::_down_pressed() { - ERR_FAIL_COND(!frames->has_animation(edited_anim)); if (tree->get_current() < 0) @@ -447,7 +426,6 @@ void SpriteFramesEditor::_down_pressed() { } void SpriteFramesEditor::_delete_pressed() { - ERR_FAIL_COND(!frames->has_animation(edited_anim)); if (tree->get_current() < 0) @@ -467,7 +445,6 @@ void SpriteFramesEditor::_delete_pressed() { } void SpriteFramesEditor::_animation_select() { - if (updating) return; @@ -484,7 +461,6 @@ void SpriteFramesEditor::_animation_select() { } static void _find_anim_sprites(Node *p_node, List<Node *> *r_nodes, Ref<SpriteFrames> p_sfames) { - Node *edited = EditorNode::get_singleton()->get_edited_scene(); if (!edited) return; @@ -511,7 +487,6 @@ static void _find_anim_sprites(Node *p_node, List<Node *> *r_nodes, Ref<SpriteFr } void SpriteFramesEditor::_animation_name_edited() { - if (updating) return; @@ -544,7 +519,6 @@ void SpriteFramesEditor::_animation_name_edited() { undo_redo->add_undo_method(frames, "rename_animation", name, edited_anim); for (List<Node *>::Element *E = nodes.front(); E; E = E->next()) { - String current = E->get()->call("get_animation"); undo_redo->add_do_method(E->get(), "set_animation", name); undo_redo->add_undo_method(E->get(), "set_animation", edited_anim); @@ -559,7 +533,6 @@ void SpriteFramesEditor::_animation_name_edited() { } void SpriteFramesEditor::_animation_add() { - String name = "New Anim"; int counter = 0; while (frames->has_animation(name)) { @@ -577,7 +550,6 @@ void SpriteFramesEditor::_animation_add() { undo_redo->add_undo_method(this, "_update_library"); for (List<Node *>::Element *E = nodes.front(); E; E = E->next()) { - String current = E->get()->call("get_animation"); undo_redo->add_do_method(E->get(), "set_animation", name); undo_redo->add_undo_method(E->get(), "set_animation", current); @@ -590,7 +562,6 @@ void SpriteFramesEditor::_animation_add() { } void SpriteFramesEditor::_animation_remove() { - if (updating) return; @@ -602,7 +573,6 @@ void SpriteFramesEditor::_animation_remove() { } void SpriteFramesEditor::_animation_remove_confirmed() { - undo_redo->create_action(TTR("Remove Animation")); undo_redo->add_do_method(frames, "remove_animation", edited_anim); undo_redo->add_undo_method(frames, "add_animation", edited_anim); @@ -622,7 +592,6 @@ void SpriteFramesEditor::_animation_remove_confirmed() { } void SpriteFramesEditor::_animation_loop_changed() { - if (updating) return; @@ -635,7 +604,6 @@ void SpriteFramesEditor::_animation_loop_changed() { } void SpriteFramesEditor::_animation_fps_changed(double p_value) { - if (updating) return; @@ -649,7 +617,6 @@ void SpriteFramesEditor::_animation_fps_changed(double p_value) { } void SpriteFramesEditor::_update_library(bool p_skip_selector) { - updating = true; if (!p_skip_selector) { @@ -664,7 +631,6 @@ void SpriteFramesEditor::_update_library(bool p_skip_selector) { anim_names.sort_custom<StringName::AlphCompare>(); for (List<StringName>::Element *E = anim_names.front(); E; E = E->next()) { - String name = E->get(); TreeItem *it = animations->create_item(anim_root); @@ -693,12 +659,10 @@ void SpriteFramesEditor::_update_library(bool p_skip_selector) { sel = 0; for (int i = 0; i < frames->get_frame_count(edited_anim); i++) { - String name; Ref<Texture2D> icon; if (frames->get_frame(edited_anim, i).is_null()) { - name = itos(i) + ": " + TTR("(empty)"); } else { @@ -721,16 +685,13 @@ void SpriteFramesEditor::_update_library(bool p_skip_selector) { } void SpriteFramesEditor::edit(SpriteFrames *p_frames) { - if (frames == p_frames) return; frames = p_frames; if (p_frames) { - if (!p_frames->has_animation(edited_anim)) { - List<StringName> anim_names; frames->get_animation_list(&anim_names); anim_names.sort_custom<StringName::AlphCompare>(); @@ -743,13 +704,11 @@ void SpriteFramesEditor::edit(SpriteFrames *p_frames) { _update_library(); } else { - hide(); } } Variant SpriteFramesEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from) { - if (!frames->has_animation(edited_anim)) return false; @@ -769,7 +728,6 @@ Variant SpriteFramesEditor::get_drag_data_fw(const Point2 &p_point, Control *p_f } bool SpriteFramesEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const { - Dictionary d = p_data; if (!d.has("type")) @@ -785,13 +743,11 @@ bool SpriteFramesEditor::can_drop_data_fw(const Point2 &p_point, const Variant & Ref<Texture2D> texture = r; if (texture.is_valid()) { - return true; } } if (String(d["type"]) == "files") { - Vector<String> files = d["files"]; if (files.size() == 0) @@ -812,7 +768,6 @@ bool SpriteFramesEditor::can_drop_data_fw(const Point2 &p_point, const Variant & } void SpriteFramesEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) { - if (!can_drop_data_fw(p_point, p_data, p_from)) return; @@ -858,7 +813,6 @@ void SpriteFramesEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da } if (String(d["type"]) == "files") { - Vector<String> files = d["files"]; _file_load_request(files, at_pos); @@ -866,7 +820,6 @@ void SpriteFramesEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da } void SpriteFramesEditor::_bind_methods() { - ClassDB::bind_method(D_METHOD("_update_library", "skipsel"), &SpriteFramesEditor::_update_library, DEFVAL(false)); ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &SpriteFramesEditor::get_drag_data_fw); ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &SpriteFramesEditor::can_drop_data_fw); @@ -874,7 +827,6 @@ void SpriteFramesEditor::_bind_methods() { } SpriteFramesEditor::SpriteFramesEditor() { - VBoxContainer *vbc_animlist = memnew(VBoxContainer); add_child(vbc_animlist); vbc_animlist->set_custom_minimum_size(Size2(150, 0) * EDSCALE); @@ -1071,7 +1023,6 @@ SpriteFramesEditor::SpriteFramesEditor() { } void SpriteFramesEditorPlugin::edit(Object *p_object) { - frames_editor->set_undo_redo(&get_undo_redo()); SpriteFrames *s; @@ -1083,7 +1034,6 @@ void SpriteFramesEditorPlugin::edit(Object *p_object) { if (animated_sprite_3d) { s = *animated_sprite_3d->get_sprite_frames(); } else { - s = Object::cast_to<SpriteFrames>(p_object); } } @@ -1092,7 +1042,6 @@ void SpriteFramesEditorPlugin::edit(Object *p_object) { } bool SpriteFramesEditorPlugin::handles(Object *p_object) const { - AnimatedSprite2D *animated_sprite = Object::cast_to<AnimatedSprite2D>(p_object); AnimatedSprite3D *animated_sprite_3d = Object::cast_to<AnimatedSprite3D>(p_object); if (animated_sprite && *animated_sprite->get_sprite_frames()) { @@ -1105,12 +1054,10 @@ bool SpriteFramesEditorPlugin::handles(Object *p_object) const { } void SpriteFramesEditorPlugin::make_visible(bool p_visible) { - if (p_visible) { button->show(); editor->make_bottom_panel_item_visible(frames_editor); } else { - button->hide(); if (frames_editor->is_visible_in_tree()) editor->hide_bottom_panel(); @@ -1118,7 +1065,6 @@ void SpriteFramesEditorPlugin::make_visible(bool p_visible) { } SpriteFramesEditorPlugin::SpriteFramesEditorPlugin(EditorNode *p_node) { - editor = p_node; frames_editor = memnew(SpriteFramesEditor); frames_editor->set_custom_minimum_size(Size2(0, 300) * EDSCALE); |