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

Merge pull request #54130 from raulsntos/csharp-exports

Browse source 
Keep order for C# exported members
This commit is contained in:
Rémi Verschelde 2021-10-24 21:17:58 +02:00 committed by GitHub
commit 6ccc3e4d87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/mono/csharp_script.cpp
View file

@ -1813,8 +1813,8 @@ void CSharpInstance::get_event_signals_state_for_reloading(List<Pair<StringName,
}
void CSharpInstance::get_property_list(List<PropertyInfo> *p_properties) const {
for (const KeyValue<StringName, PropertyInfo> &E : script->member_info) {
p_properties->push_back(E.value);
for (OrderedHashMap<StringName, PropertyInfo>::ConstElement E = script->member_info.front(); E; E = E.next()) {
p_properties->push_front(E.value());
}
// Call _get_property_list
@ -1839,10 +1839,9 @@ void CSharpInstance::get_property_list(List<PropertyInfo> *p_properties) const {
for (int i = 0, size = array.size(); i < size; i++) {
p_properties->push_back(PropertyInfo::from_dict(array.get(i)));
}
return;
}
break;
return;
}
top = top->get_parent_class();
@ -1865,8 +1864,9 @@ Variant::Type CSharpInstance::get_property_type(const StringName &p_name, bool *
}
void CSharpInstance::get_method_list(List<MethodInfo> *p_list) const {
if (!script->is_valid() || !script->script_class)
if (!script->is_valid() || !script->script_class) {
return;
}
GD_MONO_SCOPE_THREAD_ATTACH;
@ -3499,9 +3499,9 @@ Ref<Script> CSharpScript::get_base_script() const {
return Ref<Script>();
}
void CSharpScript::get_script_property_list(List<PropertyInfo> *p_list) const {
for (const KeyValue<StringName, PropertyInfo> &E : member_info) {
p_list->push_back(E.value);
void CSharpScript::get_script_property_list(List<PropertyInfo> *r_list) const {
for (OrderedHashMap<StringName, PropertyInfo>::ConstElement E = member_info.front(); E; E = E.next()) {
r_list->push_front(E.value());
}
}

4
modules/mono/csharp_script.h
View file

@ -154,7 +154,7 @@ private:
Set<StringName> exported_members_names;
#endif
Map<StringName, PropertyInfo> member_info;
OrderedHashMap<StringName, PropertyInfo> member_info;
void _clear();
@ -215,7 +215,7 @@ public:
void get_script_signal_list(List<MethodInfo> *r_signals) const override;
bool get_property_default_value(const StringName &p_property, Variant &r_value) const override;
void get_script_property_list(List<PropertyInfo> *p_list) const override;
void get_script_property_list(List<PropertyInfo> *r_list) const override;
void update_exports() override;
void get_members(Set<StringName> *p_members) override;