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

New chaperone adjust system and height toggle action (and Ykeara's PTT fix) (#108)

Browse Source 
* Improve reset function and velocity timing

* fixed PTT checkbox error

* Rewrite of chaperone adjust. Make drift impossible

* Formatting

* fixed mic mute on exit

* format

* Clean up interactions with new chaperone adjust

* Remove commented code

* Implement height toggle action and ui
This commit is contained in:
Kung-vr
2019-03-15 16:49:44 -05:00
committed by ykeara
parent db863dbec2
commit ab69d3180c
7 changed files with 554 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/ChaperoneTabController.cpp
+7 -2
View File
@@ -837,7 +837,7 @@ void ChaperoneTabController::setHeight( float value, bool notify )
}
if ( notify )
{
emit heightChanged( m_fadeDistance );
emit heightChanged( m_height );
}
}
}
@@ -849,7 +849,7 @@ void ChaperoneTabController::updateHeight( float value, bool notify )
m_height = value;
if ( notify )
{
emit heightChanged( m_fadeDistance );
emit heightChanged( m_height );
}
}
}
@@ -1314,12 +1314,15 @@ void ChaperoneTabController::flipOrientation()
parent->m_moveCenterTabController.reset();
parent->RotateUniverseCenter( vr::TrackingUniverseStanding,
static_cast<float>( M_PI ) );
parent->m_moveCenterTabController.zeroOffsets();
}
void ChaperoneTabController::reloadFromDisk()
{
parent->m_moveCenterTabController.reset();
vr::VRChaperoneSetup()->ReloadFromDisk( vr::EChaperoneConfigFile_Live );
vr::VRChaperoneSetup()->CommitWorkingCopy( vr::EChaperoneConfigFile_Live );
parent->m_moveCenterTabController.zeroOffsets();
}
void ChaperoneTabController::addChaperoneProfile(
@@ -1501,6 +1504,7 @@ void ChaperoneTabController::applyChaperoneProfile( unsigned index )
auto& profile = chaperoneProfiles[index];
if ( profile.includesChaperoneGeometry )
{
parent->m_moveCenterTabController.reset();
vr::VRChaperoneSetup()->RevertWorkingCopy();
vr::VRChaperoneSetup()->SetWorkingCollisionBoundsInfo(
profile.chaperoneGeometryQuads.get(),
@@ -1511,6 +1515,7 @@ void ChaperoneTabController::applyChaperoneProfile( unsigned index )
profile.playSpaceAreaX, profile.playSpaceAreaZ );
vr::VRChaperoneSetup()->CommitWorkingCopy(
vr::EChaperoneConfigFile_Live );
parent->m_moveCenterTabController.zeroOffsets();
}
if ( profile.includesVisibility )
{