asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix GlobalConstant/BasicTypeConstant return type in visual scripts

Browse source 
(cherry picked from commit c19933eec4)
This commit is contained in:
Yuri Roubinsky 2020-01-30 20:20:33 +03:00 committed by Rémi Verschelde
parent b90a5d4c80
commit 61901bd7cc
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
modules/visual_script/visual_script_nodes.cpp
View file

@ -1842,7 +1842,7 @@ PropertyInfo VisualScriptGlobalConstant::get_input_value_port_info(int p_idx) co
PropertyInfo VisualScriptGlobalConstant::get_output_value_port_info(int p_idx) const { PropertyInfo VisualScriptGlobalConstant::get_output_value_port_info(int p_idx) const {
String name = GlobalConstants::get_global_constant_name(index); String name = GlobalConstants::get_global_constant_name(index);
return PropertyInfo(Variant::REAL, name); return PropertyInfo(Variant::INT, name);
} }
String VisualScriptGlobalConstant::get_caption() const { String VisualScriptGlobalConstant::get_caption() const {
@ -2060,7 +2060,7 @@ PropertyInfo VisualScriptBasicTypeConstant::get_input_value_port_info(int p_idx)
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(type, "value");
} }
String VisualScriptBasicTypeConstant::get_caption() const { String VisualScriptBasicTypeConstant::get_caption() const {
@ -2069,8 +2069,11 @@ String VisualScriptBasicTypeConstant::get_caption() const {
} }
String VisualScriptBasicTypeConstant::get_text() const { String VisualScriptBasicTypeConstant::get_text() const {
if (name == "") {
return Variant::get_type_name(type) + "." + String(name); return Variant::get_type_name(type);
} else {
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) {
@ -2087,6 +2090,23 @@ StringName VisualScriptBasicTypeConstant::get_basic_type_constant() const {
void VisualScriptBasicTypeConstant::set_basic_type(Variant::Type p_which) { void VisualScriptBasicTypeConstant::set_basic_type(Variant::Type p_which) {
type = p_which; type = p_which;
List<StringName> constants;
Variant::get_constants_for_type(type, &constants);
if (constants.size() > 0) {
bool found_name = false;
for (List<StringName>::Element *E = constants.front(); E; E = E->next()) {
if (E->get() == name) {
found_name = true;
break;
}
}
if (!found_name) {
name = constants[0];
}
} else {
name = "";
}
_change_notify(); _change_notify();
ports_changed_notify(); ports_changed_notify();
} }