changed m_k_ to m_ (#341)
This commit is contained in:
@@ -21,7 +21,7 @@ void AudioTabController::initStage1()
|
|||||||
audioManager.reset( new AudioManagerDummy() );
|
audioManager.reset( new AudioManagerDummy() );
|
||||||
#endif
|
#endif
|
||||||
audioManager->init( this );
|
audioManager->init( this );
|
||||||
m_k_audioSettingsUpdateCounter
|
m_audioSettingsUpdateCounter
|
||||||
= utils::adjustUpdateRate( k_audioSettingsUpdateCounter );
|
= utils::adjustUpdateRate( k_audioSettingsUpdateCounter );
|
||||||
initOverride();
|
initOverride();
|
||||||
m_playbackDevices = audioManager->getPlaybackDevices();
|
m_playbackDevices = audioManager->getPlaybackDevices();
|
||||||
@@ -160,7 +160,7 @@ void AudioTabController::eventLoopTick()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( settingsUpdateCounter >= m_k_audioSettingsUpdateCounter )
|
if ( settingsUpdateCounter >= m_audioSettingsUpdateCounter )
|
||||||
{
|
{
|
||||||
vr::EVRSettingsError vrSettingsError;
|
vr::EVRSettingsError vrSettingsError;
|
||||||
char mirrorDeviceId[1024];
|
char mirrorDeviceId[1024];
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ private:
|
|||||||
bool m_isPlaybackOverride = false;
|
bool m_isPlaybackOverride = false;
|
||||||
bool m_isRecordingOverride = false;
|
bool m_isRecordingOverride = false;
|
||||||
|
|
||||||
unsigned int m_k_audioSettingsUpdateCounter = 90;
|
unsigned int m_audioSettingsUpdateCounter = 90;
|
||||||
|
|
||||||
int m_defaultProfileIndex = -1;
|
int m_defaultProfileIndex = -1;
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ void ChaperoneTabController::initStage1()
|
|||||||
}
|
}
|
||||||
|
|
||||||
reloadChaperoneProfiles();
|
reloadChaperoneProfiles();
|
||||||
m_k_chaperoneSettingsUpdateCounter
|
m_chaperoneSettingsUpdateCounter
|
||||||
= utils::adjustUpdateRate( k_chaperoneSettingsUpdateCounter );
|
= utils::adjustUpdateRate( k_chaperoneSettingsUpdateCounter );
|
||||||
eventLoopTick( nullptr );
|
eventLoopTick( nullptr );
|
||||||
}
|
}
|
||||||
@@ -618,7 +618,7 @@ void ChaperoneTabController::eventLoopTick(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( settingsUpdateCounter >= m_k_chaperoneSettingsUpdateCounter )
|
if ( settingsUpdateCounter >= m_chaperoneSettingsUpdateCounter )
|
||||||
{
|
{
|
||||||
if ( parent->isDashboardVisible() )
|
if ( parent->isDashboardVisible() )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -159,7 +159,7 @@ private:
|
|||||||
|
|
||||||
int m_updateTicksChaperoneReload = 0;
|
int m_updateTicksChaperoneReload = 0;
|
||||||
|
|
||||||
unsigned int m_k_chaperoneSettingsUpdateCounter = 101;
|
unsigned int m_chaperoneSettingsUpdateCounter = 101;
|
||||||
|
|
||||||
vr::VRActionHandle_t m_rightActionHandle;
|
vr::VRActionHandle_t m_rightActionHandle;
|
||||||
vr::VRActionHandle_t m_leftActionHandle;
|
vr::VRActionHandle_t m_leftActionHandle;
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ namespace advsettings
|
|||||||
void MoveCenterTabController::initStage1()
|
void MoveCenterTabController::initStage1()
|
||||||
{
|
{
|
||||||
reloadOffsetProfiles();
|
reloadOffsetProfiles();
|
||||||
m_k_moveCenterSettingsUpdateCounter
|
m_moveCenterSettingsUpdateCounter
|
||||||
= utils::adjustUpdateRate( k_moveCenterSettingsUpdateCounter );
|
= utils::adjustUpdateRate( k_moveCenterSettingsUpdateCounter );
|
||||||
m_lastDragUpdateTimePoint = std::chrono::steady_clock::now();
|
m_lastDragUpdateTimePoint = std::chrono::steady_clock::now();
|
||||||
m_lastGravityUpdateTimePoint = std::chrono::steady_clock::now();
|
m_lastGravityUpdateTimePoint = std::chrono::steady_clock::now();
|
||||||
|
|||||||
@@ -168,7 +168,7 @@ private:
|
|||||||
unsigned m_dragComfortFrameSkipCounter = 0;
|
unsigned m_dragComfortFrameSkipCounter = 0;
|
||||||
unsigned m_turnComfortFrameSkipCounter = 0;
|
unsigned m_turnComfortFrameSkipCounter = 0;
|
||||||
|
|
||||||
unsigned int m_k_moveCenterSettingsUpdateCounter = 83;
|
unsigned int m_moveCenterSettingsUpdateCounter = 83;
|
||||||
|
|
||||||
double m_velocity[3] = { 0.0, 0.0, 0.0 };
|
double m_velocity[3] = { 0.0, 0.0, 0.0 };
|
||||||
std::chrono::steady_clock::time_point m_lastGravityUpdateTimePoint;
|
std::chrono::steady_clock::time_point m_lastGravityUpdateTimePoint;
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ void SettingsTabController::initStage1()
|
|||||||
{
|
{
|
||||||
m_autoStartEnabled = vr::VRApplications()->GetApplicationAutoLaunch(
|
m_autoStartEnabled = vr::VRApplications()->GetApplicationAutoLaunch(
|
||||||
application_strings::applicationKey );
|
application_strings::applicationKey );
|
||||||
m_k_settingsTabSettingsUpdateCounter
|
m_settingsTabSettingsUpdateCounter
|
||||||
= utils::adjustUpdateRate( k_settingsTabSettingsUpdateCounter );
|
= utils::adjustUpdateRate( k_settingsTabSettingsUpdateCounter );
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -20,7 +20,7 @@ void SettingsTabController::initStage2( OverlayController* var_parent )
|
|||||||
|
|
||||||
void SettingsTabController::dashboardLoopTick()
|
void SettingsTabController::dashboardLoopTick()
|
||||||
{
|
{
|
||||||
if ( settingsUpdateCounter >= m_k_settingsTabSettingsUpdateCounter )
|
if ( settingsUpdateCounter >= m_settingsTabSettingsUpdateCounter )
|
||||||
{
|
{
|
||||||
setAutoStartEnabled( vr::VRApplications()->GetApplicationAutoLaunch(
|
setAutoStartEnabled( vr::VRApplications()->GetApplicationAutoLaunch(
|
||||||
application_strings::applicationKey ) );
|
application_strings::applicationKey ) );
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ private:
|
|||||||
|
|
||||||
bool m_autoStartEnabled = false;
|
bool m_autoStartEnabled = false;
|
||||||
|
|
||||||
unsigned int m_k_settingsTabSettingsUpdateCounter = 157;
|
unsigned int m_settingsTabSettingsUpdateCounter = 157;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void initStage1();
|
void initStage1();
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ namespace advsettings
|
|||||||
{
|
{
|
||||||
void SteamVRTabController::initStage1()
|
void SteamVRTabController::initStage1()
|
||||||
{
|
{
|
||||||
m_k_steamVrSettingsUpdateCounter
|
m_steamVrSettingsUpdateCounter
|
||||||
= utils::adjustUpdateRate( k_steamVrSettingsUpdateCounter );
|
= utils::adjustUpdateRate( k_steamVrSettingsUpdateCounter );
|
||||||
dashboardLoopTick();
|
dashboardLoopTick();
|
||||||
}
|
}
|
||||||
@@ -19,7 +19,7 @@ void SteamVRTabController::initStage2( OverlayController* var_parent )
|
|||||||
|
|
||||||
void SteamVRTabController::dashboardLoopTick()
|
void SteamVRTabController::dashboardLoopTick()
|
||||||
{
|
{
|
||||||
if ( settingsUpdateCounter >= m_k_steamVrSettingsUpdateCounter )
|
if ( settingsUpdateCounter >= m_steamVrSettingsUpdateCounter )
|
||||||
{
|
{
|
||||||
vr::EVRSettingsError vrSettingsError;
|
vr::EVRSettingsError vrSettingsError;
|
||||||
|
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ private:
|
|||||||
|
|
||||||
unsigned settingsUpdateCounter = 0;
|
unsigned settingsUpdateCounter = 0;
|
||||||
|
|
||||||
unsigned int m_k_steamVrSettingsUpdateCounter = 97;
|
unsigned int m_steamVrSettingsUpdateCounter = 97;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void initStage1();
|
void initStage1();
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ void UtilitiesTabController::initStage1()
|
|||||||
|
|
||||||
m_alarmTime = QTime( qAlarmHour, qAlarmMinute );
|
m_alarmTime = QTime( qAlarmHour, qAlarmMinute );
|
||||||
|
|
||||||
m_k_utilitiesSettingsUpdateCounter
|
m_utilitiesSettingsUpdateCounter
|
||||||
= utils::adjustUpdateRate( k_utilitiesSettingsUpdateCounter );
|
= utils::adjustUpdateRate( k_utilitiesSettingsUpdateCounter );
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -429,7 +429,7 @@ vr::VROverlayHandle_t createBatteryOverlay( vr::TrackedDeviceIndex_t index )
|
|||||||
|
|
||||||
void UtilitiesTabController::eventLoopTick()
|
void UtilitiesTabController::eventLoopTick()
|
||||||
{
|
{
|
||||||
if ( settingsUpdateCounter >= m_k_utilitiesSettingsUpdateCounter )
|
if ( settingsUpdateCounter >= m_utilitiesSettingsUpdateCounter )
|
||||||
{
|
{
|
||||||
if ( alarmEnabled() && m_alarmTime.isValid() )
|
if ( alarmEnabled() && m_alarmTime.isValid() )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ private:
|
|||||||
int m_batteryState[vr::k_unMaxTrackedDeviceCount];
|
int m_batteryState[vr::k_unMaxTrackedDeviceCount];
|
||||||
bool m_batteryVisible[vr::k_unMaxTrackedDeviceCount];
|
bool m_batteryVisible[vr::k_unMaxTrackedDeviceCount];
|
||||||
|
|
||||||
unsigned int m_k_utilitiesSettingsUpdateCounter = 19;
|
unsigned int m_utilitiesSettingsUpdateCounter = 19;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void initStage1();
|
void initStage1();
|
||||||
|
|||||||
Reference in New Issue
Block a user