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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/extension/extension_api_dump.cpp
View File

@ -82,6 +82,11 @@ static String get_property_info_type_name(const PropertyInfo &p_info) {
return get_builtin_or_variant_type_name(p_info.type); return get_builtin_or_variant_type_name(p_info.type);
} }
static String get_type_meta_name(const GodotTypeInfo::Metadata metadata) {
static const char *argmeta[11] = { "none", "int8", "int16", "int32", "int64", "uint8", "uint16", "uint32", "uint64", "float", "double" };
return argmeta[metadata];
}
Dictionary GDExtensionAPIDump::generate_extension_api() { Dictionary GDExtensionAPIDump::generate_extension_api() {
Dictionary api_dump; Dictionary api_dump;
@ -840,6 +845,10 @@ Dictionary GDExtensionAPIDump::generate_extension_api() {
d3["type"] = get_property_info_type_name(pinfo); d3["type"] = get_property_info_type_name(pinfo);
if (mi.get_argument_meta(i) > 0) {
d3["meta"] = get_type_meta_name((GodotTypeInfo::Metadata)mi.get_argument_meta(i));
}
if (i == -1) { if (i == -1) {
d2["return_value"] = d3; d2["return_value"] = d3;
} else { } else {
@ -884,8 +893,7 @@ Dictionary GDExtensionAPIDump::generate_extension_api() {
d3["type"] = get_property_info_type_name(pinfo); d3["type"] = get_property_info_type_name(pinfo);
if (method->get_argument_meta(i) > 0) { if (method->get_argument_meta(i) > 0) {
static const char *argmeta[11] = { "none", "int8", "int16", "int32", "int64", "uint8", "uint16", "uint32", "uint64", "float", "double" }; d3["meta"] = get_type_meta_name(method->get_argument_meta(i));
d3["meta"] = argmeta[method->get_argument_meta(i)];
} }
if (i >= 0 && i >= (method->get_argument_count() - default_args.size())) { if (i >= 0 && i >= (method->get_argument_count() - default_args.size())) {
@ -929,6 +937,9 @@ Dictionary GDExtensionAPIDump::generate_extension_api() {
Dictionary d3; Dictionary d3;
d3["name"] = F.arguments[i].name; d3["name"] = F.arguments[i].name;
d3["type"] = get_property_info_type_name(F.arguments[i]); d3["type"] = get_property_info_type_name(F.arguments[i]);
if (F.get_argument_meta(i) > 0) {
d3["meta"] = get_type_meta_name((GodotTypeInfo::Metadata)F.get_argument_meta(i));
}
arguments.push_back(d3); arguments.push_back(d3);
} }
if (arguments.size()) { if (arguments.size()) {

4
core/object/make_virtuals.py
View File

@ -72,6 +72,7 @@ def generate_version(argcount, const=False, returns=False):
s = s.replace("$RVOID", "(void)r_ret;") # If required, may lead to uninitialized errors s = s.replace("$RVOID", "(void)r_ret;") # If required, may lead to uninitialized errors
s = s.replace("$CALLPTRRETDEF", "PtrToArg<m_ret>::EncodeT ret;") s = s.replace("$CALLPTRRETDEF", "PtrToArg<m_ret>::EncodeT ret;")
method_info += "\tmethod_info.return_val = GetTypeInfo<m_ret>::get_class_info();\\\n" method_info += "\tmethod_info.return_val = GetTypeInfo<m_ret>::get_class_info();\\\n"
method_info += "\tmethod_info.return_val_metadata = GetTypeInfo<m_ret>::METADATA;\\\n"
else: else:
s = s.replace("$RET", "") s = s.replace("$RET", "")
s = s.replace("$RVOID", "") s = s.replace("$RVOID", "")
@ -113,6 +114,9 @@ def generate_version(argcount, const=False, returns=False):
) )
callptrargsptr += "&argval" + str(i + 1) callptrargsptr += "&argval" + str(i + 1)
method_info += "\tmethod_info.arguments.push_back(GetTypeInfo<m_type" + str(i + 1) + ">::get_class_info());\\\n" method_info += "\tmethod_info.arguments.push_back(GetTypeInfo<m_type" + str(i + 1) + ">::get_class_info());\\\n"
method_info += (
"\tmethod_info.arguments_metadata.push_back(GetTypeInfo<m_type" + str(i + 1) + ">::METADATA);\\\n"
)
if argcount: if argcount:
callsiargs += "};\\\n" callsiargs += "};\\\n"

4
core/object/object.cpp
View File

@ -1549,7 +1549,9 @@ void Object::_bind_methods() {
#define BIND_OBJ_CORE_METHOD(m_method) \ #define BIND_OBJ_CORE_METHOD(m_method) \
::ClassDB::add_virtual_method(get_class_static(), m_method, true, Vector<String>(), true); ::ClassDB::add_virtual_method(get_class_static(), m_method, true, Vector<String>(), true);
BIND_OBJ_CORE_METHOD(MethodInfo("_notification", PropertyInfo(Variant::INT, "what"))); MethodInfo notification_mi("_notification", PropertyInfo(Variant::INT, "what"));
notification_mi.arguments_metadata.push_back(GodotTypeInfo::Metadata::METADATA_INT_IS_INT32);
BIND_OBJ_CORE_METHOD(notification_mi);
BIND_OBJ_CORE_METHOD(MethodInfo(Variant::BOOL, "_set", PropertyInfo(Variant::STRING_NAME, "property"), PropertyInfo(Variant::NIL, "value"))); BIND_OBJ_CORE_METHOD(MethodInfo(Variant::BOOL, "_set", PropertyInfo(Variant::STRING_NAME, "property"), PropertyInfo(Variant::NIL, "value")));
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
MethodInfo miget("_get", PropertyInfo(Variant::STRING_NAME, "property")); MethodInfo miget("_get", PropertyInfo(Variant::STRING_NAME, "property"));

10
core/object/object.h
View File

@ -223,6 +223,16 @@ struct MethodInfo {
int id = 0; int id = 0;
List<PropertyInfo> arguments; List<PropertyInfo> arguments;
Vector<Variant> default_arguments; Vector<Variant> default_arguments;
int return_val_metadata = 0;
Vector<int> arguments_metadata;
int get_argument_meta(int p_arg) const {
ERR_FAIL_COND_V(p_arg < -1 || p_arg > arguments.size(), 0);
if (p_arg == -1) {
return return_val_metadata;
}
return arguments_metadata.size() > p_arg ? arguments_metadata[p_arg] : 0;
}
inline bool operator==(const MethodInfo &p_method) const { return id == p_method.id; } inline bool operator==(const MethodInfo &p_method) const { return id == p_method.id; }
inline bool operator<(const MethodInfo &p_method) const { return id == p_method.id ? (name < p_method.name) : (id < p_method.id); } inline bool operator<(const MethodInfo &p_method) const { return id == p_method.id ? (name < p_method.name) : (id < p_method.id); }

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

@ -175,7 +175,7 @@ namespace GodotTools.Build
AddChild(BuildOutputView); AddChild(BuildOutputView);
} }
public override void _Notification(long what) public override void _Notification(int what)
{ {
base._Notification(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); 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; private Timer _watchTimer;
public override void _Notification(long what) public override void _Notification(int what)
{ {
if (what == Node.NotificationWMWindowFocusIn) 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) { } else if (return_info.type == Variant::NIL) {
imethod.return_type.cname = name_cache.type_void; imethod.return_type.cname = name_cache.type_void;
} else { } 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++) { for (int i = 0; i < argc; i++) {
@ -3024,7 +3024,7 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
} else if (arginfo.type == Variant::NIL) { } else if (arginfo.type == Variant::NIL) {
iarg.type.cname = name_cache.type_Variant; iarg.type.cname = name_cache.type_Variant;
} else { } 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)); 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) { } else if (arginfo.type == Variant::NIL) {
iarg.type.cname = name_cache.type_Variant; iarg.type.cname = name_cache.type_Variant;
} else { } 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)); iarg.name = escape_csharp_keyword(snake_to_camel_case(iarg.name));