diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-15 16:20:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-15 16:20:17 +0200 |
| commit | 9427bf38427da6366118bfd21fbb2f064bc5719d (patch) | |
| tree | b59c578509f8cf4af394bf1c9d79646c3b67f879 /modules/webxr/webxr_interface_js.cpp | |
| parent | 64fb4fac89ddc51f35a3e727783f4f40dc9eca8f (diff) | |
| parent | 9a044d95fc7374e10088bc33abf7909027e02b75 (diff) | |
Merge pull request #50480 from Faless/js/4.x_ci
Diffstat (limited to 'modules/webxr/webxr_interface_js.cpp')
| -rw-r--r-- | modules/webxr/webxr_interface_js.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/webxr/webxr_interface_js.cpp b/modules/webxr/webxr_interface_js.cpp index 2eab0cdb07..01cc05aa0b 100644 --- a/modules/webxr/webxr_interface_js.cpp +++ b/modules/webxr/webxr_interface_js.cpp @@ -202,8 +202,8 @@ int WebXRInterfaceJS::get_capabilities() const { return XRInterface::XR_STEREO | XRInterface::XR_MONO; }; -bool WebXRInterfaceJS::is_stereo() { - return godot_webxr_get_view_count() == 2; +uint32_t WebXRInterfaceJS::get_view_count() { + return godot_webxr_get_view_count(); }; bool WebXRInterfaceJS::is_initialized() const { @@ -425,7 +425,7 @@ void WebXRInterfaceJS::_update_tracker(int p_controller_id) { int *buttons = godot_webxr_get_controller_buttons(p_controller_id); if (buttons) { for (int i = 0; i < buttons[0]; i++) { - input->joy_button(p_controller_id + 100, i, *((float *)buttons + (i + 1))); + input->joy_button(p_controller_id + 100, (JoyButton)i, *((float *)buttons + (i + 1))); } free(buttons); } @@ -436,7 +436,7 @@ void WebXRInterfaceJS::_update_tracker(int p_controller_id) { Input::JoyAxisValue joy_axis; joy_axis.min = -1; joy_axis.value = *((float *)axes + (i + 1)); - input->joy_axis(p_controller_id + 100, i, joy_axis); + input->joy_axis(p_controller_id + 100, (JoyAxis)i, joy_axis); } free(axes); } |