1 files changed, 168 insertions, 6 deletions

diff --git a/scene/resources/visual_shader.h b/scene/resources/visual_shader.h
index d3b5365893..aaf570d98c 100644
--- a/scene/resources/visual_shader.h
+++ b/scene/resources/visual_shader.h
@@ -73,6 +73,50 @@ public:
 		List<Ref<Texture2D>> params;
 	};
 
+	enum VaryingMode {
+		VARYING_MODE_VERTEX_TO_FRAG_LIGHT,
+		VARYING_MODE_FRAG_TO_LIGHT,
+		VARYING_MODE_MAX,
+	};
+
+	enum VaryingType {
+		VARYING_TYPE_FLOAT,
+		VARYING_TYPE_VECTOR_2D,
+		VARYING_TYPE_VECTOR_3D,
+		VARYING_TYPE_VECTOR_4D,
+		VARYING_TYPE_COLOR,
+		VARYING_TYPE_TRANSFORM,
+		VARYING_TYPE_MAX,
+	};
+
+	struct Varying {
+		String name;
+		VaryingMode mode;
+		VaryingType type;
+
+		Varying() {
+		}
+
+		Varying(String p_name, VaryingMode p_mode, VaryingType p_type) :
+				name(p_name), mode(p_mode), type(p_type) {}
+
+		bool from_string(const String &p_str) {
+			Vector<String> arr = p_str.split(",");
+			if (arr.size() != 2) {
+				return false;
+			}
+
+			mode = (VaryingMode)arr[0].to_int();
+			type = (VaryingType)arr[1].to_int();
+
+			return true;
+		}
+
+		String to_string() const {
+			return vformat("%s,%s", itos((int)mode), itos((int)type));
+		}
+	};
+
 private:
 	Type current_type;
 
@@ -94,14 +138,12 @@ private:
 
 	Vector2 graph_offset;
 
-	struct RenderModeEnums {
-		Shader::Mode mode = Shader::Mode::MODE_MAX;
-		const char *string;
-	};
-
 	HashMap<String, int> modes;
 	Set<StringName> flags;
 
+	Map<String, Varying> varyings;
+	List<Varying> varyings_list;
+
 	mutable SafeFlag dirty;
 	void _queue_update();
 
@@ -116,7 +158,7 @@ private:
 		}
 	};
 
-	Error _write_node(Type p_type, StringBuilder &global_code, StringBuilder &global_code_per_node, Map<Type, StringBuilder> &global_code_per_func, StringBuilder &code, Vector<DefaultTextureParam> &def_tex_params, const VMap<ConnectionKey, const List<Connection>::Element *> &input_connections, const VMap<ConnectionKey, const List<Connection>::Element *> &output_connections, int node, Set<int> &processed, bool for_preview, Set<StringName> &r_classes) const;
+	Error _write_node(Type p_type, StringBuilder *global_code, StringBuilder *global_code_per_node, Map<Type, StringBuilder> *global_code_per_func, StringBuilder &code, Vector<DefaultTextureParam> &def_tex_params, const VMap<ConnectionKey, const List<Connection>::Element *> &input_connections, const VMap<ConnectionKey, const List<Connection>::Element *> &output_connections, int node, Set<int> &processed, bool for_preview, Set<StringName> &r_classes) const;
 
 	void _input_type_changed(Type p_type, int p_id);
 	bool has_func_name(RenderingServer::ShaderMode p_mode, const String &p_func_name) const;
@@ -151,6 +193,18 @@ public:
 	void add_node(Type p_type, const Ref<VisualShaderNode> &p_node, const Vector2 &p_position, int p_id);
 	void set_node_position(Type p_type, int p_id, const Vector2 &p_position);
 
+	void add_varying(const String &p_name, VaryingMode p_mode, VaryingType p_type);
+	void remove_varying(const String &p_name);
+	bool has_varying(const String &p_name) const;
+	int get_varyings_count() const;
+	const Varying *get_varying_by_index(int p_idx) const;
+
+	void set_varying_mode(const String &p_name, VaryingMode p_mode);
+	VaryingMode get_varying_mode(const String &p_name);
+
+	void set_varying_type(const String &p_name, VaryingType p_type);
+	VaryingType get_varying_type(const String &p_name);
+
 	Vector2 get_node_position(Type p_type, int p_id) const;
 	Ref<VisualShaderNode> get_node(Type p_type, int p_id) const;
 
@@ -190,6 +244,8 @@ public:
 };
 
 VARIANT_ENUM_CAST(VisualShader::Type)
+VARIANT_ENUM_CAST(VisualShader::VaryingMode)
+VARIANT_ENUM_CAST(VisualShader::VaryingType)
 ///
 ///
 ///
@@ -216,6 +272,7 @@ public:
 		PORT_TYPE_SCALAR_INT,
 		PORT_TYPE_VECTOR_2D,
 		PORT_TYPE_VECTOR_3D,
+		PORT_TYPE_VECTOR_4D,
 		PORT_TYPE_BOOLEAN,
 		PORT_TYPE_TRANSFORM,
 		PORT_TYPE_SAMPLER,
@@ -328,14 +385,20 @@ protected:
 	GDVIRTUAL1RC(int, _get_output_port_type, int)
 	GDVIRTUAL1RC(String, _get_output_port_name, int)
 	GDVIRTUAL4RC(String, _get_code, TypedArray<String>, TypedArray<String>, Shader::Mode, VisualShader::Type)
+	GDVIRTUAL2RC(String, _get_func_code, Shader::Mode, VisualShader::Type)
 	GDVIRTUAL1RC(String, _get_global_code, Shader::Mode)
 	GDVIRTUAL0RC(bool, _is_highend)
+	GDVIRTUAL2RC(bool, _is_available, Shader::Mode, VisualShader::Type)
+
+	bool _is_valid_code(const String &p_code) const;
 
 protected:
 	void _set_input_port_default_value(int p_port, const Variant &p_value);
 
+	bool is_available(Shader::Mode p_mode, VisualShader::Type p_type) const;
 	virtual String generate_code(Shader::Mode p_mode, VisualShader::Type p_type, int p_id, const String *p_input_vars, const String *p_output_vars, bool p_for_preview = false) const override;
 	virtual String generate_global_per_node(Shader::Mode p_mode, int p_id) const override;
+	virtual String generate_global_per_func(Shader::Mode p_mode, VisualShader::Type p_type, int p_id) const override;
 
 	static void _bind_methods();
 
@@ -385,6 +448,7 @@ public:
 	virtual int get_output_port_count() const override;
 	virtual PortType get_output_port_type(int p_port) const override;
 	virtual String get_output_port_name(int p_port) const override;
+	virtual bool is_output_port_expandable(int p_port) const override;
 
 	virtual String get_caption() const override;
 
@@ -495,6 +559,7 @@ public:
 		UNIFORM_TYPE_BOOLEAN,
 		UNIFORM_TYPE_VECTOR2,
 		UNIFORM_TYPE_VECTOR3,
+		UNIFORM_TYPE_VECTOR4,
 		UNIFORM_TYPE_TRANSFORM,
 		UNIFORM_TYPE_COLOR,
 		UNIFORM_TYPE_SAMPLER,
@@ -697,6 +762,103 @@ public:
 	VisualShaderNodeGlobalExpression();
 };
 
+class VisualShaderNodeVarying : public VisualShaderNode {
+	GDCLASS(VisualShaderNodeVarying, VisualShaderNode);
+
+public:
+	struct Varying {
+		String name;
+		VisualShader::VaryingMode mode;
+		VisualShader::VaryingType type;
+		bool assigned = false;
+	};
+
+protected:
+	VisualShader::VaryingType varying_type = VisualShader::VARYING_TYPE_FLOAT;
+	String varying_name = "[None]";
+
+public: // internal
+	static void add_varying(const String &p_name, VisualShader::VaryingMode p_mode, VisualShader::VaryingType p_type);
+	static void clear_varyings();
+	static bool has_varying(const String &p_name);
+
+	int get_varyings_count() const;
+	String get_varying_name_by_index(int p_idx) const;
+	VisualShader::VaryingMode get_varying_mode_by_name(const String &p_name) const;
+	VisualShader::VaryingMode get_varying_mode_by_index(int p_idx) const;
+	VisualShader::VaryingType get_varying_type_by_name(const String &p_name) const;
+	VisualShader::VaryingType get_varying_type_by_index(int p_idx) const;
+	PortType get_port_type_by_index(int p_idx) const;
+
+protected:
+	static void _bind_methods();
+
+protected:
+	String get_type_str() const;
+	PortType get_port_type(VisualShader::VaryingType p_type, int p_port) const;
+
+public:
+	virtual String get_caption() const override = 0;
+
+	virtual int get_input_port_count() const override = 0;
+	virtual PortType get_input_port_type(int p_port) const override = 0;
+	virtual String get_input_port_name(int p_port) const override = 0;
+
+	virtual int get_output_port_count() const override = 0;
+	virtual PortType get_output_port_type(int p_port) const override = 0;
+	virtual String get_output_port_name(int p_port) const override = 0;
+
+	virtual String generate_code(Shader::Mode p_mode, VisualShader::Type p_type, int p_id, const String *p_input_vars, const String *p_output_vars, bool p_for_preview = false) const override = 0;
+
+	void set_varying_name(String p_varying_name);
+	String get_varying_name() const;
+
+	void set_varying_type(VisualShader::VaryingType p_varying_type);
+	VisualShader::VaryingType get_varying_type() const;
+
+	VisualShaderNodeVarying();
+};
+
+class VisualShaderNodeVaryingSetter : public VisualShaderNodeVarying {
+	GDCLASS(VisualShaderNodeVaryingSetter, VisualShaderNodeVarying);
+
+public:
+	virtual String get_caption() const override;
+
+	virtual int get_input_port_count() const override;
+	virtual PortType get_input_port_type(int p_port) const override;
+	virtual String get_input_port_name(int p_port) const override;
+
+	virtual int get_output_port_count() const override;
+	virtual PortType get_output_port_type(int p_port) const override;
+	virtual String get_output_port_name(int p_port) const override;
+
+	virtual String generate_global(Shader::Mode p_mode, VisualShader::Type p_type, int p_id) const override;
+	virtual String generate_code(Shader::Mode p_mode, VisualShader::Type p_type, int p_id, const String *p_input_vars, const String *p_output_vars, bool p_for_preview = false) const override;
+
+	VisualShaderNodeVaryingSetter();
+};
+
+class VisualShaderNodeVaryingGetter : public VisualShaderNodeVarying {
+	GDCLASS(VisualShaderNodeVaryingGetter, VisualShaderNodeVarying);
+
+public:
+	virtual String get_caption() const override;
+
+	virtual int get_input_port_count() const override;
+	virtual PortType get_input_port_type(int p_port) const override;
+	virtual String get_input_port_name(int p_port) const override;
+
+	virtual int get_output_port_count() const override;
+	virtual PortType get_output_port_type(int p_port) const override;
+	virtual String get_output_port_name(int p_port) const override;
+	virtual bool has_output_port_preview(int p_port) const override;
+
+	virtual String generate_code(Shader::Mode p_mode, VisualShader::Type p_type, int p_id, const String *p_input_vars, const String *p_output_vars, bool p_for_preview = false) const override;
+
+	VisualShaderNodeVaryingGetter();
+};
+
 extern String make_unique_id(VisualShader::Type p_type, int p_id, const String &p_name);
 
 #endif // VISUAL_SHADER_H