Skip to content

Commit 54d22a4

Browse files
ykearaykeara
authored
5.7.4 (#642)
* 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
1 parent 67fb57a commit 54d22a4

38 files changed

Lines changed: 1453 additions & 18094 deletions

‎build_scripts/compile_version_string.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.7.3-release
1+
5.7.4-release

‎src/overlaycontroller.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1224,7 +1224,7 @@ void OverlayController::mainEventLoop()
12241224
case vr::VREvent_SeatedZeroPoseReset:
12251225
{
12261226
m_moveCenterTabController.incomingSeatedReset();
1227-
LOG( INFO ) << "Game Triggered Seated Zero-Position Reset";
1227+
LOG( INFO ) << "Game/SteamVR Triggered Seated Zero-Position Reset";
12281228
}
12291229
break;
12301230

‎src/res/qml/steamvr_page/camera/CameraGroupBox.qml‎

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,10 @@ GroupBox {
4040
SteamVRTabController.setCameraActive(this.checked, false)
4141
if(this.checked){
4242
steamvrCameraBoundsToggle.enabled = true
43-
steamvrCameraDashboardToggle.enabled = true
44-
steamvrCameraRoomToggle.enabled = true
43+
steamvrCameraContToggle.enabled = true
4544
}else{
4645
steamvrCameraBoundsToggle.enabled = false
47-
steamvrCameraDashboardToggle.enabled = false
48-
steamvrCameraRoomToggle.enabled = false
46+
steamvrCameraContToggle.enabled = false
4947
}
5048
}
5149
}
@@ -57,27 +55,21 @@ GroupBox {
5755

5856
MyToggleButton {
5957
id: steamvrCameraBoundsToggle
60-
text: "Camera for Bounds"
61-
Layout.preferredWidth: 300
58+
text: "Show camera on bounds collision"
59+
Layout.preferredWidth: 400
6260
onCheckedChanged: {
6361
SteamVRTabController.setCameraBounds(this.checked, false)
6462
}
6563
}
66-
67-
MyToggleButton {
68-
id: steamvrCameraDashboardToggle
69-
text: "Camera for Dashboard"
70-
Layout.preferredWidth: 300
71-
onCheckedChanged: {
72-
SteamVRTabController.setCameraDashboard(this.checked, false)
73-
}
64+
Item{
65+
Layout.preferredWidth: 100
7466
}
7567

7668
MyToggleButton {
77-
id: steamvrCameraRoomToggle
78-
text: "Camera for Room View"
69+
id: steamvrCameraContToggle
70+
text: "Show camera on controller"
7971
onCheckedChanged: {
80-
SteamVRTabController.setCameraRoom(this.checked, false)
72+
SteamVRTabController.setCameraCont(this.checked, false)
8173
}
8274
}
8375
}
@@ -88,11 +80,10 @@ GroupBox {
8880
var c1 = SteamVRTabController.cameraActive
8981
steamvrCameraActiveToggle.checked = c1
9082
steamvrCameraBoundsToggle.checked = SteamVRTabController.cameraBounds
91-
steamvrCameraDashboardToggle.checked = SteamVRTabController.cameraDashboard
92-
steamvrCameraRoomToggle.checked = SteamVRTabController.cameraRoom
83+
steamvrCameraContToggle.checked = SteamVRTabController.cameraCont
9384

9485
if(!c1){
95-
steamvrCameraDashboardToggle.enabled = false;
86+
9687
steamvrCameraBoundsToggle.enabled = false;
9788
steamvrCameraRoomToggle.enabled = false;
9889
}
@@ -104,11 +95,8 @@ GroupBox {
10495
onCameraActiveChanged: {
10596
steamvrCameraActiveToggle.checked = SteamVRTabController.cameraActive
10697
}
107-
onCameraRoomChanged: {
108-
steamvrCameraRoomToggle.checked = SteamVRTabController.cameraRoom
109-
}
110-
onCameraDashboardChanged: {
111-
steamvrCameraDashboardToggle.checked = SteamVRTabController.cameraDashboard
98+
onCameraContChanged: {
99+
steamvrCameraContToggle.checked = SteamVRTabController.cameraCont
112100
}
113101
onCameraBoundsChanged: {
114102
steamvrCameraBoundsToggle.checked = SteamVRTabController.cameraBounds

‎src/tabcontrollers/MoveCenterTabController.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,7 @@ void MoveCenterTabController::incomingSeatedReset()
968968
if ( !m_selfRequestedSeatedRecenter && !simpleRecenter() )
969969
{
970970
m_selfRequestedSeatedRecenter = true;
971-
vr::VRSystem()->ResetSeatedZeroPose();
971+
vr::VRChaperone()->ResetZeroPose( vr::TrackingUniverseSeated );
972972
}
973973
else
974974
{
@@ -1122,6 +1122,8 @@ void MoveCenterTabController::zeroOffsets()
11221122
// offsets
11231123
auto chaperoneState = vr::VRChaperone()->GetCalibrationState();
11241124
if ( chaperoneState < vr::ChaperoneCalibrationState_Error
1125+
|| chaperoneState
1126+
== vr::ChaperoneCalibrationState_Error_PlayAreaInvalid
11251127
|| m_ignoreChaperoneState )
11261128
{
11271129
if ( !m_chaperoneInit )
@@ -1202,7 +1204,7 @@ void MoveCenterTabController::zeroOffsets()
12021204

12031205
void MoveCenterTabController::sendSeatedRecenter()
12041206
{
1205-
vr::VRSystem()->ResetSeatedZeroPose();
1207+
vr::VRChaperone()->ResetZeroPose( vr::TrackingUniverseSeated );
12061208
}
12071209

12081210
double MoveCenterTabController::getHmdYawTotal()

‎src/tabcontrollers/SteamVRTabController.cpp‎

Lines changed: 11 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ void SteamVRTabController::synchSteamVR()
3838
setDND( dnd() );
3939
setNoFadeToGrid( noFadeToGrid() );
4040
setCameraActive( cameraActive() );
41-
setCameraRoom( cameraRoom() );
42-
setCameraDashboard( cameraDashboard() );
41+
setCameraCont( cameraCont() );
4342
setCameraBounds( cameraBounds() );
4443
}
4544

@@ -249,48 +248,33 @@ void SteamVRTabController::setCameraBounds( const bool value,
249248
}
250249
}
251250

252-
bool SteamVRTabController::cameraRoom() const
251+
bool SteamVRTabController::cameraCont() const
253252
{
254253
auto p = ovr_settings_wrapper::getBool(
255-
vr::k_pch_Camera_Section,
256-
vr::k_pch_Camera_EnableCameraForRoomView_Bool );
254+
vr::k_pch_Camera_Section, vr::k_pch_Camera_ShowOnController_Bool );
257255

258256
if ( p.first == ovr_settings_wrapper::SettingsError::NoError )
259257
{
260258
return p.second;
261259
}
262-
return m_cameraRoom;
260+
return m_cameraCont;
263261
}
264262

265-
void SteamVRTabController::setCameraRoom( const bool value, const bool notify )
263+
void SteamVRTabController::setCameraCont( const bool value, const bool notify )
266264
{
267-
if ( m_cameraRoom != value )
265+
if ( m_cameraCont != value )
268266
{
269-
m_cameraRoom = value;
270-
ovr_settings_wrapper::setBool(
271-
vr::k_pch_Camera_Section,
272-
vr::k_pch_Camera_EnableCameraForRoomView_Bool,
273-
m_cameraRoom );
267+
m_cameraCont = value;
268+
ovr_settings_wrapper::setBool( vr::k_pch_Camera_Section,
269+
vr::k_pch_Camera_ShowOnController_Bool,
270+
m_cameraCont );
274271
if ( notify )
275272
{
276-
emit cameraRoomChanged( m_cameraRoom );
273+
emit cameraContChanged( m_cameraCont );
277274
}
278275
}
279276
}
280277

281-
bool SteamVRTabController::cameraDashboard() const
282-
{
283-
auto p = ovr_settings_wrapper::getBool(
284-
vr::k_pch_Camera_Section,
285-
vr::k_pch_Camera_EnableCameraInDashboard_Bool );
286-
287-
if ( p.first == ovr_settings_wrapper::SettingsError::NoError )
288-
{
289-
return p.second;
290-
}
291-
return m_cameraDashboard;
292-
}
293-
294278
void SteamVRTabController::updateRXTXList()
295279
{
296280
emit updateRXTX( true );
@@ -471,24 +455,6 @@ void SteamVRTabController::launchBindingUI()
471455
LOG( ERROR ) << "Input Error: " << error;
472456
}
473457
}
474-
475-
void SteamVRTabController::setCameraDashboard( const bool value,
476-
const bool notify )
477-
{
478-
if ( m_cameraDashboard != value )
479-
{
480-
m_cameraDashboard = value;
481-
ovr_settings_wrapper::setBool(
482-
vr::k_pch_Camera_Section,
483-
vr::k_pch_Camera_EnableCameraInDashboard_Bool,
484-
m_cameraDashboard );
485-
if ( notify )
486-
{
487-
emit cameraDashboardChanged( m_cameraDashboard );
488-
}
489-
}
490-
}
491-
492458
void SteamVRTabController::restartSteamVR()
493459
{
494460
QString cmd = QString( "cmd.exe /C restartvrserver.bat \"" )

‎src/tabcontrollers/SteamVRTabController.h‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,8 @@ class SteamVRTabController : public QObject
6161
cameraActiveChanged )
6262
Q_PROPERTY( bool cameraBounds READ cameraBounds WRITE setCameraBounds NOTIFY
6363
cameraBoundsChanged )
64-
Q_PROPERTY( bool cameraRoom READ cameraRoom WRITE setCameraRoom NOTIFY
65-
cameraRoomChanged )
66-
Q_PROPERTY( bool cameraDashboard READ cameraDashboard WRITE
67-
setCameraDashboard NOTIFY cameraDashboardChanged )
64+
Q_PROPERTY( bool cameraCont READ cameraCont WRITE setCameraCont NOTIFY
65+
cameraContChanged )
6866
Q_PROPERTY( bool perAppBindEnabled READ perAppBindEnabled WRITE
6967
setPerAppBindEnabled NOTIFY perAppBindEnabledChanged )
7068

@@ -84,8 +82,7 @@ class SteamVRTabController : public QObject
8482

8583
bool m_cameraActive = false;
8684
bool m_cameraBounds = false;
87-
bool m_cameraRoom = false;
88-
bool m_cameraDashboard = false;
85+
bool m_cameraCont = false;
8986
bool m_pathRXTXInit = false;
9087
int m_dongleCountCur = 0;
9188
int m_dongleCountMax = 0;
@@ -118,8 +115,7 @@ class SteamVRTabController : public QObject
118115

119116
bool cameraActive() const;
120117
bool cameraBounds() const;
121-
bool cameraRoom() const;
122-
bool cameraDashboard() const;
118+
bool cameraCont() const;
123119
QNetworkProxy m_proxy;
124120
QWebSocket m_webSocket;
125121

@@ -170,8 +166,7 @@ public slots:
170166

171167
void setCameraActive( bool value, bool notify = true );
172168
void setCameraBounds( bool value, bool notify = true );
173-
void setCameraRoom( bool value, bool notify = true );
174-
void setCameraDashboard( bool value, bool notify = true );
169+
void setCameraCont( bool value, bool notify = true );
175170

176171
void setPerAppBindEnabled( bool value, bool notify = true );
177172

@@ -190,8 +185,7 @@ public slots:
190185

191186
void cameraActiveChanged( bool value );
192187
void cameraBoundsChanged( bool value );
193-
void cameraRoomChanged( bool value );
194-
void cameraDashboardChanged( bool value );
188+
void cameraContChanged( bool value );
195189

196190
void pairStatusChanged( QString value );
197191
void updateRXTX( bool value );

‎third-party/openvr/bin/linux32/libopenvr_api.so‎

67.8 KB
Binary file not shown.

‎third-party/openvr/bin/linux32/libopenvr_api.so.dbg‎

1.82 MB
Binary file not shown.

‎third-party/openvr/bin/linux64/libopenvr_api.so‎

46.7 KB
Binary file not shown.

‎third-party/openvr/bin/linux64/libopenvr_api.so.dbg‎

2.28 MB
Binary file not shown.

0 commit comments

Comments
 (0)