diff options
Diffstat (limited to 'modules/visual_script/visual_script_nodes.h')
| -rw-r--r-- | modules/visual_script/visual_script_nodes.h | 90 | 
1 files changed, 60 insertions, 30 deletions
diff --git a/modules/visual_script/visual_script_nodes.h b/modules/visual_script/visual_script_nodes.h index 7392443e4e..bf2d8e9683 100644 --- a/modules/visual_script/visual_script_nodes.h +++ b/modules/visual_script/visual_script_nodes.h @@ -31,6 +31,8 @@  #ifndef VISUAL_SCRIPT_NODES_H  #define VISUAL_SCRIPT_NODES_H +#include "core/object/gdvirtual.gen.inc" +#include "core/object/script_language.h"  #include "visual_script.h"  class VisualScriptFunction : public VisualScriptNode { @@ -47,7 +49,7 @@ class VisualScriptFunction : public VisualScriptNode {  	bool stack_less;  	int stack_size; -	MultiplayerAPI::RPCMode rpc_mode; +	Multiplayer::RPCMode rpc_mode;  	bool sequenced;  protected: @@ -94,10 +96,10 @@ public:  	void set_return_type(Variant::Type p_type);  	Variant::Type get_return_type() const; -	void set_rpc_mode(MultiplayerAPI::RPCMode p_mode); -	MultiplayerAPI::RPCMode get_rpc_mode() const; +	void set_rpc_mode(Multiplayer::RPCMode p_mode); +	Multiplayer::RPCMode get_rpc_mode() const; -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	virtual void reset_state() override; @@ -192,7 +194,7 @@ public:  	virtual String get_text() const override;  	virtual String get_category() const override { return "functions"; } -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptComposeArray();  }; @@ -227,7 +229,9 @@ public:  	void set_typed(Variant::Type p_op);  	Variant::Type get_typed() const; -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	static String get_operator_name(Variant::Operator p_op); + +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptOperator();  }; @@ -259,7 +263,7 @@ public:  	void set_typed(Variant::Type p_op);  	Variant::Type get_typed() const; -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptSelect();  }; @@ -291,7 +295,7 @@ public:  	void set_variable(StringName p_variable);  	StringName get_variable() const; -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptVariableGet();  }; @@ -323,7 +327,7 @@ public:  	void set_variable(StringName p_variable);  	StringName get_variable() const; -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptVariableSet();  }; @@ -359,7 +363,7 @@ public:  	void set_constant_value(Variant p_value);  	Variant get_constant_value() const; -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptConstant();  }; @@ -390,7 +394,7 @@ public:  	void set_preload(const Ref<Resource> &p_preload);  	Ref<Resource> get_preload() const; -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptPreload();  }; @@ -413,7 +417,7 @@ public:  	virtual String get_caption() const override;  	virtual String get_category() const override { return "operators"; } -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptIndexGet();  }; @@ -436,7 +440,7 @@ public:  	virtual String get_caption() const override;  	virtual String get_category() const override { return "operators"; } -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptIndexSet();  }; @@ -466,7 +470,7 @@ public:  	void set_global_constant(int p_which);  	int get_global_constant(); -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptGlobalConstant();  }; @@ -502,7 +506,7 @@ public:  	void set_base_type(const StringName &p_which);  	StringName get_base_type(); -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptClassConstant();  }; @@ -539,7 +543,7 @@ public:  	void set_basic_type(Variant::Type p_which);  	Variant::Type get_basic_type() const; -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptBasicTypeConstant();  }; @@ -586,7 +590,7 @@ public:  	void set_math_constant(MathConstant p_which);  	MathConstant get_math_constant(); -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptMathConstant();  }; @@ -621,7 +625,7 @@ public:  	void set_singleton(const String &p_string);  	String get_singleton(); -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override; @@ -655,7 +659,7 @@ public:  	void set_node_path(const NodePath &p_path);  	NodePath get_node_path(); -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override; @@ -684,7 +688,7 @@ public:  	virtual String get_caption() const override;  	virtual String get_category() const override { return "data"; } -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override; @@ -717,7 +721,7 @@ public:  	void set_resource_path(const String &p_path);  	String get_resource_path(); -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptResourcePath();  }; @@ -743,7 +747,7 @@ public:  	virtual String get_caption() const override;  	virtual String get_category() const override { return "data"; } -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override; @@ -755,6 +759,30 @@ class VisualScriptCustomNode : public VisualScriptNode {  protected:  	static void _bind_methods(); +	friend class VisualScriptNodeInstanceCustomNode; +	GDVIRTUAL0RC(int, _get_output_sequence_port_count) +	GDVIRTUAL0RC(bool, _has_input_sequence_port) +	GDVIRTUAL1RC(String, _get_output_sequence_port_text, int) + +	GDVIRTUAL0RC(int, _get_input_value_port_count) +	GDVIRTUAL1RC(int, _get_input_value_port_type, int) +	GDVIRTUAL1RC(String, _get_input_value_port_name, int) +	GDVIRTUAL1RC(int, _get_input_value_port_hint, int) +	GDVIRTUAL1RC(String, _get_input_value_port_hint_string, int) + +	GDVIRTUAL0RC(int, _get_output_value_port_count) +	GDVIRTUAL1RC(int, _get_output_value_port_type, int) +	GDVIRTUAL1RC(String, _get_output_value_port_name, int) +	GDVIRTUAL1RC(int, _get_output_value_port_hint, int) +	GDVIRTUAL1RC(String, _get_output_value_port_hint_string, int) + +	GDVIRTUAL0RC(String, _get_caption) +	GDVIRTUAL0RC(String, _get_text) +	GDVIRTUAL0RC(String, _get_category) + +	GDVIRTUAL0RC(int, _get_working_memory_size) + +	GDVIRTUAL4RC(Variant, _step, Array, Array, int, Array)  public:  	enum StartMode { //replicated for step @@ -788,7 +816,9 @@ public:  	virtual String get_text() const override;  	virtual String get_category() const override; -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override; + +	virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override;  	void _script_changed(); @@ -819,7 +849,7 @@ public:  	virtual String get_text() const override;  	virtual String get_category() const override; -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptSubCall();  }; @@ -859,7 +889,7 @@ public:  	void set_size(const Size2 &p_size);  	Size2 get_size() const; -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptComment();  }; @@ -894,7 +924,7 @@ public:  	void set_constructor(const Dictionary &p_info);  	Dictionary get_constructor() const; -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptConstructor();  }; @@ -929,7 +959,7 @@ public:  	void set_var_type(Variant::Type p_type);  	Variant::Type get_var_type() const; -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptLocalVar();  }; @@ -965,7 +995,7 @@ public:  	void set_var_type(Variant::Type p_type);  	Variant::Type get_var_type() const; -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptLocalVarSet();  }; @@ -1010,7 +1040,7 @@ public:  	void set_action_mode(Mode p_mode);  	Mode get_action_mode() const; -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptInputAction();  }; @@ -1056,7 +1086,7 @@ public:  	void set_deconstruct_type(Variant::Type p_type);  	Variant::Type get_deconstruct_type() const; -	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override; +	virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;  	VisualScriptDeconstruct();  };  |