Skip to content

Add some button descriptions #1885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions headers/openvr.h
Original file line number Diff line number Diff line change
Expand Up @@ -1067,8 +1067,8 @@ enum EVRButtonId
k_EButton_IndexController_B = k_EButton_ApplicationMenu,
k_EButton_IndexController_JoyStick = k_EButton_Axis3,

k_EButton_Reserved0 = 50,
k_EButton_Reserved1 = 51,
k_EButton_Steam = 50,
k_EButton_QAM = 51,

k_EButton_Max = 64
};
Expand Down Expand Up @@ -3952,7 +3952,7 @@ namespace vr
VROverlayFlags_EnableControlBarClose = 1 << 25,

// Do not use
VROverlayFlags_Reserved = 1 << 26,
VROverlayFlags_EnableControlBarSteamUI = 1 << 26,

// If this is set, click stabilization will be applied to the laser interaction so that clicks more reliably
// trigger on the user's intended target
Expand Down
4 changes: 2 additions & 2 deletions headers/openvr_api.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5155,8 +5155,8 @@ public enum EVRButtonId
k_EButton_IndexController_A = 2,
k_EButton_IndexController_B = 1,
k_EButton_IndexController_JoyStick = 35,
k_EButton_Reserved0 = 50,
k_EButton_Reserved1 = 51,
k_EButton_Steam = 50,
k_EButton_QAM = 51,
k_EButton_Max = 64,
}
public enum EVRMouseButton
Expand Down
6 changes: 3 additions & 3 deletions headers/openvr_api.json
Original file line number Diff line number Diff line change
Expand Up @@ -596,8 +596,8 @@
,{"name": "k_EButton_IndexController_A","value": "2"}
,{"name": "k_EButton_IndexController_B","value": "1"}
,{"name": "k_EButton_IndexController_JoyStick","value": "35"}
,{"name": "k_EButton_Reserved0","value": "50"}
,{"name": "k_EButton_Reserved1","value": "51"}
,{"name": "k_EButton_Steam","value": "50"}
,{"name": "k_EButton_QAM","value": "51"}
,{"name": "k_EButton_Max","value": "64"}
]}
, {"enumname": "vr::EVRMouseButton","values": [
Expand Down Expand Up @@ -1173,7 +1173,7 @@
,{"name": "VROverlayFlags_EnableControlBar","value": "8388608"}
,{"name": "VROverlayFlags_EnableControlBarKeyboard","value": "16777216"}
,{"name": "VROverlayFlags_EnableControlBarClose","value": "33554432"}
,{"name": "VROverlayFlags_Reserved","value": "67108864"}
,{"name": "VROverlayFlags_EnableControlBarSteamUI","value": "67108864"}
,{"name": "VROverlayFlags_EnableClickStabilization","value": "134217728"}
,{"name": "VROverlayFlags_MultiCursor","value": "268435456"}
]}
Expand Down
6 changes: 3 additions & 3 deletions headers/openvr_capi.h
Original file line number Diff line number Diff line change
Expand Up @@ -1022,8 +1022,8 @@ typedef enum EVRButtonId
EVRButtonId_k_EButton_IndexController_A = 2,
EVRButtonId_k_EButton_IndexController_B = 1,
EVRButtonId_k_EButton_IndexController_JoyStick = 35,
EVRButtonId_k_EButton_Reserved0 = 50,
EVRButtonId_k_EButton_Reserved1 = 51,
EVRButtonId_k_EButton_Steam = 50,
EVRButtonId_k_EButton_QAM = 51,
EVRButtonId_k_EButton_Max = 64,
} EVRButtonId;

Expand Down Expand Up @@ -1673,7 +1673,7 @@ typedef enum VROverlayFlags
VROverlayFlags_EnableControlBar = 8388608,
VROverlayFlags_EnableControlBarKeyboard = 16777216,
VROverlayFlags_EnableControlBarClose = 33554432,
VROverlayFlags_Reserved = 67108864,
VROverlayFlags_EnableControlBarSteamUI = 67108864,
VROverlayFlags_EnableClickStabilization = 134217728,
VROverlayFlags_MultiCursor = 268435456,
} VROverlayFlags;
Expand Down
4 changes: 2 additions & 2 deletions headers/openvr_driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -1067,8 +1067,8 @@ enum EVRButtonId
k_EButton_IndexController_B = k_EButton_ApplicationMenu,
k_EButton_IndexController_JoyStick = k_EButton_Axis3,

k_EButton_Reserved0 = 50,
k_EButton_Reserved1 = 51,
k_EButton_Steam = 50,
k_EButton_QAM = 51,

k_EButton_Max = 64
};
Expand Down