Skip to content

Commit 76101b1

Browse files
authored
Spacedragupdate (#663)
* 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 * add zero-offset to true as potential edge case fix * remove dead code in qml * fix both brightness sliders to be uniform .05 minimum via set, and .2 minimum via slider * attempt to fix recenter, and fix floor * further space drag/recenter improvements * get rid of old code * increment version 5.8.6 * remove old commented code settings page * update documentation * re-add mistakenly removed line * attempt at fixing reset etc. etc. * incrment verison * fix brightness slider min at 3 or 20 depending if slide or direct input add error recovery from bad cal state on recenter and reset offsets * update version 5.8.8 * fix room-setup bug on startup if using auto apply chaperone * incrmenet version 5.8.9
1 parent c0da050 commit 76101b1

9 files changed

Lines changed: 117 additions & 141 deletions

File tree

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

src/overlaycontroller.cpp

Lines changed: 23 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -526,22 +526,15 @@ void OverlayController::SetWidget( QQuickItem* quickItem,
526526
autoApplyChaperoneName() );
527527
if ( chapindex.first )
528528
{
529+
LOG( INFO ) << "Auto Applying Chaperone";
529530
m_chaperoneTabController.applyChaperoneProfile( chapindex.second );
530-
bool success = vr::VRApplications()->CancelApplicationLaunch(
531-
"openvr.tool.steamvr_room_setup" );
532-
auto successsstr = success ? "true" : "false";
533-
534-
LOG( INFO ) << "Attempted to stop roomsetup: " << successsstr;
535-
if ( vr::VRApplications()->GetApplicationProcessId(
536-
"openvr.tool.steamvr_room_setup" )
537-
!= 0 )
538-
{
539-
LOG( INFO ) << "room setup running after applying chaperone "
540-
"exiting roomsetup";
541-
vr::VRApplications()->LaunchApplication(
542-
"openvr.tool.steamvr_environments" );
543-
}
531+
// This should be the way to stop room-setup from starting... as it
532+
// sends steamvr a signal that it is completed
533+
vr::VRChaperoneSetup()->CommitWorkingCopy(
534+
vr::EChaperoneConfigFile_Live );
535+
return;
544536
}
537+
LOG( WARNING ) << "Profile Not Found for Auto Apply Chaperone!";
545538
}
546539
}
547540

@@ -1248,41 +1241,28 @@ void OverlayController::mainEventLoop()
12481241
break;
12491242

12501243
case vr::VREvent_SeatedZeroPoseReset:
1251-
{
1252-
m_incomingReset = true;
1253-
}
1254-
break;
12551244
case vr::VREvent_StandingZeroPoseReset:
12561245
{
12571246
m_incomingReset = true;
12581247
}
12591248
break;
12601249

1261-
// Multiple ChaperoneUniverseHasChanged are often emitted at the
1262-
// same time (some with a little bit of delay) There is no sure way
1263-
// to recognize redundant events, we can only exclude redundant
1264-
// events during the same call of OnTimeoutPumpEvents() INFO Removed
1265-
// logging on play space mover for possible crashing issues.
1250+
// Multiple ChaperoneUniverseHasChanged are often
1251+
// emitted at the same time (some with a little bit of
1252+
// delay) There is no sure way to recognize redundant
1253+
// events, we can only exclude redundant events during
1254+
// the same call of OnTimeoutPumpEvents() INFO Removed
1255+
// logging on play space mover for possible crashing
1256+
// issues.
12661257
case vr::VREvent_ChaperoneUniverseHasChanged:
12671258
{
12681259
uint64_t previousUniverseId
12691260
= vrEvent.data.chaperone.m_nPreviousUniverse;
12701261
uint64_t currentUniverseId
12711262
= vrEvent.data.chaperone.m_nCurrentUniverse;
1272-
LOG( INFO ) << "(VREvent) ChaperoneUniverseHasChanged... Previous:"
1273-
<< previousUniverseId
1274-
<< " Current:" << currentUniverseId;
1275-
1276-
if ( !chaperoneDataAlreadyUpdated )
1277-
{
1278-
m_chaperoneUtils.loadChaperoneData();
1279-
chaperoneDataAlreadyUpdated = true;
1280-
}
1281-
}
1282-
break;
1283-
1284-
case vr::VREvent_ChaperoneDataHasChanged:
1285-
{
1263+
LOG( INFO )
1264+
<< "(VREvent) ChaperoneUniverseHasChanged... Previous : "
1265+
<< previousUniverseId << " Current:" << currentUniverseId;
12861266
if ( !chaperoneDataAlreadyUpdated )
12871267
{
12881268
m_chaperoneUtils.loadChaperoneData();
@@ -1303,6 +1283,12 @@ void OverlayController::mainEventLoop()
13031283
break;
13041284
}
13051285
}
1286+
if ( m_incomingReset )
1287+
{
1288+
m_incomingReset = false;
1289+
LOG( INFO ) << "Reset zero event recorded";
1290+
m_moveCenterTabController.incomingZeroReset();
1291+
}
13061292

13071293
if ( m_incomingReset )
13081294
{

src/overlaycontroller.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ class OverlayController : public QObject
167167
UtilitiesTabController m_utilitiesTabController;
168168
VideoTabController m_videoTabController;
169169
RotationTabController m_rotationTabController;
170+
bool m_incomingReset = false;
170171

171172
private:
172173
QPoint getMousePositionForEvent( vr::VREvent_Mouse_t mouse );

src/res/qml/PlayspacePage.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ MyStackViewPage {
488488
id: spaceSeatedRecenter
489489
Layout.preferredWidth: 250
490490
visible: true
491-
text: "Seated Recenter"
491+
text: "Re-center"
492492
onClicked: {
493493
MoveCenterTabController.sendSeatedRecenter()
494494
}

src/res/qml/video_page/brightness/BrightnessGroupBox.qml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ GroupBox {
5757
value: 1.0
5858
Layout.fillWidth: true
5959
onMoved: {
60-
var val = (this.value * 100)
61-
brightnessValueText.text = Math.round(val) + "%"
62-
VideoTabController.setBrightnessOpacityValue(value.toFixed(2), true)
60+
VideoTabController.setBrightnessOpacityValue(this.value.toFixed(2), true)
6361
}
6462
}
6563

@@ -73,17 +71,13 @@ GroupBox {
7371
function onInputEvent(input) {
7472
var val = parseFloat(input)
7573
if (!isNaN(val)) {
76-
if (val < 5.0) {
77-
val = 5.0
74+
if (val < 3) {
75+
val = 3
7876
} else if (val > 100.0) {
7977
val = 100.0
8078
}
8179
var v = (val/100)
8280
VideoTabController.setBrightnessOpacityValue(v.toFixed(2), true)
83-
if(v<.05){
84-
v = .05
85-
}
86-
brightnessSlider.value = v
8781
}
8882
text = Math.round(VideoTabController.brightnessOpacityValue * 100) + "%"
8983
}

src/res/qml/video_page/overlaycolorbright/OverlayMethodGroupBox.qml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,8 @@ GroupBox {
5757
stepSize: 0.01
5858
value: 1.0
5959
Layout.fillWidth: true
60-
onPositionChanged: {
61-
var val = (this.value * 100)
62-
brightnessValueText.text = Math.round(val) + "%"
63-
}
64-
onValueChanged: {
65-
66-
VideoTabController.setBrightnessOpacityValue(value.toFixed(2), true)
60+
onMoved: {
61+
VideoTabController.setBrightnessOpacityValue(this.value.toFixed(2), true)
6762
}
6863
}
6964

@@ -77,13 +72,13 @@ GroupBox {
7772
function onInputEvent(input) {
7873
var val2 = parseFloat(input)
7974
if (!isNaN(val2)) {
80-
if (val2 < 5) {
81-
val2 = 5
75+
if (val2 < 3) {
76+
val2 = 3
8277
} else if (val2 > 100.0) {
8378
val2 = 100.0
8479
}
85-
var v2 = (val2/100).toFixed(2)
86-
brightnessSlider.value = v
80+
var v2 = (val2/100)
81+
VideoTabController.setBrightnessOpacityValue(v2.toFixed(2), true)
8782
}
8883
text = Math.round(VideoTabController.brightnessOpacityValue * 100) + "%"
8984
}
@@ -304,7 +299,9 @@ GroupBox {
304299
target: VideoTabController
305300

306301
onBrightnessOpacityValueChanged: {
307-
brightnessSlider.value = VideoTabController.brightnessOpacityValue
302+
var brightvalue = VideoTabController.brightnessOpacityValue
303+
brightnessSlider.value = brightvalue
304+
brightnessValueText.text = Math.round(brightvalue*100)+ "%"
308305
}
309306
onBrightnessEnabledChanged: {
310307
brightnessToggle.checked = VideoTabController.brightnessEnabled

0 commit comments

Comments
 (0)