maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #12230 from BastiaanOlij/arvr_fix_binand

Browse source 
Fix button signals on ARVRController

[ci skip]
This commit is contained in:
Rémi Verschelde 2017-10-19 16:19:24 +02:00 committed by GitHub
parent f85d428b56 914c4d3066
commit 6a363ad470
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scene/3d/arvr_nodes.cpp
View file

@ -204,7 +204,7 @@ void ARVRController::_notification(int p_what) {
int mask = 1;
// check button states
for (int i = 0; i < 16; i++) {
bool was_pressed = (button_states && mask) == mask;
bool was_pressed = (button_states & mask) == mask;
bool is_pressed = Input::get_singleton()->is_joy_button_pressed(joy_id, i);
if (!was_pressed && is_pressed) {
@ -336,6 +336,7 @@ String ARVRController::get_configuration_warning() const {
ARVRController::ARVRController() {
controller_id = 0;
is_active = true;
button_states = 0;
};
ARVRController::~ARVRController(){