SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

5.7.4 (#642)

Browse Source 
* update openvr 1.26.7

* ignore chaperone play area error, as it should not effect chaperone, and it frequently occurs with some meta to pcvr configurations

* replace old seated origin call with new reset zero pose call

* change zero offsets to new command

* adjust camera settings to new version of openvr 1.27

* fix save error

* increment version 5.7.4
This commit is contained in:
ykeara
2023-10-09 15:39:13 -05:00
committed by GitHub
parent 67fb57a353
commit 54d22a429e
38 changed files with 1455 additions and 18096 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlaycontroller.cpp
+1 -1
View File
@@ -1224,7 +1224,7 @@ void OverlayController::mainEventLoop()
case vr::VREvent_SeatedZeroPoseReset:
{
m_moveCenterTabController.incomingSeatedReset();
LOG( INFO ) << "Game Triggered Seated Zero-Position Reset";
LOG( INFO ) << "Game/SteamVR Triggered Seated Zero-Position Reset";
}
break;
src/res/qml/steamvr_page/camera/CameraGroupBox.qml
+13 -25
View File
@@ -40,12 +40,10 @@ GroupBox {
SteamVRTabController.setCameraActive(this.checked, false)
if(this.checked){
steamvrCameraBoundsToggle.enabled = true
steamvrCameraDashboardToggle.enabled = true
steamvrCameraRoomToggle.enabled = true
steamvrCameraContToggle.enabled = true
}else{
steamvrCameraBoundsToggle.enabled = false
steamvrCameraDashboardToggle.enabled = false
steamvrCameraRoomToggle.enabled = false
steamvrCameraContToggle.enabled = false
}
}
}
@@ -57,27 +55,21 @@ GroupBox {
MyToggleButton {
id: steamvrCameraBoundsToggle
text: "Camera for Bounds"
Layout.preferredWidth: 300
text: "Show camera on bounds collision"
Layout.preferredWidth: 400
onCheckedChanged: {
SteamVRTabController.setCameraBounds(this.checked, false)
}
}
MyToggleButton {
id: steamvrCameraDashboardToggle
text: "Camera for Dashboard"
Layout.preferredWidth: 300
onCheckedChanged: {
SteamVRTabController.setCameraDashboard(this.checked, false)
}
Item{
Layout.preferredWidth: 100
}
MyToggleButton {
id: steamvrCameraRoomToggle
text: "Camera for Room View"
id: steamvrCameraContToggle
text: "Show camera on controller"
onCheckedChanged: {
SteamVRTabController.setCameraRoom(this.checked, false)
SteamVRTabController.setCameraCont(this.checked, false)
}
}
}
@@ -88,11 +80,10 @@ GroupBox {
var c1 = SteamVRTabController.cameraActive
steamvrCameraActiveToggle.checked = c1
steamvrCameraBoundsToggle.checked = SteamVRTabController.cameraBounds
steamvrCameraDashboardToggle.checked = SteamVRTabController.cameraDashboard
steamvrCameraRoomToggle.checked = SteamVRTabController.cameraRoom
steamvrCameraContToggle.checked = SteamVRTabController.cameraCont
if(!c1){
steamvrCameraDashboardToggle.enabled = false;
steamvrCameraBoundsToggle.enabled = false;
steamvrCameraRoomToggle.enabled = false;
}
@@ -104,11 +95,8 @@ GroupBox {
onCameraActiveChanged: {
steamvrCameraActiveToggle.checked = SteamVRTabController.cameraActive
}
onCameraRoomChanged: {
steamvrCameraRoomToggle.checked = SteamVRTabController.cameraRoom
}
onCameraDashboardChanged: {
steamvrCameraDashboardToggle.checked = SteamVRTabController.cameraDashboard
onCameraContChanged: {
steamvrCameraContToggle.checked = SteamVRTabController.cameraCont
}
onCameraBoundsChanged: {
steamvrCameraBoundsToggle.checked = SteamVRTabController.cameraBounds
src/tabcontrollers/MoveCenterTabController.cpp
+4 -2
View File
@@ -968,7 +968,7 @@ void MoveCenterTabController::incomingSeatedReset()
if ( !m_selfRequestedSeatedRecenter && !simpleRecenter() )
{
m_selfRequestedSeatedRecenter = true;
vr::VRSystem()->ResetSeatedZeroPose();
vr::VRChaperone()->ResetZeroPose( vr::TrackingUniverseSeated );
}
else
{
@@ -1122,6 +1122,8 @@ void MoveCenterTabController::zeroOffsets()
// offsets
auto chaperoneState = vr::VRChaperone()->GetCalibrationState();
if ( chaperoneState < vr::ChaperoneCalibrationState_Error
|| chaperoneState
== vr::ChaperoneCalibrationState_Error_PlayAreaInvalid
|| m_ignoreChaperoneState )
{
if ( !m_chaperoneInit )
@@ -1202,7 +1204,7 @@ void MoveCenterTabController::zeroOffsets()
void MoveCenterTabController::sendSeatedRecenter()
{
vr::VRSystem()->ResetSeatedZeroPose();
vr::VRChaperone()->ResetZeroPose( vr::TrackingUniverseSeated );
}
double MoveCenterTabController::getHmdYawTotal()
src/tabcontrollers/SteamVRTabController.cpp
+11 -45
View File
@@ -38,8 +38,7 @@ void SteamVRTabController::synchSteamVR()
setDND( dnd() );
setNoFadeToGrid( noFadeToGrid() );
setCameraActive( cameraActive() );
setCameraRoom( cameraRoom() );
setCameraDashboard( cameraDashboard() );
setCameraCont( cameraCont() );
setCameraBounds( cameraBounds() );
}
@@ -249,48 +248,33 @@ void SteamVRTabController::setCameraBounds( const bool value,
}
}
bool SteamVRTabController::cameraRoom() const
bool SteamVRTabController::cameraCont() const
{
auto p = ovr_settings_wrapper::getBool(
vr::k_pch_Camera_Section,
vr::k_pch_Camera_EnableCameraForRoomView_Bool );
vr::k_pch_Camera_Section, vr::k_pch_Camera_ShowOnController_Bool );
if ( p.first == ovr_settings_wrapper::SettingsError::NoError )
{
return p.second;
}
return m_cameraRoom;
return m_cameraCont;
}
void SteamVRTabController::setCameraRoom( const bool value, const bool notify )
void SteamVRTabController::setCameraCont( const bool value, const bool notify )
{
if ( m_cameraRoom != value )
if ( m_cameraCont != value )
{
m_cameraRoom = value;
ovr_settings_wrapper::setBool(
vr::k_pch_Camera_Section,
vr::k_pch_Camera_EnableCameraForRoomView_Bool,
m_cameraRoom );
m_cameraCont = value;
ovr_settings_wrapper::setBool( vr::k_pch_Camera_Section,
vr::k_pch_Camera_ShowOnController_Bool,
m_cameraCont );
if ( notify )
{
emit cameraRoomChanged( m_cameraRoom );
emit cameraContChanged( m_cameraCont );
}
}
}
bool SteamVRTabController::cameraDashboard() const
{
auto p = ovr_settings_wrapper::getBool(
vr::k_pch_Camera_Section,
vr::k_pch_Camera_EnableCameraInDashboard_Bool );
if ( p.first == ovr_settings_wrapper::SettingsError::NoError )
{
return p.second;
}
return m_cameraDashboard;
}
void SteamVRTabController::updateRXTXList()
{
emit updateRXTX( true );
@@ -471,24 +455,6 @@ void SteamVRTabController::launchBindingUI()
LOG( ERROR ) << "Input Error: " << error;
}
}
void SteamVRTabController::setCameraDashboard( const bool value,
const bool notify )
{
if ( m_cameraDashboard != value )
{
m_cameraDashboard = value;
ovr_settings_wrapper::setBool(
vr::k_pch_Camera_Section,
vr::k_pch_Camera_EnableCameraInDashboard_Bool,
m_cameraDashboard );
if ( notify )
{
emit cameraDashboardChanged( m_cameraDashboard );
}
}
}
void SteamVRTabController::restartSteamVR()
{
QString cmd = QString( "cmd.exe /C restartvrserver.bat \"" )
src/tabcontrollers/SteamVRTabController.h
+6 -12
View File
@@ -61,10 +61,8 @@ class SteamVRTabController : public QObject
cameraActiveChanged )
Q_PROPERTY( bool cameraBounds READ cameraBounds WRITE setCameraBounds NOTIFY
cameraBoundsChanged )
Q_PROPERTY( bool cameraRoom READ cameraRoom WRITE setCameraRoom NOTIFY
cameraRoomChanged )
Q_PROPERTY( bool cameraDashboard READ cameraDashboard WRITE
setCameraDashboard NOTIFY cameraDashboardChanged )
Q_PROPERTY( bool cameraCont READ cameraCont WRITE setCameraCont NOTIFY
cameraContChanged )
Q_PROPERTY( bool perAppBindEnabled READ perAppBindEnabled WRITE
setPerAppBindEnabled NOTIFY perAppBindEnabledChanged )
@@ -84,8 +82,7 @@ private:
bool m_cameraActive = false;
bool m_cameraBounds = false;
bool m_cameraRoom = false;
bool m_cameraDashboard = false;
bool m_cameraCont = false;
bool m_pathRXTXInit = false;
int m_dongleCountCur = 0;
int m_dongleCountMax = 0;
@@ -118,8 +115,7 @@ public:
bool cameraActive() const;
bool cameraBounds() const;
bool cameraRoom() const;
bool cameraDashboard() const;
bool cameraCont() const;
QNetworkProxy m_proxy;
QWebSocket m_webSocket;
@@ -170,8 +166,7 @@ public slots:
void setCameraActive( bool value, bool notify = true );
void setCameraBounds( bool value, bool notify = true );
void setCameraRoom( bool value, bool notify = true );
void setCameraDashboard( bool value, bool notify = true );
void setCameraCont( bool value, bool notify = true );
void setPerAppBindEnabled( bool value, bool notify = true );
@@ -190,8 +185,7 @@ signals:
void cameraActiveChanged( bool value );
void cameraBoundsChanged( bool value );
void cameraRoomChanged( bool value );
void cameraDashboardChanged( bool value );
void cameraContChanged( bool value );
void pairStatusChanged( QString value );
void updateRXTX( bool value );