godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

GDScript: Convert values when setting member variables

Browse Source 
This allows doing: self.x = 1 even if self.x is declared as float.
This commit is contained in:
George Marques
2019-12-13 12:51:53 -03:00
parent 475d7f0e52
commit cb887324e6
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/gdscript/gdscript.cpp
View File

@@ -946,18 +946,29 @@ bool GDScriptInstance::set(const StringName &p_name, const Variant &p_value) {
{ {
const Map<StringName, GDScript::MemberInfo>::Element *E = script->member_indices.find(p_name); const Map<StringName, GDScript::MemberInfo>::Element *E = script->member_indices.find(p_name);
if (E) { if (E) {
if (E->get().setter) { const GDScript::MemberInfo *member = &E->get();
if (member->setter) {
const Variant *val = &p_value; const Variant *val = &p_value;
Variant::CallError err; Variant::CallError err;
call(E->get().setter, &val, 1, err); call(member->setter, &val, 1, err);
if (err.error == Variant::CallError::CALL_OK) { if (err.error == Variant::CallError::CALL_OK) {
return true; //function exists, call was successful return true; //function exists, call was successful
} }
} else { } else {
if (!E->get().data_type.is_type(p_value)) { if (!member->data_type.is_type(p_value)) {
return false; // Type mismatch // Try conversion
Variant::CallError ce;
const Variant *value = &p_value;
Variant converted = Variant::construct(member->data_type.builtin_type, &value, 1, ce);
if (ce.error == Variant::CallError::CALL_OK) {
members.write[member->index] = converted;
return true;
} else {
return false;
}
} else {
members.write[member->index] = p_value;
} }
members.write[E->get().index] = p_value;
} }
return true; return true;
} }