godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27950 from Nonnu42/contrib 

Fixes #17233 allowing C# to override _GetPropertyList
This commit is contained in:
Ignacio Roldán Etcheverry 2019-04-12 16:43:27 +02:00 committed by GitHub
parent 6008745991 d011c8e109
commit b7cf4c2050
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/mono/csharp_script.cpp
View File

@ -1424,6 +1424,34 @@ void CSharpInstance::get_property_list(List<PropertyInfo> *p_properties) const {
for (Map<StringName, PropertyInfo>::Element *E = script->member_info.front(); E; E = E->next()) { for (Map<StringName, PropertyInfo>::Element *E = script->member_info.front(); E; E = E->next()) {
p_properties->push_back(E->value()); p_properties->push_back(E->value());
} }
// Call _get_property_list
ERR_FAIL_COND(!script.is_valid());
MonoObject *mono_object = get_mono_object();
ERR_FAIL_NULL(mono_object);
GDMonoClass *top = script->script_class;
while (top && top != script->native) {
GDMonoMethod *method = top->get_method(CACHED_STRING_NAME(_get_property_list), 0);
if (method) {
MonoObject *ret = method->invoke(mono_object);
if (ret) {
Array array = Array(GDMonoMarshal::mono_object_to_variant(ret));
for (int i = 0, size = array.size(); i < size; i++)
p_properties->push_back(PropertyInfo::from_dict(array.get(i)));
return;
}
break;
}
top = top->get_parent_class();
}
} }
Variant::Type CSharpInstance::get_property_type(const StringName &p_name, bool *r_is_valid) const { Variant::Type CSharpInstance::get_property_type(const StringName &p_name, bool *r_is_valid) const {
@ -3027,6 +3055,7 @@ CSharpLanguage::StringNameCache::StringNameCache() {
_signal_callback = StaticCString::create("_signal_callback"); _signal_callback = StaticCString::create("_signal_callback");
_set = StaticCString::create("_set"); _set = StaticCString::create("_set");
_get = StaticCString::create("_get"); _get = StaticCString::create("_get");
_get_property_list = StaticCString::create("_get_property_list");
_notification = StaticCString::create("_notification"); _notification = StaticCString::create("_notification");
_script_source = StaticCString::create("script/source"); _script_source = StaticCString::create("script/source");
dotctor = StaticCString::create(".ctor"); dotctor = StaticCString::create(".ctor");

1
modules/mono/csharp_script.h
View File

@ -298,6 +298,7 @@ class CSharpLanguage : public ScriptLanguage {
StringName _signal_callback; StringName _signal_callback;
StringName _set; StringName _set;
StringName _get; StringName _get;
StringName _get_property_list;
StringName _notification; StringName _notification;
StringName _script_source; StringName _script_source;
StringName dotctor; // .ctor StringName dotctor; // .ctor