From 5dbf1809c6e3e905b94b8764e99491e608122261 Mon Sep 17 00:00:00 2001 From: Rémi Verschelde Date: Sun, 5 Mar 2017 16:44:50 +0100 Subject: A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code --- modules/visual_script/visual_script_nodes.cpp | 2142 +++++++++++-------------- 1 file changed, 923 insertions(+), 1219 deletions(-) (limited to 'modules/visual_script/visual_script_nodes.cpp') diff --git a/modules/visual_script/visual_script_nodes.cpp b/modules/visual_script/visual_script_nodes.cpp index 824dfe88a..68bd1e6d4 100644 --- a/modules/visual_script/visual_script_nodes.cpp +++ b/modules/visual_script/visual_script_nodes.cpp @@ -28,157 +28,146 @@ /*************************************************************************/ #include "visual_script_nodes.h" -#include "global_constants.h" #include "global_config.h" -#include "scene/main/scene_main_loop.h" +#include "global_constants.h" +#include "os/input.h" #include "os/os.h" #include "scene/main/node.h" -#include "os/input.h" +#include "scene/main/scene_main_loop.h" ////////////////////////////////////////// ////////////////FUNCTION////////////////// ////////////////////////////////////////// +bool VisualScriptFunction::_set(const StringName &p_name, const Variant &p_value) { -bool VisualScriptFunction::_set(const StringName& p_name, const Variant& p_value) { - - - if (p_name=="argument_count") { + if (p_name == "argument_count") { - int new_argc=p_value; + int new_argc = p_value; int argc = arguments.size(); - if (argc==new_argc) + if (argc == new_argc) return true; arguments.resize(new_argc); - for(int i=argc;i *p_list) const { - +void VisualScriptFunction::_get_property_list(List *p_list) const { - p_list->push_back(PropertyInfo(Variant::INT,"argument_count",PROPERTY_HINT_RANGE,"0,256")); - String argt="Any"; - for(int i=1;ipush_back(PropertyInfo(Variant::INT, "argument_count", PROPERTY_HINT_RANGE, "0,256")); + String argt = "Any"; + for (int i = 1; i < Variant::VARIANT_MAX; i++) { + argt += "," + Variant::get_type_name(Variant::Type(i)); } - for(int i=0;ipush_back(PropertyInfo(Variant::INT,"argument/"+itos(i+1)+"/type",PROPERTY_HINT_ENUM,argt)); - p_list->push_back(PropertyInfo(Variant::STRING,"argument/"+itos(i+1)+"/name")); + for (int i = 0; i < arguments.size(); i++) { + p_list->push_back(PropertyInfo(Variant::INT, "argument/" + itos(i + 1) + "/type", PROPERTY_HINT_ENUM, argt)); + p_list->push_back(PropertyInfo(Variant::STRING, "argument/" + itos(i + 1) + "/name")); } if (!stack_less) { - p_list->push_back(PropertyInfo(Variant::INT,"stack/size",PROPERTY_HINT_RANGE,"1,100000")); + p_list->push_back(PropertyInfo(Variant::INT, "stack/size", PROPERTY_HINT_RANGE, "1,100000")); } - p_list->push_back(PropertyInfo(Variant::BOOL,"stack/stackless")); - p_list->push_back(PropertyInfo(Variant::INT,"rpc/mode",PROPERTY_HINT_ENUM,"Disabled,Remote,Sync,Master,Slave")); - + p_list->push_back(PropertyInfo(Variant::BOOL, "stack/stackless")); + p_list->push_back(PropertyInfo(Variant::INT, "rpc/mode", PROPERTY_HINT_ENUM, "Disabled,Remote,Sync,Master,Slave")); } - int VisualScriptFunction::get_output_sequence_port_count() const { return 1; } -bool VisualScriptFunction::has_input_sequence_port() const{ +bool VisualScriptFunction::has_input_sequence_port() const { return false; } -int VisualScriptFunction::get_input_value_port_count() const{ +int VisualScriptFunction::get_input_value_port_count() const { return 0; } -int VisualScriptFunction::get_output_value_port_count() const{ +int VisualScriptFunction::get_output_value_port_count() const { return arguments.size(); } @@ -188,17 +177,17 @@ String VisualScriptFunction::get_output_sequence_port_text(int p_port) const { return String(); } -PropertyInfo VisualScriptFunction::get_input_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptFunction::get_input_value_port_info(int p_idx) const { ERR_FAIL_V(PropertyInfo()); return PropertyInfo(); } -PropertyInfo VisualScriptFunction::get_output_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptFunction::get_output_value_port_info(int p_idx) const { - ERR_FAIL_INDEX_V(p_idx,arguments.size(),PropertyInfo()); + ERR_FAIL_INDEX_V(p_idx, arguments.size(), PropertyInfo()); PropertyInfo out; - out.type=arguments[p_idx].type; - out.name=arguments[p_idx].name; + out.type = arguments[p_idx].type; + out.name = arguments[p_idx].name; return out; } @@ -212,53 +201,48 @@ String VisualScriptFunction::get_text() const { return get_name(); //use name as function name I guess } -void VisualScriptFunction::add_argument(Variant::Type p_type,const String& p_name,int p_index){ +void VisualScriptFunction::add_argument(Variant::Type p_type, const String &p_name, int p_index) { Argument arg; - arg.name=p_name; - arg.type=p_type; - if (p_index>=0) - arguments.insert(p_index,arg); + arg.name = p_name; + arg.type = p_type; + if (p_index >= 0) + arguments.insert(p_index, arg); else arguments.push_back(arg); ports_changed_notify(); - } -void VisualScriptFunction::set_argument_type(int p_argidx,Variant::Type p_type){ +void VisualScriptFunction::set_argument_type(int p_argidx, Variant::Type p_type) { - ERR_FAIL_INDEX(p_argidx,arguments.size()); + ERR_FAIL_INDEX(p_argidx, arguments.size()); - arguments[p_argidx].type=p_type; + arguments[p_argidx].type = p_type; ports_changed_notify(); } Variant::Type VisualScriptFunction::get_argument_type(int p_argidx) const { - ERR_FAIL_INDEX_V(p_argidx,arguments.size(),Variant::NIL); + ERR_FAIL_INDEX_V(p_argidx, arguments.size(), Variant::NIL); return arguments[p_argidx].type; - } -void VisualScriptFunction::set_argument_name(int p_argidx,const String& p_name) { +void VisualScriptFunction::set_argument_name(int p_argidx, const String &p_name) { - ERR_FAIL_INDEX(p_argidx,arguments.size()); + ERR_FAIL_INDEX(p_argidx, arguments.size()); - arguments[p_argidx].name=p_name; + arguments[p_argidx].name = p_name; ports_changed_notify(); - } String VisualScriptFunction::get_argument_name(int p_argidx) const { - ERR_FAIL_INDEX_V(p_argidx,arguments.size(),String()); + ERR_FAIL_INDEX_V(p_argidx, arguments.size(), String()); return arguments[p_argidx].name; - } void VisualScriptFunction::remove_argument(int p_argidx) { - ERR_FAIL_INDEX(p_argidx,arguments.size()); + ERR_FAIL_INDEX(p_argidx, arguments.size()); arguments.remove(p_argidx); ports_changed_notify(); - } int VisualScriptFunction::get_argument_count() const { @@ -266,68 +250,62 @@ int VisualScriptFunction::get_argument_count() const { return arguments.size(); } - void VisualScriptFunction::set_rpc_mode(ScriptInstance::RPCMode p_mode) { - rpc_mode=p_mode; + rpc_mode = p_mode; } ScriptInstance::RPCMode VisualScriptFunction::get_rpc_mode() const { return rpc_mode; } - class VisualScriptNodeInstanceFunction : public VisualScriptNodeInstance { public: - VisualScriptFunction *node; VisualScriptInstance *instance; //virtual int get_working_memory_size() const { return 0; } - virtual int step(const Variant** p_inputs,Variant** p_outputs,StartMode p_start_mode,Variant* p_working_mem,Variant::CallError& r_error,String& r_error_str) { + virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) { int ac = node->get_argument_count(); - for(int i=0;iget_argument_type(i); - if (expected!=Variant::NIL) { - if (!Variant::can_convert_strict(p_inputs[i]->get_type(),expected)) { - r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT; - r_error.expected=expected; - r_error.argument=i; + if (expected != Variant::NIL) { + if (!Variant::can_convert_strict(p_inputs[i]->get_type(), expected)) { + r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT; + r_error.expected = expected; + r_error.argument = i; return 0; } } #endif - *p_outputs[i]=*p_inputs[i]; + *p_outputs[i] = *p_inputs[i]; } return 0; } - - }; -VisualScriptNodeInstance* VisualScriptFunction::instance(VisualScriptInstance* p_instance) { +VisualScriptNodeInstance *VisualScriptFunction::instance(VisualScriptInstance *p_instance) { - VisualScriptNodeInstanceFunction * instance = memnew(VisualScriptNodeInstanceFunction ); - instance->node=this; - instance->instance=p_instance; + VisualScriptNodeInstanceFunction *instance = memnew(VisualScriptNodeInstanceFunction); + instance->node = this; + instance->instance = p_instance; return instance; } VisualScriptFunction::VisualScriptFunction() { - stack_size=256; - stack_less=false; - rpc_mode=ScriptInstance::RPC_MODE_DISABLED; + stack_size = 256; + stack_less = false; + rpc_mode = ScriptInstance::RPC_MODE_DISABLED; } - void VisualScriptFunction::set_stack_less(bool p_enable) { - stack_less=p_enable; + stack_less = p_enable; _change_notify(); } @@ -337,8 +315,8 @@ bool VisualScriptFunction::is_stack_less() const { void VisualScriptFunction::set_stack_size(int p_size) { - ERR_FAIL_COND(p_size <1 || p_size>100000); - stack_size=p_size; + ERR_FAIL_COND(p_size < 1 || p_size > 100000); + stack_size = p_size; } int VisualScriptFunction::get_stack_size() const { @@ -346,7 +324,6 @@ int VisualScriptFunction::get_stack_size() const { return stack_size; } - ////////////////////////////////////////// ////////////////OPERATOR////////////////// ////////////////////////////////////////// @@ -356,16 +333,16 @@ int VisualScriptOperator::get_output_sequence_port_count() const { return 0; } -bool VisualScriptOperator::has_input_sequence_port() const{ +bool VisualScriptOperator::has_input_sequence_port() const { return false; } -int VisualScriptOperator::get_input_value_port_count() const{ +int VisualScriptOperator::get_input_value_port_count() const { - return (op==Variant::OP_BIT_NEGATE || op==Variant::OP_NOT || op==Variant::OP_NEGATE || op==Variant::OP_POSITIVE) ? 1 : 2; + return (op == Variant::OP_BIT_NEGATE || op == Variant::OP_NOT || op == Variant::OP_NEGATE || op == Variant::OP_POSITIVE) ? 1 : 2; } -int VisualScriptOperator::get_output_value_port_count() const{ +int VisualScriptOperator::get_output_value_port_count() const { return 1; } @@ -375,51 +352,51 @@ String VisualScriptOperator::get_output_sequence_port_text(int p_port) const { return String(); } -PropertyInfo VisualScriptOperator::get_input_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptOperator::get_input_value_port_info(int p_idx) const { - static const Variant::Type port_types[Variant::OP_MAX][2]={ - {Variant::NIL,Variant::NIL}, //OP_EQUAL, - {Variant::NIL,Variant::NIL}, //OP_NOT_EQUAL, - {Variant::NIL,Variant::NIL}, //OP_LESS, - {Variant::NIL,Variant::NIL}, //OP_LESS_EQUAL, - {Variant::NIL,Variant::NIL}, //OP_GREATER, - {Variant::NIL,Variant::NIL}, //OP_GREATER_EQUAL, + static const Variant::Type port_types[Variant::OP_MAX][2] = { + { Variant::NIL, Variant::NIL }, //OP_EQUAL, + { Variant::NIL, Variant::NIL }, //OP_NOT_EQUAL, + { Variant::NIL, Variant::NIL }, //OP_LESS, + { Variant::NIL, Variant::NIL }, //OP_LESS_EQUAL, + { Variant::NIL, Variant::NIL }, //OP_GREATER, + { Variant::NIL, Variant::NIL }, //OP_GREATER_EQUAL, //mathematic - {Variant::NIL,Variant::NIL}, //OP_ADD, - {Variant::NIL,Variant::NIL}, //OP_SUBSTRACT, - {Variant::NIL,Variant::NIL}, //OP_MULTIPLY, - {Variant::NIL,Variant::NIL}, //OP_DIVIDE, - {Variant::NIL,Variant::NIL}, //OP_NEGATE, - {Variant::NIL,Variant::NIL}, //OP_POSITIVE, - {Variant::INT,Variant::INT}, //OP_MODULE, - {Variant::STRING,Variant::STRING}, //OP_STRING_CONCAT, + { Variant::NIL, Variant::NIL }, //OP_ADD, + { Variant::NIL, Variant::NIL }, //OP_SUBSTRACT, + { Variant::NIL, Variant::NIL }, //OP_MULTIPLY, + { Variant::NIL, Variant::NIL }, //OP_DIVIDE, + { Variant::NIL, Variant::NIL }, //OP_NEGATE, + { Variant::NIL, Variant::NIL }, //OP_POSITIVE, + { Variant::INT, Variant::INT }, //OP_MODULE, + { Variant::STRING, Variant::STRING }, //OP_STRING_CONCAT, //bitwise - {Variant::INT,Variant::INT}, //OP_SHIFT_LEFT, - {Variant::INT,Variant::INT}, //OP_SHIFT_RIGHT, - {Variant::INT,Variant::INT}, //OP_BIT_AND, - {Variant::INT,Variant::INT}, //OP_BIT_OR, - {Variant::INT,Variant::INT}, //OP_BIT_XOR, - {Variant::INT,Variant::INT}, //OP_BIT_NEGATE, + { Variant::INT, Variant::INT }, //OP_SHIFT_LEFT, + { Variant::INT, Variant::INT }, //OP_SHIFT_RIGHT, + { Variant::INT, Variant::INT }, //OP_BIT_AND, + { Variant::INT, Variant::INT }, //OP_BIT_OR, + { Variant::INT, Variant::INT }, //OP_BIT_XOR, + { Variant::INT, Variant::INT }, //OP_BIT_NEGATE, //logic - {Variant::BOOL,Variant::BOOL}, //OP_AND, - {Variant::BOOL,Variant::BOOL}, //OP_OR, - {Variant::BOOL,Variant::BOOL}, //OP_XOR, - {Variant::BOOL,Variant::BOOL}, //OP_NOT, + { Variant::BOOL, Variant::BOOL }, //OP_AND, + { Variant::BOOL, Variant::BOOL }, //OP_OR, + { Variant::BOOL, Variant::BOOL }, //OP_XOR, + { Variant::BOOL, Variant::BOOL }, //OP_NOT, //containment - {Variant::NIL,Variant::NIL} //OP_IN, + { Variant::NIL, Variant::NIL } //OP_IN, }; - ERR_FAIL_INDEX_V(p_idx,Variant::OP_MAX,PropertyInfo()); + ERR_FAIL_INDEX_V(p_idx, Variant::OP_MAX, PropertyInfo()); PropertyInfo pinfo; - pinfo.name=p_idx==0?"A":"B"; - pinfo.type=port_types[op][p_idx]; - if (pinfo.type==Variant::NIL) - pinfo.type=typed; + pinfo.name = p_idx == 0 ? "A" : "B"; + pinfo.type = port_types[op][p_idx]; + if (pinfo.type == Variant::NIL) + pinfo.type = typed; return pinfo; } -PropertyInfo VisualScriptOperator::get_output_value_port_info(int p_idx) const{ - static const Variant::Type port_types[Variant::OP_MAX]={ +PropertyInfo VisualScriptOperator::get_output_value_port_info(int p_idx) const { + static const Variant::Type port_types[Variant::OP_MAX] = { //comparation Variant::BOOL, //OP_EQUAL, Variant::BOOL, //OP_NOT_EQUAL, @@ -453,15 +430,14 @@ PropertyInfo VisualScriptOperator::get_output_value_port_info(int p_idx) const{ }; PropertyInfo pinfo; - pinfo.name=""; - pinfo.type=port_types[op]; - if (pinfo.type==Variant::NIL) - pinfo.type=typed; + pinfo.name = ""; + pinfo.type = port_types[op]; + if (pinfo.type == Variant::NIL) + pinfo.type = typed; return pinfo; - } -static const char* op_names[]={ +static const char *op_names[] = { //comparation "Equal", //OP_EQUAL, "NotEqual", //OP_NOT_EQUAL, @@ -496,14 +472,12 @@ static const char* op_names[]={ String VisualScriptOperator::get_caption() const { - - return op_names[op]; } String VisualScriptOperator::get_text() const { - static const wchar_t* op_names[]={ + static const wchar_t *op_names[] = { //comparation L"A = B", //OP_EQUAL, L"A \u2260 B", //OP_NOT_EQUAL, @@ -539,24 +513,23 @@ String VisualScriptOperator::get_text() const { void VisualScriptOperator::set_operator(Variant::Operator p_op) { - if (op==p_op) + if (op == p_op) return; - op=p_op; + op = p_op; ports_changed_notify(); - } -Variant::Operator VisualScriptOperator::get_operator() const{ +Variant::Operator VisualScriptOperator::get_operator() const { return op; } void VisualScriptOperator::set_typed(Variant::Type p_op) { - if (typed==p_op) + if (typed == p_op) return; - typed=p_op; + typed = p_op; ports_changed_notify(); } @@ -565,87 +538,80 @@ Variant::Type VisualScriptOperator::get_typed() const { return typed; } - void VisualScriptOperator::_bind_methods() { - ClassDB::bind_method(D_METHOD("set_operator","op"),&VisualScriptOperator::set_operator); - ClassDB::bind_method(D_METHOD("get_operator"),&VisualScriptOperator::get_operator); + ClassDB::bind_method(D_METHOD("set_operator", "op"), &VisualScriptOperator::set_operator); + ClassDB::bind_method(D_METHOD("get_operator"), &VisualScriptOperator::get_operator); - ClassDB::bind_method(D_METHOD("set_typed","type"),&VisualScriptOperator::set_typed); - ClassDB::bind_method(D_METHOD("get_typed"),&VisualScriptOperator::get_typed); + ClassDB::bind_method(D_METHOD("set_typed", "type"), &VisualScriptOperator::set_typed); + ClassDB::bind_method(D_METHOD("get_typed"), &VisualScriptOperator::get_typed); String types; - for(int i=0;i0) - types+=","; - types+=op_names[i]; + for (int i = 0; i < Variant::OP_MAX; i++) { + if (i > 0) + types += ","; + types += op_names[i]; } - String argt="Any"; - for(int i=1;iget_type()==Variant::STRING) { - r_error_str=*p_outputs[0]; + r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD; + if (p_outputs[0]->get_type() == Variant::STRING) { + r_error_str = *p_outputs[0]; } else { if (unary) - r_error_str=String(op_names[op])+RTR(": Invalid argument of type: ")+Variant::get_type_name(p_inputs[0]->get_type()); + r_error_str = String(op_names[op]) + RTR(": Invalid argument of type: ") + Variant::get_type_name(p_inputs[0]->get_type()); else - r_error_str=String(op_names[op])+RTR(": Invalid arguments: ")+"A: "+Variant::get_type_name(p_inputs[0]->get_type())+" B: "+Variant::get_type_name(p_inputs[1]->get_type()); + r_error_str = String(op_names[op]) + RTR(": Invalid arguments: ") + "A: " + Variant::get_type_name(p_inputs[0]->get_type()) + " B: " + Variant::get_type_name(p_inputs[1]->get_type()); } } return 0; } - - }; -VisualScriptNodeInstance* VisualScriptOperator::instance(VisualScriptInstance* p_instance) { +VisualScriptNodeInstance *VisualScriptOperator::instance(VisualScriptInstance *p_instance) { - VisualScriptNodeInstanceOperator * instance = memnew(VisualScriptNodeInstanceOperator ); - instance->unary=get_input_value_port_count()==1; - instance->op=op; + VisualScriptNodeInstanceOperator *instance = memnew(VisualScriptNodeInstanceOperator); + instance->unary = get_input_value_port_count() == 1; + instance->op = op; return instance; } VisualScriptOperator::VisualScriptOperator() { - op=Variant::OP_ADD; - typed=Variant::NIL; + op = Variant::OP_ADD; + typed = Variant::NIL; } - - -template -static Ref create_op_node(const String& p_name) { +template +static Ref create_op_node(const String &p_name) { Ref node; node.instance(); @@ -662,16 +628,16 @@ int VisualScriptVariableGet::get_output_sequence_port_count() const { return 0; } -bool VisualScriptVariableGet::has_input_sequence_port() const{ +bool VisualScriptVariableGet::has_input_sequence_port() const { return false; } -int VisualScriptVariableGet::get_input_value_port_count() const{ +int VisualScriptVariableGet::get_input_value_port_count() const { return 0; } -int VisualScriptVariableGet::get_output_value_port_count() const{ +int VisualScriptVariableGet::get_output_value_port_count() const { return 1; } @@ -681,25 +647,24 @@ String VisualScriptVariableGet::get_output_sequence_port_text(int p_port) const return String(); } -PropertyInfo VisualScriptVariableGet::get_input_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptVariableGet::get_input_value_port_info(int p_idx) const { return PropertyInfo(); } -PropertyInfo VisualScriptVariableGet::get_output_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptVariableGet::get_output_value_port_info(int p_idx) const { PropertyInfo pinfo; - pinfo.name="value"; + pinfo.name = "value"; if (get_visual_script().is_valid() && get_visual_script()->has_variable(variable)) { PropertyInfo vinfo = get_visual_script()->get_variable_info(variable); - pinfo.type=vinfo.type; - pinfo.hint=vinfo.hint; - pinfo.hint_string=vinfo.hint_string; + pinfo.type = vinfo.type; + pinfo.hint = vinfo.hint; + pinfo.hint_string = vinfo.hint_string; } return pinfo; } - String VisualScriptVariableGet::get_caption() const { return "Variable"; @@ -712,83 +677,73 @@ String VisualScriptVariableGet::get_text() const { void VisualScriptVariableGet::set_variable(StringName p_variable) { - if (variable==p_variable) + if (variable == p_variable) return; - variable=p_variable; + variable = p_variable; ports_changed_notify(); - } -StringName VisualScriptVariableGet::get_variable() const{ +StringName VisualScriptVariableGet::get_variable() const { return variable; } -void VisualScriptVariableGet::_validate_property(PropertyInfo& property) const { +void VisualScriptVariableGet::_validate_property(PropertyInfo &property) const { - if (property.name=="variable/name" && get_visual_script().is_valid()) { + if (property.name == "variable/name" && get_visual_script().is_valid()) { Ref vs = get_visual_script(); List vars; vs->get_variable_list(&vars); String vhint; - for (List::Element *E=vars.front();E;E=E->next()) { - if (vhint!=String()) - vhint+=","; + for (List::Element *E = vars.front(); E; E = E->next()) { + if (vhint != String()) + vhint += ","; - vhint+=E->get().operator String(); + vhint += E->get().operator String(); } - property.hint=PROPERTY_HINT_ENUM; - property.hint_string=vhint; + property.hint = PROPERTY_HINT_ENUM; + property.hint_string = vhint; } } void VisualScriptVariableGet::_bind_methods() { - ClassDB::bind_method(D_METHOD("set_variable","name"),&VisualScriptVariableGet::set_variable); - ClassDB::bind_method(D_METHOD("get_variable"),&VisualScriptVariableGet::get_variable); - - - ADD_PROPERTY(PropertyInfo(Variant::STRING,"variable/name"),"set_variable","get_variable"); + ClassDB::bind_method(D_METHOD("set_variable", "name"), &VisualScriptVariableGet::set_variable); + ClassDB::bind_method(D_METHOD("get_variable"), &VisualScriptVariableGet::get_variable); + ADD_PROPERTY(PropertyInfo(Variant::STRING, "variable/name"), "set_variable", "get_variable"); } class VisualScriptNodeInstanceVariableGet : public VisualScriptNodeInstance { public: - VisualScriptVariableGet *node; VisualScriptInstance *instance; StringName variable; + virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) { - virtual int step(const Variant** p_inputs,Variant** p_outputs,StartMode p_start_mode,Variant* p_working_mem,Variant::CallError& r_error,String& r_error_str) { - - if (instance->get_variable(variable,p_outputs[0])==false) { - r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD; - r_error_str=RTR("VariableGet not found in script: ")+"'"+String(variable)+"'"; + if (instance->get_variable(variable, p_outputs[0]) == false) { + r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD; + r_error_str = RTR("VariableGet not found in script: ") + "'" + String(variable) + "'"; return false; } return 0; } - - }; -VisualScriptNodeInstance* VisualScriptVariableGet::instance(VisualScriptInstance* p_instance) { +VisualScriptNodeInstance *VisualScriptVariableGet::instance(VisualScriptInstance *p_instance) { - VisualScriptNodeInstanceVariableGet * instance = memnew(VisualScriptNodeInstanceVariableGet ); - instance->node=this; - instance->instance=p_instance; - instance->variable=variable; + VisualScriptNodeInstanceVariableGet *instance = memnew(VisualScriptNodeInstanceVariableGet); + instance->node = this; + instance->instance = p_instance; + instance->variable = variable; return instance; } VisualScriptVariableGet::VisualScriptVariableGet() { - - } - ////////////////////////////////////////// ////////////////VARIABLE SET////////////////// ////////////////////////////////////////// @@ -798,16 +753,16 @@ int VisualScriptVariableSet::get_output_sequence_port_count() const { return 1; } -bool VisualScriptVariableSet::has_input_sequence_port() const{ +bool VisualScriptVariableSet::has_input_sequence_port() const { return true; } -int VisualScriptVariableSet::get_input_value_port_count() const{ +int VisualScriptVariableSet::get_input_value_port_count() const { return 1; } -int VisualScriptVariableSet::get_output_value_port_count() const{ +int VisualScriptVariableSet::get_output_value_port_count() const { return 0; } @@ -817,25 +772,24 @@ String VisualScriptVariableSet::get_output_sequence_port_text(int p_port) const return String(); } -PropertyInfo VisualScriptVariableSet::get_input_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptVariableSet::get_input_value_port_info(int p_idx) const { PropertyInfo pinfo; - pinfo.name="set"; + pinfo.name = "set"; if (get_visual_script().is_valid() && get_visual_script()->has_variable(variable)) { PropertyInfo vinfo = get_visual_script()->get_variable_info(variable); - pinfo.type=vinfo.type; - pinfo.hint=vinfo.hint; - pinfo.hint_string=vinfo.hint_string; + pinfo.type = vinfo.type; + pinfo.hint = vinfo.hint; + pinfo.hint_string = vinfo.hint_string; } return pinfo; } -PropertyInfo VisualScriptVariableSet::get_output_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptVariableSet::get_output_value_port_info(int p_idx) const { return PropertyInfo(); } - String VisualScriptVariableSet::get_caption() const { return "VariableSet"; @@ -848,87 +802,76 @@ String VisualScriptVariableSet::get_text() const { void VisualScriptVariableSet::set_variable(StringName p_variable) { - if (variable==p_variable) + if (variable == p_variable) return; - variable=p_variable; + variable = p_variable; ports_changed_notify(); - } -StringName VisualScriptVariableSet::get_variable() const{ +StringName VisualScriptVariableSet::get_variable() const { return variable; } -void VisualScriptVariableSet::_validate_property(PropertyInfo& property) const { +void VisualScriptVariableSet::_validate_property(PropertyInfo &property) const { - if (property.name=="variable/name" && get_visual_script().is_valid()) { + if (property.name == "variable/name" && get_visual_script().is_valid()) { Ref vs = get_visual_script(); List vars; vs->get_variable_list(&vars); String vhint; - for (List::Element *E=vars.front();E;E=E->next()) { - if (vhint!=String()) - vhint+=","; + for (List::Element *E = vars.front(); E; E = E->next()) { + if (vhint != String()) + vhint += ","; - vhint+=E->get().operator String(); + vhint += E->get().operator String(); } - property.hint=PROPERTY_HINT_ENUM; - property.hint_string=vhint; + property.hint = PROPERTY_HINT_ENUM; + property.hint_string = vhint; } } void VisualScriptVariableSet::_bind_methods() { - ClassDB::bind_method(D_METHOD("set_variable","name"),&VisualScriptVariableSet::set_variable); - ClassDB::bind_method(D_METHOD("get_variable"),&VisualScriptVariableSet::get_variable); - - - ADD_PROPERTY(PropertyInfo(Variant::STRING,"variable/name"),"set_variable","get_variable"); + ClassDB::bind_method(D_METHOD("set_variable", "name"), &VisualScriptVariableSet::set_variable); + ClassDB::bind_method(D_METHOD("get_variable"), &VisualScriptVariableSet::get_variable); + ADD_PROPERTY(PropertyInfo(Variant::STRING, "variable/name"), "set_variable", "get_variable"); } class VisualScriptNodeInstanceVariableSet : public VisualScriptNodeInstance { public: - VisualScriptVariableSet *node; VisualScriptInstance *instance; StringName variable; //virtual int get_working_memory_size() const { return 0; } - virtual int step(const Variant** p_inputs,Variant** p_outputs,StartMode p_start_mode,Variant* p_working_mem,Variant::CallError& r_error,String& r_error_str) { - - if (instance->set_variable(variable,*p_inputs[0])==false) { + virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) { + if (instance->set_variable(variable, *p_inputs[0]) == false) { - r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD; - r_error_str=RTR("VariableSet not found in script: ")+"'"+String(variable)+"'"; + r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD; + r_error_str = RTR("VariableSet not found in script: ") + "'" + String(variable) + "'"; } return 0; } - - }; -VisualScriptNodeInstance* VisualScriptVariableSet::instance(VisualScriptInstance* p_instance) { +VisualScriptNodeInstance *VisualScriptVariableSet::instance(VisualScriptInstance *p_instance) { - VisualScriptNodeInstanceVariableSet * instance = memnew(VisualScriptNodeInstanceVariableSet ); - instance->node=this; - instance->instance=p_instance; - instance->variable=variable; + VisualScriptNodeInstanceVariableSet *instance = memnew(VisualScriptNodeInstanceVariableSet); + instance->node = this; + instance->instance = p_instance; + instance->variable = variable; return instance; } VisualScriptVariableSet::VisualScriptVariableSet() { - - } - - ////////////////////////////////////////// ////////////////CONSTANT////////////////// ////////////////////////////////////////// @@ -938,16 +881,16 @@ int VisualScriptConstant::get_output_sequence_port_count() const { return 0; } -bool VisualScriptConstant::has_input_sequence_port() const{ +bool VisualScriptConstant::has_input_sequence_port() const { return false; } -int VisualScriptConstant::get_input_value_port_count() const{ +int VisualScriptConstant::get_input_value_port_count() const { return 0; } -int VisualScriptConstant::get_output_value_port_count() const{ +int VisualScriptConstant::get_output_value_port_count() const { return 1; } @@ -957,20 +900,19 @@ String VisualScriptConstant::get_output_sequence_port_text(int p_port) const { return String(); } -PropertyInfo VisualScriptConstant::get_input_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptConstant::get_input_value_port_info(int p_idx) const { return PropertyInfo(); } -PropertyInfo VisualScriptConstant::get_output_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptConstant::get_output_value_port_info(int p_idx) const { PropertyInfo pinfo; - pinfo.name="get"; - pinfo.type=type; + pinfo.name = "get"; + pinfo.type = type; return pinfo; } - String VisualScriptConstant::get_caption() const { return "Constant"; @@ -983,90 +925,82 @@ String VisualScriptConstant::get_text() const { void VisualScriptConstant::set_constant_type(Variant::Type p_type) { - if (type==p_type) + if (type == p_type) return; - type=p_type; + type = p_type; ports_changed_notify(); Variant::CallError ce; - value=Variant::construct(type,NULL,0,ce); + value = Variant::construct(type, NULL, 0, ce); _change_notify(); - } -Variant::Type VisualScriptConstant::get_constant_type() const{ +Variant::Type VisualScriptConstant::get_constant_type() const { return type; } -void VisualScriptConstant::set_constant_value(Variant p_value){ +void VisualScriptConstant::set_constant_value(Variant p_value) { - if (value==p_value) + if (value == p_value) return; - value=p_value; + value = p_value; ports_changed_notify(); } -Variant VisualScriptConstant::get_constant_value() const{ +Variant VisualScriptConstant::get_constant_value() const { return value; } -void VisualScriptConstant::_validate_property(PropertyInfo& property) const { - +void VisualScriptConstant::_validate_property(PropertyInfo &property) const { - if (property.name=="constant/value") { - property.type=type; - if (type==Variant::NIL) - property.usage=0; //do not save if nil + if (property.name == "constant/value") { + property.type = type; + if (type == Variant::NIL) + property.usage = 0; //do not save if nil } } void VisualScriptConstant::_bind_methods() { - ClassDB::bind_method(D_METHOD("set_constant_type","type"),&VisualScriptConstant::set_constant_type); - ClassDB::bind_method(D_METHOD("get_constant_type"),&VisualScriptConstant::get_constant_type); + ClassDB::bind_method(D_METHOD("set_constant_type", "type"), &VisualScriptConstant::set_constant_type); + ClassDB::bind_method(D_METHOD("get_constant_type"), &VisualScriptConstant::get_constant_type); - ClassDB::bind_method(D_METHOD("set_constant_value","value"),&VisualScriptConstant::set_constant_value); - ClassDB::bind_method(D_METHOD("get_constant_value"),&VisualScriptConstant::get_constant_value); + ClassDB::bind_method(D_METHOD("set_constant_value", "value"), &VisualScriptConstant::set_constant_value); + ClassDB::bind_method(D_METHOD("get_constant_value"), &VisualScriptConstant::get_constant_value); - String argt="Null"; - for(int i=1;iconstant=value; + VisualScriptNodeInstanceConstant *instance = memnew(VisualScriptNodeInstanceConstant); + instance->constant = value; return instance; } VisualScriptConstant::VisualScriptConstant() { - type=Variant::NIL; - + type = Variant::NIL; } ////////////////////////////////////////// @@ -1078,16 +1012,16 @@ int VisualScriptPreload::get_output_sequence_port_count() const { return 0; } -bool VisualScriptPreload::has_input_sequence_port() const{ +bool VisualScriptPreload::has_input_sequence_port() const { return false; } -int VisualScriptPreload::get_input_value_port_count() const{ +int VisualScriptPreload::get_input_value_port_count() const { return 0; } -int VisualScriptPreload::get_output_value_port_count() const{ +int VisualScriptPreload::get_output_value_port_count() const { return 1; } @@ -1097,23 +1031,22 @@ String VisualScriptPreload::get_output_sequence_port_text(int p_port) const { return String(); } -PropertyInfo VisualScriptPreload::get_input_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptPreload::get_input_value_port_info(int p_idx) const { return PropertyInfo(); } -PropertyInfo VisualScriptPreload::get_output_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptPreload::get_output_value_port_info(int p_idx) const { - PropertyInfo pinfo=PropertyInfo(Variant::OBJECT,"res"); + PropertyInfo pinfo = PropertyInfo(Variant::OBJECT, "res"); if (preload.is_valid()) { - pinfo.hint=PROPERTY_HINT_RESOURCE_TYPE; - pinfo.hint_string=preload->get_class(); + pinfo.hint = PROPERTY_HINT_RESOURCE_TYPE; + pinfo.hint_string = preload->get_class(); } return pinfo; } - String VisualScriptPreload::get_caption() const { return "Preload"; @@ -1124,7 +1057,7 @@ String VisualScriptPreload::get_text() const { if (preload.is_valid()) { if (preload->get_path().is_resource_file()) { return preload->get_path(); - } else if (preload->get_name()!=String()) { + } else if (preload->get_name() != String()) { return preload->get_name(); } else { return preload->get_class(); @@ -1134,61 +1067,49 @@ String VisualScriptPreload::get_text() const { } } +void VisualScriptPreload::set_preload(const Ref &p_preload) { -void VisualScriptPreload::set_preload(const Ref& p_preload){ - - if (preload==p_preload) + if (preload == p_preload) return; - preload=p_preload; + preload = p_preload; ports_changed_notify(); } -Ref VisualScriptPreload::get_preload() const{ +Ref VisualScriptPreload::get_preload() const { return preload; } - void VisualScriptPreload::_bind_methods() { + ClassDB::bind_method(D_METHOD("set_preload", "resource"), &VisualScriptPreload::set_preload); + ClassDB::bind_method(D_METHOD("get_preload"), &VisualScriptPreload::get_preload); - ClassDB::bind_method(D_METHOD("set_preload","resource"),&VisualScriptPreload::set_preload); - ClassDB::bind_method(D_METHOD("get_preload"),&VisualScriptPreload::get_preload); - - - ADD_PROPERTY(PropertyInfo(Variant::OBJECT,"resource",PROPERTY_HINT_RESOURCE_TYPE,"Resource"),"set_preload","get_preload"); - + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "Resource"), "set_preload", "get_preload"); } class VisualScriptNodeInstancePreload : public VisualScriptNodeInstance { public: - Ref preload; //virtual int get_working_memory_size() const { return 0; } - virtual int step(const Variant** p_inputs,Variant** p_outputs,StartMode p_start_mode,Variant* p_working_mem,Variant::CallError& r_error,String& r_error_str) { + virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) { - *p_outputs[0]=preload; + *p_outputs[0] = preload; return 0; } - - }; -VisualScriptNodeInstance* VisualScriptPreload::instance(VisualScriptInstance* p_instance) { +VisualScriptNodeInstance *VisualScriptPreload::instance(VisualScriptInstance *p_instance) { - VisualScriptNodeInstancePreload * instance = memnew(VisualScriptNodeInstancePreload ); - instance->preload=preload; + VisualScriptNodeInstancePreload *instance = memnew(VisualScriptNodeInstancePreload); + instance->preload = preload; return instance; } VisualScriptPreload::VisualScriptPreload() { - } - - - ////////////////////////////////////////// ////////////////INDEX//////////////////// ////////////////////////////////////////// @@ -1198,16 +1119,16 @@ int VisualScriptIndexGet::get_output_sequence_port_count() const { return 0; } -bool VisualScriptIndexGet::has_input_sequence_port() const{ +bool VisualScriptIndexGet::has_input_sequence_port() const { return false; } -int VisualScriptIndexGet::get_input_value_port_count() const{ +int VisualScriptIndexGet::get_input_value_port_count() const { return 2; } -int VisualScriptIndexGet::get_output_value_port_count() const{ +int VisualScriptIndexGet::get_output_value_port_count() const { return 1; } @@ -1217,22 +1138,20 @@ String VisualScriptIndexGet::get_output_sequence_port_text(int p_port) const { return String(); } -PropertyInfo VisualScriptIndexGet::get_input_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptIndexGet::get_input_value_port_info(int p_idx) const { - if (p_idx==0) { - return PropertyInfo(Variant::NIL,"base"); + if (p_idx == 0) { + return PropertyInfo(Variant::NIL, "base"); } else { - return PropertyInfo(Variant::NIL,"index"); - + return PropertyInfo(Variant::NIL, "index"); } } -PropertyInfo VisualScriptIndexGet::get_output_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptIndexGet::get_output_value_port_info(int p_idx) const { return PropertyInfo(); } - String VisualScriptIndexGet::get_caption() const { return "IndexGet"; @@ -1243,37 +1162,29 @@ String VisualScriptIndexGet::get_text() const { return String("get"); } - class VisualScriptNodeInstanceIndexGet : public VisualScriptNodeInstance { public: - - //virtual int get_working_memory_size() const { return 0; } - virtual int step(const Variant** p_inputs,Variant** p_outputs,StartMode p_start_mode,Variant* p_working_mem,Variant::CallError& r_error,String& r_error_str) { + virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) { bool valid; - *p_outputs[0] = p_inputs[0]->get(*p_inputs[1],&valid); + *p_outputs[0] = p_inputs[0]->get(*p_inputs[1], &valid); if (!valid) { - r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD; - r_error_str="Invalid get: "+p_inputs[0]->get_construct_string(); + r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD; + r_error_str = "Invalid get: " + p_inputs[0]->get_construct_string(); } return 0; } - - }; -VisualScriptNodeInstance* VisualScriptIndexGet::instance(VisualScriptInstance* p_instance) { +VisualScriptNodeInstance *VisualScriptIndexGet::instance(VisualScriptInstance *p_instance) { - VisualScriptNodeInstanceIndexGet * instance = memnew(VisualScriptNodeInstanceIndexGet ); + VisualScriptNodeInstanceIndexGet *instance = memnew(VisualScriptNodeInstanceIndexGet); return instance; } VisualScriptIndexGet::VisualScriptIndexGet() { - - - } ////////////////////////////////////////// @@ -1285,16 +1196,16 @@ int VisualScriptIndexSet::get_output_sequence_port_count() const { return 1; } -bool VisualScriptIndexSet::has_input_sequence_port() const{ +bool VisualScriptIndexSet::has_input_sequence_port() const { return true; } -int VisualScriptIndexSet::get_input_value_port_count() const{ +int VisualScriptIndexSet::get_input_value_port_count() const { return 3; } -int VisualScriptIndexSet::get_output_value_port_count() const{ +int VisualScriptIndexSet::get_output_value_port_count() const { return 0; } @@ -1304,25 +1215,23 @@ String VisualScriptIndexSet::get_output_sequence_port_text(int p_port) const { return String(); } -PropertyInfo VisualScriptIndexSet::get_input_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptIndexSet::get_input_value_port_info(int p_idx) const { - if (p_idx==0) { - return PropertyInfo(Variant::NIL,"base"); - } else if (p_idx==1){ - return PropertyInfo(Variant::NIL,"index"); + if (p_idx == 0) { + return PropertyInfo(Variant::NIL, "base"); + } else if (p_idx == 1) { + return PropertyInfo(Variant::NIL, "index"); } else { - return PropertyInfo(Variant::NIL,"value"); - + return PropertyInfo(Variant::NIL, "value"); } } -PropertyInfo VisualScriptIndexSet::get_output_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptIndexSet::get_output_value_port_info(int p_idx) const { return PropertyInfo(); } - String VisualScriptIndexSet::get_caption() const { return "IndexSet"; @@ -1333,41 +1242,32 @@ String VisualScriptIndexSet::get_text() const { return String("set"); } - class VisualScriptNodeInstanceIndexSet : public VisualScriptNodeInstance { public: - - //virtual int get_working_memory_size() const { return 0; } - virtual int step(const Variant** p_inputs,Variant** p_outputs,StartMode p_start_mode,Variant* p_working_mem,Variant::CallError& r_error,String& r_error_str) { + virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) { bool valid; - *p_outputs[0]=*p_inputs[0]; - p_outputs[0]->set(*p_inputs[1],*p_inputs[2],&valid); + *p_outputs[0] = *p_inputs[0]; + p_outputs[0]->set(*p_inputs[1], *p_inputs[2], &valid); if (!valid) { - r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD; - r_error_str="Invalid set: "+p_inputs[1]->get_construct_string(); + r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD; + r_error_str = "Invalid set: " + p_inputs[1]->get_construct_string(); } return 0; } - - }; -VisualScriptNodeInstance* VisualScriptIndexSet::instance(VisualScriptInstance* p_instance) { +VisualScriptNodeInstance *VisualScriptIndexSet::instance(VisualScriptInstance *p_instance) { - VisualScriptNodeInstanceIndexSet * instance = memnew(VisualScriptNodeInstanceIndexSet ); + VisualScriptNodeInstanceIndexSet *instance = memnew(VisualScriptNodeInstanceIndexSet); return instance; } VisualScriptIndexSet::VisualScriptIndexSet() { - - - } - ////////////////////////////////////////// ////////////////GLOBALCONSTANT/////////// ////////////////////////////////////////// @@ -1377,16 +1277,16 @@ int VisualScriptGlobalConstant::get_output_sequence_port_count() const { return 0; } -bool VisualScriptGlobalConstant::has_input_sequence_port() const{ +bool VisualScriptGlobalConstant::has_input_sequence_port() const { return false; } -int VisualScriptGlobalConstant::get_input_value_port_count() const{ +int VisualScriptGlobalConstant::get_input_value_port_count() const { return 0; } -int VisualScriptGlobalConstant::get_output_value_port_count() const{ +int VisualScriptGlobalConstant::get_output_value_port_count() const { return 1; } @@ -1396,17 +1296,16 @@ String VisualScriptGlobalConstant::get_output_sequence_port_text(int p_port) con return String(); } -PropertyInfo VisualScriptGlobalConstant::get_input_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptGlobalConstant::get_input_value_port_info(int p_idx) const { return PropertyInfo(); } -PropertyInfo VisualScriptGlobalConstant::get_output_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptGlobalConstant::get_output_value_port_info(int p_idx) const { - return PropertyInfo(Variant::REAL,"value"); + return PropertyInfo(Variant::REAL, "value"); } - String VisualScriptGlobalConstant::get_caption() const { return "GlobalConst"; @@ -1419,7 +1318,7 @@ String VisualScriptGlobalConstant::get_text() const { void VisualScriptGlobalConstant::set_global_constant(int p_which) { - index=p_which; + index = p_which; _change_notify(); ports_changed_notify(); } @@ -1428,49 +1327,44 @@ int VisualScriptGlobalConstant::get_global_constant() { return index; } - class VisualScriptNodeInstanceGlobalConstant : public VisualScriptNodeInstance { public: - int index; //virtual int get_working_memory_size() const { return 0; } - virtual int step(const Variant** p_inputs,Variant** p_outputs,StartMode p_start_mode,Variant* p_working_mem,Variant::CallError& r_error,String& r_error_str) { - + virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) { *p_outputs[0] = GlobalConstants::get_global_constant_value(index); return 0; } - - }; -VisualScriptNodeInstance* VisualScriptGlobalConstant::instance(VisualScriptInstance* p_instance) { +VisualScriptNodeInstance *VisualScriptGlobalConstant::instance(VisualScriptInstance *p_instance) { - VisualScriptNodeInstanceGlobalConstant * instance = memnew(VisualScriptNodeInstanceGlobalConstant ); - instance->index=index; + VisualScriptNodeInstanceGlobalConstant *instance = memnew(VisualScriptNodeInstanceGlobalConstant); + instance->index = index; return instance; } void VisualScriptGlobalConstant::_bind_methods() { - ClassDB::bind_method(D_METHOD("set_global_constant","index"),&VisualScriptGlobalConstant::set_global_constant); - ClassDB::bind_method(D_METHOD("get_global_constant"),&VisualScriptGlobalConstant::get_global_constant); + ClassDB::bind_method(D_METHOD("set_global_constant", "index"), &VisualScriptGlobalConstant::set_global_constant); + ClassDB::bind_method(D_METHOD("get_global_constant"), &VisualScriptGlobalConstant::get_global_constant); String cc; - for(int i=0;i0) - cc+=","; - cc+=GlobalConstants::get_global_constant_name(i); + if (i > 0) + cc += ","; + cc += GlobalConstants::get_global_constant_name(i); } - ADD_PROPERTY(PropertyInfo(Variant::INT,"constant",PROPERTY_HINT_ENUM,cc),"set_global_constant","get_global_constant"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "constant", PROPERTY_HINT_ENUM, cc), "set_global_constant", "get_global_constant"); } VisualScriptGlobalConstant::VisualScriptGlobalConstant() { - index=0; + index = 0; } ////////////////////////////////////////// @@ -1482,16 +1376,16 @@ int VisualScriptClassConstant::get_output_sequence_port_count() const { return 0; } -bool VisualScriptClassConstant::has_input_sequence_port() const{ +bool VisualScriptClassConstant::has_input_sequence_port() const { return false; } -int VisualScriptClassConstant::get_input_value_port_count() const{ +int VisualScriptClassConstant::get_input_value_port_count() const { return 0; } -int VisualScriptClassConstant::get_output_value_port_count() const{ +int VisualScriptClassConstant::get_output_value_port_count() const { return 1; } @@ -1501,17 +1395,16 @@ String VisualScriptClassConstant::get_output_sequence_port_text(int p_port) cons return String(); } -PropertyInfo VisualScriptClassConstant::get_input_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptClassConstant::get_input_value_port_info(int p_idx) const { return PropertyInfo(); } -PropertyInfo VisualScriptClassConstant::get_output_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptClassConstant::get_output_value_port_info(int p_idx) const { - return PropertyInfo(Variant::INT,"value"); + return PropertyInfo(Variant::INT, "value"); } - String VisualScriptClassConstant::get_caption() const { return "ClassConst"; @@ -1519,12 +1412,12 @@ String VisualScriptClassConstant::get_caption() const { String VisualScriptClassConstant::get_text() const { - return String(base_type)+"."+String(name); + return String(base_type) + "." + String(name); } -void VisualScriptClassConstant::set_class_constant(const StringName& p_which) { +void VisualScriptClassConstant::set_class_constant(const StringName &p_which) { - name=p_which; + name = p_which; _change_notify(); ports_changed_notify(); } @@ -1533,10 +1426,9 @@ StringName VisualScriptClassConstant::get_class_constant() { return name; } +void VisualScriptClassConstant::set_base_type(const StringName &p_which) { -void VisualScriptClassConstant::set_base_type(const StringName& p_which) { - - base_type=p_which; + base_type = p_which; _change_notify(); ports_changed_notify(); } @@ -1547,67 +1439,63 @@ StringName VisualScriptClassConstant::get_base_type() { class VisualScriptNodeInstanceClassConstant : public VisualScriptNodeInstance { public: - int value; bool valid; //virtual int get_working_memory_size() const { return 0; } - virtual int step(const Variant** p_inputs,Variant** p_outputs,StartMode p_start_mode,Variant* p_working_mem,Variant::CallError& r_error,String& r_error_str) { + virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) { if (!valid) { - r_error_str="Invalid constant name, pick a valid class constant."; - r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD; + r_error_str = "Invalid constant name, pick a valid class constant."; + r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD; } *p_outputs[0] = value; return 0; } - - }; -VisualScriptNodeInstance* VisualScriptClassConstant::instance(VisualScriptInstance* p_instance) { +VisualScriptNodeInstance *VisualScriptClassConstant::instance(VisualScriptInstance *p_instance) { - VisualScriptNodeInstanceClassConstant * instance = memnew(VisualScriptNodeInstanceClassConstant ); - instance->value=ClassDB::get_integer_constant(base_type,name,&instance->valid); + VisualScriptNodeInstanceClassConstant *instance = memnew(VisualScriptNodeInstanceClassConstant); + instance->value = ClassDB::get_integer_constant(base_type, name, &instance->valid); return instance; } -void VisualScriptClassConstant::_validate_property(PropertyInfo& property) const { +void VisualScriptClassConstant::_validate_property(PropertyInfo &property) const { - if (property.name=="constant") { + if (property.name == "constant") { List constants; - ClassDB::get_integer_constant_list(base_type,&constants,true); + ClassDB::get_integer_constant_list(base_type, &constants, true); - property.hint_string=""; - for(List::Element *E=constants.front();E;E=E->next()) { - if (property.hint_string!=String()) { - property.hint_string+=","; + property.hint_string = ""; + for (List::Element *E = constants.front(); E; E = E->next()) { + if (property.hint_string != String()) { + property.hint_string += ","; } - property.hint_string+=E->get(); + property.hint_string += E->get(); } } } void VisualScriptClassConstant::_bind_methods() { - ClassDB::bind_method(D_METHOD("set_class_constant","name"),&VisualScriptClassConstant::set_class_constant); - ClassDB::bind_method(D_METHOD("get_class_constant"),&VisualScriptClassConstant::get_class_constant); + ClassDB::bind_method(D_METHOD("set_class_constant", "name"), &VisualScriptClassConstant::set_class_constant); + ClassDB::bind_method(D_METHOD("get_class_constant"), &VisualScriptClassConstant::get_class_constant); - ClassDB::bind_method(D_METHOD("set_base_type","name"),&VisualScriptClassConstant::set_base_type); - ClassDB::bind_method(D_METHOD("get_base_type"),&VisualScriptClassConstant::get_base_type); + ClassDB::bind_method(D_METHOD("set_base_type", "name"), &VisualScriptClassConstant::set_base_type); + ClassDB::bind_method(D_METHOD("get_base_type"), &VisualScriptClassConstant::get_base_type); - ADD_PROPERTY(PropertyInfo(Variant::STRING,"base_type",PROPERTY_HINT_TYPE_STRING,"Object"),"set_base_type","get_base_type"); - ADD_PROPERTY(PropertyInfo(Variant::STRING,"constant",PROPERTY_HINT_ENUM,""),"set_class_constant","get_class_constant"); + ADD_PROPERTY(PropertyInfo(Variant::STRING, "base_type", PROPERTY_HINT_TYPE_STRING, "Object"), "set_base_type", "get_base_type"); + ADD_PROPERTY(PropertyInfo(Variant::STRING, "constant", PROPERTY_HINT_ENUM, ""), "set_class_constant", "get_class_constant"); } VisualScriptClassConstant::VisualScriptClassConstant() { - base_type="Object"; + base_type = "Object"; } - ////////////////////////////////////////// ////////////////BASICTYPECONSTANT/////////// ////////////////////////////////////////// @@ -1617,16 +1505,16 @@ int VisualScriptBasicTypeConstant::get_output_sequence_port_count() const { return 0; } -bool VisualScriptBasicTypeConstant::has_input_sequence_port() const{ +bool VisualScriptBasicTypeConstant::has_input_sequence_port() const { return false; } -int VisualScriptBasicTypeConstant::get_input_value_port_count() const{ +int VisualScriptBasicTypeConstant::get_input_value_port_count() const { return 0; } -int VisualScriptBasicTypeConstant::get_output_value_port_count() const{ +int VisualScriptBasicTypeConstant::get_output_value_port_count() const { return 1; } @@ -1636,17 +1524,16 @@ String VisualScriptBasicTypeConstant::get_output_sequence_port_text(int p_port) return String(); } -PropertyInfo VisualScriptBasicTypeConstant::get_input_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptBasicTypeConstant::get_input_value_port_info(int p_idx) const { return PropertyInfo(); } -PropertyInfo VisualScriptBasicTypeConstant::get_output_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptBasicTypeConstant::get_output_value_port_info(int p_idx) const { - return PropertyInfo(Variant::INT,"value"); + return PropertyInfo(Variant::INT, "value"); } - String VisualScriptBasicTypeConstant::get_caption() const { return "BasicConst"; @@ -1654,12 +1541,12 @@ String VisualScriptBasicTypeConstant::get_caption() const { String VisualScriptBasicTypeConstant::get_text() const { - return Variant::get_type_name(type)+"."+String(name); + return Variant::get_type_name(type) + "." + String(name); } -void VisualScriptBasicTypeConstant::set_basic_type_constant(const StringName& p_which) { +void VisualScriptBasicTypeConstant::set_basic_type_constant(const StringName &p_which) { - name=p_which; + name = p_which; _change_notify(); ports_changed_notify(); } @@ -1668,10 +1555,9 @@ StringName VisualScriptBasicTypeConstant::get_basic_type_constant() const { return name; } - void VisualScriptBasicTypeConstant::set_basic_type(Variant::Type p_which) { - type=p_which; + type = p_which; _change_notify(); ports_changed_notify(); } @@ -1682,85 +1568,77 @@ Variant::Type VisualScriptBasicTypeConstant::get_basic_type() const { class VisualScriptNodeInstanceBasicTypeConstant : public VisualScriptNodeInstance { public: - int value; bool valid; //virtual int get_working_memory_size() const { return 0; } - virtual int step(const Variant** p_inputs,Variant** p_outputs,StartMode p_start_mode,Variant* p_working_mem,Variant::CallError& r_error,String& r_error_str) { + virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) { if (!valid) { - r_error_str="Invalid constant name, pick a valid basic type constant."; - r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD; + r_error_str = "Invalid constant name, pick a valid basic type constant."; + r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD; } *p_outputs[0] = value; return 0; } - - }; -VisualScriptNodeInstance* VisualScriptBasicTypeConstant::instance(VisualScriptInstance* p_instance) { +VisualScriptNodeInstance *VisualScriptBasicTypeConstant::instance(VisualScriptInstance *p_instance) { - VisualScriptNodeInstanceBasicTypeConstant * instance = memnew(VisualScriptNodeInstanceBasicTypeConstant ); - instance->value=Variant::get_numeric_constant_value(type,name,&instance->valid); + VisualScriptNodeInstanceBasicTypeConstant *instance = memnew(VisualScriptNodeInstanceBasicTypeConstant); + instance->value = Variant::get_numeric_constant_value(type, name, &instance->valid); return instance; } -void VisualScriptBasicTypeConstant::_validate_property(PropertyInfo& property) const { +void VisualScriptBasicTypeConstant::_validate_property(PropertyInfo &property) const { - if (property.name=="constant") { + if (property.name == "constant") { List constants; - Variant::get_numeric_constants_for_type(type,&constants); + Variant::get_numeric_constants_for_type(type, &constants); - if (constants.size()==0) { - property.usage=0; + if (constants.size() == 0) { + property.usage = 0; return; } - property.hint_string=""; - for(List::Element *E=constants.front();E;E=E->next()) { - if (property.hint_string!=String()) { - property.hint_string+=","; + property.hint_string = ""; + for (List::Element *E = constants.front(); E; E = E->next()) { + if (property.hint_string != String()) { + property.hint_string += ","; } - property.hint_string+=String(E->get()); + property.hint_string += String(E->get()); } - } } void VisualScriptBasicTypeConstant::_bind_methods() { - ClassDB::bind_method(D_METHOD("set_basic_type","name"),&VisualScriptBasicTypeConstant::set_basic_type); - ClassDB::bind_method(D_METHOD("get_basic_type"),&VisualScriptBasicTypeConstant::get_basic_type); - - ClassDB::bind_method(D_METHOD("set_basic_type_constant","name"),&VisualScriptBasicTypeConstant::set_basic_type_constant); - ClassDB::bind_method(D_METHOD("get_basic_type_constant"),&VisualScriptBasicTypeConstant::get_basic_type_constant); + ClassDB::bind_method(D_METHOD("set_basic_type", "name"), &VisualScriptBasicTypeConstant::set_basic_type); + ClassDB::bind_method(D_METHOD("get_basic_type"), &VisualScriptBasicTypeConstant::get_basic_type); + ClassDB::bind_method(D_METHOD("set_basic_type_constant", "name"), &VisualScriptBasicTypeConstant::set_basic_type_constant); + ClassDB::bind_method(D_METHOD("get_basic_type_constant"), &VisualScriptBasicTypeConstant::get_basic_type_constant); - String argt="Null"; - for(int i=1;ivalue=const_value[constant]; + VisualScriptNodeInstanceMathConstant *instance = memnew(VisualScriptNodeInstanceMathConstant); + instance->value = const_value[constant]; return instance; } - void VisualScriptMathConstant::_bind_methods() { - ClassDB::bind_method(D_METHOD("set_math_constant","which"),&VisualScriptMathConstant::set_math_constant); - ClassDB::bind_method(D_METHOD("get_math_constant"),&VisualScriptMathConstant::get_math_constant); + ClassDB::bind_method(D_METHOD("set_math_constant", "which"), &VisualScriptMathConstant::set_math_constant); + ClassDB::bind_method(D_METHOD("get_math_constant"), &VisualScriptMathConstant::get_math_constant); String cc; - for(int i=0;i0) - cc+=","; - cc+=const_name[i]; + if (i > 0) + cc += ","; + cc += const_name[i]; } - ADD_PROPERTY(PropertyInfo(Variant::INT,"constant",PROPERTY_HINT_ENUM,cc),"set_math_constant","get_math_constant"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "constant", PROPERTY_HINT_ENUM, cc), "set_math_constant", "get_math_constant"); } VisualScriptMathConstant::VisualScriptMathConstant() { - constant=MATH_CONSTANT_ONE; + constant = MATH_CONSTANT_ONE; } - - ////////////////////////////////////////// ////////////////GLOBALSINGLETON/////////// ////////////////////////////////////////// @@ -1894,16 +1764,16 @@ int VisualScriptEngineSingleton::get_output_sequence_port_count() const { return 0; } -bool VisualScriptEngineSingleton::has_input_sequence_port() const{ +bool VisualScriptEngineSingleton::has_input_sequence_port() const { return false; } -int VisualScriptEngineSingleton::get_input_value_port_count() const{ +int VisualScriptEngineSingleton::get_input_value_port_count() const { return 0; } -int VisualScriptEngineSingleton::get_output_value_port_count() const{ +int VisualScriptEngineSingleton::get_output_value_port_count() const { return 1; } @@ -1913,17 +1783,16 @@ String VisualScriptEngineSingleton::get_output_sequence_port_text(int p_port) co return String(); } -PropertyInfo VisualScriptEngineSingleton::get_input_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptEngineSingleton::get_input_value_port_info(int p_idx) const { return PropertyInfo(); } -PropertyInfo VisualScriptEngineSingleton::get_output_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptEngineSingleton::get_output_value_port_info(int p_idx) const { - return PropertyInfo(Variant::OBJECT,"instance"); + return PropertyInfo(Variant::OBJECT, "instance"); } - String VisualScriptEngineSingleton::get_caption() const { return "EngineSingleton"; @@ -1934,9 +1803,9 @@ String VisualScriptEngineSingleton::get_text() const { return singleton; } -void VisualScriptEngineSingleton::set_singleton(const String& p_string) { +void VisualScriptEngineSingleton::set_singleton(const String &p_string) { - singleton=p_string; + singleton = p_string; _change_notify(); ports_changed_notify(); @@ -1946,48 +1815,43 @@ String VisualScriptEngineSingleton::get_singleton() { return singleton; } - - class VisualScriptNodeInstanceEngineSingleton : public VisualScriptNodeInstance { public: - - Object* singleton; + Object *singleton; //virtual int get_working_memory_size() const { return 0; } - virtual int step(const Variant** p_inputs,Variant** p_outputs,StartMode p_start_mode,Variant* p_working_mem,Variant::CallError& r_error,String& r_error_str) { + virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) { - *p_outputs[0]=singleton; + *p_outputs[0] = singleton; return 0; } - }; -VisualScriptNodeInstance* VisualScriptEngineSingleton::instance(VisualScriptInstance* p_instance) { +VisualScriptNodeInstance *VisualScriptEngineSingleton::instance(VisualScriptInstance *p_instance) { - VisualScriptNodeInstanceEngineSingleton * instance = memnew(VisualScriptNodeInstanceEngineSingleton ); - instance->singleton=GlobalConfig::get_singleton()->get_singleton_object(singleton); + VisualScriptNodeInstanceEngineSingleton *instance = memnew(VisualScriptNodeInstanceEngineSingleton); + instance->singleton = GlobalConfig::get_singleton()->get_singleton_object(singleton); return instance; } -VisualScriptEngineSingleton::TypeGuess VisualScriptEngineSingleton::guess_output_type(TypeGuess* p_inputs, int p_output) const { +VisualScriptEngineSingleton::TypeGuess VisualScriptEngineSingleton::guess_output_type(TypeGuess *p_inputs, int p_output) const { - Object *obj=GlobalConfig::get_singleton()->get_singleton_object(singleton); + Object *obj = GlobalConfig::get_singleton()->get_singleton_object(singleton); TypeGuess tg; - tg.type=Variant::OBJECT; + tg.type = Variant::OBJECT; if (obj) { - tg.GDCLASS=obj->get_class(); - tg.script=obj->get_script(); + tg.GDCLASS = obj->get_class(); + tg.script = obj->get_script(); } return tg; } - void VisualScriptEngineSingleton::_bind_methods() { - ClassDB::bind_method(D_METHOD("set_singleton","name"),&VisualScriptEngineSingleton::set_singleton); - ClassDB::bind_method(D_METHOD("get_singleton"),&VisualScriptEngineSingleton::get_singleton); + ClassDB::bind_method(D_METHOD("set_singleton", "name"), &VisualScriptEngineSingleton::set_singleton); + ClassDB::bind_method(D_METHOD("get_singleton"), &VisualScriptEngineSingleton::get_singleton); String cc; @@ -1995,25 +1859,23 @@ void VisualScriptEngineSingleton::_bind_methods() { GlobalConfig::get_singleton()->get_singletons(&singletons); - for (List::Element *E=singletons.front();E;E=E->next()) { - if (E->get().name=="VS" || E->get().name=="PS" || E->get().name=="PS2D" || E->get().name=="AS" || E->get().name=="TS" || E->get().name=="SS" || E->get().name=="SS2D") + for (List::Element *E = singletons.front(); E; E = E->next()) { + if (E->get().name == "VS" || E->get().name == "PS" || E->get().name == "PS2D" || E->get().name == "AS" || E->get().name == "TS" || E->get().name == "SS" || E->get().name == "SS2D") continue; //skip these, too simple named - if (cc!=String()) - cc+=","; - cc+=E->get().name; + if (cc != String()) + cc += ","; + cc += E->get().name; } - ADD_PROPERTY(PropertyInfo(Variant::STRING,"constant",PROPERTY_HINT_ENUM,cc),"set_singleton","get_singleton"); + ADD_PROPERTY(PropertyInfo(Variant::STRING, "constant", PROPERTY_HINT_ENUM, cc), "set_singleton", "get_singleton"); } VisualScriptEngineSingleton::VisualScriptEngineSingleton() { - singleton=String(); + singleton = String(); } - - ////////////////////////////////////////// ////////////////GETNODE/////////// ////////////////////////////////////////// @@ -2023,16 +1885,16 @@ int VisualScriptSceneNode::get_output_sequence_port_count() const { return 0; } -bool VisualScriptSceneNode::has_input_sequence_port() const{ +bool VisualScriptSceneNode::has_input_sequence_port() const { return false; } -int VisualScriptSceneNode::get_input_value_port_count() const{ +int VisualScriptSceneNode::get_input_value_port_count() const { return 0; } -int VisualScriptSceneNode::get_output_value_port_count() const{ +int VisualScriptSceneNode::get_output_value_port_count() const { return 1; } @@ -2042,17 +1904,16 @@ String VisualScriptSceneNode::get_output_sequence_port_text(int p_port) const { return String(); } -PropertyInfo VisualScriptSceneNode::get_input_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptSceneNode::get_input_value_port_info(int p_idx) const { return PropertyInfo(); } -PropertyInfo VisualScriptSceneNode::get_output_value_port_info(int p_idx) const{ +PropertyInfo VisualScriptSceneNode::get_output_value_port_info(int p_idx) const { - return PropertyInfo(Variant::OBJECT,"node"); + return PropertyInfo(Variant::OBJECT, "node"); } - String VisualScriptSceneNode::get_caption() const { return "SceneNode"; @@ -2063,9 +1924,9 @@ String VisualScriptSceneNode::get_text() const { return path.simplified(); } -void VisualScriptSceneNode::set_node_path(const NodePath& p_path) { +void VisualScriptSceneNode::set_node_path(const NodePath &p_path) { - path=p_path; + path = p_path; _change_notify(); ports_changed_notify(); } @@ -2074,68 +1935,59 @@ NodePath VisualScriptSceneNode::get_node_path() { return path; } - class VisualScriptNodeInstanceSceneNode : public VisualScriptNodeInstance { public: - VisualScriptSceneNode *node; VisualScriptInstance *instance; NodePath path; //virtual int get_working_memory_size() const { return 0; } - virtual int step(const Variant** p_inputs,Variant** p_outputs,StartMode p_start_mode,Variant* p_working_mem,Variant::CallError& r_error,String& r_error_str) { + virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) { - Node* node = instance->get_owner_ptr()->cast_to(); + Node *node = instance->get_owner_ptr()->cast_to(); if (!node) { - r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD; - r_error_str="Base object is not a Node!"; + r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD; + r_error_str = "Base object is not a Node!"; return 0; } - - - Node* another = node->get_node(path); + Node *another = node->get_node(path); if (!node) { - r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD; - r_error_str="Path does not lead Node!"; + r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD; + r_error_str = "Path does not lead Node!"; return 0; } - *p_outputs[0]=another; + *p_outputs[0] = another; return 0; } - - }; -VisualScriptNodeInstance* VisualScriptSceneNode::instance(VisualScriptInstance* p_instance) { +VisualScriptNodeInstance *VisualScriptSceneNode::instance(VisualScriptInstance *p_instance) { - VisualScriptNodeInstanceSceneNode * instance = memnew(VisualScriptNodeInstanceSceneNode ); - instance->node=this; - instance->instance=p_instance; - instance->path=path; + VisualScriptNodeInstanceSceneNode *instance = memnew(VisualScriptNodeInstanceSceneNode); + instance->node = this; + instance->instance = p_instance; + instance->path = path; return instance; } - - - #ifdef TOOLS_ENABLED -static Node* _find_script_node(Node* p_edited_scene,Node* p_current_node,const Ref