|
|
@@ -39,40 +39,40 @@
|
|
|
|
|
|
namespace godot {
|
|
|
|
|
|
-std::unordered_map<std::string, ClassDB::ClassInfo> ClassDB::classes;
|
|
|
+std::unordered_map<StringName, ClassDB::ClassInfo> ClassDB::classes;
|
|
|
GDNativeInitializationLevel ClassDB::current_level = GDNATIVE_INITIALIZATION_CORE;
|
|
|
|
|
|
-MethodDefinition D_METHOD(const char *p_name) {
|
|
|
+MethodDefinition D_METHOD(StringName p_name) {
|
|
|
return MethodDefinition(p_name);
|
|
|
}
|
|
|
|
|
|
-MethodDefinition D_METHOD(const char *p_name, const char *p_arg1) {
|
|
|
+MethodDefinition D_METHOD(StringName p_name, StringName p_arg1) {
|
|
|
MethodDefinition method(p_name);
|
|
|
method.args.push_front(p_arg1);
|
|
|
return method;
|
|
|
}
|
|
|
|
|
|
-void ClassDB::add_property_group(const char *p_class, const char *p_name, const char *p_prefix) {
|
|
|
+void ClassDB::add_property_group(const StringName &p_class, const String &p_name, const String &p_prefix) {
|
|
|
ERR_FAIL_COND_MSG(classes.find(p_class) == classes.end(), String("Trying to add property '{0}{1}' to non-existing class '{2}'.").format(Array::make(p_prefix, p_name, p_class)));
|
|
|
|
|
|
- internal::gdn_interface->classdb_register_extension_class_property_group(internal::library, p_class, p_name, p_prefix);
|
|
|
+ internal::gdn_interface->classdb_register_extension_class_property_group(internal::library, p_class._native_ptr(), p_name._native_ptr(), p_prefix._native_ptr());
|
|
|
}
|
|
|
|
|
|
-void ClassDB::add_property_subgroup(const char *p_class, const char *p_name, const char *p_prefix) {
|
|
|
+void ClassDB::add_property_subgroup(const StringName &p_class, const String &p_name, const String &p_prefix) {
|
|
|
ERR_FAIL_COND_MSG(classes.find(p_class) == classes.end(), String("Trying to add property '{0}{1}' to non-existing class '{2}'.").format(Array::make(p_prefix, p_name, p_class)));
|
|
|
|
|
|
- internal::gdn_interface->classdb_register_extension_class_property_subgroup(internal::library, p_class, p_name, p_prefix);
|
|
|
+ internal::gdn_interface->classdb_register_extension_class_property_subgroup(internal::library, p_class._native_ptr(), p_name._native_ptr(), p_prefix._native_ptr());
|
|
|
}
|
|
|
|
|
|
-void ClassDB::add_property(const char *p_class, const PropertyInfo &p_pinfo, const char *p_setter, const char *p_getter, int p_index) {
|
|
|
+void ClassDB::add_property(const StringName &p_class, const PropertyInfo &p_pinfo, const StringName &p_setter, const StringName &p_getter, int p_index) {
|
|
|
ERR_FAIL_COND_MSG(classes.find(p_class) == classes.end(), String("Trying to add property '{0}' to non-existing class '{1}'.").format(Array::make(p_pinfo.name, p_class)));
|
|
|
|
|
|
ClassInfo &info = classes[p_class];
|
|
|
|
|
|
- ERR_FAIL_COND_MSG(info.property_names.find(p_pinfo.name.utf8().get_data()) != info.property_names.end(), String("Property '{0}' already exists in class '{1}'.").format(Array::make(p_pinfo.name, p_class)));
|
|
|
+ ERR_FAIL_COND_MSG(info.property_names.find(p_pinfo.name) != info.property_names.end(), String("Property '{0}' already exists in class '{1}'.").format(Array::make(p_pinfo.name, p_class)));
|
|
|
|
|
|
MethodBind *setter = nullptr;
|
|
|
- if (p_setter) {
|
|
|
+ if (p_setter != String("")) {
|
|
|
setter = get_method(p_class, p_setter);
|
|
|
|
|
|
ERR_FAIL_COND_MSG(!setter, String("Setter method '{0}::{1}()' not found for property '{2}::{3}'.").format(Array::make(p_class, p_setter, p_class, p_pinfo.name)));
|
|
|
@@ -81,7 +81,7 @@ void ClassDB::add_property(const char *p_class, const PropertyInfo &p_pinfo, con
|
|
|
ERR_FAIL_COND_MSG(exp_args != setter->get_argument_count(), String("Setter method '{0}::{1}()' must take a single argument.").format(Array::make(p_class, p_setter)));
|
|
|
}
|
|
|
|
|
|
- ERR_FAIL_COND_MSG(!p_getter, String("Getter method must be specified for '{0}::{1}'.").format(Array::make(p_class, p_pinfo.name)));
|
|
|
+ ERR_FAIL_COND_MSG(p_getter == String(""), String("Getter method must be specified for '{0}::{1}'.").format(Array::make(p_class, p_pinfo.name)));
|
|
|
|
|
|
MethodBind *getter = get_method(p_class, p_getter);
|
|
|
ERR_FAIL_COND_MSG(!getter, String("Getter method '{0}::{1}()' not found for property '{2}::{3}'.").format(Array::make(p_class, p_getter, p_class, p_pinfo.name)));
|
|
|
@@ -91,15 +91,15 @@ void ClassDB::add_property(const char *p_class, const PropertyInfo &p_pinfo, con
|
|
|
}
|
|
|
|
|
|
// register property with plugin
|
|
|
- info.property_names.insert(p_pinfo.name.utf8().get_data());
|
|
|
+ info.property_names.insert(p_pinfo.name);
|
|
|
|
|
|
// register with Godot
|
|
|
GDNativePropertyInfo prop_info = {
|
|
|
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.name._native_ptr(), // GDNativeStringNamePtr name;
|
|
|
+ p_pinfo.class_name._native_ptr(), // GDNativeStringNamePtr class_name;
|
|
|
p_pinfo.hint, // NONE //uint32_t hint;
|
|
|
- _alloc_and_copy_cstr(p_pinfo.hint_string.utf8().get_data()), // const char *hint_string;
|
|
|
+ p_pinfo.hint_string._native_ptr(), // GDNativeStringPtr hint_string;
|
|
|
p_pinfo.usage, // DEFAULT //uint32_t usage;
|
|
|
};
|
|
|
|
|
|
@@ -111,19 +111,15 @@ void ClassDB::add_property(const char *p_class, const PropertyInfo &p_pinfo, con
|
|
|
setget.index = p_index;
|
|
|
setget.type = p_pinfo.type;
|
|
|
|
|
|
- internal::gdn_interface->classdb_register_extension_class_property(internal::library, info.name, &prop_info, setget.setter, setget.getter);
|
|
|
-
|
|
|
- memfree(const_cast<char *>(prop_info.name));
|
|
|
- memfree(const_cast<char *>(prop_info.class_name));
|
|
|
- memfree(const_cast<char *>(prop_info.hint_string));
|
|
|
+ internal::gdn_interface->classdb_register_extension_class_property(internal::library, info.name._native_ptr(), &prop_info, setget.setter._native_ptr(), setget.getter._native_ptr());
|
|
|
}
|
|
|
|
|
|
-MethodBind *ClassDB::get_method(const char *p_class, const char *p_method) {
|
|
|
- ERR_FAIL_COND_V_MSG(classes.find(p_class) == classes.end(), nullptr, String("Class '{0}' not found.").format(p_class));
|
|
|
+MethodBind *ClassDB::get_method(const StringName &p_class, const StringName &p_method) {
|
|
|
+ ERR_FAIL_COND_V_MSG(classes.find(p_class) == classes.end(), nullptr, String("Class '{0}' not found.").format(Array::make(p_class)));
|
|
|
|
|
|
ClassInfo *type = &classes[p_class];
|
|
|
while (type) {
|
|
|
- std::unordered_map<std::string, MethodBind *>::iterator method = type->method_map.find(p_method);
|
|
|
+ std::unordered_map<StringName, MethodBind *>::iterator method = type->method_map.find(p_method);
|
|
|
if (method != type->method_map.end()) {
|
|
|
return method->second;
|
|
|
}
|
|
|
@@ -135,12 +131,12 @@ MethodBind *ClassDB::get_method(const char *p_class, const char *p_method) {
|
|
|
}
|
|
|
|
|
|
MethodBind *ClassDB::bind_methodfi(uint32_t p_flags, MethodBind *p_bind, const MethodDefinition &method_name, const void **p_defs, int p_defcount) {
|
|
|
- const char *instance_type = p_bind->get_instance_class();
|
|
|
+ StringName instance_type = p_bind->get_instance_class();
|
|
|
|
|
|
- std::unordered_map<std::string, ClassInfo>::iterator type_it = classes.find(instance_type);
|
|
|
+ std::unordered_map<StringName, ClassInfo>::iterator type_it = classes.find(instance_type);
|
|
|
if (type_it == classes.end()) {
|
|
|
memdelete(p_bind);
|
|
|
- ERR_FAIL_V_MSG(nullptr, String("Class '{0}' doesn't exist.").format(instance_type));
|
|
|
+ ERR_FAIL_V_MSG(nullptr, String("Class '{0}' doesn't exist.").format(Array::make(instance_type)));
|
|
|
}
|
|
|
|
|
|
ClassInfo &type = type_it->second;
|
|
|
@@ -164,10 +160,10 @@ MethodBind *ClassDB::bind_methodfi(uint32_t p_flags, MethodBind *p_bind, const M
|
|
|
|
|
|
p_bind->set_hint_flags(p_flags);
|
|
|
|
|
|
- std::vector<std::string> args;
|
|
|
+ std::vector<StringName> args;
|
|
|
args.resize(method_name.args.size());
|
|
|
size_t arg_index = 0;
|
|
|
- for (std::string arg : method_name.args) {
|
|
|
+ for (StringName arg : method_name.args) {
|
|
|
args[arg_index++] = arg;
|
|
|
}
|
|
|
|
|
|
@@ -192,36 +188,59 @@ MethodBind *ClassDB::bind_methodfi(uint32_t p_flags, MethodBind *p_bind, const M
|
|
|
return p_bind;
|
|
|
}
|
|
|
|
|
|
-void ClassDB::bind_method_godot(const char *p_class_name, MethodBind *p_method) {
|
|
|
+void ClassDB::bind_method_godot(const StringName &p_class_name, MethodBind *p_method) {
|
|
|
std::vector<GDNativeVariantPtr> def_args;
|
|
|
const std::vector<Variant> &def_args_val = p_method->get_default_arguments();
|
|
|
-
|
|
|
def_args.resize(def_args_val.size());
|
|
|
for (int i = 0; i < def_args_val.size(); i++) {
|
|
|
def_args[i] = (GDNativeVariantPtr)&def_args_val[i];
|
|
|
}
|
|
|
|
|
|
+ std::vector<PropertyInfo> return_value_and_arguments_info = p_method->get_arguments_info_list();
|
|
|
+ std::vector<GDNativeExtensionClassMethodArgumentMetadata> return_value_and_arguments_metadata = p_method->get_arguments_metadata_list();
|
|
|
+
|
|
|
+ std::vector<GDNativePropertyInfo> return_value_and_arguments_gdnative_info;
|
|
|
+ return_value_and_arguments_gdnative_info.reserve(return_value_and_arguments_info.size());
|
|
|
+ for (std::vector<PropertyInfo>::iterator it = return_value_and_arguments_info.begin(); it != return_value_and_arguments_info.end(); it++) {
|
|
|
+ return_value_and_arguments_gdnative_info.push_back(
|
|
|
+ GDNativePropertyInfo{
|
|
|
+ static_cast<GDNativeVariantType>(it->type), // GDNativeVariantType type;
|
|
|
+ it->name._native_ptr(), // GDNativeStringNamePtr name;
|
|
|
+ it->class_name._native_ptr(), // GDNativeStringNamePtr class_name;
|
|
|
+ it->hint, // uint32_t hint;
|
|
|
+ it->hint_string._native_ptr(), // GDNativeStringPtr hint_string;
|
|
|
+ it->usage, // uint32_t usage;
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ GDNativePropertyInfo *return_value_info = return_value_and_arguments_gdnative_info.data();
|
|
|
+ GDNativeExtensionClassMethodArgumentMetadata *return_value_metadata = return_value_and_arguments_metadata.data();
|
|
|
+ GDNativePropertyInfo *arguments_info = return_value_and_arguments_gdnative_info.data() + 1;
|
|
|
+ GDNativeExtensionClassMethodArgumentMetadata *arguments_metadata = return_value_and_arguments_metadata.data() + 1;
|
|
|
+
|
|
|
+ StringName name = p_method->get_name();
|
|
|
GDNativeExtensionClassMethodInfo method_info = {
|
|
|
- p_method->get_name(), // const char *name;
|
|
|
+ name._native_ptr(), // const GDNativeStringNamePtr;
|
|
|
p_method, // void *method_userdata;
|
|
|
MethodBind::bind_call, // GDNativeExtensionClassMethodCall call_func;
|
|
|
MethodBind::bind_ptrcall, // GDNativeExtensionClassMethodPtrCall ptrcall_func;
|
|
|
p_method->get_hint_flags(), // uint32_t method_flags; /* GDNativeExtensionClassMethodFlags */
|
|
|
(uint32_t)p_method->get_argument_count(), // uint32_t argument_count;
|
|
|
(GDNativeBool)p_method->has_return(), // GDNativeBool has_return_value;
|
|
|
- MethodBind::bind_get_argument_type, //(GDNativeExtensionClassMethodGetArgumentType) get_argument_type_func;
|
|
|
- MethodBind::bind_get_argument_info, // GDNativeExtensionClassMethodGetArgumentInfo get_argument_info_func; /* name and hint information for the argument can be omitted in release builds. Class name should always be present if it applies. */
|
|
|
- MethodBind::bind_get_argument_metadata, // GDNativeExtensionClassMethodGetArgumentMetadata get_argument_metadata_func;
|
|
|
+ return_value_info, // GDNativePropertyInfo *
|
|
|
+ *return_value_metadata, // GDNativeExtensionClassMethodArgumentMetadata *
|
|
|
+ arguments_info, // GDNativePropertyInfo *
|
|
|
+ arguments_metadata, // GDNativeExtensionClassMethodArgumentMetadata *
|
|
|
(uint32_t)p_method->get_default_argument_count(), // uint32_t default_argument_count;
|
|
|
def_args.data(), // GDNativeVariantPtr *default_arguments;
|
|
|
};
|
|
|
- internal::gdn_interface->classdb_register_extension_class_method(internal::library, p_class_name, &method_info);
|
|
|
+ internal::gdn_interface->classdb_register_extension_class_method(internal::library, p_class_name._native_ptr(), &method_info);
|
|
|
}
|
|
|
|
|
|
-void ClassDB::add_signal(const char *p_class, const MethodInfo &p_signal) {
|
|
|
- std::unordered_map<std::string, ClassInfo>::iterator type_it = classes.find(p_class);
|
|
|
+void ClassDB::add_signal(const StringName &p_class, const MethodInfo &p_signal) {
|
|
|
+ std::unordered_map<StringName, ClassInfo>::iterator type_it = classes.find(p_class);
|
|
|
|
|
|
- ERR_FAIL_COND_MSG(type_it == classes.end(), String("Class '{0}' doesn't exist.").format(p_class));
|
|
|
+ ERR_FAIL_COND_MSG(type_it == classes.end(), String("Class '{0}' doesn't exist.").format(Array::make(p_class)));
|
|
|
|
|
|
ClassInfo &cl = type_it->second;
|
|
|
|
|
|
@@ -242,27 +261,21 @@ 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<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.name._native_ptr(), // const GDNativeStringNamePtr name;
|
|
|
+ par.class_name._native_ptr(), // const GDNativeStringNamePtr class_name;
|
|
|
par.hint, // NONE //uint32_t hint;
|
|
|
- _alloc_and_copy_cstr(par.hint_string.utf8().get_data()), // const char *hint_string;
|
|
|
+ par.hint_string._native_ptr(), // const GDNativeStringPtr hint_string;
|
|
|
par.usage, // DEFAULT //uint32_t usage;
|
|
|
});
|
|
|
}
|
|
|
|
|
|
- internal::gdn_interface->classdb_register_extension_class_signal(internal::library, cl.name, p_signal.name, parameters.data(), parameters.size());
|
|
|
-
|
|
|
- for (GDNativePropertyInfo &par : parameters) {
|
|
|
- memfree(const_cast<char *>(par.name));
|
|
|
- memfree(const_cast<char *>(par.class_name));
|
|
|
- memfree(const_cast<char *>(par.hint_string));
|
|
|
- }
|
|
|
+ internal::gdn_interface->classdb_register_extension_class_signal(internal::library, cl.name._native_ptr(), p_signal.name._native_ptr(), parameters.data(), parameters.size());
|
|
|
}
|
|
|
|
|
|
-void ClassDB::bind_integer_constant(const char *p_class_name, const char *p_enum_name, const char *p_constant_name, GDNativeInt p_constant_value, bool p_is_bitfield) {
|
|
|
- std::unordered_map<std::string, ClassInfo>::iterator type_it = classes.find(p_class_name);
|
|
|
+void ClassDB::bind_integer_constant(const StringName &p_class_name, const StringName &p_enum_name, const StringName &p_constant_name, GDNativeInt p_constant_value, bool p_is_bitfield) {
|
|
|
+ std::unordered_map<StringName, ClassInfo>::iterator type_it = classes.find(p_class_name);
|
|
|
|
|
|
- ERR_FAIL_COND_MSG(type_it == classes.end(), String("Class '{0}' doesn't exist.").format(p_class_name));
|
|
|
+ ERR_FAIL_COND_MSG(type_it == classes.end(), String("Class '{0}' doesn't exist.").format(Array::make(p_class_name)));
|
|
|
|
|
|
ClassInfo &type = type_it->second;
|
|
|
|
|
|
@@ -273,24 +286,23 @@ void ClassDB::bind_integer_constant(const char *p_class_name, const char *p_enum
|
|
|
type.constant_names.insert(p_constant_name);
|
|
|
|
|
|
// Register it with Godot
|
|
|
- internal::gdn_interface->classdb_register_extension_class_integer_constant(internal::library, p_class_name, p_enum_name, p_constant_name, p_constant_value, p_is_bitfield);
|
|
|
+ internal::gdn_interface->classdb_register_extension_class_integer_constant(internal::library, p_class_name._native_ptr(), p_enum_name._native_ptr(), p_constant_name._native_ptr(), p_constant_value, p_is_bitfield);
|
|
|
}
|
|
|
-
|
|
|
-GDNativeExtensionClassCallVirtual ClassDB::get_virtual_func(void *p_userdata, const char *p_name) {
|
|
|
+GDNativeExtensionClassCallVirtual ClassDB::get_virtual_func(void *p_userdata, const GDNativeStringNamePtr p_name) {
|
|
|
// This is called by Godot the first time it calls a virtual function, and it caches the result, per object instance.
|
|
|
// Because of this, it can happen from different threads at once.
|
|
|
// It should be ok not using any mutex as long as we only READ data.
|
|
|
+ const StringName *class_name = reinterpret_cast<const StringName *>(p_userdata);
|
|
|
+ const StringName *name = reinterpret_cast<const StringName *>(p_name);
|
|
|
|
|
|
- const char *class_name = (const char *)p_userdata;
|
|
|
-
|
|
|
- std::unordered_map<std::string, ClassInfo>::iterator type_it = classes.find(class_name);
|
|
|
- ERR_FAIL_COND_V_MSG(type_it == classes.end(), nullptr, String("Class '{0}' doesn't exist.").format(class_name));
|
|
|
+ std::unordered_map<StringName, ClassInfo>::iterator type_it = classes.find(*class_name);
|
|
|
+ ERR_FAIL_COND_V_MSG(type_it == classes.end(), nullptr, String("Class '{0}' doesn't exist.").format(Array::make(*class_name)));
|
|
|
|
|
|
const ClassInfo *type = &type_it->second;
|
|
|
|
|
|
// Find method in current class, or any of its parent classes (Godot classes not included)
|
|
|
while (type != nullptr) {
|
|
|
- std::unordered_map<std::string, GDNativeExtensionClassCallVirtual>::const_iterator method_it = type->virtual_methods.find(p_name);
|
|
|
+ std::unordered_map<StringName, GDNativeExtensionClassCallVirtual>::const_iterator method_it = type->virtual_methods.find(*name);
|
|
|
|
|
|
if (method_it != type->virtual_methods.end()) {
|
|
|
return method_it->second;
|
|
|
@@ -302,9 +314,9 @@ GDNativeExtensionClassCallVirtual ClassDB::get_virtual_func(void *p_userdata, co
|
|
|
return nullptr;
|
|
|
}
|
|
|
|
|
|
-void ClassDB::bind_virtual_method(const char *p_class, const char *p_method, GDNativeExtensionClassCallVirtual p_call) {
|
|
|
- std::unordered_map<std::string, ClassInfo>::iterator type_it = classes.find(p_class);
|
|
|
- ERR_FAIL_COND_MSG(type_it == classes.end(), String("Class '{0}' doesn't exist.").format(p_class));
|
|
|
+void ClassDB::bind_virtual_method(const StringName &p_class, const StringName &p_method, GDNativeExtensionClassCallVirtual p_call) {
|
|
|
+ std::unordered_map<StringName, ClassInfo>::iterator type_it = classes.find(p_class);
|
|
|
+ ERR_FAIL_COND_MSG(type_it == classes.end(), String("Class '{0}' doesn't exist.").format(Array::make(p_class)));
|
|
|
|
|
|
ClassInfo &type = type_it->second;
|
|
|
|
|
|
@@ -318,7 +330,7 @@ void ClassDB::initialize_class(const ClassInfo &p_cl) {
|
|
|
}
|
|
|
|
|
|
void ClassDB::initialize(GDNativeInitializationLevel p_level) {
|
|
|
- for (const std::pair<std::string, ClassInfo> pair : classes) {
|
|
|
+ for (const std::pair<StringName, ClassInfo> pair : classes) {
|
|
|
const ClassInfo &cl = pair.second;
|
|
|
if (cl.level != p_level) {
|
|
|
continue;
|
|
|
@@ -329,13 +341,13 @@ void ClassDB::initialize(GDNativeInitializationLevel p_level) {
|
|
|
}
|
|
|
|
|
|
void ClassDB::deinitialize(GDNativeInitializationLevel p_level) {
|
|
|
- for (const std::pair<std::string, ClassInfo> pair : classes) {
|
|
|
+ for (const std::pair<StringName, ClassInfo> pair : classes) {
|
|
|
const ClassInfo &cl = pair.second;
|
|
|
if (cl.level != p_level) {
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- internal::gdn_interface->classdb_unregister_extension_class(internal::library, cl.name);
|
|
|
+ internal::gdn_interface->classdb_unregister_extension_class(internal::library, cl.name._native_ptr());
|
|
|
|
|
|
for (auto method : cl.method_map) {
|
|
|
memdelete(method.second);
|
Emmanuel Leblond