Add Create Curve button to Path2D editor

1 files changed, 46 insertions, 9 deletions

diff --git a/editor/plugins/path_3d_editor_plugin.cpp b/editor/plugins/path_3d_editor_plugin.cpp
index 240206e124..7ba464f4e5 100644
--- a/editor/plugins/path_3d_editor_plugin.cpp
+++ b/editor/plugins/path_3d_editor_plugin.cpp
@@ -652,6 +652,7 @@ void Path3DEditorPlugin::edit(Object *p_object) {
 			if (path->get_curve().is_valid()) {
 				path->get_curve()->emit_signal(CoreStringName(changed));
 			}
+			_update_toolbar();
 		}
 	} else {
 		Path3D *pre = path;
@@ -732,6 +733,21 @@ void Path3DEditorPlugin::_handle_option_pressed(int p_option) {
 	}
 }
 
+void Path3DEditorPlugin::_create_curve() {
+	ERR_FAIL_NULL(path);
+
+	Ref<Curve3D> new_curve;
+	new_curve.instantiate();
+
+	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
+	undo_redo->create_action(TTR("Create Curve in Path3D"));
+	undo_redo->add_do_property(path, "curve", new_curve);
+	undo_redo->add_undo_property(path, "curve", Ref<Curve3D>());
+	undo_redo->add_do_method(this, "_update_toolbar");
+	undo_redo->add_undo_method(this, "_update_toolbar");
+	undo_redo->commit_action();
+}
+
 void Path3DEditorPlugin::_confirm_clear_points() {
 	if (!path || path->get_curve().is_null() || path->get_curve()->get_point_count() == 0) {
 		return;
@@ -783,6 +799,17 @@ void Path3DEditorPlugin::_update_theme() {
 	curve_del->set_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("CurveDelete"), EditorStringName(EditorIcons)));
 	curve_close->set_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("CurveClose"), EditorStringName(EditorIcons)));
 	curve_clear_points->set_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("Clear"), EditorStringName(EditorIcons)));
+
+	create_curve_button->set_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("Curve3D"), EditorStringName(EditorIcons)));
+}
+
+void Path3DEditorPlugin::_update_toolbar() {
+	if (!path) {
+		return;
+	}
+	bool has_curve = path->get_curve().is_valid();
+	toolbar->set_visible(has_curve);
+	create_curve_button->set_visible(!has_curve);
 }
 
 void Path3DEditorPlugin::_notification(int p_what) {
@@ -808,6 +835,7 @@ void Path3DEditorPlugin::_notification(int p_what) {
 }
 
 void Path3DEditorPlugin::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("_update_toolbar"), &Path3DEditorPlugin::_update_toolbar);
 	ClassDB::bind_method(D_METHOD("_clear_curve_points"), &Path3DEditorPlugin::_clear_curve_points);
 	ClassDB::bind_method(D_METHOD("_restore_curve_points"), &Path3DEditorPlugin::_restore_curve_points);
 }
@@ -830,65 +858,74 @@ Path3DEditorPlugin::Path3DEditorPlugin() {
 	topmenu_bar->hide();
 	Node3DEditor::get_singleton()->add_control_to_menu_panel(topmenu_bar);
 
+	toolbar = memnew(HBoxContainer);
+	topmenu_bar->add_child(toolbar);
+
 	curve_edit = memnew(Button);
 	curve_edit->set_theme_type_variation("FlatButton");
 	curve_edit->set_toggle_mode(true);
 	curve_edit->set_focus_mode(Control::FOCUS_NONE);
 	curve_edit->set_tooltip_text(TTR("Select Points") + "\n" + TTR("Shift+Click: Select multiple Points") + "\n" + keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL) + TTR("Click: Add Point") + "\n" + TTR("Right Click: Delete Point"));
-	topmenu_bar->add_child(curve_edit);
+	toolbar->add_child(curve_edit);
 
 	curve_edit_curve = memnew(Button);
 	curve_edit_curve->set_theme_type_variation("FlatButton");
 	curve_edit_curve->set_toggle_mode(true);
 	curve_edit_curve->set_focus_mode(Control::FOCUS_NONE);
 	curve_edit_curve->set_tooltip_text(TTR("Select Control Points") + "\n" + TTR("Shift+Click: Drag out Control Points"));
-	topmenu_bar->add_child(curve_edit_curve);
+	toolbar->add_child(curve_edit_curve);
 
 	curve_edit_tilt = memnew(Button);
 	curve_edit_tilt->set_theme_type_variation("FlatButton");
 	curve_edit_tilt->set_toggle_mode(true);
 	curve_edit_tilt->set_focus_mode(Control::FOCUS_NONE);
 	curve_edit_tilt->set_tooltip_text(TTR("Select Tilt Handles"));
-	topmenu_bar->add_child(curve_edit_tilt);
+	toolbar->add_child(curve_edit_tilt);
 
 	curve_create = memnew(Button);
 	curve_create->set_theme_type_variation("FlatButton");
 	curve_create->set_toggle_mode(true);
 	curve_create->set_focus_mode(Control::FOCUS_NONE);
 	curve_create->set_tooltip_text(TTR("Add Point (in empty space)") + "\n" + TTR("Split Segment (in curve)"));
-	topmenu_bar->add_child(curve_create);
+	toolbar->add_child(curve_create);
 
 	curve_del = memnew(Button);
 	curve_del->set_theme_type_variation("FlatButton");
 	curve_del->set_toggle_mode(true);
 	curve_del->set_focus_mode(Control::FOCUS_NONE);
 	curve_del->set_tooltip_text(TTR("Delete Point"));
-	topmenu_bar->add_child(curve_del);
+	toolbar->add_child(curve_del);
 
 	curve_close = memnew(Button);
 	curve_close->set_theme_type_variation("FlatButton");
 	curve_close->set_focus_mode(Control::FOCUS_NONE);
 	curve_close->set_tooltip_text(TTR("Close Curve"));
-	topmenu_bar->add_child(curve_close);
+	toolbar->add_child(curve_close);
 
 	curve_clear_points = memnew(Button);
 	curve_clear_points->set_theme_type_variation("FlatButton");
 	curve_clear_points->set_focus_mode(Control::FOCUS_NONE);
 	curve_clear_points->set_tooltip_text(TTR("Clear Points"));
 	curve_clear_points->connect(SceneStringName(pressed), callable_mp(this, &Path3DEditorPlugin::_confirm_clear_points));
-	topmenu_bar->add_child(curve_clear_points);
+	toolbar->add_child(curve_clear_points);
 
 	clear_points_dialog = memnew(ConfirmationDialog);
 	clear_points_dialog->set_title(TTR("Please Confirm..."));
 	clear_points_dialog->set_text(TTR("Remove all curve points?"));
 	clear_points_dialog->connect(SceneStringName(confirmed), callable_mp(this, &Path3DEditorPlugin::_clear_points));
-	topmenu_bar->add_child(clear_points_dialog);
+	toolbar->add_child(clear_points_dialog);
 
 	handle_menu = memnew(MenuButton);
 	handle_menu->set_flat(false);
 	handle_menu->set_theme_type_variation("FlatMenuButton");
 	handle_menu->set_text(TTR("Options"));
-	topmenu_bar->add_child(handle_menu);
+	toolbar->add_child(handle_menu);
+
+	create_curve_button = memnew(Button);
+	create_curve_button->set_text(TTR("Create Curve"));
+	create_curve_button->hide();
+	topmenu_bar->add_child(create_curve_button);
+	create_curve_button->connect(SceneStringName(pressed), callable_mp(this, &Path3DEditorPlugin::_create_curve));
 
 	PopupMenu *menu;
 	menu = handle_menu->get_popup();