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
This commit is contained in:
+23
-37
@@ -526,22 +526,15 @@ void OverlayController::SetWidget( QQuickItem* quickItem,
|
||||
autoApplyChaperoneName() );
|
||||
if ( chapindex.first )
|
||||
{
|
||||
LOG( INFO ) << "Auto Applying Chaperone";
|
||||
m_chaperoneTabController.applyChaperoneProfile( chapindex.second );
|
||||
bool success = vr::VRApplications()->CancelApplicationLaunch(
|
||||
"openvr.tool.steamvr_room_setup" );
|
||||
auto successsstr = success ? "true" : "false";
|
||||
|
||||
LOG( INFO ) << "Attempted to stop roomsetup: " << successsstr;
|
||||
if ( vr::VRApplications()->GetApplicationProcessId(
|
||||
"openvr.tool.steamvr_room_setup" )
|
||||
!= 0 )
|
||||
{
|
||||
LOG( INFO ) << "room setup running after applying chaperone "
|
||||
"exiting roomsetup";
|
||||
vr::VRApplications()->LaunchApplication(
|
||||
"openvr.tool.steamvr_environments" );
|
||||
}
|
||||
// This should be the way to stop room-setup from starting... as it
|
||||
// sends steamvr a signal that it is completed
|
||||
vr::VRChaperoneSetup()->CommitWorkingCopy(
|
||||
vr::EChaperoneConfigFile_Live );
|
||||
return;
|
||||
}
|
||||
LOG( WARNING ) << "Profile Not Found for Auto Apply Chaperone!";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1248,41 +1241,28 @@ void OverlayController::mainEventLoop()
|
||||
break;
|
||||
|
||||
case vr::VREvent_SeatedZeroPoseReset:
|
||||
{
|
||||
m_incomingReset = true;
|
||||
}
|
||||
break;
|
||||
case vr::VREvent_StandingZeroPoseReset:
|
||||
{
|
||||
m_incomingReset = true;
|
||||
}
|
||||
break;
|
||||
|
||||
// Multiple ChaperoneUniverseHasChanged are often emitted at the
|
||||
// same time (some with a little bit of delay) There is no sure way
|
||||
// to recognize redundant events, we can only exclude redundant
|
||||
// events during the same call of OnTimeoutPumpEvents() INFO Removed
|
||||
// logging on play space mover for possible crashing issues.
|
||||
// Multiple ChaperoneUniverseHasChanged are often
|
||||
// emitted at the same time (some with a little bit of
|
||||
// delay) There is no sure way to recognize redundant
|
||||
// events, we can only exclude redundant events during
|
||||
// the same call of OnTimeoutPumpEvents() INFO Removed
|
||||
// logging on play space mover for possible crashing
|
||||
// issues.
|
||||
case vr::VREvent_ChaperoneUniverseHasChanged:
|
||||
{
|
||||
uint64_t previousUniverseId
|
||||
= vrEvent.data.chaperone.m_nPreviousUniverse;
|
||||
uint64_t currentUniverseId
|
||||
= vrEvent.data.chaperone.m_nCurrentUniverse;
|
||||
LOG( INFO ) << "(VREvent) ChaperoneUniverseHasChanged... Previous:"
|
||||
<< previousUniverseId
|
||||
<< " Current:" << currentUniverseId;
|
||||
|
||||
if ( !chaperoneDataAlreadyUpdated )
|
||||
{
|
||||
m_chaperoneUtils.loadChaperoneData();
|
||||
chaperoneDataAlreadyUpdated = true;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case vr::VREvent_ChaperoneDataHasChanged:
|
||||
{
|
||||
LOG( INFO )
|
||||
<< "(VREvent) ChaperoneUniverseHasChanged... Previous : "
|
||||
<< previousUniverseId << " Current:" << currentUniverseId;
|
||||
if ( !chaperoneDataAlreadyUpdated )
|
||||
{
|
||||
m_chaperoneUtils.loadChaperoneData();
|
||||
@@ -1303,6 +1283,12 @@ void OverlayController::mainEventLoop()
|
||||
break;
|
||||
}
|
||||
}
|
||||
if ( m_incomingReset )
|
||||
{
|
||||
m_incomingReset = false;
|
||||
LOG( INFO ) << "Reset zero event recorded";
|
||||
m_moveCenterTabController.incomingZeroReset();
|
||||
}
|
||||
|
||||
if ( m_incomingReset )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user