1 files changed, 227 insertions, 66 deletions

diff --git a/scene/resources/visual_shader.h b/scene/resources/visual_shader.h
index d3b5365893..4116eaa196 100644
--- a/scene/resources/visual_shader.h
+++ b/scene/resources/visual_shader.h
@@ -36,7 +36,7 @@
 #include "scene/gui/control.h"
 #include "scene/resources/shader.h"
 
-class VisualShaderNodeUniform;
+class VisualShaderNodeParameter;
 class VisualShaderNode;
 
 class VisualShader : public Shader {
@@ -44,8 +44,6 @@ class VisualShader : public Shader {
 
 	friend class VisualShaderNodeVersionChecker;
 
-	Dictionary engine_version;
-
 public:
 	enum Type {
 		TYPE_VERTEX,
@@ -73,6 +71,51 @@ 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_INT,
+		VARYING_TYPE_VECTOR_2D,
+		VARYING_TYPE_VECTOR_3D,
+		VARYING_TYPE_VECTOR_4D,
+		VARYING_TYPE_BOOLEAN,
+		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;
 
@@ -83,24 +126,22 @@ private:
 	};
 
 	struct Graph {
-		Map<int, Node> nodes;
+		RBMap<int, Node> nodes;
 		List<Connection> connections;
 	} graph[TYPE_MAX];
 
 	Shader::Mode shader_mode = Shader::MODE_SPATIAL;
 	mutable String previous_code;
 
-	Array _get_node_connections(Type p_type) const;
+	TypedArray<Dictionary> _get_node_connections(Type p_type) const;
 
 	Vector2 graph_offset;
 
-	struct RenderModeEnums {
-		Shader::Mode mode = Shader::Mode::MODE_MAX;
-		const char *string;
-	};
-
 	HashMap<String, int> modes;
-	Set<StringName> flags;
+	HashSet<StringName> flags;
+
+	HashMap<String, Varying> varyings;
+	List<Varying> varyings_list;
 
 	mutable SafeFlag dirty;
 	void _queue_update();
@@ -116,7 +157,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, HashMap<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, HashSet<int> &processed, bool for_preview, HashSet<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;
@@ -135,14 +176,6 @@ public: // internal methods
 	void set_shader_type(Type p_type);
 	Type get_shader_type() const;
 
-public:
-	void set_engine_version(const Dictionary &p_version);
-	Dictionary get_engine_version() const;
-
-#ifndef DISABLE_DEPRECATED
-	void update_engine_version(const Dictionary &p_new_version);
-#endif /* DISABLE_DEPRECATED */
-
 	enum {
 		NODE_ID_INVALID = -1,
 		NODE_ID_OUTPUT = 0,
@@ -151,6 +184,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;
 
@@ -184,12 +229,14 @@ public:
 	String generate_preview_shader(Type p_type, int p_node, int p_port, Vector<DefaultTextureParam> &r_default_tex_params) const;
 
 	String validate_port_name(const String &p_port_name, VisualShaderNode *p_node, int p_port_id, bool p_output) const;
-	String validate_uniform_name(const String &p_name, const Ref<VisualShaderNodeUniform> &p_uniform) const;
+	String validate_parameter_name(const String &p_name, const Ref<VisualShaderNodeParameter> &p_parameter) const;
 
 	VisualShader();
 };
 
 VARIANT_ENUM_CAST(VisualShader::Type)
+VARIANT_ENUM_CAST(VisualShader::VaryingMode)
+VARIANT_ENUM_CAST(VisualShader::VaryingType)
 ///
 ///
 ///
@@ -199,10 +246,10 @@ class VisualShaderNode : public Resource {
 
 	int port_preview = -1;
 
-	Map<int, Variant> default_input_values;
-	Map<int, bool> connected_input_ports;
-	Map<int, int> connected_output_ports;
-	Map<int, bool> expanded_output_ports;
+	HashMap<int, Variant> default_input_values;
+	HashMap<int, bool> connected_input_ports;
+	HashMap<int, int> connected_output_ports;
+	HashMap<int, bool> expanded_output_ports;
 
 protected:
 	bool simple_decl = true;
@@ -216,6 +263,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,
@@ -271,7 +319,7 @@ public:
 	void set_disabled(bool p_disabled = true);
 
 	virtual Vector<StringName> get_editable_properties() const;
-	virtual Map<StringName, String> get_editable_properties_names() const;
+	virtual HashMap<StringName, String> get_editable_properties_names() const;
 
 	virtual Vector<VisualShader::DefaultTextureParam> get_default_texture_parameters(VisualShader::Type p_type, int p_id) const;
 	virtual String generate_global(Shader::Mode p_mode, VisualShader::Type p_type, int p_id) const;
@@ -328,14 +376,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();
 
@@ -375,7 +429,7 @@ public:
 
 protected:
 	static void _bind_methods();
-	void _validate_property(PropertyInfo &property) const override;
+	void _validate_property(PropertyInfo &p_property) const;
 
 public:
 	virtual int get_input_port_count() const override;
@@ -385,6 +439,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;
 
@@ -444,8 +499,8 @@ public:
 	VisualShaderNodeOutput();
 };
 
-class VisualShaderNodeUniform : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeUniform, VisualShaderNode);
+class VisualShaderNodeParameter : public VisualShaderNode {
+	GDCLASS(VisualShaderNodeParameter, VisualShaderNode);
 
 public:
 	enum Qualifier {
@@ -456,7 +511,7 @@ public:
 	};
 
 private:
-	String uniform_name = "";
+	String parameter_name = "";
 	Qualifier qualifier = QUAL_NONE;
 	bool global_code_generated = false;
 
@@ -464,9 +519,13 @@ protected:
 	static void _bind_methods();
 	String _get_qual_str() const;
 
+#ifndef DISABLE_DEPRECATED
+	bool _set(const StringName &p_name, const Variant &p_value);
+#endif
+
 public:
-	void set_uniform_name(const String &p_name);
-	String get_uniform_name() const;
+	void set_parameter_name(const String &p_name);
+	String get_parameter_name() const;
 
 	void set_qualifier(Qualifier p_qual);
 	Qualifier get_qualifier() const;
@@ -480,42 +539,44 @@ public:
 	virtual Vector<StringName> get_editable_properties() const override;
 	virtual String get_warning(Shader::Mode p_mode, VisualShader::Type p_type) const override;
 
-	VisualShaderNodeUniform();
+	VisualShaderNodeParameter();
 };
 
-VARIANT_ENUM_CAST(VisualShaderNodeUniform::Qualifier)
+VARIANT_ENUM_CAST(VisualShaderNodeParameter::Qualifier)
 
-class VisualShaderNodeUniformRef : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeUniformRef, VisualShaderNode);
+class VisualShaderNodeParameterRef : public VisualShaderNode {
+	GDCLASS(VisualShaderNodeParameterRef, VisualShaderNode);
 
 public:
-	enum UniformType {
-		UNIFORM_TYPE_FLOAT,
-		UNIFORM_TYPE_INT,
-		UNIFORM_TYPE_BOOLEAN,
-		UNIFORM_TYPE_VECTOR2,
-		UNIFORM_TYPE_VECTOR3,
-		UNIFORM_TYPE_TRANSFORM,
-		UNIFORM_TYPE_COLOR,
+	enum ParameterType {
+		PARAMETER_TYPE_FLOAT,
+		PARAMETER_TYPE_INT,
+		PARAMETER_TYPE_BOOLEAN,
+		PARAMETER_TYPE_VECTOR2,
+		PARAMETER_TYPE_VECTOR3,
+		PARAMETER_TYPE_VECTOR4,
+		PARAMETER_TYPE_TRANSFORM,
+		PARAMETER_TYPE_COLOR,
 		UNIFORM_TYPE_SAMPLER,
 	};
 
-	struct Uniform {
+	struct Parameter {
 		String name;
-		UniformType type;
+		ParameterType type;
 	};
 
 private:
-	String uniform_name = "[None]";
-	UniformType uniform_type = UniformType::UNIFORM_TYPE_FLOAT;
+	RID shader_rid;
+	String parameter_name = "[None]";
+	ParameterType param_type = ParameterType::PARAMETER_TYPE_FLOAT;
 
 protected:
 	static void _bind_methods();
 
 public:
-	static void add_uniform(const String &p_name, UniformType p_type);
-	static void clear_uniforms();
-	static bool has_uniform(const String &p_name);
+	static void add_parameter(RID p_shader_rid, const String &p_name, ParameterType p_type);
+	static void clear_parameters(RID p_shader_rid);
+	static bool has_parameter(RID p_shader_rid, const String &p_name);
 
 public:
 	virtual String get_caption() const override;
@@ -528,38 +589,42 @@ public:
 	virtual PortType get_output_port_type(int p_port) const override;
 	virtual String get_output_port_name(int p_port) const override;
 
-	void set_uniform_name(const String &p_name);
-	String get_uniform_name() const;
+	void set_shader_rid(const RID &p_shader);
+
+	void set_parameter_name(const String &p_name);
+	String get_parameter_name() const;
 
-	void _set_uniform_type(int p_uniform_type);
-	int _get_uniform_type() const;
+	void update_parameter_type();
 
-	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;
-	UniformType get_uniform_type_by_index(int p_idx) const;
+	void _set_parameter_type(int p_parameter_type);
+	int _get_parameter_type() const;
+
+	int get_parameters_count() const;
+	String get_parameter_name_by_index(int p_idx) const;
+	ParameterType get_parameter_type_by_name(const String &p_name) const;
+	ParameterType get_parameter_type_by_index(int p_idx) const;
 	PortType get_port_type_by_index(int p_idx) const;
 
 	virtual Vector<StringName> get_editable_properties() 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;
 
-	VisualShaderNodeUniformRef();
+	VisualShaderNodeParameterRef();
 };
 
 class VisualShaderNodeResizableBase : public VisualShaderNode {
 	GDCLASS(VisualShaderNodeResizableBase, VisualShaderNode);
 
 protected:
-	Vector2 size = Size2(0, 0);
+	Size2 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;
+	void set_size(const Size2 &p_size);
+	Size2 get_size() const;
 
 	bool is_allow_v_resize() const;
 	void set_allow_v_resize(bool p_enabled);
@@ -615,9 +680,9 @@ protected:
 		String name;
 	};
 
-	Map<int, Port> input_ports;
-	Map<int, Port> output_ports;
-	Map<int, Control *> controls;
+	HashMap<int, Port> input_ports;
+	HashMap<int, Port> output_ports;
+	HashMap<int, Control *> controls;
 
 protected:
 	static void _bind_methods();
@@ -697,6 +762,102 @@ 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_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