Merge pull request #11019 from poke1024/refactor-polygon-v2

Refactoring of polygon editors to a common code base (v2)

8 files changed, 877 insertions, 1378 deletions

diff --git a/editor/plugins/abstract_polygon_2d_editor.cpp b/editor/plugins/abstract_polygon_2d_editor.cpp
new file mode 100644
index 0000000000..2fd74d529e
--- /dev/null
+++ b/editor/plugins/abstract_polygon_2d_editor.cpp
@@ -0,0 +1,619 @@
+/*************************************************************************/
+/*  abstract_polygon_2d_editor.cpp                                       */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "abstract_polygon_2d_editor.h"
+
+#include "canvas_item_editor_plugin.h"
+
+bool AbstractPolygon2DEditor::_is_empty() const {
+
+	if (!_get_node())
+		return true;
+
+	const int n = _get_polygon_count();
+
+	for (int i = 0; i < n; i++) {
+
+		Vector<Vector2> vertices = _get_polygon(i);
+
+		if (vertices.size() != 0)
+			return false;
+	}
+
+	return true;
+}
+
+int AbstractPolygon2DEditor::_get_polygon_count() const {
+
+	return 1;
+}
+
+Variant AbstractPolygon2DEditor::_get_polygon(int p_idx) const {
+
+	return _get_node()->get("polygon");
+}
+
+void AbstractPolygon2DEditor::_set_polygon(int p_idx, const Variant &p_polygon) const {
+
+	_get_node()->set("polygon", p_polygon);
+}
+
+void AbstractPolygon2DEditor::_action_set_polygon(int p_idx, const Variant &p_previous, const Variant &p_polygon) {
+
+	Node2D *node = _get_node();
+	undo_redo->add_do_method(node, "set_polygon", p_polygon);
+	undo_redo->add_undo_method(node, "set_polygon", p_previous);
+}
+
+Vector2 AbstractPolygon2DEditor::_get_offset(int p_idx) const {
+
+	return Vector2(0, 0);
+}
+
+void AbstractPolygon2DEditor::_commit_action() {
+
+	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();
+}
+
+void AbstractPolygon2DEditor::_action_add_polygon(const Variant &p_polygon) {
+
+	_action_set_polygon(0, p_polygon);
+}
+
+void AbstractPolygon2DEditor::_action_remove_polygon(int p_idx) {
+
+	_action_set_polygon(p_idx, _get_polygon(p_idx), PoolVector<Vector2>());
+}
+
+void AbstractPolygon2DEditor::_action_set_polygon(int p_idx, const Variant &p_polygon) {
+
+	_action_set_polygon(p_idx, _get_polygon(p_idx), p_polygon);
+}
+
+bool AbstractPolygon2DEditor::_has_resource() const {
+
+	return true;
+}
+
+void AbstractPolygon2DEditor::_create_resource() {
+}
+
+void AbstractPolygon2DEditor::_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;
+	}
+}
+
+void AbstractPolygon2DEditor::_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);
+
+			get_tree()->connect("node_removed", this, "_node_removed");
+
+			create_resource->connect("confirmed", this, "_create_resource");
+
+		} break;
+		case NOTIFICATION_PHYSICS_PROCESS: {
+
+		} break;
+	}
+}
+
+void AbstractPolygon2DEditor::_node_removed(Node *p_node) {
+
+	if (p_node == _get_node()) {
+		edit(NULL);
+		hide();
+
+		canvas_item_editor->get_viewport_control()->update();
+	}
+}
+
+void AbstractPolygon2DEditor::_wip_close() {
+
+	if (wip.size() >= 3) {
+
+		undo_redo->create_action(TTR("Create Poly"));
+		_action_add_polygon(wip);
+		_commit_action();
+
+		mode = MODE_EDIT;
+		button_edit->set_pressed(true);
+		button_create->set_pressed(false);
+	}
+
+	wip.clear();
+	wip_active = false;
+	edited_point = -1;
+}
+
+bool AbstractPolygon2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
+
+	if (!_get_node())
+		return false;
+
+	Ref<InputEventMouseButton> mb = p_event;
+
+	if (!_has_resource()) {
+
+		if (mb.is_valid() && mb->get_button_index() == 1 && mb->is_pressed()) {
+			create_resource->set_text(String("No polygon resource on this node.\nCreate and assign one?"));
+			create_resource->popup_centered_minsize();
+		}
+		return (mb.is_valid() && mb->get_button_index() == 1);
+	}
+
+	if (mb.is_valid()) {
+
+		Transform2D xform = canvas_item_editor->get_canvas_transform() * _get_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 = _get_node()->get_global_transform().affine_inverse().xform(cpoint);
+
+		//first check if a point is to be added (segment split)
+		real_t grab_threshold = EDITOR_DEF("editors/poly_editor/point_grab_radius", 8);
+
+		if (mode == MODE_CREATE) {
+
+			if (mb->get_button_index() == BUTTON_LEFT && mb->is_pressed()) {
+
+				if (!wip_active) {
+
+					wip.clear();
+					wip.push_back(cpoint);
+					wip_active = true;
+					edited_point_pos = cpoint;
+					edited_polygon = -1;
+					edited_point = 1;
+					canvas_item_editor->get_viewport_control()->update();
+					return true;
+				} else {
+
+					if (wip.size() > 1 && xform.xform(wip[0]).distance_to(gpoint) < grab_threshold) {
+						//wip closed
+						_wip_close();
+
+						return true;
+					} else {
+
+						wip.push_back(cpoint);
+						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();
+			}
+		} else if (mode == MODE_EDIT) {
+
+			if (mb->get_button_index() == BUTTON_LEFT) {
+
+				if (mb->is_pressed()) {
+
+					if (mb->get_control()) {
+
+						const int n_polygons = _get_polygon_count();
+
+						if (n_polygons >= 1) {
+
+							Vector<Vector2> vertices = _get_polygon(n_polygons - 1);
+
+							if (vertices.size() < 3) {
+
+								vertices.push_back(cpoint);
+								undo_redo->create_action(TTR("Edit Poly"));
+								_action_set_polygon(n_polygons - 1, vertices);
+								_commit_action();
+								return true;
+							}
+						}
+
+						//search edges
+						int closest_poly = -1;
+						int closest_idx = -1;
+						Vector2 closest_pos;
+						real_t closest_dist = 1e10;
+
+						for (int j = 0; j < n_polygons; j++) {
+
+							PoolVector<Vector2> points = _get_polygon(j);
+							const Vector2 offset = _get_offset(j);
+							const int n_points = points.size();
+
+							for (int i = 0; i < n_points; i++) {
+
+								Vector2 p[2] = { xform.xform(points[i] + offset),
+									xform.xform(points[(i + 1) % n_points] + offset) };
+
+								Vector2 cp = Geometry::get_closest_point_to_segment_2d(gpoint, p);
+								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_poly = j;
+									closest_dist = d;
+									closest_pos = cp;
+									closest_idx = i;
+								}
+							}
+						}
+
+						if (closest_idx >= 0) {
+
+							Vector<Vector2> vertices = _get_polygon(closest_poly);
+							pre_move_edit = vertices;
+							vertices.insert(closest_idx + 1, xform.affine_inverse().xform(closest_pos));
+							edited_point = closest_idx + 1;
+							edited_polygon = closest_poly;
+							edited_point_pos = xform.affine_inverse().xform(closest_pos);
+
+							undo_redo->create_action(TTR("Insert Point"));
+							_action_set_polygon(closest_poly, vertices);
+							_commit_action();
+
+							return true;
+						}
+					} else {
+
+						//look for points to move
+						int closest_poly = -1;
+						int closest_idx = -1;
+						Vector2 closest_pos;
+						real_t closest_dist = 1e10;
+
+						const int n_polygons = _get_polygon_count();
+
+						for (int j = 0; j < n_polygons; j++) {
+
+							PoolVector<Vector2> points = _get_polygon(j);
+							const Vector2 offset = _get_offset(j);
+							const int n_points = points.size();
+
+							for (int i = 0; i < n_points; i++) {
+
+								Vector2 cp = xform.xform(points[i] + offset);
+
+								real_t d = cp.distance_to(gpoint);
+								if (d < closest_dist && d < grab_threshold) {
+									closest_poly = j;
+									closest_dist = d;
+									closest_pos = cp;
+									closest_idx = i;
+								}
+							}
+						}
+
+						if (closest_idx >= 0) {
+
+							pre_move_edit = _get_polygon(closest_poly);
+							edited_polygon = closest_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
+
+						Vector<Vector2> vertices = _get_polygon(edited_polygon);
+						ERR_FAIL_INDEX_V(edited_point, vertices.size(), false);
+						vertices[edited_point] = edited_point_pos - _get_offset(edited_polygon);
+
+						undo_redo->create_action(TTR("Edit Poly"));
+						_action_set_polygon(edited_polygon, pre_move_edit, vertices);
+						_commit_action();
+
+						edited_point = -1;
+						return true;
+					}
+				}
+			} else if (mb->get_button_index() == BUTTON_RIGHT && mb->is_pressed() && edited_point == -1) {
+
+				int closest_poly = -1;
+				int closest_idx = -1;
+				Vector2 closest_pos;
+				real_t closest_dist = 1e10;
+				const int n_polygons = _get_polygon_count();
+
+				for (int j = 0; j < n_polygons; j++) {
+
+					PoolVector<Vector2> points = _get_polygon(j);
+					const int n_points = points.size();
+					const Vector2 offset = _get_offset(j);
+
+					for (int i = 0; i < n_points; i++) {
+
+						Vector2 cp = xform.xform(points[i] + offset);
+
+						real_t d = cp.distance_to(gpoint);
+						if (d < closest_dist && d < grab_threshold) {
+							closest_poly = j;
+							closest_dist = d;
+							closest_pos = cp;
+							closest_idx = i;
+						}
+					}
+				}
+
+				if (closest_idx >= 0) {
+
+					PoolVector<Vector2> vertices = _get_polygon(closest_poly);
+
+					if (vertices.size() > 3) {
+
+						vertices.remove(closest_idx);
+
+						undo_redo->create_action(TTR("Edit Poly (Remove Point)"));
+						_action_set_polygon(closest_poly, vertices);
+						_commit_action();
+					} else {
+
+						undo_redo->create_action(TTR("Remove Poly And Point"));
+						_action_remove_polygon(closest_poly);
+						_commit_action();
+					}
+
+					if (_is_empty())
+						_menu_option(MODE_CREATE);
+					return true;
+				}
+			}
+		}
+	}
+
+	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 = _get_node()->get_global_transform().affine_inverse().xform(cpoint);
+
+			if (!wip_active) {
+
+				Vector<Vector2> vertices = _get_polygon(edited_polygon);
+				ERR_FAIL_INDEX_V(edited_point, vertices.size(), false);
+				vertices[edited_point] = edited_point_pos - _get_offset(edited_polygon);
+				_set_polygon(edited_polygon, vertices);
+			}
+
+			canvas_item_editor->get_viewport_control()->update();
+		}
+	}
+
+	return false;
+}
+
+void AbstractPolygon2DEditor::_canvas_draw() {
+
+	if (!_get_node())
+		return;
+
+	Control *vpc = canvas_item_editor->get_viewport_control();
+
+	Transform2D xform = canvas_item_editor->get_canvas_transform() * _get_node()->get_global_transform();
+	Ref<Texture> handle = get_icon("EditorHandle", "EditorIcons");
+	const int n_polygons = _get_polygon_count();
+
+	for (int j = -1; j < n_polygons; j++) {
+
+		if (wip_active && wip_destructive && j != -1)
+			continue;
+
+		PoolVector<Vector2> points;
+		Vector2 offset;
+
+		if (wip_active && j == edited_polygon) {
+
+			points = Variant(wip);
+			offset = Vector2(0, 0);
+		} else {
+
+			if (j == -1)
+				continue;
+			points = _get_polygon(j);
+			offset = _get_offset(j);
+		}
+
+		if (!wip_active && j == edited_polygon && edited_point >= 0 && EDITOR_DEF("editors/poly_editor/show_previous_outline", true)) {
+
+			const Color col = Color(0.5, 0.5, 0.5); // FIXME polygon->get_outline_color();
+			const int n = pre_move_edit.size();
+			for (int i = 0; i < n; i++) {
+
+				Vector2 p, p2;
+				p = pre_move_edit[i] + offset;
+				p2 = pre_move_edit[(i + 1) % n] + offset;
+
+				Vector2 point = xform.xform(p);
+				Vector2 next_point = xform.xform(p2);
+
+				vpc->draw_line(point, next_point, col, 2);
+			}
+		}
+
+		const int n_points = points.size();
+		const Color col = Color(1, 0.3, 0.1, 0.8);
+
+		for (int i = 0; i < n_points; i++) {
+
+			Vector2 p, p2;
+			p = (j == edited_polygon && i == edited_point) ? edited_point_pos : (points[i] + offset);
+			if (j == edited_polygon && ((wip_active && i == n_points - 1) || (((i + 1) % n_points) == edited_point)))
+				p2 = edited_point_pos;
+			else
+				p2 = points[(i + 1) % n_points] + offset;
+
+			Vector2 point = xform.xform(p);
+			Vector2 next_point = xform.xform(p2);
+
+			vpc->draw_line(point, next_point, col, 2);
+			vpc->draw_texture(handle, point - handle->get_size() * 0.5);
+		}
+	}
+}
+
+void AbstractPolygon2DEditor::edit(Node *p_polygon) {
+
+	if (!canvas_item_editor) {
+		canvas_item_editor = CanvasItemEditor::get_singleton();
+	}
+
+	if (p_polygon) {
+
+		_set_node(p_polygon);
+
+		//Enable the pencil tool if the polygon is empty
+		if (_is_empty())
+			_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;
+
+		canvas_item_editor->get_viewport_control()->update();
+
+	} else {
+
+		_set_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 AbstractPolygon2DEditor::_bind_methods() {
+
+	ClassDB::bind_method(D_METHOD("_canvas_draw"), &AbstractPolygon2DEditor::_canvas_draw);
+	ClassDB::bind_method(D_METHOD("_node_removed"), &AbstractPolygon2DEditor::_node_removed);
+	ClassDB::bind_method(D_METHOD("_menu_option"), &AbstractPolygon2DEditor::_menu_option);
+	ClassDB::bind_method(D_METHOD("_create_resource"), &AbstractPolygon2DEditor::_create_resource);
+}
+
+AbstractPolygon2DEditor::AbstractPolygon2DEditor(EditorNode *p_editor, bool p_wip_destructive) {
+
+	canvas_item_editor = NULL;
+	editor = p_editor;
+	undo_redo = editor->get_undo_redo();
+
+	wip_active = false;
+	edited_polygon = -1;
+	wip_destructive = p_wip_destructive;
+
+	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_create->set_tooltip(TTR("Create a new polygon from scratch."));
+
+	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_edit->set_tooltip(TTR("Edit existing polygon:\nLMB: Move Point.\nCtrl+LMB: Split Segment.\nRMB: Erase Point."));
+
+	create_resource = memnew(ConfirmationDialog);
+	add_child(create_resource);
+	create_resource->get_ok()->set_text(TTR("Create"));
+
+	mode = MODE_EDIT;
+}
+
+void AbstractPolygon2DEditorPlugin::edit(Object *p_object) {
+
+	polygon_editor->edit(Object::cast_to<Node>(p_object));
+}
+
+bool AbstractPolygon2DEditorPlugin::handles(Object *p_object) const {
+
+	return p_object->is_class(klass);
+}
+
+void AbstractPolygon2DEditorPlugin::make_visible(bool p_visible) {
+
+	if (p_visible) {
+
+		polygon_editor->show();
+	} else {
+
+		polygon_editor->hide();
+		polygon_editor->edit(NULL);
+	}
+}
+
+AbstractPolygon2DEditorPlugin::AbstractPolygon2DEditorPlugin(EditorNode *p_node, AbstractPolygon2DEditor *p_polygon_editor, String p_class) {
+
+	editor = p_node;
+	polygon_editor = p_polygon_editor;
+	klass = p_class;
+	CanvasItemEditor::get_singleton()->add_control_to_menu_panel(polygon_editor);
+
+	polygon_editor->hide();
+}
+
+AbstractPolygon2DEditorPlugin::~AbstractPolygon2DEditorPlugin() {
+}
diff --git a/editor/plugins/abstract_polygon_2d_editor.h b/editor/plugins/abstract_polygon_2d_editor.h
new file mode 100644
index 0000000000..86e14694da
--- /dev/null
+++ b/editor/plugins/abstract_polygon_2d_editor.h
@@ -0,0 +1,131 @@
+/*************************************************************************/
+/*  abstract_polygon_2d_editor.h                                         */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#ifndef ABSTRACT_POLYGON_2D_EDITOR_H
+#define ABSTRACT_POLYGON_2D_EDITOR_H
+
+#include "editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "scene/2d/polygon_2d.h"
+#include "scene/gui/tool_button.h"
+
+/**
+	@author Juan Linietsky <reduzio@gmail.com>
+*/
+class CanvasItemEditor;
+
+class AbstractPolygon2DEditor : public HBoxContainer {
+
+	GDCLASS(AbstractPolygon2DEditor, HBoxContainer);
+
+	ToolButton *button_create;
+	ToolButton *button_edit;
+
+	int edited_polygon;
+	int edited_point;
+	Vector2 edited_point_pos;
+	Vector<Vector2> pre_move_edit;
+	Vector<Vector2> wip;
+	bool wip_active;
+	bool wip_destructive;
+
+	CanvasItemEditor *canvas_item_editor;
+	EditorNode *editor;
+	Panel *panel;
+	ConfirmationDialog *create_resource;
+
+protected:
+	enum {
+
+		MODE_CREATE,
+		MODE_EDIT,
+		MODE_CONT,
+
+	};
+
+	int mode;
+
+	UndoRedo *undo_redo;
+
+	virtual void _menu_option(int p_option);
+	void _wip_close();
+	void _canvas_draw();
+
+	void _notification(int p_what);
+	void _node_removed(Node *p_node);
+	static void _bind_methods();
+
+	bool _is_empty() const;
+	void _commit_action();
+
+protected:
+	virtual Node2D *_get_node() const = 0;
+	virtual void _set_node(Node *p_polygon) = 0;
+
+	virtual int _get_polygon_count() const;
+	virtual Vector2 _get_offset(int p_idx) const;
+	virtual Variant _get_polygon(int p_idx) const;
+	virtual void _set_polygon(int p_idx, const Variant &p_polygon) const;
+
+	virtual void _action_add_polygon(const Variant &p_polygon);
+	virtual void _action_remove_polygon(int p_idx);
+	virtual void _action_set_polygon(int p_idx, const Variant &p_polygon);
+	virtual void _action_set_polygon(int p_idx, const Variant &p_previous, const Variant &p_polygon);
+
+	virtual bool _has_resource() const;
+	virtual void _create_resource();
+
+public:
+	bool forward_gui_input(const Ref<InputEvent> &p_event);
+	void edit(Node *p_polygon);
+	AbstractPolygon2DEditor(EditorNode *p_editor, bool p_wip_destructive = true);
+};
+
+class AbstractPolygon2DEditorPlugin : public EditorPlugin {
+
+	GDCLASS(AbstractPolygon2DEditorPlugin, EditorPlugin);
+
+	AbstractPolygon2DEditor *polygon_editor;
+	EditorNode *editor;
+	String klass;
+
+public:
+	virtual bool forward_canvas_gui_input(const Transform2D &p_canvas_xform, const Ref<InputEvent> &p_event) { return polygon_editor->forward_gui_input(p_event); }
+
+	bool has_main_screen() const { return false; }
+	virtual String get_name() const { return klass; }
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
+	virtual void make_visible(bool p_visible);
+
+	AbstractPolygon2DEditorPlugin(EditorNode *p_node, AbstractPolygon2DEditor *p_polygon_editor, String p_class);
+	~AbstractPolygon2DEditorPlugin();
+};
+
+#endif // ABSTRACT_POLYGON_2D_EDITOR_H
diff --git a/editor/plugins/collision_polygon_2d_editor_plugin.cpp b/editor/plugins/collision_polygon_2d_editor_plugin.cpp
index 4501136e19..00e6d617a1 100644..100755
--- a/editor/plugins/collision_polygon_2d_editor_plugin.cpp
+++ b/editor/plugins/collision_polygon_2d_editor_plugin.cpp
@@ -29,400 +29,20 @@
 /*************************************************************************/
 #include "collision_polygon_2d_editor_plugin.h"
 
-#include "canvas_item_editor_plugin.h"
-#include "editor/editor_settings.h"
-#include "os/file_access.h"
+Node2D *CollisionPolygon2DEditor::_get_node() const {
 
-void CollisionPolygon2DEditor::_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);
-			get_tree()->connect("node_removed", this, "_node_removed");
-
-		} break;
-		case NOTIFICATION_PHYSICS_PROCESS: {
-
-		} break;
-	}
-}
-void CollisionPolygon2DEditor::_node_removed(Node *p_node) {
-
-	if (p_node == node) {
-		node = NULL;
-		hide();
-		canvas_item_editor->get_viewport_control()->update();
-	}
-}
-
-void CollisionPolygon2DEditor::_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;
-	}
-}
-
-void CollisionPolygon2DEditor::_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 CollisionPolygon2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
-
-	if (!node)
-		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 = 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);
-						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]).distance_to(gpoint) < grab_threshold) {
-							//wip closed
-							_wip_close();
-
-							return true;
-						} else {
-
-							wip.push_back(cpoint);
-							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]),
-									xform.xform(poly[(i + 1) % poly.size()]) };
-
-								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));
-								edited_point = closest_idx + 1;
-								edited_point_pos = xform.affine_inverse().xform(closest_pos);
-								node->set_polygon(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]);
-
-								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;
-							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]);
-
-						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);
-
-			canvas_item_editor->get_viewport_control()->update();
-		}
-	}
-
-	return false;
+	return node;
 }
-void CollisionPolygon2DEditor::_canvas_draw() {
-
-	if (!node)
-		return;
-
-	Control *vpc = canvas_item_editor->get_viewport_control();
-
-	Vector<Vector2> poly;
-
-	if (wip_active)
-		poly = wip;
-	else
-		poly = node->get_polygon();
 
-	Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
-	Ref<Texture> handle = get_icon("EditorHandle", "EditorIcons");
+void CollisionPolygon2DEditor::_set_node(Node *p_polygon) {
 
-	for (int i = 0; i < poly.size(); i++) {
-
-		Vector2 p, p2;
-		p = i == edited_point ? edited_point_pos : poly[i];
-		if ((wip_active && i == poly.size() - 1) || (((i + 1) % poly.size()) == edited_point))
-			p2 = edited_point_pos;
-		else
-			p2 = poly[(i + 1) % poly.size()];
-
-		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);
-	}
+	node = Object::cast_to<CollisionPolygon2D>(p_polygon);
 }
 
-void CollisionPolygon2DEditor::edit(Node *p_collision_polygon) {
-
-	if (!canvas_item_editor) {
-		canvas_item_editor = CanvasItemEditor::get_singleton();
-	}
-
-	if (p_collision_polygon) {
-
-		node = Object::cast_to<CollisionPolygon2D>(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;
-		canvas_item_editor->get_viewport_control()->update();
-
-	} 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 CollisionPolygon2DEditor::_bind_methods() {
-
-	ClassDB::bind_method(D_METHOD("_menu_option"), &CollisionPolygon2DEditor::_menu_option);
-	ClassDB::bind_method(D_METHOD("_canvas_draw"), &CollisionPolygon2DEditor::_canvas_draw);
-	ClassDB::bind_method(D_METHOD("_node_removed"), &CollisionPolygon2DEditor::_node_removed);
-}
-
-CollisionPolygon2DEditor::CollisionPolygon2DEditor(EditorNode *p_editor) {
-
-	node = NULL;
-	canvas_item_editor = NULL;
-	editor = p_editor;
-	undo_redo = editor->get_undo_redo();
-
-	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_create->set_tooltip(TTR("Create a new polygon from scratch."));
-
-	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_edit->set_tooltip(TTR("Edit existing polygon:\nLMB: Move Point.\nCtrl+LMB: Split Segment.\nRMB: Erase Point."));
-
-	mode = MODE_EDIT;
-	wip_active = false;
-}
-
-void CollisionPolygon2DEditorPlugin::edit(Object *p_object) {
-
-	collision_polygon_editor->edit(Object::cast_to<Node>(p_object));
-}
-
-bool CollisionPolygon2DEditorPlugin::handles(Object *p_object) const {
-
-	return p_object->is_class("CollisionPolygon2D");
-}
-
-void CollisionPolygon2DEditorPlugin::make_visible(bool p_visible) {
-
-	if (p_visible) {
-		collision_polygon_editor->show();
-	} else {
-
-		collision_polygon_editor->hide();
-		collision_polygon_editor->edit(NULL);
-	}
-}
-
-CollisionPolygon2DEditorPlugin::CollisionPolygon2DEditorPlugin(EditorNode *p_node) {
-
-	editor = p_node;
-	collision_polygon_editor = memnew(CollisionPolygon2DEditor(p_node));
-	CanvasItemEditor::get_singleton()->add_control_to_menu_panel(collision_polygon_editor);
-
-	collision_polygon_editor->hide();
+CollisionPolygon2DEditor::CollisionPolygon2DEditor(EditorNode *p_editor)
+	: AbstractPolygon2DEditor(p_editor) {
 }
 
-CollisionPolygon2DEditorPlugin::~CollisionPolygon2DEditorPlugin() {
+CollisionPolygon2DEditorPlugin::CollisionPolygon2DEditorPlugin(EditorNode *p_node)
+	: AbstractPolygon2DEditorPlugin(p_node, memnew(CollisionPolygon2DEditor(p_node)), "CollisionPolygon2D") {
 }
diff --git a/editor/plugins/collision_polygon_2d_editor_plugin.h b/editor/plugins/collision_polygon_2d_editor_plugin.h
index 4715abd2e6..edf3bbcc08 100644..100755
--- a/editor/plugins/collision_polygon_2d_editor_plugin.h
+++ b/editor/plugins/collision_polygon_2d_editor_plugin.h
@@ -30,78 +30,32 @@
 #ifndef COLLISION_POLYGON_2D_EDITOR_PLUGIN_H
 #define COLLISION_POLYGON_2D_EDITOR_PLUGIN_H
 
-#include "editor/editor_node.h"
-#include "editor/editor_plugin.h"
+#include "editor/plugins/abstract_polygon_2d_editor.h"
 #include "scene/2d/collision_polygon_2d.h"
-#include "scene/gui/tool_button.h"
 
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
 */
-class CanvasItemEditor;
+class CollisionPolygon2DEditor : public AbstractPolygon2DEditor {
 
-class CollisionPolygon2DEditor : public HBoxContainer {
+	GDCLASS(CollisionPolygon2DEditor, AbstractPolygon2DEditor);
 
-	GDCLASS(CollisionPolygon2DEditor, HBoxContainer);
-
-	UndoRedo *undo_redo;
-	enum Mode {
-
-		MODE_CREATE,
-		MODE_EDIT,
-
-	};
-
-	Mode mode;
-
-	ToolButton *button_create;
-	ToolButton *button_edit;
-
-	CanvasItemEditor *canvas_item_editor;
-	EditorNode *editor;
-	Panel *panel;
 	CollisionPolygon2D *node;
-	MenuButton *options;
-
-	int edited_point;
-	Vector2 edited_point_pos;
-	Vector<Vector2> pre_move_edit;
-	Vector<Vector2> wip;
-	bool wip_active;
-
-	void _wip_close();
-	void _canvas_draw();
-	void _menu_option(int p_option);
 
 protected:
-	void _notification(int p_what);
-	void _node_removed(Node *p_node);
-	static void _bind_methods();
+	virtual Node2D *_get_node() const;
+	virtual void _set_node(Node *p_polygon);
 
 public:
-	bool forward_gui_input(const Ref<InputEvent> &p_event);
-	void edit(Node *p_collision_polygon);
 	CollisionPolygon2DEditor(EditorNode *p_editor);
 };
 
-class CollisionPolygon2DEditorPlugin : public EditorPlugin {
-
-	GDCLASS(CollisionPolygon2DEditorPlugin, EditorPlugin);
+class CollisionPolygon2DEditorPlugin : public AbstractPolygon2DEditorPlugin {
 
-	CollisionPolygon2DEditor *collision_polygon_editor;
-	EditorNode *editor;
+	GDCLASS(CollisionPolygon2DEditorPlugin, AbstractPolygon2DEditorPlugin);
 
 public:
-	virtual bool forward_canvas_gui_input(const Transform2D &p_canvas_xform, const Ref<InputEvent> &p_event) { return collision_polygon_editor->forward_gui_input(p_event); }
-
-	virtual String get_name() const { return "CollisionPolygon2D"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
-
 	CollisionPolygon2DEditorPlugin(EditorNode *p_node);
-	~CollisionPolygon2DEditorPlugin();
 };
 
 #endif // COLLISION_POLYGON_2D_EDITOR_PLUGIN_H
diff --git a/editor/plugins/navigation_polygon_editor_plugin.cpp b/editor/plugins/navigation_polygon_editor_plugin.cpp
index 69e553eefb..6560a8dac7 100644..100755
--- a/editor/plugins/navigation_polygon_editor_plugin.cpp
+++ b/editor/plugins/navigation_polygon_editor_plugin.cpp
@@ -29,485 +29,101 @@
 /*************************************************************************/
 #include "navigation_polygon_editor_plugin.h"
 
-#include "canvas_item_editor_plugin.h"
-#include "editor/editor_settings.h"
-#include "os/file_access.h"
+Ref<NavigationPolygon> NavigationPolygonEditor::_ensure_navpoly() const {
 
-void NavigationPolygonEditor::_notification(int p_what) {
+	Ref<NavigationPolygon> navpoly = node->get_navigation_polygon();
+	if (!navpoly.is_valid()) {
 
-	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);
-			get_tree()->connect("node_removed", this, "_node_removed");
-			create_nav->connect("confirmed", this, "_create_nav");
-
-		} break;
-		case NOTIFICATION_PHYSICS_PROCESS: {
-
-		} break;
+		navpoly = Ref<NavigationPolygon>(memnew(NavigationPolygon));
+		node->set_navigation_polygon(navpoly);
 	}
+	return navpoly;
 }
-void NavigationPolygonEditor::_node_removed(Node *p_node) {
 
-	if (p_node == node) {
-		node = NULL;
-		hide();
-		canvas_item_editor->get_viewport_control()->update();
-	}
-}
+Node2D *NavigationPolygonEditor::_get_node() const {
 
-void NavigationPolygonEditor::_create_nav() {
-
-	if (!node)
-		return;
-
-	undo_redo->create_action(TTR("Create Navigation Polygon"));
-	undo_redo->add_do_method(node, "set_navigation_polygon", Ref<NavigationPolygon>(memnew(NavigationPolygon)));
-	undo_redo->add_undo_method(node, "set_navigation_polygon", Variant(REF()));
-	undo_redo->commit_action();
-	_menu_option(MODE_CREATE);
+	return node;
 }
 
-void NavigationPolygonEditor::_menu_option(int p_option) {
+void NavigationPolygonEditor::_set_node(Node *p_polygon) {
 
-	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;
-	}
+	node = Object::cast_to<NavigationPolygonInstance>(p_polygon);
 }
 
-void NavigationPolygonEditor::_wip_close() {
+int NavigationPolygonEditor::_get_polygon_count() const {
 
-	if (wip.size() >= 3) {
-
-		undo_redo->create_action(TTR("Create Poly"));
-		undo_redo->add_undo_method(node->get_navigation_polygon().ptr(), "remove_outline", node->get_navigation_polygon()->get_outline_count());
-		undo_redo->add_do_method(node->get_navigation_polygon().ptr(), "add_outline", wip);
-		undo_redo->add_do_method(node->get_navigation_polygon().ptr(), "make_polygons_from_outlines");
-		undo_redo->add_undo_method(node->get_navigation_polygon().ptr(), "make_polygons_from_outlines");
-		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();
-		mode = MODE_EDIT;
-		button_edit->set_pressed(true);
-		button_create->set_pressed(false);
-	}
-
-	wip.clear();
-	wip_active = false;
-	edited_point = -1;
+	Ref<NavigationPolygon> navpoly = node->get_navigation_polygon();
+	if (navpoly.is_valid())
+		return navpoly->get_outline_count();
+	else
+		return 0;
 }
 
-bool NavigationPolygonEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
-
-	if (!node)
-		return false;
-
-	if (node->get_navigation_polygon().is_null()) {
-
-		Ref<InputEventMouseButton> mb = p_event;
-
-		if (mb.is_valid() && mb->get_button_index() == 1 && mb->is_pressed()) {
-			create_nav->set_text("No NavigationPolygon resource on this node.\nCreate and assign one?");
-			create_nav->popup_centered_minsize();
-		}
-		return (mb.is_valid() && mb->get_button_index() == 1);
-	}
-
-	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);
-
-		//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);
-						wip_active = true;
-						edited_point_pos = cpoint;
-						edited_outline = -1;
-						canvas_item_editor->get_viewport_control()->update();
-						edited_point = 1;
-						return true;
-					} else {
-
-						if (wip.size() > 1 && xform.xform(wip[0]).distance_to(gpoint) < grab_threshold) {
-							//wip closed
-							_wip_close();
-
-							return true;
-						} else {
-
-							wip.push_back(cpoint);
-							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()) {
-
-							//search edges
-							int closest_outline = -1;
-							int closest_idx = -1;
-							Vector2 closest_pos;
-							real_t closest_dist = 1e10;
-
-							for (int j = 0; j < node->get_navigation_polygon()->get_outline_count(); j++) {
-
-								PoolVector<Vector2> points = node->get_navigation_polygon()->get_outline(j);
-
-								int pc = points.size();
-								PoolVector<Vector2>::Read poly = points.read();
-
-								for (int i = 0; i < pc; i++) {
-
-									Vector2 points[2] = { xform.xform(poly[i]),
-										xform.xform(poly[(i + 1) % pc]) };
-
-									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_outline = j;
-										closest_pos = cp;
-										closest_idx = i;
-									}
-								}
-							}
-
-							if (closest_idx >= 0) {
-
-								pre_move_edit = node->get_navigation_polygon()->get_outline(closest_outline);
-								PoolVector<Point2> poly = pre_move_edit;
-								poly.insert(closest_idx + 1, xform.affine_inverse().xform(closest_pos));
-								edited_point = closest_idx + 1;
-								edited_outline = closest_outline;
-								edited_point_pos = xform.affine_inverse().xform(closest_pos);
-								node->get_navigation_polygon()->set_outline(closest_outline, poly);
-								canvas_item_editor->get_viewport_control()->update();
-								return true;
-							}
-						} else {
-
-							//look for points to move
-							int closest_outline = -1;
-							int closest_idx = -1;
-							Vector2 closest_pos;
-							real_t closest_dist = 1e10;
-
-							for (int j = 0; j < node->get_navigation_polygon()->get_outline_count(); j++) {
-
-								PoolVector<Vector2> points = node->get_navigation_polygon()->get_outline(j);
-
-								int pc = points.size();
-								PoolVector<Vector2>::Read poly = points.read();
+Variant NavigationPolygonEditor::_get_polygon(int p_idx) const {
 
-								for (int i = 0; i < pc; i++) {
-
-									Vector2 cp = xform.xform(poly[i]);
-
-									real_t d = cp.distance_to(gpoint);
-									if (d < closest_dist && d < grab_threshold) {
-										closest_dist = d;
-										closest_pos = cp;
-										closest_outline = j;
-										closest_idx = i;
-									}
-								}
-							}
-
-							if (closest_idx >= 0) {
-
-								pre_move_edit = node->get_navigation_polygon()->get_outline(closest_outline);
-								edited_point = closest_idx;
-								edited_outline = closest_outline;
-								edited_point_pos = xform.affine_inverse().xform(closest_pos);
-								canvas_item_editor->get_viewport_control()->update();
-								return true;
-							}
-						}
-					} else {
-
-						if (edited_point != -1) {
-
-							//apply
-
-							PoolVector<Vector2> poly = node->get_navigation_polygon()->get_outline(edited_outline);
-							ERR_FAIL_INDEX_V(edited_point, poly.size(), false);
-							poly.set(edited_point, edited_point_pos);
-							undo_redo->create_action(TTR("Edit Poly"));
-							undo_redo->add_do_method(node->get_navigation_polygon().ptr(), "set_outline", edited_outline, poly);
-							undo_redo->add_undo_method(node->get_navigation_polygon().ptr(), "set_outline", edited_outline, pre_move_edit);
-							undo_redo->add_do_method(node->get_navigation_polygon().ptr(), "make_polygons_from_outlines");
-							undo_redo->add_undo_method(node->get_navigation_polygon().ptr(), "make_polygons_from_outlines");
-							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_outline = -1;
-					int closest_idx = -1;
-					Vector2 closest_pos;
-					real_t closest_dist = 1e10;
-
-					for (int j = 0; j < node->get_navigation_polygon()->get_outline_count(); j++) {
-
-						PoolVector<Vector2> points = node->get_navigation_polygon()->get_outline(j);
-
-						int pc = points.size();
-						PoolVector<Vector2>::Read poly = points.read();
-
-						for (int i = 0; i < pc; i++) {
-
-							Vector2 cp = xform.xform(poly[i]);
-
-							real_t d = cp.distance_to(gpoint);
-							if (d < closest_dist && d < grab_threshold) {
-								closest_dist = d;
-								closest_pos = cp;
-								closest_outline = j;
-								closest_idx = i;
-							}
-						}
-					}
-
-					if (closest_idx >= 0) {
-
-						PoolVector<Vector2> poly = node->get_navigation_polygon()->get_outline(closest_outline);
-
-						if (poly.size() > 3) {
-							undo_redo->create_action(TTR("Edit Poly (Remove Point)"));
-							undo_redo->add_undo_method(node->get_navigation_polygon().ptr(), "set_outline", closest_outline, poly);
-							poly.remove(closest_idx);
-							undo_redo->add_do_method(node->get_navigation_polygon().ptr(), "set_outline", closest_outline, poly);
-							undo_redo->add_do_method(node->get_navigation_polygon().ptr(), "make_polygons_from_outlines");
-							undo_redo->add_undo_method(node->get_navigation_polygon().ptr(), "make_polygons_from_outlines");
-							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();
-						} else {
-
-							undo_redo->create_action(TTR("Remove Poly And Point"));
-							undo_redo->add_undo_method(node->get_navigation_polygon().ptr(), "add_outline_at_index", poly, closest_outline);
-							poly.remove(closest_idx);
-							undo_redo->add_do_method(node->get_navigation_polygon().ptr(), "remove_outline", closest_outline);
-							undo_redo->add_do_method(node->get_navigation_polygon().ptr(), "make_polygons_from_outlines");
-							undo_redo->add_undo_method(node->get_navigation_polygon().ptr(), "make_polygons_from_outlines");
-							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);
-
-			canvas_item_editor->get_viewport_control()->update();
-		}
-	}
-
-	return false;
+	Ref<NavigationPolygon> navpoly = node->get_navigation_polygon();
+	if (navpoly.is_valid())
+		return navpoly->get_outline(p_idx);
+	else
+		return Variant(Vector<Vector2>());
 }
-void NavigationPolygonEditor::_canvas_draw() {
 
-	if (!node)
-		return;
+void NavigationPolygonEditor::_set_polygon(int p_idx, const Variant &p_polygon) const {
 
-	Control *vpc = canvas_item_editor->get_viewport_control();
-	if (node->get_navigation_polygon().is_null())
-		return;
-
-	Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
-	Ref<Texture> handle = get_icon("EditorHandle", "EditorIcons");
-
-	for (int j = -1; j < node->get_navigation_polygon()->get_outline_count(); j++) {
-		Vector<Vector2> poly;
-
-		if (wip_active && j == edited_outline) {
-			poly = wip;
-		} else {
-			if (j == -1)
-				continue;
-			poly = Variant(node->get_navigation_polygon()->get_outline(j));
-		}
-
-		for (int i = 0; i < poly.size(); i++) {
-
-			Vector2 p, p2;
-			p = (j == edited_outline && i == edited_point) ? edited_point_pos : poly[i];
-			if (j == edited_outline && ((wip_active && i == poly.size() - 1) || (((i + 1) % poly.size()) == edited_point)))
-				p2 = edited_point_pos;
-			else
-				p2 = poly[(i + 1) % poly.size()];
-
-			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);
-		}
-	}
+	Ref<NavigationPolygon> navpoly = _ensure_navpoly();
+	navpoly->set_outline(p_idx, p_polygon);
+	navpoly->make_polygons_from_outlines();
 }
 
-void NavigationPolygonEditor::edit(Node *p_collision_polygon) {
-
-	if (!canvas_item_editor) {
-		canvas_item_editor = CanvasItemEditor::get_singleton();
-	}
-
-	if (p_collision_polygon) {
+void NavigationPolygonEditor::_action_add_polygon(const Variant &p_polygon) {
 
-		node = Object::cast_to<NavigationPolygonInstance>(p_collision_polygon);
-		//Enable the pencil tool if the polygon is empty
-		if (!node->get_navigation_polygon().is_null()) {
-			if (node->get_navigation_polygon()->get_polygon_count() == 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;
-		canvas_item_editor->get_viewport_control()->update();
-
-	} 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");
-	}
+	Ref<NavigationPolygon> navpoly = _ensure_navpoly();
+	undo_redo->add_do_method(navpoly.ptr(), "add_outline", p_polygon);
+	undo_redo->add_undo_method(navpoly.ptr(), "remove_outline", navpoly->get_outline_count());
+	undo_redo->add_do_method(navpoly.ptr(), "make_polygons_from_outlines");
+	undo_redo->add_undo_method(navpoly.ptr(), "make_polygons_from_outlines");
 }
 
-void NavigationPolygonEditor::_bind_methods() {
+void NavigationPolygonEditor::_action_remove_polygon(int p_idx) {
 
-	ClassDB::bind_method(D_METHOD("_menu_option"), &NavigationPolygonEditor::_menu_option);
-	ClassDB::bind_method(D_METHOD("_canvas_draw"), &NavigationPolygonEditor::_canvas_draw);
-	ClassDB::bind_method(D_METHOD("_node_removed"), &NavigationPolygonEditor::_node_removed);
-	ClassDB::bind_method(D_METHOD("_create_nav"), &NavigationPolygonEditor::_create_nav);
+	Ref<NavigationPolygon> navpoly = _ensure_navpoly();
+	undo_redo->add_do_method(navpoly.ptr(), "remove_outline", p_idx);
+	undo_redo->add_undo_method(navpoly.ptr(), "add_outline_at_index", navpoly->get_outline(p_idx), p_idx);
+	undo_redo->add_do_method(navpoly.ptr(), "make_polygons_from_outlines");
+	undo_redo->add_undo_method(navpoly.ptr(), "make_polygons_from_outlines");
 }
 
-NavigationPolygonEditor::NavigationPolygonEditor(EditorNode *p_editor) {
-	node = NULL;
-	canvas_item_editor = NULL;
-	editor = p_editor;
-	undo_redo = editor->get_undo_redo();
+void NavigationPolygonEditor::_action_set_polygon(int p_idx, const Variant &p_previous, const Variant &p_polygon) {
 
-	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_create->set_tooltip(TTR("Create a new polygon from scratch."));
-
-	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_edit->set_tooltip(TTR("Edit existing polygon:") + "\n" + TTR("LMB: Move Point.") + "\n" + TTR("Ctrl+LMB: Split Segment.") + "\n" + TTR("RMB: Erase Point."));
-	create_nav = memnew(ConfirmationDialog);
-	add_child(create_nav);
-	create_nav->get_ok()->set_text(TTR("Create"));
-
-	mode = MODE_EDIT;
-	wip_active = false;
-	edited_outline = -1;
+	Ref<NavigationPolygon> navpoly = _ensure_navpoly();
+	undo_redo->add_do_method(navpoly.ptr(), "set_outline", p_idx, p_polygon);
+	undo_redo->add_undo_method(navpoly.ptr(), "set_outline", p_idx, p_previous);
+	undo_redo->add_do_method(navpoly.ptr(), "make_polygons_from_outlines");
+	undo_redo->add_undo_method(navpoly.ptr(), "make_polygons_from_outlines");
 }
 
-void NavigationPolygonEditorPlugin::edit(Object *p_object) {
+bool NavigationPolygonEditor::_has_resource() const {
 
-	collision_polygon_editor->edit(Object::cast_to<Node>(p_object));
+	return node && node->get_navigation_polygon().is_valid();
 }
 
-bool NavigationPolygonEditorPlugin::handles(Object *p_object) const {
-
-	return p_object->is_class("NavigationPolygonInstance");
-}
+void NavigationPolygonEditor::_create_resource() {
 
-void NavigationPolygonEditorPlugin::make_visible(bool p_visible) {
+	if (!node)
+		return;
 
-	if (p_visible) {
-		collision_polygon_editor->show();
-	} else {
+	undo_redo->create_action(TTR("Create Navigation Polygon"));
+	undo_redo->add_do_method(node, "set_navigation_polygon", Ref<NavigationPolygon>(memnew(NavigationPolygon)));
+	undo_redo->add_undo_method(node, "set_navigation_polygon", Variant(REF()));
+	undo_redo->commit_action();
 
-		collision_polygon_editor->hide();
-		collision_polygon_editor->edit(NULL);
-	}
+	_menu_option(MODE_CREATE);
 }
 
-NavigationPolygonEditorPlugin::NavigationPolygonEditorPlugin(EditorNode *p_node) {
-
-	editor = p_node;
-	collision_polygon_editor = memnew(NavigationPolygonEditor(p_node));
-	CanvasItemEditor::get_singleton()->add_control_to_menu_panel(collision_polygon_editor);
-
-	collision_polygon_editor->hide();
+NavigationPolygonEditor::NavigationPolygonEditor(EditorNode *p_editor)
+	: AbstractPolygon2DEditor(p_editor) {
 }
 
-NavigationPolygonEditorPlugin::~NavigationPolygonEditorPlugin() {
+NavigationPolygonEditorPlugin::NavigationPolygonEditorPlugin(EditorNode *p_node)
+	: AbstractPolygon2DEditorPlugin(p_node, memnew(NavigationPolygonEditor(p_node)), "NavigationPolygonInstance") {
 }
diff --git a/editor/plugins/navigation_polygon_editor_plugin.h b/editor/plugins/navigation_polygon_editor_plugin.h
index 7dd555e9c9..54cc347a8c 100644..100755
--- a/editor/plugins/navigation_polygon_editor_plugin.h
+++ b/editor/plugins/navigation_polygon_editor_plugin.h
@@ -30,83 +30,45 @@
 #ifndef NAVIGATIONPOLYGONEDITORPLUGIN_H
 #define NAVIGATIONPOLYGONEDITORPLUGIN_H
 
-#include "editor/editor_node.h"
-#include "editor/editor_plugin.h"
+#include "editor/plugins/abstract_polygon_2d_editor.h"
 #include "scene/2d/navigation_polygon.h"
-#include "scene/gui/tool_button.h"
 
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
 */
-class CanvasItemEditor;
+class NavigationPolygonEditor : public AbstractPolygon2DEditor {
 
-class NavigationPolygonEditor : public HBoxContainer {
+	GDCLASS(NavigationPolygonEditor, AbstractPolygon2DEditor);
 
-	GDCLASS(NavigationPolygonEditor, HBoxContainer);
-
-	UndoRedo *undo_redo;
-	enum Mode {
-
-		MODE_CREATE,
-		MODE_EDIT,
-
-	};
-
-	Mode mode;
-
-	ToolButton *button_create;
-	ToolButton *button_edit;
-
-	ConfirmationDialog *create_nav;
-
-	CanvasItemEditor *canvas_item_editor;
-	EditorNode *editor;
-	Panel *panel;
 	NavigationPolygonInstance *node;
-	MenuButton *options;
 
-	int edited_outline;
-	int edited_point;
-	Vector2 edited_point_pos;
-	PoolVector<Vector2> pre_move_edit;
-	Vector<Vector2> wip;
-	bool wip_active;
+	Ref<NavigationPolygon> _ensure_navpoly() const;
 
-	void _wip_close();
-	void _canvas_draw();
-	void _create_nav();
+protected:
+	virtual Node2D *_get_node() const;
+	virtual void _set_node(Node *p_polygon);
 
-	void _menu_option(int p_option);
+	virtual int _get_polygon_count() const;
+	virtual Variant _get_polygon(int p_idx) const;
+	virtual void _set_polygon(int p_idx, const Variant &p_polygon) const;
 
-protected:
-	void _notification(int p_what);
-	void _node_removed(Node *p_node);
-	static void _bind_methods();
+	virtual void _action_add_polygon(const Variant &p_polygon);
+	virtual void _action_remove_polygon(int p_idx);
+	virtual void _action_set_polygon(int p_idx, const Variant &p_previous, const Variant &p_polygon);
+
+	virtual bool _has_resource() const;
+	virtual void _create_resource();
 
 public:
-	bool forward_gui_input(const Ref<InputEvent> &p_event);
-	void edit(Node *p_collision_polygon);
 	NavigationPolygonEditor(EditorNode *p_editor);
 };
 
-class NavigationPolygonEditorPlugin : public EditorPlugin {
+class NavigationPolygonEditorPlugin : public AbstractPolygon2DEditorPlugin {
 
-	GDCLASS(NavigationPolygonEditorPlugin, EditorPlugin);
-
-	NavigationPolygonEditor *collision_polygon_editor;
-	EditorNode *editor;
+	GDCLASS(NavigationPolygonEditorPlugin, AbstractPolygon2DEditorPlugin);
 
 public:
-	virtual bool forward_canvas_gui_input(const Transform2D &p_canvas_xform, const Ref<InputEvent> &p_event) { return collision_polygon_editor->forward_gui_input(p_event); }
-
-	virtual String get_name() const { return "NavigationPolygonInstance"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
-
 	NavigationPolygonEditorPlugin(EditorNode *p_node);
-	~NavigationPolygonEditorPlugin();
 };
 
 #endif // NAVIGATIONPOLYGONEDITORPLUGIN_H
diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp
index af2349983d..0e8c13b067 100644..100755
--- a/editor/plugins/polygon_2d_editor_plugin.cpp
+++ b/editor/plugins/polygon_2d_editor_plugin.cpp
@@ -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") {
 }
diff --git a/editor/plugins/polygon_2d_editor_plugin.h b/editor/plugins/polygon_2d_editor_plugin.h
index f9d6a6b4b6..90da3e61c1 100644..100755
--- a/editor/plugins/polygon_2d_editor_plugin.h
+++ b/editor/plugins/polygon_2d_editor_plugin.h
@@ -30,26 +30,18 @@
 #ifndef POLYGON_2D_EDITOR_PLUGIN_H
 #define POLYGON_2D_EDITOR_PLUGIN_H
 
-#include "editor/editor_node.h"
-#include "editor/editor_plugin.h"
-#include "scene/2d/polygon_2d.h"
-#include "scene/gui/tool_button.h"
+#include "editor/plugins/abstract_polygon_2d_editor.h"
 
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
 */
-class CanvasItemEditor;
+class Polygon2DEditor : public AbstractPolygon2DEditor {
 
-class Polygon2DEditor : public HBoxContainer {
+	GDCLASS(Polygon2DEditor, AbstractPolygon2DEditor);
 
-	GDCLASS(Polygon2DEditor, HBoxContainer);
-
-	UndoRedo *undo_redo;
 	enum Mode {
 
-		MODE_CREATE,
-		MODE_EDIT,
-		MODE_EDIT_UV,
+		MODE_EDIT_UV = MODE_CONT,
 		UVEDIT_POLYGON_TO_UV,
 		UVEDIT_UV_TO_POLYGON,
 		UVEDIT_UV_CLEAR
@@ -64,7 +56,7 @@ class Polygon2DEditor : public HBoxContainer {
 		UV_MODE_MAX
 	};
 
-	Mode mode;
+	Polygon2D *node;
 
 	UVMode uv_mode;
 	AcceptDialog *uv_edit;
@@ -90,34 +82,19 @@ class Polygon2DEditor : public HBoxContainer {
 
 	AcceptDialog *error;
 
-	ToolButton *button_create;
-	ToolButton *button_edit;
 	ToolButton *button_uv;
 
-	CanvasItemEditor *canvas_item_editor;
-	EditorNode *editor;
-	Panel *panel;
-	Polygon2D *node;
-	MenuButton *options;
-
-	int edited_point;
-	Vector2 edited_point_pos;
-	Vector<Vector2> pre_move_edit;
-	Vector<Vector2> wip;
-	bool wip_active;
-
 	bool use_snap;
 	bool snap_show_grid;
 	Vector2 snap_offset;
 	Vector2 snap_step;
 
+	virtual void _menu_option(int p_option);
+
 	void _uv_scroll_changed(float);
 	void _uv_input(const Ref<InputEvent> &p_input);
 	void _uv_draw();
 	void _uv_mode(int p_mode);
-	void _wip_close();
-	void _canvas_draw();
-	void _menu_option(int p_option);
 
 	void _set_use_snap(bool p_use);
 	void _set_show_grid(bool p_show);
@@ -127,36 +104,26 @@ class Polygon2DEditor : public HBoxContainer {
 	void _set_snap_step_y(float p_val);
 
 protected:
+	virtual Node2D *_get_node() const;
+	virtual void _set_node(Node *p_polygon);
+
+	virtual Vector2 _get_offset(int p_idx) const;
+
 	void _notification(int p_what);
-	void _node_removed(Node *p_node);
 	static void _bind_methods();
 
 	Vector2 snap_point(Vector2 p_target) const;
 
 public:
-	bool forward_gui_input(const Ref<InputEvent> &p_event);
-	void edit(Node *p_collision_polygon);
 	Polygon2DEditor(EditorNode *p_editor);
 };
 
-class Polygon2DEditorPlugin : public EditorPlugin {
-
-	GDCLASS(Polygon2DEditorPlugin, EditorPlugin);
+class Polygon2DEditorPlugin : public AbstractPolygon2DEditorPlugin {
 
-	Polygon2DEditor *collision_polygon_editor;
-	EditorNode *editor;
+	GDCLASS(Polygon2DEditorPlugin, AbstractPolygon2DEditorPlugin);
 
 public:
-	virtual bool forward_canvas_gui_input(const Transform2D &p_canvas_xform, const Ref<InputEvent> &p_event) { return collision_polygon_editor->forward_gui_input(p_event); }
-
-	virtual String get_name() const { return "Polygon2D"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
-
 	Polygon2DEditorPlugin(EditorNode *p_node);
-	~Polygon2DEditorPlugin();
 };
 
 #endif // POLYGON_2D_EDITOR_PLUGIN_H