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

Convert m_heightToggleOffset to new settings API

Browse Source 
Casts inside the function because it's not feasible at the moment to
change all floats to doubles.
This commit is contained in:
Vasily
2019-12-10 08:28:41 +01:00
committed by username223
parent ed1190020c
commit 58a92f4b2b
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/MoveCenterTabController.cpp
+9 -13
View File
@@ -39,8 +39,6 @@ namespace advsettings
{ {
void MoveCenterTabController::initStage1() void MoveCenterTabController::initStage1()
{ {
m_heightToggleOffset = static_cast<float>( settings::getSetting(
settings::DoubleSetting::PLAYSPACE_heightToggleOffset ) );
m_gravityStrength = static_cast<float>( settings::getSetting( m_gravityStrength = static_cast<float>( settings::getSetting(
settings::DoubleSetting::PLAYSPACE_gravityStrength ) ); settings::DoubleSetting::PLAYSPACE_gravityStrength ) );
m_flingStrength = static_cast<float>( settings::getSetting( m_flingStrength = static_cast<float>( settings::getSetting(
@@ -658,10 +656,10 @@ void MoveCenterTabController::setHeightToggle( bool value, bool notify )
// Don't move bump around on y axis if gravity is active // Don't move bump around on y axis if gravity is active
if ( !m_gravityActive ) if ( !m_gravityActive )
{ {
m_offsetY += m_heightToggleOffset; m_offsetY += heightToggleOffset();
emit offsetYChanged( m_offsetY ); emit offsetYChanged( m_offsetY );
} }
m_gravityFloor = m_heightToggleOffset; m_gravityFloor = heightToggleOffset();
} }
// detect new deactivate // detect new deactivate
else if ( m_heightToggle && !value ) else if ( m_heightToggle && !value )
@@ -669,7 +667,7 @@ void MoveCenterTabController::setHeightToggle( bool value, bool notify )
// Don't move bump around on y axis if gravity is active // Don't move bump around on y axis if gravity is active
if ( !m_gravityActive ) if ( !m_gravityActive )
{ {
m_offsetY -= m_heightToggleOffset; m_offsetY -= heightToggleOffset();
emit offsetYChanged( m_offsetY ); emit offsetYChanged( m_offsetY );
} }
m_gravityFloor = 0.0f; m_gravityFloor = 0.0f;
@@ -684,20 +682,18 @@ void MoveCenterTabController::setHeightToggle( bool value, bool notify )
float MoveCenterTabController::heightToggleOffset() const float MoveCenterTabController::heightToggleOffset() const
{ {
return m_heightToggleOffset; return static_cast<float>( settings::getSetting(
settings::DoubleSetting::PLAYSPACE_heightToggleOffset ) );
} }
void MoveCenterTabController::setHeightToggleOffset( float value, bool notify ) void MoveCenterTabController::setHeightToggleOffset( float value, bool notify )
{ {
m_heightToggleOffset = value; settings::setSetting( settings::DoubleSetting::PLAYSPACE_heightToggleOffset,
auto settings = OverlayController::appSettings(); static_cast<double>( value ) );
settings->beginGroup( "playspaceSettings" );
settings->setValue( "heightToggleOffset", m_heightToggleOffset );
settings->endGroup();
settings->sync();
if ( notify ) if ( notify )
{ {
emit heightToggleOffsetChanged( m_heightToggleOffset ); emit heightToggleOffsetChanged( value );
} }
} }
src/tabcontrollers/MoveCenterTabController.h
-1
View File
@@ -124,7 +124,6 @@ private:
vr::TrackedDeviceIndex_t m_activeMoveController; vr::TrackedDeviceIndex_t m_activeMoveController;
float m_lastControllerPosition[3]; float m_lastControllerPosition[3];
bool m_heightToggle = false; bool m_heightToggle = false;
float m_heightToggleOffset = -1.0f;
float m_gravityFloor = 0.0f; float m_gravityFloor = 0.0f;
float m_gravityStrength = 9.8f; float m_gravityStrength = 9.8f;
float m_flingStrength = 1.0f; float m_flingStrength = 1.0f;