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

[GDNative] removed native_raw_call

Browse source
This commit is contained in:
Karroffel 2017-10-14 15:42:10 +02:00
parent e82a3f0168
commit e568f80e6e
8 changed files with 80 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

44
modules/gdnative/nativescript/nativescript.cpp
View file

@ -438,7 +438,7 @@ NativeScript::~NativeScript() {
#endif
}
////// ScriptInstance stuff
////// ScriptInstance stuff
#define GET_SCRIPT_DESC() script->get_script_desc()
@ -1010,17 +1010,12 @@ void NativeScriptLanguage::init_library(const Ref<GDNativeLibrary> &lib) {
if (!library_script_users.has(lib_path))
library_script_users.insert(lib_path, Set<NativeScript *>());
void *args[1] = {
(void *)&lib_path
};
void *proc_ptr;
gdn->get_symbol(_init_call_name, proc_ptr);
((void (*)(godot_string *))proc_ptr)((godot_string *)&lib_path);
// here the library registers all the classes and stuff.
gdn->call_native_raw(_init_call_type,
_init_call_name,
NULL,
1,
args,
NULL);
} else {
// already initialized. Nice.
}
@ -1053,13 +1048,15 @@ void NativeScriptLanguage::call_libraries_cb(const StringName &name) {
// library_gdnatives is modified only from the main thread, so it's safe not to use mutex here
for (Map<String, Ref<GDNative> >::Element *L = library_gdnatives.front(); L; L = L->next()) {
if (L->get()->is_initialized()) {
L->get()->call_native_raw(
_noarg_call_type,
name,
NULL,
0,
NULL,
NULL);
void *proc_ptr;
Error err = L->get()->get_symbol(name, proc_ptr);
if (err != OK) {
ERR_PRINT((String("No godot_gdnative_init in \"" + L->get()->get_library()->get_active_library_path()) + "\" found").utf8().get_data());
} else {
((void (*)())proc_ptr)();
}
}
}
}
@ -1142,12 +1139,11 @@ void NativeReloadNode::_notification(int p_what) {
};
// here the library registers all the classes and stuff.
L->get()->call_native_raw(NSL->_init_call_type,
NSL->_init_call_name,
NULL,
1,
args,
NULL);
void *proc_ptr;
L->get()->get_symbol("godot_nativescript_init", proc_ptr);
((void (*)(void *))proc_ptr)((void *)&L->key());
for (Map<String, Set<NativeScript *> >::Element *U = NSL->library_script_users.front(); U; U = U->next()) {
for (Set<NativeScript *>::Element *S = U->get().front(); S; S = S->next()) {

50
modules/gdnative/nativescript/register_types.cpp
View file

@ -38,53 +38,6 @@
NativeScriptLanguage *native_script_language;
typedef void (*native_script_init_fn)(void *);
void init_call_cb(void *p_handle, godot_string *p_proc_name, void *p_data, int p_num_args, void **args, void *r_ret) {
if (p_handle == NULL) {
ERR_PRINT("No valid library handle, can't call nativescript init procedure");
return;
}
void *library_proc;
Error err = OS::get_singleton()->get_dynamic_library_symbol_handle(
p_handle,
*(String *)p_proc_name,
library_proc,
true); // we print our own message
if (err != OK) {
ERR_PRINT((String("GDNative procedure \"" + *(String *)p_proc_name) + "\" does not exists and can't be called").utf8().get_data());
return;
}
native_script_init_fn fn = (native_script_init_fn)library_proc;
fn(args[0]);
}
typedef void (*native_script_empty_callback)();
void noarg_call_cb(void *p_handle, godot_string *p_proc_name, void *p_data, int p_num_args, void **args, void *r_ret) {
if (p_handle == NULL) {
ERR_PRINT("No valid library handle, can't call nativescript callback");
return;
}
void *library_proc;
Error err = OS::get_singleton()->get_dynamic_library_symbol_handle(
p_handle,
*(String *)p_proc_name,
library_proc,
true);
if (err != OK) {
// it's fine if thread callbacks are not present in the library.
return;
}
native_script_empty_callback fn = (native_script_empty_callback)library_proc;
fn();
}
ResourceFormatLoaderNativeScript *resource_loader_gdns = NULL;
ResourceFormatSaverNativeScript *resource_saver_gdns = NULL;
@ -95,9 +48,6 @@ void register_nativescript_types() {
ScriptServer::register_language(native_script_language);
GDNativeCallRegistry::singleton->register_native_raw_call_type(native_script_language->_init_call_type, init_call_cb);
GDNativeCallRegistry::singleton->register_native_raw_call_type(native_script_language->_noarg_call_type, noarg_call_cb);
resource_saver_gdns = memnew(ResourceFormatSaverNativeScript);
ResourceSaver::add_resource_format_saver(resource_saver_gdns);