Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #888 from touilleMan/gdextension-typed-enum-in-struct

pull/893/head
Rémi Verschelde 2022-10-13 14:22:03 +02:00 committed by GitHub
parent 779eaba428 b21931c4a3
commit 3abd5e131f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
godot-headers/godot/gdnative_interface.h
View File

@ -201,18 +201,18 @@ typedef GDNativeBool (*GDNativeExtensionClassGet)(GDExtensionClassInstancePtr p_
typedef uint64_t (*GDNativeExtensionClassGetRID)(GDExtensionClassInstancePtr p_instance);
typedef struct {
uint32_t type;
GDNativeVariantType type;
const char *name;
const char *class_name;
uint32_t hint;
uint32_t hint; // Bitfield of `PropertyHint` (defined in `extension_api.json`)
const char *hint_string;
uint32_t usage;
uint32_t usage; // Bitfield of `PropertyUsageFlags` (defined in `extension_api.json`)
} GDNativePropertyInfo;
typedef struct {
const char *name;
GDNativePropertyInfo return_value;
uint32_t flags; // From GDNativeExtensionClassMethodFlags
uint32_t flags; // Bitfield of `GDNativeExtensionClassMethodFlags`
int32_t id;
GDNativePropertyInfo *arguments;
uint32_t argument_count;
@ -293,7 +293,7 @@ typedef struct {
void *method_userdata;
GDNativeExtensionClassMethodCall call_func;
GDNativeExtensionClassMethodPtrCall ptrcall_func;
uint32_t method_flags; /* GDNativeExtensionClassMethodFlags */
uint32_t method_flags; // Bitfield of `GDNativeExtensionClassMethodFlags`
uint32_t argument_count;
GDNativeBool has_return_value;
GDNativeExtensionClassMethodGetArgumentType get_argument_type_func;

2
include/godot_cpp/classes/wrapped.hpp
View File

@ -219,7 +219,7 @@ public:
cls->plist = reinterpret_cast<GDNativePropertyInfo *>(memalloc(sizeof(GDNativePropertyInfo) * list.size())); \
cls->plist_size = 0; \
for (const ::godot::PropertyInfo &E : list) { \
cls->plist[cls->plist_size].type = E.type; \
cls->plist[cls->plist_size].type = static_cast<GDNativeVariantType>(E.type); \
cls->plist[cls->plist_size].name = _alloc_and_copy_cstr(E.name.utf8().get_data()); \
cls->plist[cls->plist_size].hint = E.hint; \
cls->plist[cls->plist_size].hint_string = _alloc_and_copy_cstr(E.hint_string.utf8().get_data()); \

2
include/godot_cpp/core/method_bind.hpp
View File

@ -182,7 +182,7 @@ public:
for (int i = 0; i < p_method_info.arguments.size(); i++) {
names.push_back(p_method_info.arguments[i].name.utf8().get_data());
arguments.push_back(GDNativePropertyInfo{
static_cast<uint32_t>(p_method_info.arguments[i].type), // uint32_t type;
static_cast<GDNativeVariantType>(p_method_info.arguments[i].type), // GDNativeVariantType type;
_alloc_and_copy_cstr(p_method_info.arguments[i].name.utf8().get_data()), // const char *name;
_alloc_and_copy_cstr(p_method_info.arguments[i].class_name.utf8().get_data()), // const char *class_name;
p_method_info.arguments[i].hint, // NONE //uint32_t hint;

4
src/core/class_db.cpp
View File

@ -95,7 +95,7 @@ void ClassDB::add_property(const char *p_class, const PropertyInfo &p_pinfo, con
// register with Godot
GDNativePropertyInfo prop_info = {
static_cast<uint32_t>(p_pinfo.type), // uint32_t type;
static_cast<GDNativeVariantType>(p_pinfo.type), // GDNativeVariantType type;
_alloc_and_copy_cstr(p_pinfo.name.utf8().get_data()), // const char *name;
_alloc_and_copy_cstr(p_pinfo.class_name.utf8().get_data()), // const char *class_name;
p_pinfo.hint, // NONE //uint32_t hint;
@ -241,7 +241,7 @@ void ClassDB::add_signal(const char *p_class, const MethodInfo &p_signal) {
for (const PropertyInfo &par : p_signal.arguments) {
parameters.push_back(GDNativePropertyInfo{
static_cast<uint32_t>(par.type), // uint32_t type;
static_cast<GDNativeVariantType>(par.type), // GDNativeVariantType type;
_alloc_and_copy_cstr(par.name.utf8().get_data()), // const char *name;
_alloc_and_copy_cstr(par.class_name.utf8().get_data()), // const char *class_name;
par.hint, // NONE //uint32_t hint;