diff options
Diffstat (limited to 'modules/visual_script')
-rw-r--r-- | modules/visual_script/config.py | 2 | ||||
-rw-r--r-- | modules/visual_script/doc_classes/VisualScriptLists.xml | 32 | ||||
-rw-r--r-- | modules/visual_script/visual_script_editor.cpp | 2 | ||||
-rw-r--r-- | modules/visual_script/visual_script_nodes.cpp | 18 |
4 files changed, 28 insertions, 26 deletions
diff --git a/modules/visual_script/config.py b/modules/visual_script/config.py index 04e1a40b81..087a13a200 100644 --- a/modules/visual_script/config.py +++ b/modules/visual_script/config.py @@ -11,6 +11,7 @@ def get_doc_classes(): "VisualScriptBuiltinFunc", "VisualScriptClassConstant", "VisualScriptComment", + "VisualScriptComposeArray", "VisualScriptCondition", "VisualScriptConstant", "VisualScriptConstructor", @@ -28,6 +29,7 @@ def get_doc_classes(): "VisualScriptIndexSet", "VisualScriptInputAction", "VisualScriptIterator", + "VisualScriptLists", "VisualScriptLocalVarSet", "VisualScriptLocalVar", "VisualScriptMathConstant", diff --git a/modules/visual_script/doc_classes/VisualScriptLists.xml b/modules/visual_script/doc_classes/VisualScriptLists.xml index eac0b218af..8cf3eb1d38 100644 --- a/modules/visual_script/doc_classes/VisualScriptLists.xml +++ b/modules/visual_script/doc_classes/VisualScriptLists.xml @@ -12,11 +12,11 @@ <method name="add_input_data_port"> <return type="void"> </return> - <argument index="0" name="p_type" type="int" enum="Variant.Type"> + <argument index="0" name="type" type="int" enum="Variant.Type"> </argument> - <argument index="1" name="p_name" type="String"> + <argument index="1" name="name" type="String"> </argument> - <argument index="2" name="p_index" type="int"> + <argument index="2" name="index" type="int"> </argument> <description> </description> @@ -24,11 +24,11 @@ <method name="add_output_data_port"> <return type="void"> </return> - <argument index="0" name="p_type" type="int" enum="Variant.Type"> + <argument index="0" name="type" type="int" enum="Variant.Type"> </argument> - <argument index="1" name="p_name" type="String"> + <argument index="1" name="name" type="String"> </argument> - <argument index="2" name="p_index" type="int"> + <argument index="2" name="index" type="int"> </argument> <description> </description> @@ -36,7 +36,7 @@ <method name="remove_input_data_port"> <return type="void"> </return> - <argument index="0" name="p_index" type="int"> + <argument index="0" name="index" type="int"> </argument> <description> </description> @@ -44,7 +44,7 @@ <method name="remove_output_data_port"> <return type="void"> </return> - <argument index="0" name="p_index" type="int"> + <argument index="0" name="index" type="int"> </argument> <description> </description> @@ -52,9 +52,9 @@ <method name="set_input_data_port_name"> <return type="void"> </return> - <argument index="0" name="p_index" type="int"> + <argument index="0" name="index" type="int"> </argument> - <argument index="1" name="p_name" type="String"> + <argument index="1" name="name" type="String"> </argument> <description> </description> @@ -62,9 +62,9 @@ <method name="set_input_data_port_type"> <return type="void"> </return> - <argument index="0" name="p_index" type="int"> + <argument index="0" name="index" type="int"> </argument> - <argument index="1" name="p_type" type="int" enum="Variant.Type"> + <argument index="1" name="type" type="int" enum="Variant.Type"> </argument> <description> </description> @@ -72,9 +72,9 @@ <method name="set_output_data_port_name"> <return type="void"> </return> - <argument index="0" name="p_index" type="int"> + <argument index="0" name="index" type="int"> </argument> - <argument index="1" name="p_name" type="String"> + <argument index="1" name="name" type="String"> </argument> <description> </description> @@ -82,9 +82,9 @@ <method name="set_output_data_port_type"> <return type="void"> </return> - <argument index="0" name="p_index" type="int"> + <argument index="0" name="index" type="int"> </argument> - <argument index="1" name="p_type" type="int" enum="Variant.Type"> + <argument index="1" name="type" type="int" enum="Variant.Type"> </argument> <description> </description> diff --git a/modules/visual_script/visual_script_editor.cpp b/modules/visual_script/visual_script_editor.cpp index a9169a411a..0399dbc87c 100644 --- a/modules/visual_script/visual_script_editor.cpp +++ b/modules/visual_script/visual_script_editor.cpp @@ -1350,7 +1350,7 @@ void VisualScriptEditor::_member_button(Object *p_item, int p_column, int p_butt return; //or crash because it will become invalid } } else if (ti->get_parent() == root->get_children()) { - selected = ti->get_metadata(0); + selected = ti->get_text(0); function_name_edit->set_position(Input::get_singleton()->get_mouse_position() - Vector2(60, -10)); function_name_edit->popup(); } diff --git a/modules/visual_script/visual_script_nodes.cpp b/modules/visual_script/visual_script_nodes.cpp index 8c849b28c8..dbcd3c19f8 100644 --- a/modules/visual_script/visual_script_nodes.cpp +++ b/modules/visual_script/visual_script_nodes.cpp @@ -700,15 +700,15 @@ VisualScriptLists::VisualScriptLists() { } void VisualScriptLists::_bind_methods() { - ClassDB::bind_method(D_METHOD("add_input_data_port"), &VisualScriptLists::add_input_data_port); - ClassDB::bind_method(D_METHOD("set_input_data_port_name"), &VisualScriptLists::set_input_data_port_name); - ClassDB::bind_method(D_METHOD("set_input_data_port_type"), &VisualScriptLists::set_input_data_port_type); - ClassDB::bind_method(D_METHOD("remove_input_data_port"), &VisualScriptLists::remove_input_data_port); - - ClassDB::bind_method(D_METHOD("add_output_data_port"), &VisualScriptLists::add_output_data_port); - ClassDB::bind_method(D_METHOD("set_output_data_port_name"), &VisualScriptLists::set_output_data_port_name); - ClassDB::bind_method(D_METHOD("set_output_data_port_type"), &VisualScriptLists::set_output_data_port_type); - ClassDB::bind_method(D_METHOD("remove_output_data_port"), &VisualScriptLists::remove_output_data_port); + ClassDB::bind_method(D_METHOD("add_input_data_port", "type", "name", "index"), &VisualScriptLists::add_input_data_port); + ClassDB::bind_method(D_METHOD("set_input_data_port_name", "index", "name"), &VisualScriptLists::set_input_data_port_name); + ClassDB::bind_method(D_METHOD("set_input_data_port_type", "index", "type"), &VisualScriptLists::set_input_data_port_type); + ClassDB::bind_method(D_METHOD("remove_input_data_port", "index"), &VisualScriptLists::remove_input_data_port); + + ClassDB::bind_method(D_METHOD("add_output_data_port", "type", "name", "index"), &VisualScriptLists::add_output_data_port); + ClassDB::bind_method(D_METHOD("set_output_data_port_name", "index", "name"), &VisualScriptLists::set_output_data_port_name); + ClassDB::bind_method(D_METHOD("set_output_data_port_type", "index", "type"), &VisualScriptLists::set_output_data_port_type); + ClassDB::bind_method(D_METHOD("remove_output_data_port", "index"), &VisualScriptLists::remove_output_data_port); } ////////////////////////////////////////// |