diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-10-19 16:19:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-19 16:19:24 +0200 |
| commit | 6a363ad4704cbfa916b0e10491855221a4680b8e (patch) | |
| tree | fa9acb5f6671cd6f55e16afe814722d5c2d9f31e | |
| parent | f85d428b568a68bb9515fa3002aa775f36609d32 (diff) | |
| parent | 914c4d30668af7d7ad3c18cb2ec9f4d4b992b7bf (diff) | |
Merge pull request #12230 from BastiaanOlij/arvr_fix_binand
Fix button signals on ARVRController
[ci skip]
| -rw-r--r-- | scene/3d/arvr_nodes.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/3d/arvr_nodes.cpp b/scene/3d/arvr_nodes.cpp index c6b6c02129..064a249190 100644 --- a/scene/3d/arvr_nodes.cpp +++ b/scene/3d/arvr_nodes.cpp @@ -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(){ |