1 files changed, 29 insertions, 13 deletions

diff --git a/scene/resources/visual_shader.h b/scene/resources/visual_shader.h
index 2b9115879e..e3d8dae032 100644
--- a/scene/resources/visual_shader.h
+++ b/scene/resources/visual_shader.h
@@ -33,7 +33,6 @@
 
 #include "core/string_builder.h"
 #include "scene/gui/control.h"
-#include "scene/gui/graph_edit.h"
 #include "scene/resources/shader.h"
 
 class VisualShaderNodeUniform;
@@ -76,7 +75,6 @@ private:
 		Ref<VisualShaderNode> node;
 		Vector2 position;
 		List<int> prev_connected_nodes;
-		GraphNode *graph_node;
 	};
 
 	struct Graph {
@@ -129,7 +127,6 @@ protected:
 	void _get_property_list(List<PropertyInfo> *p_list) const;
 
 public: // internal methods
-	void set_graph_node(Type p_type, int p_id, GraphNode *p_graph_node);
 	void set_shader_type(Type p_type);
 	Type get_shader_type() const;
 
@@ -196,8 +193,7 @@ class VisualShaderNode : public Resource {
 
 	Map<int, Variant> default_input_values;
 	Map<int, bool> connected_input_ports;
-	Map<int, bool> connected_output_ports;
-	int connected_output_count = 0;
+	Map<int, int> connected_output_ports;
 
 protected:
 	bool simple_decl = true;
@@ -245,6 +241,8 @@ public:
 	virtual bool is_generate_input_var(int p_port) const;
 
 	virtual bool is_code_generated() const;
+	virtual bool is_show_prop_names() const;
+	virtual bool is_use_prop_slots() const;
 
 	virtual Vector<StringName> get_editable_properties() const;
 
@@ -457,6 +455,7 @@ protected:
 public:
 	static void add_uniform(const String &p_name, UniformType p_type);
 	static void clear_uniforms();
+	static bool has_uniform(const String &p_name);
 
 public:
 	virtual String get_caption() const override;
@@ -472,6 +471,9 @@ public:
 	void set_uniform_name(const String &p_name);
 	String get_uniform_name() const;
 
+	void _set_uniform_type(int p_uniform_type);
+	int _get_uniform_type() const;
+
 	int get_uniforms_count() const;
 	String get_uniform_name_by_index(int p_idx) const;
 	UniformType get_uniform_type_by_name(const String &p_name) const;
@@ -484,14 +486,33 @@ public:
 	VisualShaderNodeUniformRef();
 };
 
-class VisualShaderNodeGroupBase : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeGroupBase, VisualShaderNode);
+class VisualShaderNodeResizableBase : public VisualShaderNode {
+	GDCLASS(VisualShaderNodeResizableBase, VisualShaderNode);
+
+protected:
+	Vector2 size = Size2(0, 0);
+	bool allow_v_resize = true;
+
+protected:
+	static void _bind_methods();
+
+public:
+	void set_size(const Vector2 &p_size);
+	Vector2 get_size() const;
+
+	bool is_allow_v_resize() const;
+	void set_allow_v_resize(bool p_enabled);
+
+	VisualShaderNodeResizableBase();
+};
+
+class VisualShaderNodeGroupBase : public VisualShaderNodeResizableBase {
+	GDCLASS(VisualShaderNodeGroupBase, VisualShaderNodeResizableBase);
 
 private:
 	void _apply_port_changes();
 
 protected:
-	Vector2 size = Size2(0, 0);
 	String inputs = "";
 	String outputs = "";
 	bool editable = false;
@@ -509,11 +530,6 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual String get_caption() const override;
-
-	void set_size(const Vector2 &p_size);
-	Vector2 get_size() const;
-
 	void set_inputs(const String &p_inputs);
 	String get_inputs() const;