diff options
| -rw-r--r-- | modules/gdnative/gdnative_api.json | 8 | ||||
| -rw-r--r-- | modules/gdnative/include/gdnative/gdnative.h | 2 | ||||
| -rw-r--r-- | modules/gdnative/include/nativearvr/godot_nativearvr.h | 22 | ||||
| -rw-r--r-- | modules/gdnative/nativearvr/arvr_interface_gdnative.cpp | 191 | ||||
| -rw-r--r-- | modules/gdnative/nativearvr/arvr_interface_gdnative.h | 6 | ||||
| -rw-r--r-- | modules/gdnative/nativearvr/register_types.cpp | 370 | ||||
| -rw-r--r-- | modules/gdnative/nativescript/nativescript.cpp | 2 |
7 files changed, 145 insertions, 456 deletions
diff --git a/modules/gdnative/gdnative_api.json b/modules/gdnative/gdnative_api.json index 5ebf26cbf7..459ca12ae9 100644 --- a/modules/gdnative/gdnative_api.json +++ b/modules/gdnative/gdnative_api.json @@ -5231,6 +5231,14 @@ ] }, { + "name": "godot_arvr_register_interface", + "return_type": "void", + "arguments": [ + ["const char *", "p_name"], + ["const godot_arvr_interface_gdnative *", "p_interface"] + ] + }, + { "name": "godot_arvr_get_worldscale", "return_type": "godot_real", "arguments": [] diff --git a/modules/gdnative/include/gdnative/gdnative.h b/modules/gdnative/include/gdnative/gdnative.h index 2d1ad90feb..25d45db306 100644 --- a/modules/gdnative/include/gdnative/gdnative.h +++ b/modules/gdnative/include/gdnative/gdnative.h @@ -47,7 +47,7 @@ extern "C" { #define GDAPI GDCALLINGCONV #endif #else -#define GDCALLINGCONV __attribute__((sysv_abi, visibility("default"))) +#define GDCALLINGCONV __attribute__((sysv_abi)) #define GDAPI GDCALLINGCONV #endif diff --git a/modules/gdnative/include/nativearvr/godot_nativearvr.h b/modules/gdnative/include/nativearvr/godot_nativearvr.h index f86919f33a..ee557843c6 100644 --- a/modules/gdnative/include/nativearvr/godot_nativearvr.h +++ b/modules/gdnative/include/nativearvr/godot_nativearvr.h @@ -36,6 +36,26 @@ extern "C" { #endif +typedef struct { + void *(*constructor)(godot_object *); + void (*destructor)(void *); + godot_string (*get_name)(const void *); + godot_int (*get_capabilities)(const void *); + godot_bool (*get_anchor_detection_is_enabled)(const void *); + void (*set_anchor_detection_is_enabled)(void *, godot_bool); + godot_bool (*is_stereo)(const void *); + godot_bool (*is_initialized)(const void *); + godot_bool (*initialize)(void *); + void (*uninitialize)(void *); + godot_vector2 (*get_recommended_render_targetsize)(const void *); + godot_transform (*get_transform_for_eye)(void *, godot_int, godot_transform *); + void (*fill_projection_for_eye)(void *, godot_real *, godot_int, godot_real, godot_real, godot_real); + void (*commit_for_eye)(void *, godot_int, godot_rid *, godot_rect2 *); + void (*process)(void *); +} godot_arvr_interface_gdnative; + +void GDAPI godot_arvr_register_interface(const char *p_name, const godot_arvr_interface_gdnative *p_interface); + // helper functions to access ARVRServer data godot_real GDAPI godot_arvr_get_worldscale(); godot_transform GDAPI godot_arvr_get_reference_frame(); @@ -55,4 +75,4 @@ void GDAPI godot_arvr_set_controller_axis(godot_int p_controller_id, godot_int p } #endif -#endif /* !GODOT_NATIVEARVR_H */
\ No newline at end of file +#endif /* !GODOT_NATIVEARVR_H */ diff --git a/modules/gdnative/nativearvr/arvr_interface_gdnative.cpp b/modules/gdnative/nativearvr/arvr_interface_gdnative.cpp index ce551d269a..2f60339afa 100644 --- a/modules/gdnative/nativearvr/arvr_interface_gdnative.cpp +++ b/modules/gdnative/nativearvr/arvr_interface_gdnative.cpp @@ -33,12 +33,18 @@ #include "servers/arvr/arvr_positional_tracker.h" #include "servers/visual/visual_server_global.h" +#include "oa_hash_map.h" + +extern OAHashMap<StringName, godot_arvr_interface_gdnative *> *_registered_interfaces; + ARVRInterfaceGDNative::ARVRInterfaceGDNative() { // testing printf("Construct gdnative interface\n"); // we won't have our data pointer until our library gets set data = NULL; + + interface = NULL; } ARVRInterfaceGDNative::~ARVRInterfaceGDNative() { @@ -53,38 +59,42 @@ ARVRInterfaceGDNative::~ARVRInterfaceGDNative() { } void ARVRInterfaceGDNative::cleanup() { - if (data != NULL) { - // library->call_native_raw("arvr_call_destructor", "godot_arvr_destructor", data, 0, NULL, NULL); + if (interface != NULL) { + interface->destructor(data); data = NULL; - }; + interface = NULL; + } +} - if (library.is_valid()) { - library->terminate(); - }; -}; +void ARVRInterfaceGDNative::set_interface(StringName p_name) { -void ARVRInterfaceGDNative::set_gdnative_library(Ref<GDNativeLibrary> p_library) { - if (library.is_null()) { - library.instance(); - } else { + godot_arvr_interface_gdnative *new_interface; + + if (!_registered_interfaces->lookup(p_name, &new_interface)) { + ERR_PRINT((String("ARVR interface \"") + p_name + "\" does not exist.").utf8().get_data()); + return; + } + + if (interface) { cleanup(); - }; + } - library->set_library(p_library); - library->initialize(); + interface = new_interface; // Now we do our constructing... - void *parameters[1]; - parameters[0] = (void *)this; - // library->call_native_raw("arvr_call_constructor", "godot_arvr_constructor", NULL, 1, parameters, &data); + + data = interface->constructor((godot_object *)this); } StringName ARVRInterfaceGDNative::get_name() const { - StringName name; - ERR_FAIL_COND_V(data == NULL, StringName()); + ERR_FAIL_COND_V(interface == NULL, StringName()); + + godot_string result = interface->get_name(data); - // const_cast<GDNative *>(library.ptr())->call_native_raw("arvr_return_string", "godot_arvr_get_name", data, 0, NULL, &name); + StringName name = *(String *)&result; + + godot_string_destroy(&result); return name; } @@ -92,58 +102,56 @@ StringName ARVRInterfaceGDNative::get_name() const { int ARVRInterfaceGDNative::get_capabilities() const { int capabilities; - ERR_FAIL_COND_V(data == NULL, 0); // 0 = None + ERR_FAIL_COND_V(interface == NULL, 0); // 0 = None - // const_cast<GDNative *>(library.ptr())->call_native_raw("arvr_return_int", "godot_arvr_get_capabilities", data, 0, NULL, &capabilities); + capabilities = interface->get_capabilities(data); return capabilities; -}; +} bool ARVRInterfaceGDNative::get_anchor_detection_is_enabled() const { bool enabled; - ERR_FAIL_COND_V(data == NULL, false); + ERR_FAIL_COND_V(interface == NULL, false); - // const_cast<GDNative *>(library.ptr())->call_native_raw("arvr_return_bool", "godot_arvr_get_anchor_detection_is_enabled", data, 0, NULL, &enabled); + enabled = interface->get_anchor_detection_is_enabled(data); return enabled; -}; +} void ARVRInterfaceGDNative::set_anchor_detection_is_enabled(bool p_enable) { - void *parameters[1]; - ERR_FAIL_COND(data == NULL); + ERR_FAIL_COND(interface == NULL); - parameters[0] = (void *)&p_enable; - // library->call_native_raw("arvr_set_bool", "godot_arvr_set_anchor_detection_is_enabled", data, 1, parameters, NULL); -}; + interface->set_anchor_detection_is_enabled(data, p_enable); +} bool ARVRInterfaceGDNative::is_stereo() { bool stereo; - ERR_FAIL_COND_V(data == NULL, false); + ERR_FAIL_COND_V(interface == NULL, false); - // library->call_native_raw("arvr_return_bool", "godot_arvr_is_stereo", data, 0, NULL, &stereo); + stereo = interface->is_stereo(data); return stereo; -}; +} bool ARVRInterfaceGDNative::is_initialized() { bool initialized; - ERR_FAIL_COND_V(data == NULL, false); + ERR_FAIL_COND_V(interface == NULL, false); - // library->call_native_raw("arvr_return_bool", "godot_arvr_is_initialized", data, 0, NULL, &initialized); + initialized = interface->is_initialized(data); return initialized; -}; +} bool ARVRInterfaceGDNative::initialize() { bool initialized; - ERR_FAIL_COND_V(data == NULL, false); + ERR_FAIL_COND_V(interface == NULL, false); - // library->call_native_raw("arvr_return_bool", "godot_arvr_initialize", data, 0, NULL, &initialized); + initialized = interface->initialize(data); if (initialized) { // if we successfully initialize our interface and we don't have a primary interface yet, this becomes our primary interface @@ -158,7 +166,7 @@ bool ARVRInterfaceGDNative::initialize() { } void ARVRInterfaceGDNative::uninitialize() { - ERR_FAIL_COND(data == NULL); + ERR_FAIL_COND(interface == NULL); ARVRServer *arvr_server = ARVRServer::get_singleton(); if (arvr_server != NULL) { @@ -166,78 +174,76 @@ void ARVRInterfaceGDNative::uninitialize() { arvr_server->clear_primary_interface_if(this); } - // library->call_native_raw("arvr_call_method", "godot_arvr_uninitialize", data, 0, NULL, NULL); + interface->uninitialize(data); } Size2 ARVRInterfaceGDNative::get_recommended_render_targetsize() { - Size2 size; - ERR_FAIL_COND_V(data == NULL, Size2()); + ERR_FAIL_COND_V(interface == NULL, Size2()); - // library->call_native_raw("arvr_return_vector2", "godot_arvr_get_recommended_render_targetsize", data, 0, NULL, &size); + godot_vector2 result = interface->get_recommended_render_targetsize(data); + Vector2 *vec = (Vector2 *)&result; - return size; + return *vec; } Transform ARVRInterfaceGDNative::get_transform_for_eye(ARVRInterface::Eyes p_eye, const Transform &p_cam_transform) { - void *parameters[2]; - Transform ret; + Transform *ret; - ERR_FAIL_COND_V(data == NULL, Transform()); + ERR_FAIL_COND_V(interface == NULL, Transform()); - parameters[0] = (void *)&p_eye; - parameters[1] = (void *)&p_cam_transform; - // library->call_native_raw("arvr_return_transform_for_eye", "godot_arvr_get_transform_for_eye", data, 2, parameters, &ret); + godot_transform t = interface->get_transform_for_eye(data, (int)p_eye, (godot_transform *)&p_cam_transform); - return ret; + ret = (Transform *)&t; + + return *ret; } CameraMatrix ARVRInterfaceGDNative::get_projection_for_eye(ARVRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far) { - void *parameters[5]; CameraMatrix cm; - ERR_FAIL_COND_V(data == NULL, CameraMatrix()); + ERR_FAIL_COND_V(interface == NULL, CameraMatrix()); - parameters[0] = (void *)cm.matrix; - parameters[1] = (void *)&p_eye; - parameters[2] = (void *)&p_aspect; - parameters[3] = (void *)&p_z_near; - parameters[4] = (void *)&p_z_far; - // library->call_native_raw("arvr_call_fill_projection_for_eye", "godot_arvr_fill_projection_for_eye", data, 5, parameters, NULL); + interface->fill_projection_for_eye(data, (godot_real *)cm.matrix, (godot_int)p_eye, p_aspect, p_z_near, p_z_far); return cm; } void ARVRInterfaceGDNative::commit_for_eye(ARVRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect) { - void *parameters[3]; - ERR_FAIL_COND(data == NULL); + ERR_FAIL_COND(interface == NULL); - parameters[0] = (void *)&p_eye; - parameters[1] = (void *)&p_render_target; - parameters[2] = (void *)&p_screen_rect; - // library->call_native_raw("arvr_call_commit_for_eye", "godot_arvr_commit_for_eye", data, 3, parameters, NULL); + interface->commit_for_eye(data, (godot_int)p_eye, (godot_rid *)&p_render_target, (godot_rect2 *)&p_screen_rect); } void ARVRInterfaceGDNative::process() { - ERR_FAIL_COND(data == NULL); + ERR_FAIL_COND(interface == NULL); - // library->call_native_raw("arvr_call_method", "godot_arvr_process", data, 0, NULL, NULL); + interface->process(data); } void ARVRInterfaceGDNative::_bind_methods() { - ClassDB::bind_method(D_METHOD("set_gdnative_library", "library"), &ARVRInterfaceGDNative::set_gdnative_library); + ClassDB::bind_method(D_METHOD("set_interface", "name"), &ARVRInterfaceGDNative::set_interface); } ///////////////////////////////////////////////////////////////////////////////////// // some helper callbacks +extern "C" { + +void GDAPI godot_arvr_register_interface(const char *p_name, const godot_arvr_interface_gdnative *p_interface) { + // this method is supposed to only be called by GDNative singletons + // which are initialized in a thread safe way, so using a global map is fine here + + _registered_interfaces->set(StringName(p_name), (godot_arvr_interface_gdnative * const)p_interface); +} + godot_real GDAPI godot_arvr_get_worldscale() { ARVRServer *arvr_server = ARVRServer::get_singleton(); ERR_FAIL_NULL_V(arvr_server, 1.0); return arvr_server->get_world_scale(); -}; +} godot_transform GDAPI godot_arvr_get_reference_frame() { godot_transform reference_frame; @@ -248,10 +254,10 @@ godot_transform GDAPI godot_arvr_get_reference_frame() { *reference_frame_ptr = arvr_server->get_reference_frame(); } else { godot_transform_new_identity(&reference_frame); - }; + } return reference_frame; -}; +} void GDAPI godot_arvr_blit(godot_int p_eye, godot_rid *p_render_target, godot_rect2 *p_rect) { // blits out our texture as is, handy for preview display of one of the eyes that is already rendered with lens distortion on an external HMD @@ -268,7 +274,7 @@ void GDAPI godot_arvr_blit(godot_int p_eye, godot_rid *p_render_target, godot_re VSG::rasterizer->set_current_render_target(RID()); VSG::rasterizer->blit_render_target_to_screen(*render_target, screen_rect, 0); -}; +} godot_int GDAPI godot_arvr_get_texid(godot_rid *p_render_target) { // In order to send off our textures to display on our hardware we need the opengl texture ID instead of the render target RID @@ -279,7 +285,7 @@ godot_int GDAPI godot_arvr_get_texid(godot_rid *p_render_target) { uint32_t texid = VS::get_singleton()->texture_get_texid(eye_texture); return texid; -}; +} godot_int GDAPI godot_arvr_add_controller(char *p_device_name, godot_int p_hand, godot_bool p_tracks_orientation, godot_bool p_tracks_position) { ARVRServer *arvr_server = ARVRServer::get_singleton(); @@ -295,30 +301,30 @@ godot_int GDAPI godot_arvr_add_controller(char *p_device_name, godot_int p_hand, new_tracker->set_hand(ARVRPositionalTracker::TRACKER_LEFT_HAND); } else if (p_hand == 2) { new_tracker->set_hand(ARVRPositionalTracker::TRACKER_RIGHT_HAND); - }; + } // also register as joystick... int joyid = input->get_unused_joy_id(); if (joyid != -1) { new_tracker->set_joy_id(joyid); input->joy_connection_changed(joyid, true, p_device_name, ""); - }; + } if (p_tracks_orientation) { Basis orientation; new_tracker->set_orientation(orientation); - }; + } if (p_tracks_position) { Vector3 position; new_tracker->set_position(position); - }; + } // add our tracker to our server and remember its pointer arvr_server->add_tracker(new_tracker); // note, this ID is only unique within controllers! return new_tracker->get_tracker_id(); -}; +} void GDAPI godot_arvr_remove_controller(godot_int p_controller_id) { ARVRServer *arvr_server = ARVRServer::get_singleton(); @@ -334,13 +340,13 @@ void GDAPI godot_arvr_remove_controller(godot_int p_controller_id) { if (joyid != -1) { input->joy_connection_changed(joyid, false, "", ""); remove_tracker->set_joy_id(-1); - }; + } // remove our tracker from our server arvr_server->remove_tracker(remove_tracker); memdelete(remove_tracker); - }; -}; + } +} void GDAPI godot_arvr_set_controller_transform(godot_int p_controller_id, godot_transform *p_transform, godot_bool p_tracks_orientation, godot_bool p_tracks_position) { ARVRServer *arvr_server = ARVRServer::get_singleton(); @@ -351,12 +357,12 @@ void GDAPI godot_arvr_set_controller_transform(godot_int p_controller_id, godot_ Transform *transform = (Transform *)p_transform; if (p_tracks_orientation) { tracker->set_orientation(transform->basis); - }; + } if (p_tracks_position) { tracker->set_position(transform->origin); - }; - }; -}; + } + } +} void GDAPI godot_arvr_set_controller_button(godot_int p_controller_id, godot_int p_button, godot_bool p_is_pressed) { ARVRServer *arvr_server = ARVRServer::get_singleton(); @@ -370,9 +376,9 @@ void GDAPI godot_arvr_set_controller_button(godot_int p_controller_id, godot_int int joyid = tracker->get_joy_id(); if (joyid != -1) { input->joy_button(joyid, p_button, p_is_pressed); - }; - }; -}; + } + } +} void GDAPI godot_arvr_set_controller_axis(godot_int p_controller_id, godot_int p_axis, godot_real p_value, godot_bool p_can_be_negative) { ARVRServer *arvr_server = ARVRServer::get_singleton(); @@ -389,6 +395,7 @@ void GDAPI godot_arvr_set_controller_axis(godot_int p_controller_id, godot_int p jx.min = p_can_be_negative ? -1 : 0; jx.value = p_value; input->joy_axis(joyid, p_axis, jx); - }; - }; -}; + } + } +} +} diff --git a/modules/gdnative/nativearvr/arvr_interface_gdnative.h b/modules/gdnative/nativearvr/arvr_interface_gdnative.h index 6995e85c73..04730571b7 100644 --- a/modules/gdnative/nativearvr/arvr_interface_gdnative.h +++ b/modules/gdnative/nativearvr/arvr_interface_gdnative.h @@ -41,12 +41,12 @@ */ class ARVRInterfaceGDNative : public ARVRInterface { - GDCLASS(ARVRInterfaceGDNative, ARVRInterface); + GDCLASS(ARVRInterfaceGDNative, ARVRInterface) void cleanup(); protected: - Ref<GDNative> library; + godot_arvr_interface_gdnative *interface; void *data; static void _bind_methods(); @@ -56,7 +56,7 @@ public: ARVRInterfaceGDNative(); ~ARVRInterfaceGDNative(); - void set_gdnative_library(Ref<GDNativeLibrary> p_library); + void set_interface(StringName p_name); virtual StringName get_name() const; virtual int get_capabilities() const; diff --git a/modules/gdnative/nativearvr/register_types.cpp b/modules/gdnative/nativearvr/register_types.cpp index 5bd41d1cfc..09debe2550 100644 --- a/modules/gdnative/nativearvr/register_types.cpp +++ b/modules/gdnative/nativearvr/register_types.cpp @@ -33,371 +33,25 @@ #include "arvr_interface_gdnative.h" #include "core/os/os.h" -void arvr_call_constructor( - void *p_handle, - godot_string *p_proc_name, - void *p_data, - int p_num_args, - void **p_args, - void *r_return) { - if (p_handle == NULL) { - ERR_PRINT("No valid library handle, can't call standard varcall procedure"); - return; - } +#include "oa_hash_map.h" +#include "ustring.h" - void *library_proc; - Error err = OS::get_singleton()->get_dynamic_library_symbol_handle( - p_handle, - *(String *)p_proc_name, - library_proc, - true); // we roll 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; - } +// what is this?? I can't memnew(OAHashMap<String, godot_arvr_interface_gdnative *>) +// but with this typedef it's working just fine... +// C++ grammar can be a joy. +typedef OAHashMap<StringName, godot_arvr_interface_gdnative *> InterfaceMap; - void *(*proc)(godot_object *); - proc = (void *(*)(godot_object *))library_proc; - - godot_object *this_object = (godot_object *)p_args[0]; - void *p = proc(this_object); - - void **return_ptr = (void **)r_return; - - *return_ptr = p; -}; - -void arvr_call_destructor( - void *p_handle, - godot_string *p_proc_name, - void *p_data, - int p_num_args, - void **p_args, - void *r_return) { - if (p_handle == NULL) { - ERR_PRINT("No valid library handle, can't call standard varcall 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 roll 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; - } - - void (*proc)(void *); - proc = (void (*)(void *))library_proc; - - proc(p_data); -}; - -void arvr_return_string( - void *p_handle, - godot_string *p_proc_name, - void *p_data, - int p_num_args, - void **p_args, - void *r_return) { - if (p_handle == NULL) { - ERR_PRINT("No valid library handle, can't call standard varcall 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 roll 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; - } - - godot_string (*proc)(void *); - proc = (godot_string(*)(void *))library_proc; - - godot_string s = proc(p_data); - - StringName *return_ptr = (StringName *)r_return; - - String *returned_string = (String *)&s; - - *return_ptr = *returned_string; - - godot_string_destroy(&s); -}; - -void arvr_return_int( - void *p_handle, - godot_string *p_proc_name, - void *p_data, - int p_num_args, - void **p_args, - void *r_return) { - if (p_handle == NULL) { - ERR_PRINT("No valid library handle, can't call standard varcall 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 roll 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; - } - - godot_int (*proc)(void *); - proc = (godot_int(*)(void *))library_proc; - - godot_int i = proc(p_data); - - int *return_ptr = (int *)r_return; - - *return_ptr = i; -}; - -void arvr_return_bool( - void *p_handle, - godot_string *p_proc_name, - void *p_data, - int p_num_args, - void **p_args, - void *r_return) { - if (p_handle == NULL) { - ERR_PRINT("No valid library handle, can't call standard varcall 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 roll 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; - } - - godot_bool (*proc)(void *); - proc = (godot_bool(*)(void *))library_proc; - - godot_bool b = proc(p_data); - - int *return_ptr = (int *)r_return; - - *return_ptr = b; -}; - -void arvr_set_bool( - void *p_handle, - godot_string *p_proc_name, - void *p_data, - int p_num_args, - void **p_args, - void *r_return) { - if (p_handle == NULL) { - ERR_PRINT("No valid library handle, can't call standard varcall 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 roll 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; - } - - void (*proc)(void *, bool); - proc = (void (*)(void *, bool))library_proc; - - bool *set_bool = (bool *)p_args[0]; - proc(p_data, *set_bool); -}; - -void arvr_call_method( - void *p_handle, - godot_string *p_proc_name, - void *p_data, - int p_num_args, - void **p_args, - void *r_return) { - if (p_handle == NULL) { - ERR_PRINT("No valid library handle, can't call standard varcall 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 roll 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; - } - - godot_bool (*proc)(void *); - proc = (godot_bool(*)(void *))library_proc; - - proc(p_data); -}; - -void arvr_return_vector2( - void *p_handle, - godot_string *p_proc_name, - void *p_data, - int p_num_args, - void **p_args, - void *r_return) { - if (p_handle == NULL) { - ERR_PRINT("No valid library handle, can't call standard varcall 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 roll 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; - } - - godot_vector2 (*proc)(void *); - proc = (godot_vector2(*)(void *))library_proc; - - godot_vector2 v = proc(p_data); - - godot_vector2 *return_ptr = (godot_vector2 *)r_return; - - *return_ptr = v; -}; - -void arvr_return_transform_for_eye( - void *p_handle, - godot_string *p_proc_name, - void *p_data, - int p_num_args, - void **p_args, - void *r_return) { - if (p_handle == NULL) { - ERR_PRINT("No valid library handle, can't call standard varcall 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 roll 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; - } - - godot_transform (*proc)(void *, int, godot_transform *); - proc = (godot_transform(*)(void *, int, godot_transform *))library_proc; - - int *eye = (int *)p_args[0]; - godot_transform *camera_transform = (godot_transform *)p_args[1]; - godot_transform t = proc(p_data, *eye, camera_transform); - - godot_transform *return_ptr = (godot_transform *)r_return; - - *return_ptr = t; -}; - -void arvr_call_fill_projection_for_eye( - void *p_handle, - godot_string *p_proc_name, - void *p_data, - int p_num_args, - void **p_args, - void *r_return) { - if (p_handle == NULL) { - ERR_PRINT("No valid library handle, can't call standard varcall 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 roll 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; - } - - void (*proc)(void *, real_t *, int, real_t, real_t, real_t); - proc = (void (*)(void *, real_t *, int, real_t, real_t, real_t))library_proc; - - real_t *projection = (real_t *)p_args[0]; // <-- we'll be writing into this buffer, must have enough space for 16 floats! - int *eye = (int *)p_args[1]; - real_t *aspect = (real_t *)p_args[2]; - real_t *zn = (real_t *)p_args[3]; - real_t *zf = (real_t *)p_args[4]; - - proc(p_data, projection, *eye, *aspect, *zn, *zf); -}; - -void arvr_call_commit_for_eye( - void *p_handle, - godot_string *p_proc_name, - void *p_data, - int p_num_args, - void **p_args, - void *r_return) { - if (p_handle == NULL) { - ERR_PRINT("No valid library handle, can't call standard varcall 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 roll 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; - } - - void (*proc)(void *, int, godot_rid *, godot_rect2 *); - proc = (void (*)(void *, int, godot_rid *, godot_rect2 *))library_proc; - - int *eye = (int *)p_args[0]; - godot_rid *rid = (godot_rid *)p_args[1]; - godot_rect2 *screen_rect = (godot_rect2 *)p_args[2]; - - proc(p_data, *eye, rid, screen_rect); -}; +InterfaceMap *_registered_interfaces; void register_nativearvr_types() { + _registered_interfaces = memnew(InterfaceMap); + ClassDB::register_class<ARVRInterfaceGDNative>(); } void unregister_nativearvr_types() { + memdelete(_registered_interfaces); + + _registered_interfaces = NULL; } diff --git a/modules/gdnative/nativescript/nativescript.cpp b/modules/gdnative/nativescript/nativescript.cpp index f1b82e4e60..7e3a7c8e9e 100644 --- a/modules/gdnative/nativescript/nativescript.cpp +++ b/modules/gdnative/nativescript/nativescript.cpp @@ -438,7 +438,7 @@ NativeScript::~NativeScript() { #endif } - ////// ScriptInstance stuff +////// ScriptInstance stuff #define GET_SCRIPT_DESC() script->get_script_desc() |