diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-13 13:07:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-13 13:07:28 +0100 |
| commit | afec30837c7026251b90fab6f47131db19df278d (patch) | |
| tree | 50ccef3db21bc6aacef9778218810e075eb78815 /modules/gdnative | |
| parent | faf097d350a2a1c63ab9399355de70728a958b2d (diff) | |
| parent | 9d3f8418ca252a4047b3818f16ed22228c1d0071 (diff) | |
Merge pull request #12622 from BastiaanOlij/arvr_changes_to_server
Removed add/remove interface bindings and added get_interfaces
Diffstat (limited to 'modules/gdnative')
| -rw-r--r-- | modules/gdnative/arvr/arvr_interface_gdnative.cpp | 4 | ||||
| -rw-r--r-- | modules/gdnative/arvr/arvr_interface_gdnative.h | 2 | ||||
| -rw-r--r-- | modules/gdnative/include/arvr/godot_arvr.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/gdnative/arvr/arvr_interface_gdnative.cpp b/modules/gdnative/arvr/arvr_interface_gdnative.cpp index e2a7019fa4..02f2ee7424 100644 --- a/modules/gdnative/arvr/arvr_interface_gdnative.cpp +++ b/modules/gdnative/arvr/arvr_interface_gdnative.cpp @@ -166,11 +166,11 @@ void ARVRInterfaceGDNative::uninitialize() { interface->uninitialize(data); } -Size2 ARVRInterfaceGDNative::get_recommended_render_targetsize() { +Size2 ARVRInterfaceGDNative::get_render_targetsize() { ERR_FAIL_COND_V(interface == NULL, Size2()); - godot_vector2 result = interface->get_recommended_render_targetsize(data); + godot_vector2 result = interface->get_render_targetsize(data); Vector2 *vec = (Vector2 *)&result; return *vec; diff --git a/modules/gdnative/arvr/arvr_interface_gdnative.h b/modules/gdnative/arvr/arvr_interface_gdnative.h index e45b51e070..96f7b580d5 100644 --- a/modules/gdnative/arvr/arvr_interface_gdnative.h +++ b/modules/gdnative/arvr/arvr_interface_gdnative.h @@ -68,7 +68,7 @@ public: virtual void set_anchor_detection_is_enabled(bool p_enable); /** rendering and internal **/ - virtual Size2 get_recommended_render_targetsize(); + virtual Size2 get_render_targetsize(); virtual bool is_stereo(); virtual Transform get_transform_for_eye(ARVRInterface::Eyes p_eye, const Transform &p_cam_transform); diff --git a/modules/gdnative/include/arvr/godot_arvr.h b/modules/gdnative/include/arvr/godot_arvr.h index c12251439d..be13ac954b 100644 --- a/modules/gdnative/include/arvr/godot_arvr.h +++ b/modules/gdnative/include/arvr/godot_arvr.h @@ -47,7 +47,7 @@ typedef struct { godot_bool (*is_initialized)(const void *); godot_bool (*initialize)(void *); void (*uninitialize)(void *); - godot_vector2 (*get_recommended_render_targetsize)(const void *); + godot_vector2 (*get_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 *); |