mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify making texture nodes in 2D editor

Browse Source
This commit is contained in:
kobewi 2023-08-19 00:17:34 +02:00
parent b51ee8b029
commit 0d8f8d7054
2 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -44,20 +44,15 @@
#include "editor/plugins/animation_player_editor_plugin.h"
#include "editor/plugins/script_editor_plugin.h"
#include "editor/scene_tree_dock.h"
#include "scene/2d/cpu_particles_2d.h"
#include "scene/2d/gpu_particles_2d.h"
#include "scene/2d/light_2d.h"
#include "scene/2d/polygon_2d.h"
#include "scene/2d/skeleton_2d.h"
#include "scene/2d/sprite_2d.h"
#include "scene/2d/touch_screen_button.h"
#include "scene/gui/flow_container.h"
#include "scene/gui/grid_container.h"
#include "scene/gui/nine_patch_rect.h"
#include "scene/gui/separator.h"
#include "scene/gui/split_container.h"
#include "scene/gui/subviewport_container.h"
#include "scene/gui/texture_rect.h"
#include "scene/gui/view_panner.h"
#include "scene/main/canvas_layer.h"
#include "scene/main/window.h"
@ -5722,7 +5717,7 @@ void CanvasItemEditorViewport::_perform_drop_data() {
} else {
Ref<Texture2D> texture = Ref<Texture2D>(Object::cast_to<Texture2D>(*res));
if (texture != nullptr && texture.is_valid()) {
Node *child = _make_texture_node_type(default_texture_node_type);
Node *child = Object::cast_to<Node>(ClassDB::instantiate(default_texture_node_type));
_create_nodes(target_node, child, path, drop_pos);
}
}
@ -5853,30 +5848,6 @@ void CanvasItemEditorViewport::drop_data(const Point2 &p_point, const Variant &p
}
}
Node *CanvasItemEditorViewport::_make_texture_node_type(String texture_node_type) {
Node *node = nullptr;
if (texture_node_type == "Sprite2D") {
node = memnew(Sprite2D);
} else if (texture_node_type == "PointLight2D") {
node = memnew(PointLight2D);
} else if (texture_node_type == "CPUParticles2D") {
node = memnew(CPUParticles2D);
} else if (texture_node_type == "GPUParticles2D") {
node = memnew(GPUParticles2D);
} else if (texture_node_type == "Polygon2D") {
node = memnew(Polygon2D);
} else if (texture_node_type == "TouchScreenButton") {
node = memnew(TouchScreenButton);
} else if (texture_node_type == "TextureRect") {
node = memnew(TextureRect);
} else if (texture_node_type == "TextureButton") {
node = memnew(TextureButton);
} else if (texture_node_type == "NinePatchRect") {
node = memnew(NinePatchRect);
}
return node;
}
void CanvasItemEditorViewport::_update_theme() {
List<BaseButton *> btn_list;
button_group->get_buttons(&btn_list);

1
editor/plugins/canvas_item_editor_plugin.h
View File

@ -613,7 +613,6 @@ class CanvasItemEditorViewport : public Control {
void _on_select_type(Object *selected);
void _on_change_type_confirmed();
void _on_change_type_closed();
Node *_make_texture_node_type(String texture_node_type);
void _create_preview(const Vector<String> &files) const;
void _remove_preview();