Add PushToTalk action

This commit is contained in:
Vitaly
2019-02-16 15:11:32 +01:00
committed by Vasily
parent f8aa2512eb
commit 28cf033bec
3 changed files with 24 additions and 2 deletions
+7 -1
View File
@@ -149,7 +149,8 @@ SteamIVRInput::SteamIVRInput()
ActionType::Digital ), ActionType::Digital ),
m_optionalOverrideRightHandRoomDrag( m_optionalOverrideRightHandRoomDrag(
input_strings::k_actionOptionalOverrideRightHandRoomDrag, input_strings::k_actionOptionalOverrideRightHandRoomDrag,
ActionType::Digital ) ActionType::Digital ),
m_pushToTalk( input_strings::k_actionPushToTalk, ActionType::Digital )
{ {
m_activeActionSet.ulActionSet = m_mainSet.handle(); m_activeActionSet.ulActionSet = m_mainSet.handle();
m_activeActionSet.ulRestrictedToDevice = vr::k_ulInvalidInputValueHandle; m_activeActionSet.ulRestrictedToDevice = vr::k_ulInvalidInputValueHandle;
@@ -242,6 +243,11 @@ bool SteamIVRInput::optionalOverrideRightHandRoomDrag()
m_optionalOverrideRightHandRoomDrag ); m_optionalOverrideRightHandRoomDrag );
} }
bool SteamIVRInput::pushToTalk()
{
return isDigitalActionActivatedConstant( m_pushToTalk );
}
/*! /*!
Updates the active action set(s). Updates the active action set(s).
Should be called every frame, or however often you want the input system to Should be called every frame, or however often you want the input system to
+9
View File
@@ -36,10 +36,12 @@ public:
SteamIVRInput(); SteamIVRInput();
void UpdateStates(); void UpdateStates();
bool nextSong(); bool nextSong();
bool previousSong(); bool previousSong();
bool pausePlaySong(); bool pausePlaySong();
bool stopSong(); bool stopSong();
bool leftHandRoomTurn(); bool leftHandRoomTurn();
bool rightHandRoomTurn(); bool rightHandRoomTurn();
bool leftHandRoomDrag(); bool leftHandRoomDrag();
@@ -49,6 +51,8 @@ public:
bool optionalOverrideLeftHandRoomDrag(); bool optionalOverrideLeftHandRoomDrag();
bool optionalOverrideRightHandRoomDrag(); bool optionalOverrideRightHandRoomDrag();
bool pushToTalk();
// Destructor. There are no terminating calls for the IVRInput API, so it // Destructor. There are no terminating calls for the IVRInput API, so it
// is left blank. // is left blank.
~SteamIVRInput() {} ~SteamIVRInput() {}
@@ -87,6 +91,9 @@ private:
Action m_optionalOverrideRightHandRoomTurn; Action m_optionalOverrideRightHandRoomTurn;
Action m_optionalOverrideLeftHandRoomDrag; Action m_optionalOverrideLeftHandRoomDrag;
Action m_optionalOverrideRightHandRoomDrag; Action m_optionalOverrideRightHandRoomDrag;
// Push To Talk
Action m_pushToTalk;
}; };
/*! /*!
@@ -118,6 +125,8 @@ namespace input_strings
constexpr auto k_actionOptionalOverrideRightHandRoomDrag constexpr auto k_actionOptionalOverrideRightHandRoomDrag
= "/actions/main/in/OptionalOverrideRightHandRoomDrag"; = "/actions/main/in/OptionalOverrideRightHandRoomDrag";
constexpr auto k_actionPushToTalk = "/actions/main/in/PushToTalk";
constexpr auto k_setMain = "/actions/main"; constexpr auto k_setMain = "/actions/main";
} // namespace input_strings } // namespace input_strings
+8 -1
View File
@@ -65,6 +65,11 @@
"name": "/actions/main/in/OptionalOverrideRightHandRoomDrag", "name": "/actions/main/in/OptionalOverrideRightHandRoomDrag",
"requirement": "optional", "requirement": "optional",
"type": "boolean" "type": "boolean"
},
{
"name": "/actions/main/in/PushToTalk",
"requirement": "optional",
"type": "boolean"
} }
], ],
"action_sets": [ "action_sets": [
@@ -90,7 +95,9 @@
"/actions/main/in/OptionalOverrideLeftHandRoomTurn" : "Optional Override Left Hand Room Turn", "/actions/main/in/OptionalOverrideLeftHandRoomTurn" : "Optional Override Left Hand Room Turn",
"/actions/main/in/OptionalOverrideRightHandRoomTurn" : "Optional Override Right Hand Room Turn", "/actions/main/in/OptionalOverrideRightHandRoomTurn" : "Optional Override Right Hand Room Turn",
"/actions/main/in/OptionalOverrideLeftHandRoomDrag" : "Optional Override Left Hand Room Drag", "/actions/main/in/OptionalOverrideLeftHandRoomDrag" : "Optional Override Left Hand Room Drag",
"/actions/main/in/OptionalOverrideRightHandRoomDrag" : "Optional Override Right Hand Room Drag" "/actions/main/in/OptionalOverrideRightHandRoomDrag" : "Optional Override Right Hand Room Drag",
"/actions/main/in/PushToTalk" : "Push To Talk"
} }
] ]
} }