Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Replace Oculus 6DOF immersive exit btn to Menu btn. #1015

Merged
merged 1 commit into from
Mar 14, 2019
Merged

Replace Oculus 6DOF immersive exit btn to Menu btn. #1015

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/oculusvr/cpp/DeviceDelegateOculusVR.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,8 +869,9 @@ struct DeviceDelegateOculusVR::State {
const bool xTouched = (state[i].controllerState.Touches & ovrTouch_X) != 0;
const bool yPressed = (state[i].controllerState.Buttons & ovrButton_Y) != 0;
const bool yTouched = (state[i].controllerState.Touches & ovrTouch_Y) != 0;
const bool menuPressed = (state[i].controllerState.Buttons & ovrButton_Enter) != 0;

controller->SetButtonState(i, ControllerDelegate::BUTTON_APP, -1, yPressed, yTouched);
controller->SetButtonState(i, ControllerDelegate::BUTTON_APP, -1, menuPressed, menuPressed);
controller->SetButtonState(i, ControllerDelegate::BUTTON_OTHERS, 3, xPressed, xTouched);
controller->SetButtonState(i, ControllerDelegate::BUTTON_OTHERS, 4, yPressed, yTouched);
} else if (state[i].hand == ElbowModel::HandEnum::Right) {
Expand All @@ -879,7 +880,6 @@ struct DeviceDelegateOculusVR::State {
const bool bPressed = (state[i].controllerState.Buttons & ovrButton_B) != 0;
const bool bTouched = (state[i].controllerState.Touches & ovrTouch_B) != 0;

controller->SetButtonState(i, ControllerDelegate::BUTTON_APP, -1, bPressed, bTouched);
controller->SetButtonState(i, ControllerDelegate::BUTTON_OTHERS, 3, aPressed, aTouched);
controller->SetButtonState(i, ControllerDelegate::BUTTON_OTHERS, 4, bPressed, bTouched);
} else {
Expand Down