You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-17 14:11:06 +00:00
Refactoring of polygon editors to a common code base
includes rebase and manual application67a706fc1band4537977d6d
This commit is contained in:
Bernhard Liebl
committed by
Bernhard Liebl
Bernhard Liebl
parent
6dc1025e63
commit
f815a3df7e
414
editor/plugins/polygon_2d_editor_plugin.cpp
Normal file → Executable file
414
editor/plugins/polygon_2d_editor_plugin.cpp
Normal file → Executable file
@@ -35,15 +35,27 @@
|
||||
#include "os/input.h"
|
||||
#include "os/keyboard.h"
|
||||
|
||||
Node2D *Polygon2DEditor::_get_node() const {
|
||||
|
||||
return node;
|
||||
}
|
||||
|
||||
void Polygon2DEditor::_set_node(Node *p_polygon) {
|
||||
|
||||
node = Object::cast_to<Polygon2D>(p_polygon);
|
||||
}
|
||||
|
||||
Vector2 Polygon2DEditor::_get_offset(int p_idx) const {
|
||||
|
||||
return node->get_offset();
|
||||
}
|
||||
|
||||
void Polygon2DEditor::_notification(int p_what) {
|
||||
|
||||
switch (p_what) {
|
||||
|
||||
case NOTIFICATION_READY: {
|
||||
|
||||
button_create->set_icon(get_icon("Edit", "EditorIcons"));
|
||||
button_edit->set_icon(get_icon("MovePoint", "EditorIcons"));
|
||||
button_edit->set_pressed(true);
|
||||
button_uv->set_icon(get_icon("Uv", "EditorIcons"));
|
||||
|
||||
uv_button[UV_MODE_EDIT_POINT]->set_icon(get_icon("ToolSelect", "EditorIcons"));
|
||||
@@ -55,40 +67,17 @@ void Polygon2DEditor::_notification(int p_what) {
|
||||
b_snap_enable->set_icon(get_icon("SnapGrid", "EditorIcons"));
|
||||
uv_icon_zoom->set_texture(get_icon("Zoom", "EditorIcons"));
|
||||
|
||||
get_tree()->connect("node_removed", this, "_node_removed");
|
||||
|
||||
} break;
|
||||
case NOTIFICATION_PHYSICS_PROCESS: {
|
||||
|
||||
} break;
|
||||
}
|
||||
}
|
||||
void Polygon2DEditor::_node_removed(Node *p_node) {
|
||||
|
||||
if (p_node == node) {
|
||||
edit(NULL);
|
||||
hide();
|
||||
|
||||
canvas_item_editor->get_viewport_control()->update();
|
||||
}
|
||||
}
|
||||
|
||||
void Polygon2DEditor::_menu_option(int p_option) {
|
||||
|
||||
switch (p_option) {
|
||||
|
||||
case MODE_CREATE: {
|
||||
|
||||
mode = MODE_CREATE;
|
||||
button_create->set_pressed(true);
|
||||
button_edit->set_pressed(false);
|
||||
} break;
|
||||
case MODE_EDIT: {
|
||||
|
||||
mode = MODE_EDIT;
|
||||
button_create->set_pressed(false);
|
||||
button_edit->set_pressed(true);
|
||||
} break;
|
||||
case MODE_EDIT_UV: {
|
||||
|
||||
if (node->get_texture().is_null()) {
|
||||
@@ -153,6 +142,9 @@ void Polygon2DEditor::_menu_option(int p_option) {
|
||||
undo_redo->commit_action();
|
||||
|
||||
} break;
|
||||
default: {
|
||||
AbstractPolygon2DEditor::_menu_option(p_option);
|
||||
} break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -185,289 +177,6 @@ void Polygon2DEditor::_set_snap_step_y(float p_val) {
|
||||
uv_edit_draw->update();
|
||||
}
|
||||
|
||||
void Polygon2DEditor::_wip_close() {
|
||||
|
||||
undo_redo->create_action(TTR("Create Poly"));
|
||||
undo_redo->add_undo_method(node, "set_polygon", node->get_polygon());
|
||||
undo_redo->add_do_method(node, "set_polygon", wip);
|
||||
undo_redo->add_do_method(canvas_item_editor->get_viewport_control(), "update");
|
||||
undo_redo->add_undo_method(canvas_item_editor->get_viewport_control(), "update");
|
||||
undo_redo->commit_action();
|
||||
wip.clear();
|
||||
wip_active = false;
|
||||
mode = MODE_EDIT;
|
||||
button_edit->set_pressed(true);
|
||||
button_create->set_pressed(false);
|
||||
edited_point = -1;
|
||||
}
|
||||
|
||||
bool Polygon2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
|
||||
|
||||
if (node == NULL)
|
||||
return false;
|
||||
|
||||
Ref<InputEventMouseButton> mb = p_event;
|
||||
|
||||
if (mb.is_valid()) {
|
||||
|
||||
Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
|
||||
|
||||
Vector2 gpoint = mb->get_position();
|
||||
Vector2 cpoint = canvas_item_editor->get_canvas_transform().affine_inverse().xform(gpoint);
|
||||
cpoint = canvas_item_editor->snap_point(cpoint);
|
||||
cpoint = node->get_global_transform().affine_inverse().xform(cpoint);
|
||||
|
||||
Vector<Vector2> poly = Variant(node->get_polygon());
|
||||
|
||||
//first check if a point is to be added (segment split)
|
||||
real_t grab_threshold = EDITOR_DEF("editors/poly_editor/point_grab_radius", 8);
|
||||
|
||||
switch (mode) {
|
||||
|
||||
case MODE_CREATE: {
|
||||
|
||||
if (mb->get_button_index() == BUTTON_LEFT && mb->is_pressed()) {
|
||||
|
||||
if (!wip_active) {
|
||||
|
||||
wip.clear();
|
||||
wip.push_back(cpoint - node->get_offset());
|
||||
wip_active = true;
|
||||
edited_point_pos = cpoint;
|
||||
canvas_item_editor->get_viewport_control()->update();
|
||||
edited_point = 1;
|
||||
return true;
|
||||
} else {
|
||||
|
||||
if (wip.size() > 1 && xform.xform(wip[0] + node->get_offset()).distance_to(gpoint) < grab_threshold) {
|
||||
//wip closed
|
||||
_wip_close();
|
||||
|
||||
return true;
|
||||
} else {
|
||||
|
||||
wip.push_back(cpoint - node->get_offset());
|
||||
edited_point = wip.size();
|
||||
canvas_item_editor->get_viewport_control()->update();
|
||||
return true;
|
||||
|
||||
//add wip point
|
||||
}
|
||||
}
|
||||
} else if (mb->get_button_index() == BUTTON_RIGHT && mb->is_pressed() && wip_active) {
|
||||
_wip_close();
|
||||
}
|
||||
|
||||
} break;
|
||||
|
||||
case MODE_EDIT: {
|
||||
|
||||
if (mb->get_button_index() == BUTTON_LEFT) {
|
||||
if (mb->is_pressed()) {
|
||||
|
||||
if (mb->get_control()) {
|
||||
|
||||
if (poly.size() < 3) {
|
||||
|
||||
undo_redo->create_action(TTR("Edit Poly"));
|
||||
undo_redo->add_undo_method(node, "set_polygon", poly);
|
||||
poly.push_back(cpoint);
|
||||
undo_redo->add_do_method(node, "set_polygon", poly);
|
||||
undo_redo->add_do_method(canvas_item_editor->get_viewport_control(), "update");
|
||||
undo_redo->add_undo_method(canvas_item_editor->get_viewport_control(), "update");
|
||||
undo_redo->commit_action();
|
||||
return true;
|
||||
}
|
||||
|
||||
//search edges
|
||||
int closest_idx = -1;
|
||||
Vector2 closest_pos;
|
||||
real_t closest_dist = 1e10;
|
||||
for (int i = 0; i < poly.size(); i++) {
|
||||
|
||||
Vector2 points[2] = { xform.xform(poly[i] + node->get_offset()),
|
||||
xform.xform(poly[(i + 1) % poly.size()] + node->get_offset()) };
|
||||
|
||||
Vector2 cp = Geometry::get_closest_point_to_segment_2d(gpoint, points);
|
||||
if (cp.distance_squared_to(points[0]) < CMP_EPSILON2 || cp.distance_squared_to(points[1]) < CMP_EPSILON2)
|
||||
continue; //not valid to reuse point
|
||||
|
||||
real_t d = cp.distance_to(gpoint);
|
||||
if (d < closest_dist && d < grab_threshold) {
|
||||
closest_dist = d;
|
||||
closest_pos = cp;
|
||||
closest_idx = i;
|
||||
}
|
||||
}
|
||||
|
||||
if (closest_idx >= 0) {
|
||||
|
||||
pre_move_edit = poly;
|
||||
poly.insert(closest_idx + 1, xform.affine_inverse().xform(closest_pos) - node->get_offset());
|
||||
edited_point = closest_idx + 1;
|
||||
edited_point_pos = xform.affine_inverse().xform(closest_pos);
|
||||
node->set_polygon(Variant(poly));
|
||||
canvas_item_editor->get_viewport_control()->update();
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
|
||||
//look for points to move
|
||||
|
||||
int closest_idx = -1;
|
||||
Vector2 closest_pos;
|
||||
real_t closest_dist = 1e10;
|
||||
for (int i = 0; i < poly.size(); i++) {
|
||||
|
||||
Vector2 cp = xform.xform(poly[i] + node->get_offset());
|
||||
|
||||
real_t d = cp.distance_to(gpoint);
|
||||
if (d < closest_dist && d < grab_threshold) {
|
||||
closest_dist = d;
|
||||
closest_pos = cp;
|
||||
closest_idx = i;
|
||||
}
|
||||
}
|
||||
|
||||
if (closest_idx >= 0) {
|
||||
|
||||
pre_move_edit = poly;
|
||||
edited_point = closest_idx;
|
||||
edited_point_pos = xform.affine_inverse().xform(closest_pos);
|
||||
canvas_item_editor->get_viewport_control()->update();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
if (edited_point != -1) {
|
||||
|
||||
//apply
|
||||
|
||||
ERR_FAIL_INDEX_V(edited_point, poly.size(), false);
|
||||
poly[edited_point] = edited_point_pos - node->get_offset();
|
||||
undo_redo->create_action(TTR("Edit Poly"));
|
||||
undo_redo->add_do_method(node, "set_polygon", poly);
|
||||
undo_redo->add_undo_method(node, "set_polygon", pre_move_edit);
|
||||
undo_redo->add_do_method(canvas_item_editor->get_viewport_control(), "update");
|
||||
undo_redo->add_undo_method(canvas_item_editor->get_viewport_control(), "update");
|
||||
undo_redo->commit_action();
|
||||
|
||||
edited_point = -1;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
} else if (mb->get_button_index() == BUTTON_RIGHT && mb->is_pressed() && edited_point == -1) {
|
||||
|
||||
int closest_idx = -1;
|
||||
Vector2 closest_pos;
|
||||
real_t closest_dist = 1e10;
|
||||
for (int i = 0; i < poly.size(); i++) {
|
||||
|
||||
Vector2 cp = xform.xform(poly[i] + node->get_offset());
|
||||
|
||||
real_t d = cp.distance_to(gpoint);
|
||||
if (d < closest_dist && d < grab_threshold) {
|
||||
closest_dist = d;
|
||||
closest_pos = cp;
|
||||
closest_idx = i;
|
||||
}
|
||||
}
|
||||
|
||||
if (closest_idx >= 0) {
|
||||
|
||||
undo_redo->create_action(TTR("Edit Poly (Remove Point)"));
|
||||
undo_redo->add_undo_method(node, "set_polygon", poly);
|
||||
poly.remove(closest_idx);
|
||||
undo_redo->add_do_method(node, "set_polygon", poly);
|
||||
undo_redo->add_do_method(canvas_item_editor->get_viewport_control(), "update");
|
||||
undo_redo->add_undo_method(canvas_item_editor->get_viewport_control(), "update");
|
||||
undo_redo->commit_action();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
} break;
|
||||
}
|
||||
}
|
||||
|
||||
Ref<InputEventMouseMotion> mm = p_event;
|
||||
|
||||
if (mm.is_valid()) {
|
||||
|
||||
if (edited_point != -1 && (wip_active || (mm->get_button_mask() & BUTTON_MASK_LEFT))) {
|
||||
|
||||
Vector2 gpoint = mm->get_position();
|
||||
Vector2 cpoint = canvas_item_editor->get_canvas_transform().affine_inverse().xform(gpoint);
|
||||
cpoint = canvas_item_editor->snap_point(cpoint);
|
||||
edited_point_pos = node->get_global_transform().affine_inverse().xform(cpoint);
|
||||
|
||||
if (!wip_active) {
|
||||
|
||||
Vector<Vector2> poly = Variant(node->get_polygon());
|
||||
ERR_FAIL_INDEX_V(edited_point, poly.size(), false);
|
||||
poly[edited_point] = edited_point_pos - node->get_offset();
|
||||
node->set_polygon(Variant(poly));
|
||||
}
|
||||
|
||||
canvas_item_editor->get_viewport_control()->update();
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
void Polygon2DEditor::_canvas_draw() {
|
||||
|
||||
if (!node)
|
||||
return;
|
||||
|
||||
Control *vpc = canvas_item_editor->get_viewport_control();
|
||||
|
||||
Vector<Vector2> poly;
|
||||
|
||||
if (wip_active)
|
||||
poly = wip;
|
||||
else
|
||||
poly = Variant(node->get_polygon());
|
||||
|
||||
Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
|
||||
Ref<Texture> handle = get_icon("EditorHandle", "EditorIcons");
|
||||
|
||||
if (!wip_active && edited_point >= 0 && EDITOR_DEF("editors/poly_editor/show_previous_outline", true)) {
|
||||
|
||||
const Color col = node->get_color().contrasted();
|
||||
const int n = pre_move_edit.size();
|
||||
for (int i = 0; i < n; i++) {
|
||||
|
||||
Vector2 p, p2;
|
||||
p = pre_move_edit[i] + node->get_offset();
|
||||
p2 = pre_move_edit[(i + 1) % n] + node->get_offset();
|
||||
|
||||
Vector2 point = xform.xform(p);
|
||||
Vector2 next_point = xform.xform(p2);
|
||||
|
||||
vpc->draw_line(point, next_point, col, 2);
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < poly.size(); i++) {
|
||||
|
||||
Vector2 p, p2;
|
||||
p = i == edited_point ? edited_point_pos : (poly[i] + node->get_offset());
|
||||
if ((wip_active && i == poly.size() - 1) || (((i + 1) % poly.size()) == edited_point))
|
||||
p2 = edited_point_pos;
|
||||
else
|
||||
p2 = poly[(i + 1) % poly.size()] + node->get_offset();
|
||||
|
||||
Vector2 point = xform.xform(p);
|
||||
Vector2 next_point = xform.xform(p2);
|
||||
|
||||
Color col = Color(1, 0.3, 0.1, 0.8);
|
||||
vpc->draw_line(point, next_point, col, 2);
|
||||
vpc->draw_texture(handle, point - handle->get_size() * 0.5);
|
||||
}
|
||||
}
|
||||
|
||||
void Polygon2DEditor::_uv_mode(int p_mode) {
|
||||
|
||||
uv_mode = UVMode(p_mode);
|
||||
@@ -714,44 +423,12 @@ void Polygon2DEditor::_uv_draw() {
|
||||
updating_uv_scroll = false;
|
||||
}
|
||||
|
||||
void Polygon2DEditor::edit(Node *p_collision_polygon) {
|
||||
|
||||
if (!canvas_item_editor) {
|
||||
canvas_item_editor = CanvasItemEditor::get_singleton();
|
||||
}
|
||||
|
||||
if (p_collision_polygon) {
|
||||
|
||||
node = Object::cast_to<Polygon2D>(p_collision_polygon);
|
||||
//Enable the pencil tool if the polygon is empty
|
||||
if (node->get_polygon().size() == 0) {
|
||||
_menu_option(MODE_CREATE);
|
||||
}
|
||||
if (!canvas_item_editor->get_viewport_control()->is_connected("draw", this, "_canvas_draw"))
|
||||
canvas_item_editor->get_viewport_control()->connect("draw", this, "_canvas_draw");
|
||||
|
||||
wip.clear();
|
||||
wip_active = false;
|
||||
edited_point = -1;
|
||||
|
||||
} else {
|
||||
|
||||
node = NULL;
|
||||
|
||||
if (canvas_item_editor->get_viewport_control()->is_connected("draw", this, "_canvas_draw"))
|
||||
canvas_item_editor->get_viewport_control()->disconnect("draw", this, "_canvas_draw");
|
||||
}
|
||||
}
|
||||
|
||||
void Polygon2DEditor::_bind_methods() {
|
||||
|
||||
ClassDB::bind_method(D_METHOD("_menu_option"), &Polygon2DEditor::_menu_option);
|
||||
ClassDB::bind_method(D_METHOD("_canvas_draw"), &Polygon2DEditor::_canvas_draw);
|
||||
ClassDB::bind_method(D_METHOD("_uv_mode"), &Polygon2DEditor::_uv_mode);
|
||||
ClassDB::bind_method(D_METHOD("_uv_draw"), &Polygon2DEditor::_uv_draw);
|
||||
ClassDB::bind_method(D_METHOD("_uv_input"), &Polygon2DEditor::_uv_input);
|
||||
ClassDB::bind_method(D_METHOD("_uv_scroll_changed"), &Polygon2DEditor::_uv_scroll_changed);
|
||||
ClassDB::bind_method(D_METHOD("_node_removed"), &Polygon2DEditor::_node_removed);
|
||||
ClassDB::bind_method(D_METHOD("_set_use_snap"), &Polygon2DEditor::_set_use_snap);
|
||||
ClassDB::bind_method(D_METHOD("_set_show_grid"), &Polygon2DEditor::_set_show_grid);
|
||||
ClassDB::bind_method(D_METHOD("_set_snap_off_x"), &Polygon2DEditor::_set_snap_off_x);
|
||||
@@ -773,35 +450,17 @@ Vector2 Polygon2DEditor::snap_point(Vector2 p_target) const {
|
||||
return p_target;
|
||||
}
|
||||
|
||||
Polygon2DEditor::Polygon2DEditor(EditorNode *p_editor) {
|
||||
|
||||
node = NULL;
|
||||
canvas_item_editor = NULL;
|
||||
editor = p_editor;
|
||||
undo_redo = editor->get_undo_redo();
|
||||
Polygon2DEditor::Polygon2DEditor(EditorNode *p_editor)
|
||||
: AbstractPolygon2DEditor(p_editor) {
|
||||
|
||||
snap_step = Vector2(10, 10);
|
||||
use_snap = false;
|
||||
snap_show_grid = false;
|
||||
|
||||
add_child(memnew(VSeparator));
|
||||
button_create = memnew(ToolButton);
|
||||
add_child(button_create);
|
||||
button_create->connect("pressed", this, "_menu_option", varray(MODE_CREATE));
|
||||
button_create->set_toggle_mode(true);
|
||||
|
||||
button_edit = memnew(ToolButton);
|
||||
add_child(button_edit);
|
||||
button_edit->connect("pressed", this, "_menu_option", varray(MODE_EDIT));
|
||||
button_edit->set_toggle_mode(true);
|
||||
|
||||
button_uv = memnew(ToolButton);
|
||||
add_child(button_uv);
|
||||
button_uv->connect("pressed", this, "_menu_option", varray(MODE_EDIT_UV));
|
||||
|
||||
mode = MODE_EDIT;
|
||||
wip_active = false;
|
||||
|
||||
uv_mode = UV_MODE_EDIT_POINT;
|
||||
uv_edit = memnew(AcceptDialog);
|
||||
add_child(uv_edit);
|
||||
@@ -941,35 +600,6 @@ Polygon2DEditor::Polygon2DEditor(EditorNode *p_editor) {
|
||||
uv_edit_draw->set_clip_contents(true);
|
||||
}
|
||||
|
||||
void Polygon2DEditorPlugin::edit(Object *p_object) {
|
||||
|
||||
collision_polygon_editor->edit(Object::cast_to<Node>(p_object));
|
||||
}
|
||||
|
||||
bool Polygon2DEditorPlugin::handles(Object *p_object) const {
|
||||
|
||||
return p_object->is_class("Polygon2D");
|
||||
}
|
||||
|
||||
void Polygon2DEditorPlugin::make_visible(bool p_visible) {
|
||||
|
||||
if (p_visible) {
|
||||
collision_polygon_editor->show();
|
||||
} else {
|
||||
|
||||
collision_polygon_editor->hide();
|
||||
collision_polygon_editor->edit(NULL);
|
||||
}
|
||||
}
|
||||
|
||||
Polygon2DEditorPlugin::Polygon2DEditorPlugin(EditorNode *p_node) {
|
||||
|
||||
editor = p_node;
|
||||
collision_polygon_editor = memnew(Polygon2DEditor(p_node));
|
||||
CanvasItemEditor::get_singleton()->add_control_to_menu_panel(collision_polygon_editor);
|
||||
|
||||
collision_polygon_editor->hide();
|
||||
}
|
||||
|
||||
Polygon2DEditorPlugin::~Polygon2DEditorPlugin() {
|
||||
Polygon2DEditorPlugin::Polygon2DEditorPlugin(EditorNode *p_node)
|
||||
: AbstractPolygon2DEditorPlugin(p_node, memnew(Polygon2DEditor(p_node)), "Polygon2D") {
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user