WMR default binding, Toggle Chaperone Action, frame timing graph, prox sensor back-end (#182)
* perf graph overlay/checkbox added * added toggle Chaperone action * toggle chaperone non-functional * fixed chaperone toggle action const to once * Added Proximity Sensor Action back-end, not implemented via logic Until fixed by valve * added default WMR controller profile * formated * formated steamvrtabcontroller.h * fixed un-intended change
This commit is contained in:
@@ -131,9 +131,11 @@ SteamIVRInput::SteamIVRInput()
|
||||
m_xAxisLockToggle( action_keys::xAxisLockToggle ),
|
||||
m_yAxisLockToggle( action_keys::yAxisLockToggle ),
|
||||
m_zAxisLockToggle( action_keys::zAxisLockToggle ),
|
||||
m_chaperoneToggle( action_keys::chaperoneToggle ),
|
||||
m_pushToTalk( action_keys::pushToTalk ),
|
||||
m_leftHaptic( action_keys::hapticsLeft ),
|
||||
m_rightHaptic( action_keys::hapticsRight ),
|
||||
m_proxSensor( action_keys::proxSensor ),
|
||||
m_leftHand( input_keys::leftHand ), m_rightHand( input_keys::rightHand ),
|
||||
m_sets( { m_mainSet.activeActionSet(),
|
||||
m_music.activeActionSet(),
|
||||
@@ -290,6 +292,16 @@ bool SteamIVRInput::pushToTalk()
|
||||
return isDigitalActionActivatedConstant( m_pushToTalk );
|
||||
}
|
||||
|
||||
bool SteamIVRInput::chaperoneToggle()
|
||||
{
|
||||
return isDigitalActionActivatedOnce( m_chaperoneToggle );
|
||||
}
|
||||
|
||||
bool SteamIVRInput::proxState()
|
||||
{
|
||||
return isDigitalActionActivatedConstant( m_pushToTalk );
|
||||
}
|
||||
|
||||
/*!
|
||||
Returns the action handle of the Left Haptic Action
|
||||
*/
|
||||
|
||||
@@ -51,6 +51,9 @@ namespace action_keys
|
||||
|
||||
constexpr auto hapticsLeft = "/actions/haptic/out/HapticsLeft";
|
||||
constexpr auto hapticsRight = "/actions/haptic/out/HapticsRight";
|
||||
constexpr auto proxSensor = "/actions/misc/in/ProxSensor";
|
||||
|
||||
constexpr auto chaperoneToggle = "/actions/misc/in/ChaperoneToggle";
|
||||
|
||||
} // namespace action_keys
|
||||
|
||||
@@ -131,6 +134,8 @@ public:
|
||||
bool xAxisLockToggle();
|
||||
bool yAxisLockToggle();
|
||||
bool zAxisLockToggle();
|
||||
bool chaperoneToggle();
|
||||
bool proxState();
|
||||
|
||||
bool pushToTalk();
|
||||
|
||||
@@ -192,6 +197,9 @@ private:
|
||||
DigitalAction m_yAxisLockToggle;
|
||||
DigitalAction m_zAxisLockToggle;
|
||||
|
||||
// Misc Bindings
|
||||
DigitalAction m_chaperoneToggle;
|
||||
|
||||
// Push To Talk
|
||||
DigitalAction m_pushToTalk;
|
||||
|
||||
@@ -199,6 +207,9 @@ private:
|
||||
DigitalAction m_leftHaptic;
|
||||
DigitalAction m_rightHaptic;
|
||||
|
||||
// prox Sensor
|
||||
DigitalAction m_proxSensor;
|
||||
|
||||
// input sources
|
||||
InputSource m_leftHand;
|
||||
InputSource m_rightHand;
|
||||
|
||||
Reference in New Issue
Block a user