Merge pull request #395 from m4gr3d/patch-1

Fix godot-cpp types registration
pull/401/head
Bastiaan Olij 2020-04-17 14:31:48 +10:00 committed by GitHub
commit 9ccbb809ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions

View File

@ -140,6 +140,13 @@ void Godot::gdnative_init(godot_gdnative_init_options *options) {
} }
} }
// Initialize the `language_index` here since `__register_types()` makes use of it.
godot_instance_binding_functions binding_funcs = {};
binding_funcs.alloc_instance_binding_data = wrapper_create;
binding_funcs.free_instance_binding_data = wrapper_destroy;
godot::_RegisterState::language_index = godot::nativescript_1_1_api->godot_nativescript_register_instance_binding_data_functions(binding_funcs);
// register these now // register these now
___register_types(); ___register_types();
___init_method_bindings(); ___init_method_bindings();
@ -155,12 +162,6 @@ void Godot::gdnative_profiling_add_data(const char *p_signature, uint64_t p_time
void Godot::nativescript_init(void *handle) { void Godot::nativescript_init(void *handle) {
godot::_RegisterState::nativescript_handle = handle; godot::_RegisterState::nativescript_handle = handle;
godot_instance_binding_functions binding_funcs = {};
binding_funcs.alloc_instance_binding_data = wrapper_create;
binding_funcs.free_instance_binding_data = wrapper_destroy;
godot::_RegisterState::language_index = godot::nativescript_1_1_api->godot_nativescript_register_instance_binding_data_functions(binding_funcs);
} }
void Godot::nativescript_terminate(void *handle) { void Godot::nativescript_terminate(void *handle) {