Merge pull request #49343 from theoway/node_auto_arrangement_graph_edit

Node Auto Arrangement in GraphEdit/VisualScript/VisualShader
godotengine · Aug 10, 2021 · 18bd0fe · 18bd0fe
2 parents afb4092 + 12fc3f1
commit 18bd0fe
Show file tree

Hide file tree

Showing 9 changed files with 542 additions and 1 deletion.
diff --git a/doc/classes/GraphEdit.xml b/doc/classes/GraphEdit.xml
@@ -32,6 +32,12 @@
 				Makes possible to disconnect nodes when dragging from the slot at the right if it has the specified type.
 			</description>
 		</method>
+		<method name="arrange_nodes">
+			<return type="void" />
+			<description>
+				Rearranges selected nodes in a layout with minimum crossings between connections and uniform horizontal and vertical gap between nodes.
+			</description>
+		</method>
 		<method name="clear_connections">
 			<return type="void" />
 			<description>
@@ -283,6 +289,8 @@
 		<theme_item name="grid_minor" data_type="color" type="Color" default="Color(1, 1, 1, 0.05)">
 			Color of minor grid lines.
 		</theme_item>
+		<theme_item name="layout" data_type="icon" type="Texture2D">
+		</theme_item>
 		<theme_item name="minimap" data_type="icon" type="Texture2D">
 		</theme_item>
 		<theme_item name="minus" data_type="icon" type="Texture2D">

diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp
@@ -1232,6 +1232,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
 	theme->set_icon("reset", "GraphEdit", theme->get_icon("ZoomReset", "EditorIcons"));
 	theme->set_icon("snap", "GraphEdit", theme->get_icon("SnapGrid", "EditorIcons"));
 	theme->set_icon("minimap", "GraphEdit", theme->get_icon("GridMinimap", "EditorIcons"));
+	theme->set_icon("layout", "GraphEdit", theme->get_icon("GridLayout", "EditorIcons"));
 	theme->set_constant("bezier_len_pos", "GraphEdit", 80 * EDSCALE);
 	theme->set_constant("bezier_len_neg", "GraphEdit", 160 * EDSCALE);
 

diff --git a/editor/icons/GridLayout.svg b/editor/icons/GridLayout.svg
diff --git a/modules/visual_script/visual_script_editor.h b/modules/visual_script/visual_script_editor.h
@@ -60,7 +60,7 @@ class VisualScriptEditor : public ScriptEditorBase {
 		EDIT_CUT_NODES,
 		EDIT_PASTE_NODES,
 		EDIT_CREATE_FUNCTION,
-		REFRESH_GRAPH
+		REFRESH_GRAPH,
 	};
 
 	enum PortAction {