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

Convert m_lockZToggle to new settings API

Browse Source
This commit is contained in:
Vasily
2019-12-10 08:28:41 +01:00
committed by username223
parent 866d48cc9e
commit d5b98f8452
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/MoveCenterTabController.cpp
+8 -18
View File
@@ -76,8 +76,6 @@ void MoveCenterTabController::initStage1()
= settings::getSetting( settings::BoolSetting::PLAYSPACE_momentumSave ); = settings::getSetting( settings::BoolSetting::PLAYSPACE_momentumSave );
m_lockYToggle m_lockYToggle
= settings::getSetting( settings::BoolSetting::PLAYSPACE_lockYToggle ); = settings::getSetting( settings::BoolSetting::PLAYSPACE_lockYToggle );
m_lockZToggle
= settings::getSetting( settings::BoolSetting::PLAYSPACE_lockZToggle );
m_showLogMatricesButton = settings::getSetting( m_showLogMatricesButton = settings::getSetting(
settings::BoolSetting::PLAYSPACE_showLogMatricesButton ); settings::BoolSetting::PLAYSPACE_showLogMatricesButton );
m_allowExternalEdits = settings::getSetting( m_allowExternalEdits = settings::getSetting(
@@ -261,10 +259,6 @@ void MoveCenterTabController::outputLogSettings()
{ {
LOG( INFO ) << "LOADED SETTINGS: Y Axis Locked"; LOG( INFO ) << "LOADED SETTINGS: Y Axis Locked";
} }
if ( m_lockZToggle )
{
LOG( INFO ) << "LOADED SETTINGS: Z Axis Locked";
}
if ( m_allowExternalEdits ) if ( m_allowExternalEdits )
{ {
LOG( INFO ) << "LOADED SETTINGS: Allow External Edits Enabled"; LOG( INFO ) << "LOADED SETTINGS: Allow External Edits Enabled";
@@ -1003,20 +997,15 @@ void MoveCenterTabController::setLockY( bool value, bool notify )
bool MoveCenterTabController::lockZToggle() const bool MoveCenterTabController::lockZToggle() const
{ {
return m_lockZToggle; return settings::getSetting( settings::BoolSetting::PLAYSPACE_lockZToggle );
} }
void MoveCenterTabController::setLockZ( bool value, bool notify ) void MoveCenterTabController::setLockZ( bool value, bool notify )
{ {
m_lockZToggle = value; settings::setSetting( settings::BoolSetting::PLAYSPACE_lockZToggle, value );
auto settings = OverlayController::appSettings();
settings->beginGroup( "playspaceSettings" );
settings->setValue( "lockZToggle", m_lockZToggle );
settings->endGroup();
settings->sync();
if ( notify ) if ( notify )
{ {
emit requireLockZChanged( m_lockZToggle ); emit requireLockZChanged( value );
} }
} }
@@ -1184,7 +1173,7 @@ void MoveCenterTabController::modOffsetY( float value, bool notify )
void MoveCenterTabController::modOffsetZ( float value, bool notify ) void MoveCenterTabController::modOffsetZ( float value, bool notify )
{ {
if ( !m_lockZToggle ) if ( !settings::getSetting( settings::BoolSetting::PLAYSPACE_lockZToggle ) )
{ {
m_offsetZ += value; m_offsetZ += value;
if ( notify ) if ( notify )
@@ -2318,7 +2307,7 @@ void MoveCenterTabController::zAxisLockToggle( bool zAxisLockToggleJustPressed )
return; return;
} }
if ( !m_lockZToggle ) if ( !settings::getSetting( settings::BoolSetting::PLAYSPACE_lockZToggle ) )
{ {
setLockZ( true ); setLockZ( true );
} }
@@ -2490,7 +2479,8 @@ void MoveCenterTabController::updateHandDrag(
{ {
m_offsetY += static_cast<float>( diff[1] ); m_offsetY += static_cast<float>( diff[1] );
} }
if ( !m_lockZToggle ) if ( !settings::getSetting(
settings::BoolSetting::PLAYSPACE_lockZToggle ) )
{ {
m_offsetZ += static_cast<float>( diff[2] ); m_offsetZ += static_cast<float>( diff[2] );
} }
@@ -2625,7 +2615,7 @@ void MoveCenterTabController::updateGravity()
{ {
m_velocity[1] = 0.0; m_velocity[1] = 0.0;
} }
if ( m_lockZToggle ) if ( settings::getSetting( settings::BoolSetting::PLAYSPACE_lockZToggle ) )
{ {
m_velocity[2] = 0.0; m_velocity[2] = 0.0;
} }
src/tabcontrollers/MoveCenterTabController.h
-1
View File
@@ -141,7 +141,6 @@ private:
float m_flingStrength = 1.0f; float m_flingStrength = 1.0f;
bool m_momentumSave = false; bool m_momentumSave = false;
bool m_lockYToggle = false; bool m_lockYToggle = false;
bool m_lockZToggle = false;
// Set lastHandQuaternion.w to -1000.0 when last hand is invalid. // Set lastHandQuaternion.w to -1000.0 when last hand is invalid.
vr::HmdQuaternion_t m_lastHandQuaternion vr::HmdQuaternion_t m_lastHandQuaternion
= { k_quaternionInvalidValue, 0.0, 0.0, 0.0 }; = { k_quaternionInvalidValue, 0.0, 0.0, 0.0 };