asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

ARVRController.is_button_pressed requires to return a boolean

Browse source
This commit is contained in:
Bastiaan Olij 2020-03-07 12:22:18 +11:00
parent d4b31c6980
commit 0ca1711681
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> </description>
</method> </method>
<method name="is_button_pressed" qualifiers="const"> <method name="is_button_pressed" qualifiers="const">
<return type="int"> <return type="bool">
</return> </return>
<argument index="0" name="button" type="int"> <argument index="0" name="button" type="int">
</argument> </argument>

2
scene/3d/arvr_nodes.cpp
View file

@ -300,7 +300,7 @@ int ARVRController::get_joystick_id() const {
return tracker->get_joy_id(); 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(); int joy_id = get_joystick_id();
if (joy_id == -1) { if (joy_id == -1) {
return false; return false;

2
scene/3d/arvr_nodes.h
View file

@ -88,7 +88,7 @@ public:
String get_controller_name(void) const; String get_controller_name(void) const;
int get_joystick_id() 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; float get_joystick_axis(int p_axis) const;
real_t get_rumble() const; real_t get_rumble() const;