Prox sensor re-integration (#220)
* added arbitrary orientation change * removed commented code * updated to OVR 1.4.18 * changed two instances using new to init via array * moved prox sensor action to haptic instead of Misc * fixed json file, added prox sensor back for mic mute/un-mute * added proximity sensor to audio and haptic chaperone warnings * fixed fall-through behavior * removed bad prox code
This commit is contained in:
@@ -172,43 +172,6 @@ void AudioTabController::eventLoopTick()
|
||||
|
||||
if ( settingsUpdateCounter >= k_audioSettingsUpdateCounter )
|
||||
{
|
||||
// Not usable until OpenVR 1.4.x?
|
||||
// Will require updates to action based system
|
||||
/*
|
||||
if ( m_micProximitySensorCanMute )
|
||||
{
|
||||
vr::VRControllerState_t controllerState;
|
||||
if ( vr::VRSystem()->GetControllerState(
|
||||
vr::k_unTrackedDeviceIndex_Hmd,
|
||||
&controllerState,
|
||||
sizeof( vr::VRControllerState_t ) ) )
|
||||
{
|
||||
if ( ( controllerState.ulButtonPressed
|
||||
& vr::ButtonMaskFromId( vr::k_EButton_ProximitySensor ) )
|
||||
== 0 )
|
||||
{
|
||||
if ( !m_micMuted )
|
||||
{
|
||||
setMicMuted( true );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( m_micMuted )
|
||||
{
|
||||
setMicMuted( false );
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( !parent->isDashboardVisible() )
|
||||
{
|
||||
LOG( ERROR ) << "Could not read proximity sensor!";
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
vr::EVRSettingsError vrSettingsError;
|
||||
char mirrorDeviceId[1024];
|
||||
vr::VRSettings()->GetString(
|
||||
|
||||
Reference in New Issue
Block a user