godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

More stuff!

Browse Source
This commit is contained in:
Pieter-Jan Briers
2018-05-01 00:39:28 +02:00
parent 8d9d847a1a
commit 99e871f45f
4 changed files with 86 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
modules/visual_script/visual_script_func_nodes.cpp
View File

@@ -1063,36 +1063,31 @@ PropertyInfo VisualScriptPropertySet::get_output_value_port_info(int p_idx) cons
String VisualScriptPropertySet::get_caption() const {
static const char *cname[4] = {
"Self",
"Node",
"Instance",
"Basic"
static const char *opname[ASSIGN_OP_MAX] = {
"Set", "Add", "Subtract", "Multiply", "Divide", "Mod", "ShiftLeft", "ShiftRight", "BitAnd", "BitOr", "BitXor"
};
static const char *opname[ASSIGN_OP_MAX] = {
"Set", "Add", "Sub", "Mul", "Div", "Mod", "ShiftLeft", "ShiftRight", "BitAnd", "BitOr", "BitXor"
};
return String(cname[call_mode]) + opname[assign_op];
String prop = String(opname[assign_op]) + " " + property;
if (index != StringName()) {
prop += "." + String(index);
}
return prop;
}
String VisualScriptPropertySet::get_text() const {
String prop;
if (call_mode == CALL_MODE_BASIC_TYPE)
prop = Variant::get_type_name(basic_type) + "." + property;
else if (call_mode == CALL_MODE_NODE_PATH)
prop = String(base_path) + ":" + property;
else if (call_mode == CALL_MODE_SELF)
prop = property;
else if (call_mode == CALL_MODE_INSTANCE)
prop = String(base_type) + ":" + property;
if (index != StringName()) {
prop += "." + String(index);
if (call_mode == CALL_MODE_BASIC_TYPE) {
return String("On ") + Variant::get_type_name(basic_type);
}
return prop;
static const char *cname[3] = {
"Self",
"Scene Node",
"Instance"
};
return String("On ") + cname[call_mode];
}
void VisualScriptPropertySet::_update_base_type() {
@@ -1826,30 +1821,22 @@ PropertyInfo VisualScriptPropertyGet::get_output_value_port_info(int p_idx) cons
String VisualScriptPropertyGet::get_caption() const {
static const char *cname[4] = {
"SelfGet",
"NodeGet",
"InstanceGet",
"BasicGet"
};
return cname[call_mode];
return String("Get ") + property;
}
String VisualScriptPropertyGet::get_text() const {
String prop;
if (call_mode == CALL_MODE_BASIC_TYPE) {
return String("On ") + Variant::get_type_name(basic_type);
}
if (call_mode == CALL_MODE_BASIC_TYPE)
prop = Variant::get_type_name(basic_type) + "." + property;
else if (call_mode == CALL_MODE_NODE_PATH)
prop = String(base_path) + ":" + property;
else if (call_mode == CALL_MODE_SELF)
prop = property;
else if (call_mode == CALL_MODE_INSTANCE)
prop = String(base_type) + ":" + property;
static const char *cname[3] = {
"Self",
"Scene Node",
"Instance"
};
return prop;
return String("On ") + cname[call_mode];
}
void VisualScriptPropertyGet::set_base_type(const StringName &p_type) {
@@ -2385,16 +2372,9 @@ PropertyInfo VisualScriptEmitSignal::get_output_value_port_info(int p_idx) const
return PropertyInfo();
}
/*
String VisualScriptEmitSignal::get_caption() const {
return "EmitSignal";
}
*/
String VisualScriptEmitSignal::get_caption() const {
return "emit " + String(name);
return "Emit " + String(name);
}
void VisualScriptEmitSignal::set_signal(const StringName &p_type) {