2D Animation Improvements

-=-=-=-=-=-=-=-=-=--=-=-=

-Ability to set 2D nodes as bones
-Abity to set 2D nodes as IK chains
-2D IK Solver
-Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)

1 files changed, 134 insertions, 23 deletions

diff --git a/tools/editor/plugins/path_2d_editor_plugin.cpp b/tools/editor/plugins/path_2d_editor_plugin.cpp
index 5e4cd9812..33ea5f358 100644
--- a/tools/editor/plugins/path_2d_editor_plugin.cpp
+++ b/tools/editor/plugins/path_2d_editor_plugin.cpp
@@ -31,7 +31,7 @@
 #include "canvas_item_editor_plugin.h"
 #include "os/file_access.h"
 #include "tools/editor/editor_settings.h"
-
+#include "os/keyboard.h"
 void Path2DEditor::_notification(int p_what) {
 
 	switch(p_what) {
@@ -103,7 +103,7 @@ bool Path2DEditor::forward_input_event(const InputEvent& p_event) {
 
 			// Test move point!!
 
-			if ( mb.pressed && mb.button_index==BUTTON_LEFT ) {
+			if ( mb.pressed && action==ACTION_NONE ) {
 
 				Ref<Curve2D> curve = node->get_curve();
 
@@ -115,21 +115,30 @@ bool Path2DEditor::forward_input_event(const InputEvent& p_event) {
 						Point2 p = xform.xform( curve->get_point_pos(i) );
 						if (gpoint.distance_to(p) < grab_treshold ) {
 
-							if (!mb.mod.shift) {
+							if (mb.button_index==BUTTON_LEFT && !mb.mod.shift && mode==MODE_EDIT) {
 
 								action=ACTION_MOVING_POINT;
 								action_point=i;
 								moving_from=curve->get_point_pos(i);
 								moving_screen_from=gpoint;
 								return true;
+							} else if  ((mb.button_index==BUTTON_RIGHT && mode==MODE_EDIT) || (mb.button_index==BUTTON_LEFT && mode==MODE_DELETE)) {
+
+								undo_redo->create_action("Remove Point from Curve");
+								undo_redo->add_do_method(curve.ptr(),"remove_point",i);
+								undo_redo->add_undo_method(curve.ptr(),"add_point",curve->get_point_pos(i),curve->get_point_in(i),curve->get_point_out(i),i);
+								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;
 							} else
 								pointunder=true;
 						}
 					}
 
-					if (i<(curve->get_point_count()-1)) {
+					if (mb.button_index==BUTTON_LEFT && i<(curve->get_point_count()-1)) {
 						Point2 p = xform.xform( curve->get_point_pos(i)+curve->get_point_out(i) );
-						if (gpoint.distance_to(p) < grab_treshold ) {
+						if (gpoint.distance_to(p) < grab_treshold && (mode == MODE_EDIT || mode==MODE_EDIT_CURVE) ) {
 
 							action=ACTION_MOVING_OUT;
 							action_point=i;
@@ -139,9 +148,9 @@ bool Path2DEditor::forward_input_event(const InputEvent& p_event) {
 						}
 					}
 
-					if (i>0) {
+					if (mb.button_index==BUTTON_LEFT && i>0) {
 						Point2 p = xform.xform( curve->get_point_pos(i)+curve->get_point_in(i) );
-						if (gpoint.distance_to(p) < grab_treshold ) {
+						if (gpoint.distance_to(p) < grab_treshold && (mode == MODE_EDIT || mode==MODE_EDIT_CURVE)) {
 
 							action=ACTION_MOVING_IN;
 							action_point=i;
@@ -160,15 +169,15 @@ bool Path2DEditor::forward_input_event(const InputEvent& p_event) {
 
 			// Test add point in empty space!
 
-			if ( mb.pressed && mb.mod.control && mb.button_index==BUTTON_LEFT ) {
+			if ( mb.pressed && mb.button_index==BUTTON_LEFT && ((mb.mod.command && mode == MODE_EDIT) || mode == MODE_CREATE)) {
 
 				Ref<Curve2D> curve = node->get_curve();
 
 				undo_redo->create_action("Add Point to Curve");
 				undo_redo->add_do_method(curve.ptr(),"add_point",cpoint);
 				undo_redo->add_undo_method(curve.ptr(),"remove_point",curve->get_point_count());
-				undo_redo->add_do_method(canvas_item_editor,"update");
-				undo_redo->add_undo_method(canvas_item_editor,"update");
+				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();
 
 				action=ACTION_MOVING_POINT;
@@ -195,8 +204,8 @@ bool Path2DEditor::forward_input_event(const InputEvent& p_event) {
 						undo_redo->create_action("Move Point in Curve");
 						undo_redo->add_do_method(curve.ptr(),"set_point_pos",action_point,cpoint);
 						undo_redo->add_undo_method(curve.ptr(),"set_point_pos",action_point,moving_from);
-						undo_redo->add_do_method(canvas_item_editor,"update");
-						undo_redo->add_undo_method(canvas_item_editor,"update");
+						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();
 
 					} break;
@@ -205,8 +214,8 @@ bool Path2DEditor::forward_input_event(const InputEvent& p_event) {
 						undo_redo->create_action("Move In-Control in Curve");
 						undo_redo->add_do_method(curve.ptr(),"set_point_in",action_point,new_pos);
 						undo_redo->add_undo_method(curve.ptr(),"set_point_in",action_point,moving_from);
-						undo_redo->add_do_method(canvas_item_editor,"update");
-						undo_redo->add_undo_method(canvas_item_editor,"update");
+						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();
 
 					} break;
@@ -215,8 +224,8 @@ bool Path2DEditor::forward_input_event(const InputEvent& p_event) {
 						undo_redo->create_action("Move Out-Control in Curve");
 						undo_redo->add_do_method(curve.ptr(),"set_point_out",action_point,new_pos);
 						undo_redo->add_undo_method(curve.ptr(),"set_point_out",action_point,moving_from);
-						undo_redo->add_do_method(canvas_item_editor,"update");
-						undo_redo->add_undo_method(canvas_item_editor,"update");
+						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();
 
 					} break;
@@ -286,8 +295,8 @@ bool Path2DEditor::forward_input_event(const InputEvent& p_event) {
 									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,"update");
-									undo_redo->add_undo_method(canvas_item_editor,"update");
+									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;
 								}
@@ -365,8 +374,8 @@ bool Path2DEditor::forward_input_event(const InputEvent& p_event) {
 								undo_redo->create_action("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,"update");
-								undo_redo->add_undo_method(canvas_item_editor,"update");
+								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;
@@ -400,8 +409,8 @@ bool Path2DEditor::forward_input_event(const InputEvent& p_event) {
 							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,"update");
-							undo_redo->add_undo_method(canvas_item_editor,"update");
+							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;
 						}
@@ -554,6 +563,60 @@ void Path2DEditor::_bind_methods() {
 	//ObjectTypeDB::bind_method(_MD("_menu_option"),&Path2DEditor::_menu_option);
 	ObjectTypeDB::bind_method(_MD("_canvas_draw"),&Path2DEditor::_canvas_draw);
 	ObjectTypeDB::bind_method(_MD("_node_visibility_changed"),&Path2DEditor::_node_visibility_changed);
+	ObjectTypeDB::bind_method(_MD("_mode_selected"),&Path2DEditor::_mode_selected);
+}
+
+void Path2DEditor::_mode_selected(int p_mode) {
+
+	if (p_mode==MODE_CREATE) {
+
+		curve_create->set_pressed(true);
+		curve_edit->set_pressed(false);
+		curve_edit_curve->set_pressed(false);
+		curve_del->set_pressed(false);
+	} else if (p_mode==MODE_EDIT) {
+
+		curve_create->set_pressed(false);
+		curve_edit->set_pressed(true);
+		curve_edit_curve->set_pressed(false);
+		curve_del->set_pressed(false);
+	} else if (p_mode==MODE_EDIT_CURVE) {
+
+		curve_create->set_pressed(false);
+		curve_edit->set_pressed(false);
+		curve_edit_curve->set_pressed(true);
+		curve_del->set_pressed(false);
+	} else if (p_mode==MODE_DELETE) {
+
+		curve_create->set_pressed(false);
+		curve_edit->set_pressed(false);
+		curve_edit_curve->set_pressed(false);
+		curve_del->set_pressed(true);
+	} else if (p_mode==ACTION_CLOSE) {
+
+		//?
+
+		if (!node->get_curve().is_valid())
+			return ;
+		if (node->get_curve()->get_point_count()<3)
+			return;
+
+		Vector2 begin = node->get_curve()->get_point_pos(0);
+		Vector2 end = node->get_curve()->get_point_pos( node->get_curve()->get_point_count() -1 );
+		if (begin.distance_to(end)<CMP_EPSILON)
+			return;
+
+		undo_redo->create_action("Remove Point from Curve");
+		undo_redo->add_do_method(node->get_curve().ptr(),"add_point",begin);
+		undo_redo->add_undo_method(node->get_curve().ptr(),"remove_point",node->get_curve()->get_point_count());
+		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;
+	}
+
+	mode=Mode(p_mode);
+
 }
 
 Path2DEditor::Path2DEditor(EditorNode *p_editor) {
@@ -573,6 +636,50 @@ Path2DEditor::Path2DEditor(EditorNode *p_editor) {
 	options->get_popup()->connect("item_pressed", this,"_menu_option");
 #endif
 
+	base_hb = memnew( HBoxContainer );
+	CanvasItemEditor::get_singleton()->add_control_to_menu_panel(base_hb);
+
+	sep = memnew( VSeparator);
+	base_hb->add_child(sep);
+	curve_edit = memnew( ToolButton );
+	curve_edit->set_icon(CanvasItemEditor::get_singleton()->get_icon("CurveEdit","EditorIcons"));
+	curve_edit->set_toggle_mode(true);
+	curve_edit->set_focus_mode(Control::FOCUS_NONE);
+	curve_edit->set_tooltip("Select Points\nShift+Drag: Select Control Points\n"+keycode_get_string(KEY_MASK_CMD)+"Click: Add Point\nRight Click: Delete Point.");
+	curve_edit->connect("pressed",this,"_mode_selected",varray(MODE_EDIT));
+	base_hb->add_child(curve_edit);
+	curve_edit_curve = memnew( ToolButton );
+	curve_edit_curve->set_icon(CanvasItemEditor::get_singleton()->get_icon("CurveCurve","EditorIcons"));
+	curve_edit_curve->set_toggle_mode(true);
+	curve_edit_curve->set_focus_mode(Control::FOCUS_NONE);
+	curve_edit_curve->set_tooltip("Select Control Points (Shift+Drag)");
+	curve_edit_curve->connect("pressed",this,"_mode_selected",varray(MODE_EDIT_CURVE));
+	base_hb->add_child(curve_edit_curve);
+	curve_create = memnew( ToolButton );
+	curve_create->set_icon(CanvasItemEditor::get_singleton()->get_icon("CurveCreate","EditorIcons"));
+	curve_create->set_toggle_mode(true);
+	curve_create->set_focus_mode(Control::FOCUS_NONE);
+	curve_create->set_tooltip("Add Point (in empty space)\nSplit Segment (in curve).");
+	curve_create->connect("pressed",this,"_mode_selected",varray(MODE_CREATE));
+	base_hb->add_child(curve_create);
+	curve_del = memnew( ToolButton );
+	curve_del->set_icon(CanvasItemEditor::get_singleton()->get_icon("CurveDelete","EditorIcons"));
+	curve_del->set_toggle_mode(true);
+	curve_del->set_focus_mode(Control::FOCUS_NONE);
+	curve_del->set_tooltip("Delete Point.");
+	curve_del->connect("pressed",this,"_mode_selected",varray(MODE_DELETE));
+	base_hb->add_child(curve_del);
+	curve_close = memnew( ToolButton );
+	curve_close->set_icon(CanvasItemEditor::get_singleton()->get_icon("CurveClose","EditorIcons"));
+	curve_close->set_focus_mode(Control::FOCUS_NONE);
+	curve_close->set_tooltip("Close Curve");
+	curve_close->connect("pressed",this,"_mode_selected",varray(ACTION_CLOSE));
+	base_hb->add_child(curve_close);
+	base_hb->hide();
+
+
+
+	curve_edit->set_pressed(true);
 
 
 }
@@ -592,9 +699,12 @@ void Path2DEditorPlugin::make_visible(bool p_visible) {
 
 	if (p_visible) {
 		path2d_editor->show();
+		path2d_editor->base_hb->show();
+
 	} else {
 
 		path2d_editor->hide();
+		path2d_editor->base_hb->hide();
 		path2d_editor->edit(NULL);
 	}
 
@@ -605,8 +715,9 @@ Path2DEditorPlugin::Path2DEditorPlugin(EditorNode *p_node) {
 	editor=p_node;
 	path2d_editor = memnew( Path2DEditor(p_node) );
 	CanvasItemEditor::get_singleton()->add_control_to_menu_panel(path2d_editor);
-
 	path2d_editor->hide();
+
+
 }