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

Merge pull request #11849 from cart/mono_parent_fields

Browse source 
Mono: support exported parent class fields
This commit is contained in:
Ignacio Etcheverry 2017-10-06 22:36:58 +02:00 committed by GitHub
commit 30328e7dfc
1 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
modules/mono/csharp_script.cpp
View file

@ -1201,8 +1201,6 @@ bool CSharpScript::_update_exports() {
exported_members_cache.clear(); exported_members_cache.clear();
exported_members_defval_cache.clear(); exported_members_defval_cache.clear();
const Vector<GDMonoField *> &fields = script_class->get_all_fields();
// We are creating a temporary new instance of the class here to get the default value // We are creating a temporary new instance of the class here to get the default value
// TODO Workaround. Should be replaced with IL opcodes analysis // TODO Workaround. Should be replaced with IL opcodes analysis
@ -1226,36 +1224,47 @@ bool CSharpScript::_update_exports() {
return false; return false;
} }
for (int i = 0; i < fields.size(); i++) { GDMonoClass *top = script_class;
GDMonoField *field = fields[i];
if (field->is_static() || field->get_visibility() != GDMono::PUBLIC) while (top && top != native) {
continue; const Vector<GDMonoField *> &fields = top->get_all_fields();
String name = field->get_name(); for (int i = 0; i < fields.size(); i++) {
StringName cname = name; GDMonoField *field = fields[i];
Variant::Type type = GDMonoMarshal::managed_to_variant_type(field->get_type()); if (field->is_static() || field->get_visibility() != GDMono::PUBLIC)
continue;
if (field->has_attribute(CACHED_CLASS(ExportAttribute))) { String name = field->get_name();
MonoObject *attr = field->get_attribute(CACHED_CLASS(ExportAttribute)); StringName cname = name;
// Field has Export attribute if (member_info.has(cname))
int hint = CACHED_FIELD(ExportAttribute, hint)->get_int_value(attr); continue;
String hint_string = CACHED_FIELD(ExportAttribute, hint_string)->get_string_value(attr);
int usage = CACHED_FIELD(ExportAttribute, usage)->get_int_value(attr);
PropertyInfo prop_info = PropertyInfo(type, name, PropertyHint(hint), hint_string, PropertyUsageFlags(usage)); Variant::Type type = GDMonoMarshal::managed_to_variant_type(field->get_type());
member_info[cname] = prop_info; if (field->has_attribute(CACHED_CLASS(ExportAttribute))) {
exported_members_cache.push_back(prop_info); MonoObject *attr = field->get_attribute(CACHED_CLASS(ExportAttribute));
if (tmp_object) { // Field has Export attribute
exported_members_defval_cache[cname] = GDMonoMarshal::mono_object_to_variant(field->get_value(tmp_object)); int hint = CACHED_FIELD(ExportAttribute, hint)->get_int_value(attr);
String hint_string = CACHED_FIELD(ExportAttribute, hint_string)->get_string_value(attr);
int usage = CACHED_FIELD(ExportAttribute, usage)->get_int_value(attr);
PropertyInfo prop_info = PropertyInfo(type, name, PropertyHint(hint), hint_string, PropertyUsageFlags(usage));
member_info[cname] = prop_info;
exported_members_cache.push_back(prop_info);
if (tmp_object) {
exported_members_defval_cache[cname] = GDMonoMarshal::mono_object_to_variant(field->get_value(tmp_object));
}
} else {
member_info[cname] = PropertyInfo(type, name, PROPERTY_HINT_NONE, "", PROPERTY_USAGE_SCRIPT_VARIABLE);
} }
} else {
member_info[cname] = PropertyInfo(type, name, PROPERTY_HINT_NONE, "", PROPERTY_USAGE_SCRIPT_VARIABLE);
} }
top = top->get_parent_class();
} }
} }