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

Convert m_simpleRecenter to new settings API

Browse Source
This commit is contained in:
Vasily
2019-12-10 08:28:41 +01:00
committed by username223
parent bce378928d
commit 065c5da456
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/MoveCenterTabController.cpp
+7 -14
View File
@@ -56,9 +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_simpleRecenter = settings::getSetting(
settings::BoolSetting::PLAYSPACE_simpleRecenter );
reloadOffsetProfiles(); reloadOffsetProfiles();
m_k_moveCenterSettingsUpdateCounter m_k_moveCenterSettingsUpdateCounter
= utils::adjustUpdateRate( k_moveCenterSettingsUpdateCounter ); = utils::adjustUpdateRate( k_moveCenterSettingsUpdateCounter );
@@ -962,23 +959,19 @@ void MoveCenterTabController::setEnableSeatedMotion( bool value, bool notify )
bool MoveCenterTabController::simpleRecenter() const bool MoveCenterTabController::simpleRecenter() const
{ {
return m_simpleRecenter; return settings::getSetting(
settings::BoolSetting::PLAYSPACE_simpleRecenter );
} }
void MoveCenterTabController::setSimpleRecenter( bool value, bool notify ) void MoveCenterTabController::setSimpleRecenter( bool value, bool notify )
{ {
m_simpleRecenter = value; settings::setSetting( settings::BoolSetting::PLAYSPACE_simpleRecenter,
auto settings = OverlayController::appSettings(); value );
settings->beginGroup( "playspaceSettings" );
settings->setValue( "simpleRecenter", m_simpleRecenter );
settings->endGroup();
settings->sync();
if ( notify ) if ( notify )
{ {
emit simpleRecenterChanged( m_simpleRecenter ); emit simpleRecenterChanged( value );
} }
LOG( INFO ) << "CHANGED SETTINGS: Simple Recenter Set: "
<< m_simpleRecenter;
} }
void MoveCenterTabController::modOffsetX( float value, bool notify ) void MoveCenterTabController::modOffsetX( float value, bool notify )
@@ -1030,7 +1023,7 @@ void MoveCenterTabController::incomingSeatedReset()
// if we didn't send the request from OVRAS, we need to send another // if we didn't send the request from OVRAS, we need to send another
// ResetSeatedZeroPose(). It seems that only after this is sent from // ResetSeatedZeroPose(). It seems that only after this is sent from
// OVRAS does ReloadFromDisk return valid info on WMR. // OVRAS does ReloadFromDisk return valid info on WMR.
if ( !m_selfRequestedSeatedRecenter && !m_simpleRecenter ) if ( !m_selfRequestedSeatedRecenter && !simpleRecenter() )
{ {
m_selfRequestedSeatedRecenter = true; m_selfRequestedSeatedRecenter = true;
vr::VRSystem()->ResetSeatedZeroPose(); vr::VRSystem()->ResetSeatedZeroPose();
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_simpleRecenter = false;
unsigned settingsUpdateCounter = 0; unsigned settingsUpdateCounter = 0;
int m_hmdRotationStatsUpdateCounter = 0; int m_hmdRotationStatsUpdateCounter = 0;
unsigned m_dragComfortFrameSkipCounter = 0; unsigned m_dragComfortFrameSkipCounter = 0;