5.8.3 (#658)
* add delay if interface not found * adjust initialization behavior * pushed for debugging reasons for concerned parties * comment out simple recenter * remove old style motion, some minor optimizations * optimize default case check * optimized default condition * change manifest install behavior to trigger on desktop mode as well * add desktop mode binding launch * add tracker overlay option to utils * commit to check status * attempt to fix native LH issues with chaperone when exiting * add desktop mode toggle and some cleanup * remove adjust chaperone * remove clang format from ci, increment version, cleanup * update circle ci * fix conversion warning * add F13-19 to keyboard parser * add additional logging around failure to initialize * add unsaved changes * update version 5.8.1 * fix some collisions in enum declaration * add controller powers on steamvr, and no HMD to steamvr tab, increment version * slightly alter drag movement, fix qml issue * code cleanup * fix logspam/attempt to delete non existant overlays * increment version 5.8.3
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
#include <QQuickWindow>
|
||||
#include "../overlaycontroller.h"
|
||||
#include "../utils/update_rate.h"
|
||||
#include <QDesktopServices>
|
||||
|
||||
QT_USE_NAMESPACE
|
||||
|
||||
@@ -40,6 +41,8 @@ void SteamVRTabController::synchSteamVR()
|
||||
setCameraActive( cameraActive() );
|
||||
setCameraCont( cameraCont() );
|
||||
setCameraBounds( cameraBounds() );
|
||||
setControllerPower( controllerPower() );
|
||||
setNoHMD( noHMD() );
|
||||
}
|
||||
|
||||
bool SteamVRTabController::performanceGraph() const
|
||||
@@ -70,6 +73,33 @@ void SteamVRTabController::setPerformanceGraph( const bool value,
|
||||
}
|
||||
}
|
||||
|
||||
bool SteamVRTabController::noHMD() const
|
||||
{
|
||||
auto p = ovr_settings_wrapper::getBool(
|
||||
vr::k_pch_SteamVR_Section, vr::k_pch_SteamVR_RequireHmd_String );
|
||||
|
||||
if ( p.first == ovr_settings_wrapper::SettingsError::NoError )
|
||||
{
|
||||
return p.second;
|
||||
}
|
||||
return m_noHMD;
|
||||
}
|
||||
|
||||
void SteamVRTabController::setNoHMD( const bool value, const bool notify )
|
||||
{
|
||||
if ( m_noHMD != value )
|
||||
{
|
||||
m_noHMD = value;
|
||||
ovr_settings_wrapper::setBool( vr::k_pch_SteamVR_Section,
|
||||
vr::k_pch_SteamVR_RequireHmd_String,
|
||||
m_noHMD );
|
||||
if ( notify )
|
||||
{
|
||||
emit noHMDChanged( m_noHMD );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool SteamVRTabController::multipleDriver() const
|
||||
{
|
||||
auto p = ovr_settings_wrapper::getBool(
|
||||
@@ -128,6 +158,35 @@ void SteamVRTabController::setNoFadeToGrid( const bool value,
|
||||
}
|
||||
}
|
||||
|
||||
bool SteamVRTabController::controllerPower() const
|
||||
{
|
||||
auto p = ovr_settings_wrapper::getBool(
|
||||
vr::k_pch_Power_Section,
|
||||
vr::k_pch_Power_AutoLaunchSteamVROnButtonPress );
|
||||
if ( p.first == ovr_settings_wrapper::SettingsError::NoError )
|
||||
{
|
||||
return p.second;
|
||||
}
|
||||
return m_controllerPower;
|
||||
}
|
||||
|
||||
void SteamVRTabController::setControllerPower( const bool value,
|
||||
const bool notify )
|
||||
{
|
||||
if ( m_controllerPower != value )
|
||||
{
|
||||
m_controllerPower = value;
|
||||
ovr_settings_wrapper::setBool(
|
||||
vr::k_pch_Power_Section,
|
||||
vr::k_pch_Power_AutoLaunchSteamVROnButtonPress,
|
||||
m_controllerPower );
|
||||
if ( notify )
|
||||
{
|
||||
emit controllerPowerChanged( m_controllerPower );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool SteamVRTabController::systemButton() const
|
||||
{
|
||||
auto p = ovr_settings_wrapper::getBool(
|
||||
@@ -448,6 +507,12 @@ void SteamVRTabController::launchBindingUI()
|
||||
LOG( ERROR )
|
||||
<< "failed to get input handle? is your right controller on?";
|
||||
}
|
||||
if ( parent->isDesktopMode() )
|
||||
{
|
||||
QDesktopServices::openUrl(
|
||||
QUrl( "http://127.0.0.1:27062/dashboard/controllerbinding.html" ) );
|
||||
return;
|
||||
}
|
||||
auto error = vr::VRInput()->OpenBindingUI(
|
||||
application_strings::applicationKey, actionHandle, inputHandle, false );
|
||||
if ( error != vr::VRInputError_None )
|
||||
|
||||
Reference in New Issue
Block a user