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

Convert m_allowExternalEdits to new settings API

Browse Source
This commit is contained in:
Vasily
2019-12-10 08:28:41 +01:00
committed by username223
parent e757c722f7
commit 48209f6536
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/MoveCenterTabController.cpp
+7 -13
View File
@@ -56,8 +56,6 @@ void MoveCenterTabController::initStage1()
m_flingStrength = static_cast<float>( settings::getSetting( m_flingStrength = static_cast<float>( settings::getSetting(
settings::DoubleSetting::PLAYSPACE_flingStrength ) ); settings::DoubleSetting::PLAYSPACE_flingStrength ) );
m_allowExternalEdits = settings::getSetting(
settings::BoolSetting::PLAYSPACE_allowExternalEdits );
m_oldStyleMotion = settings::getSetting( m_oldStyleMotion = settings::getSetting(
settings::BoolSetting::PLAYSPACE_oldStyleMotion ); settings::BoolSetting::PLAYSPACE_oldStyleMotion );
m_universeCenteredRotation = settings::getSetting( m_universeCenteredRotation = settings::getSetting(
@@ -890,23 +888,19 @@ void MoveCenterTabController::setShowLogMatricesButton( bool value,
bool MoveCenterTabController::allowExternalEdits() const bool MoveCenterTabController::allowExternalEdits() const
{ {
return m_allowExternalEdits; return settings::getSetting(
settings::BoolSetting::PLAYSPACE_allowExternalEdits );
} }
void MoveCenterTabController::setAllowExternalEdits( bool value, bool notify ) void MoveCenterTabController::setAllowExternalEdits( bool value, bool notify )
{ {
m_allowExternalEdits = value; settings::setSetting( settings::BoolSetting::PLAYSPACE_allowExternalEdits,
auto settings = OverlayController::appSettings(); value );
settings->beginGroup( "playspaceSettings" );
settings->setValue( "allowExternalEdits", m_allowExternalEdits );
settings->endGroup();
settings->sync();
if ( notify ) if ( notify )
{ {
emit allowExternalEditsChanged( m_allowExternalEdits ); emit allowExternalEditsChanged( value );
} }
LOG( INFO ) << "CHANGED SETTINGS: Allow External Edits Set: "
<< m_allowExternalEdits;
} }
bool MoveCenterTabController::oldStyleMotion() const bool MoveCenterTabController::oldStyleMotion() const
@@ -2563,7 +2557,7 @@ void MoveCenterTabController::updateSpace( bool forceUpdate )
} }
// reload from disk if we're at zero offsets and allow external edits // reload from disk if we're at zero offsets and allow external edits
if ( m_allowExternalEdits && m_oldOffsetX == 0.0f && m_oldOffsetY == 0.0f if ( allowExternalEdits() && m_oldOffsetX == 0.0f && m_oldOffsetY == 0.0f
&& m_oldOffsetZ == 0.0f && m_oldRotation == 0 ) && m_oldOffsetZ == 0.0f && m_oldRotation == 0 )
{ {
vr::VRChaperoneSetup()->ReloadFromDisk( vr::EChaperoneConfigFile_Live ); vr::VRChaperoneSetup()->ReloadFromDisk( vr::EChaperoneConfigFile_Live );
src/tabcontrollers/MoveCenterTabController.h
-1
View File
@@ -170,7 +170,6 @@ private:
bool m_dashWasOpenPreviousFrame = false; bool m_dashWasOpenPreviousFrame = false;
bool m_roomSetupModeDetected = false; bool m_roomSetupModeDetected = false;
bool m_seatedModeDetected = false; bool m_seatedModeDetected = false;
bool m_allowExternalEdits = false;
bool m_oldStyleMotion = false; bool m_oldStyleMotion = false;
bool m_universeCenteredRotation = false; bool m_universeCenteredRotation = false;
bool m_enableSeatedMotion = false; bool m_enableSeatedMotion = false;