gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-05 21:39:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36873 from BastiaanOlij/arvr_controller_button_is_bool

Browse source 
ARVRController.is_button_pressed requires to return a boolean
This commit is contained in:
Rémi Verschelde 2020-03-07 09:32:17 +01:00 committed by GitHub
parent b9f2f77dba 0ca1711681
commit 8cb6d5daa4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/classes/ARVRController.xml
View file

@ -57,7 +57,7 @@
</description>
</method>
<method name="is_button_pressed" qualifiers="const">
<return type="int">
<return type="bool">
</return>
<argument index="0" name="button" type="int">
</argument>

2
scene/3d/arvr_nodes.cpp
View file

@ -300,7 +300,7 @@ int ARVRController::get_joystick_id() const {
return tracker->get_joy_id();
};
int ARVRController::is_button_pressed(int p_button) const {
bool ARVRController::is_button_pressed(int p_button) const {
int joy_id = get_joystick_id();
if (joy_id == -1) {
return false;

2
scene/3d/arvr_nodes.h
View file

@ -88,7 +88,7 @@ public:
String get_controller_name(void) const;
int get_joystick_id() const;
int is_button_pressed(int p_button) const;
bool is_button_pressed(int p_button) const;
float get_joystick_axis(int p_axis) const;
real_t get_rumble() const;