Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #72111 from raulsntos/method-info-metadata

Browse source 
Add `GodotTypeInfo::Metadata` to `MethodInfo`
This commit is contained in:
Rémi Verschelde 2023-01-27 15:41:38 +01:00
commit 2b55ac445b
No known key found for this signature in database
GPG key ID: C3336907360768E1
8 changed files with 36 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/mono/editor/GodotTools/GodotTools/Build/MSBuildPanel.cs
View file

@ -175,7 +175,7 @@ namespace GodotTools.Build
AddChild(BuildOutputView);
}
public override void _Notification(long what)
public override void _Notification(int what)
{
base._Notification(what);

2
modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs
View file

@ -71,7 +71,7 @@ namespace GodotTools.Export
}
}
public override void _ExportBegin(string[] features, bool isDebug, string path, long flags)
public override void _ExportBegin(string[] features, bool isDebug, string path, uint flags)
{
base._ExportBegin(features, isDebug, path, flags);

2
modules/mono/editor/GodotTools/GodotTools/HotReloadAssemblyWatcher.cs
View file

@ -9,7 +9,7 @@ namespace GodotTools
{
private Timer _watchTimer;
public override void _Notification(long what)
public override void _Notification(int what)
{
if (what == Node.NotificationWMWindowFocusIn)
{

6
modules/mono/editor/bindings_generator.cpp
View file

@ -3000,7 +3000,7 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
} else if (return_info.type == Variant::NIL) {
imethod.return_type.cname = name_cache.type_void;
} else {
imethod.return_type.cname = _get_type_name_from_meta(return_info.type, m ? m->get_argument_meta(-1) : GodotTypeInfo::METADATA_NONE);
imethod.return_type.cname = _get_type_name_from_meta(return_info.type, m ? m->get_argument_meta(-1) : (GodotTypeInfo::Metadata)method_info.return_val_metadata);
}
for (int i = 0; i < argc; i++) {
@ -3024,7 +3024,7 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
} else if (arginfo.type == Variant::NIL) {
iarg.type.cname = name_cache.type_Variant;
} else {
iarg.type.cname = _get_type_name_from_meta(arginfo.type, m ? m->get_argument_meta(i) : GodotTypeInfo::METADATA_NONE);
iarg.type.cname = _get_type_name_from_meta(arginfo.type, m ? m->get_argument_meta(i) : (GodotTypeInfo::Metadata)method_info.get_argument_meta(i));
}
iarg.name = escape_csharp_keyword(snake_to_camel_case(iarg.name));
@ -3124,7 +3124,7 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
} else if (arginfo.type == Variant::NIL) {
iarg.type.cname = name_cache.type_Variant;
} else {
iarg.type.cname = _get_type_name_from_meta(arginfo.type, GodotTypeInfo::METADATA_NONE);
iarg.type.cname = _get_type_name_from_meta(arginfo.type, (GodotTypeInfo::Metadata)method_info.get_argument_meta(i));
}
iarg.name = escape_csharp_keyword(snake_to_camel_case(iarg.name));