Prefer public getter over explicit settings call

The getter call is more resistant to change and leads to less code
duplication.
This commit is contained in:
Vasily
2019-12-10 08:28:41 +01:00
committed by username223
parent 5b23247667
commit 2b7e33b51b
+23 -37
View File
@@ -1025,7 +1025,7 @@ void MoveCenterTabController::setSimpleRecenter( bool value, bool notify )
void MoveCenterTabController::modOffsetX( float value, bool notify ) void MoveCenterTabController::modOffsetX( float value, bool notify )
{ {
if ( !settings::getSetting( settings::BoolSetting::PLAYSPACE_lockXToggle ) ) if ( !lockXToggle() )
{ {
m_offsetX += value; m_offsetX += value;
if ( notify ) if ( notify )
@@ -1037,7 +1037,7 @@ void MoveCenterTabController::modOffsetX( float value, bool notify )
void MoveCenterTabController::modOffsetY( float value, bool notify ) void MoveCenterTabController::modOffsetY( float value, bool notify )
{ {
if ( !settings::getSetting( settings::BoolSetting::PLAYSPACE_lockYToggle ) ) if ( !lockYToggle() )
{ {
m_offsetY += value; m_offsetY += value;
if ( notify ) if ( notify )
@@ -1049,7 +1049,7 @@ void MoveCenterTabController::modOffsetY( float value, bool notify )
void MoveCenterTabController::modOffsetZ( float value, bool notify ) void MoveCenterTabController::modOffsetZ( float value, bool notify )
{ {
if ( !settings::getSetting( settings::BoolSetting::PLAYSPACE_lockZToggle ) ) if ( !lockZToggle() )
{ {
m_offsetZ += value; m_offsetZ += value;
if ( notify ) if ( notify )
@@ -1454,8 +1454,7 @@ float MoveCenterTabController::getBoundsBasisMaxY()
void MoveCenterTabController::leftHandSpaceDrag( bool leftHandDragActive ) void MoveCenterTabController::leftHandSpaceDrag( bool leftHandDragActive )
{ {
if ( !settings::getSetting( if ( !moveShortcutLeft() )
settings::BoolSetting::PLAYSPACE_moveShortcutLeft ) )
{ {
return; return;
} }
@@ -1508,8 +1507,7 @@ void MoveCenterTabController::leftHandSpaceDrag( bool leftHandDragActive )
void MoveCenterTabController::rightHandSpaceDrag( bool rightHandDragActive ) void MoveCenterTabController::rightHandSpaceDrag( bool rightHandDragActive )
{ {
if ( !settings::getSetting( if ( !moveShortcutRight() )
settings::BoolSetting::PLAYSPACE_moveShortcutRight ) )
{ {
return; return;
} }
@@ -1563,8 +1561,7 @@ void MoveCenterTabController::rightHandSpaceDrag( bool rightHandDragActive )
void MoveCenterTabController::optionalOverrideLeftHandSpaceDrag( void MoveCenterTabController::optionalOverrideLeftHandSpaceDrag(
bool overrideLeftHandDragActive ) bool overrideLeftHandDragActive )
{ {
if ( !settings::getSetting( if ( !moveShortcutLeft() )
settings::BoolSetting::PLAYSPACE_moveShortcutLeft ) )
{ {
return; return;
} }
@@ -1616,8 +1613,7 @@ void MoveCenterTabController::optionalOverrideLeftHandSpaceDrag(
void MoveCenterTabController::optionalOverrideRightHandSpaceDrag( void MoveCenterTabController::optionalOverrideRightHandSpaceDrag(
bool overrideRightHandDragActive ) bool overrideRightHandDragActive )
{ {
if ( !settings::getSetting( if ( !moveShortcutRight() )
settings::BoolSetting::PLAYSPACE_moveShortcutRight ) )
{ {
return; return;
} }
@@ -1669,8 +1665,7 @@ void MoveCenterTabController::optionalOverrideRightHandSpaceDrag(
void MoveCenterTabController::swapSpaceDragToLeftHandOverride( void MoveCenterTabController::swapSpaceDragToLeftHandOverride(
bool swapDragToLeftHand ) bool swapDragToLeftHand )
{ {
if ( !settings::getSetting( if ( !moveShortcutLeft() )
settings::BoolSetting::PLAYSPACE_moveShortcutLeft ) )
{ {
return; return;
} }
@@ -1748,8 +1743,7 @@ void MoveCenterTabController::swapSpaceDragToLeftHandOverride(
void MoveCenterTabController::swapSpaceDragToRightHandOverride( void MoveCenterTabController::swapSpaceDragToRightHandOverride(
bool swapDragToRightHand ) bool swapDragToRightHand )
{ {
if ( !settings::getSetting( if ( !moveShortcutRight() )
settings::BoolSetting::PLAYSPACE_moveShortcutRight ) )
{ {
return; return;
} }
@@ -1832,8 +1826,7 @@ void MoveCenterTabController::swapSpaceDragToRightHandOverride(
void MoveCenterTabController::leftHandSpaceTurn( bool leftHandTurnActive ) void MoveCenterTabController::leftHandSpaceTurn( bool leftHandTurnActive )
{ {
if ( !settings::getSetting( if ( !turnBindLeft() )
settings::BoolSetting::PLAYSPACE_turnBindLeft ) )
{ {
return; return;
} }
@@ -1876,8 +1869,7 @@ void MoveCenterTabController::leftHandSpaceTurn( bool leftHandTurnActive )
void MoveCenterTabController::rightHandSpaceTurn( bool rightHandTurnActive ) void MoveCenterTabController::rightHandSpaceTurn( bool rightHandTurnActive )
{ {
if ( !settings::getSetting( if ( !turnBindRight() )
settings::BoolSetting::PLAYSPACE_turnBindRight ) )
{ {
return; return;
} }
@@ -1921,8 +1913,7 @@ void MoveCenterTabController::rightHandSpaceTurn( bool rightHandTurnActive )
void MoveCenterTabController::optionalOverrideLeftHandSpaceTurn( void MoveCenterTabController::optionalOverrideLeftHandSpaceTurn(
bool overrideLeftHandTurnActive ) bool overrideLeftHandTurnActive )
{ {
if ( !settings::getSetting( if ( !turnBindLeft() )
settings::BoolSetting::PLAYSPACE_turnBindLeft ) )
{ {
return; return;
} }
@@ -1964,8 +1955,7 @@ void MoveCenterTabController::optionalOverrideLeftHandSpaceTurn(
void MoveCenterTabController::optionalOverrideRightHandSpaceTurn( void MoveCenterTabController::optionalOverrideRightHandSpaceTurn(
bool overrideRightHandTurnActive ) bool overrideRightHandTurnActive )
{ {
if ( !settings::getSetting( if ( !turnBindRight() )
settings::BoolSetting::PLAYSPACE_turnBindRight ) )
{ {
return; return;
} }
@@ -2159,7 +2149,7 @@ void MoveCenterTabController::xAxisLockToggle( bool xAxisLockToggleJustPressed )
return; return;
} }
if ( !settings::getSetting( settings::BoolSetting::PLAYSPACE_lockXToggle ) ) if ( !lockXToggle() )
{ {
setLockX( true ); setLockX( true );
} }
@@ -2176,7 +2166,7 @@ void MoveCenterTabController::yAxisLockToggle( bool yAxisLockToggleJustPressed )
return; return;
} }
if ( !settings::getSetting( settings::BoolSetting::PLAYSPACE_lockYToggle ) ) if ( !lockYToggle() )
{ {
setLockY( true ); setLockY( true );
} }
@@ -2193,7 +2183,7 @@ void MoveCenterTabController::zAxisLockToggle( bool zAxisLockToggleJustPressed )
return; return;
} }
if ( !settings::getSetting( settings::BoolSetting::PLAYSPACE_lockZToggle ) ) if ( !lockZToggle() )
{ {
setLockZ( true ); setLockZ( true );
} }
@@ -2356,18 +2346,15 @@ void MoveCenterTabController::updateHandDrag(
} }
// prevents updating if axis movement is locked // prevents updating if axis movement is locked
if ( !settings::getSetting( if ( !lockXToggle() )
settings::BoolSetting::PLAYSPACE_lockXToggle ) )
{ {
m_offsetX += static_cast<float>( diff[0] ); m_offsetX += static_cast<float>( diff[0] );
} }
if ( !settings::getSetting( if ( !lockYToggle() )
settings::BoolSetting::PLAYSPACE_lockYToggle ) )
{ {
m_offsetY += static_cast<float>( diff[1] ); m_offsetY += static_cast<float>( diff[1] );
} }
if ( !settings::getSetting( if ( !lockZToggle() )
settings::BoolSetting::PLAYSPACE_lockZToggle ) )
{ {
m_offsetZ += static_cast<float>( diff[2] ); m_offsetZ += static_cast<float>( diff[2] );
} }
@@ -2494,15 +2481,15 @@ void MoveCenterTabController::updateGravity()
clampVelocity( m_velocity ); clampVelocity( m_velocity );
// make axis lock checkboxes lock velocity on that axis // make axis lock checkboxes lock velocity on that axis
if ( settings::getSetting( settings::BoolSetting::PLAYSPACE_lockXToggle ) ) if ( lockXToggle() )
{ {
m_velocity[0] = 0.0; m_velocity[0] = 0.0;
} }
if ( settings::getSetting( settings::BoolSetting::PLAYSPACE_lockYToggle ) ) if ( lockYToggle() )
{ {
m_velocity[1] = 0.0; m_velocity[1] = 0.0;
} }
if ( settings::getSetting( settings::BoolSetting::PLAYSPACE_lockZToggle ) ) if ( lockZToggle() )
{ {
m_velocity[2] = 0.0; m_velocity[2] = 0.0;
} }
@@ -2753,8 +2740,7 @@ void MoveCenterTabController::updateSpace( bool forceUpdate )
&offsetSeatedCenter ); &offsetSeatedCenter );
} }
if ( settings::getSetting( if ( adjustChaperone() )
settings::BoolSetting::PLAYSPACE_adjustChaperone ) )
{ {
// make a copy of our bounds and // make a copy of our bounds and
// reorient relative to new universe center // reorient relative to new universe center