Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 21:12:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix CR feedback

Browse source
This commit is contained in:
ZappoMan 2013-06-10 14:50:04 -07:00
parent fc3fb7d3f0
commit 27f8f5dcb8
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/src/Application.cpp
View file

@ -2574,9 +2574,11 @@ void Application::saveAction(QSettings* set, QAction* action) {
} }
void Application::loadSettings(QSettings* settings) { void Application::loadSettings(QSettings* settings) {
if (!settings) settings = getSettings(); if (!settings) {
settings = getSettings();
}
_headCameraPitchYawScale = settings->value("headCameraPitchYawScale", 0.0f).toFloat(); _headCameraPitchYawScale = loadSetting(settings, "headCameraPitchYawScale", 0.0f);
settings->beginGroup("View Frustum Offset Camera"); settings->beginGroup("View Frustum Offset Camera");
// in case settings is corrupt or missing loadSetting() will check for NaN // in case settings is corrupt or missing loadSetting() will check for NaN
@ -2593,10 +2595,11 @@ void Application::loadSettings(QSettings* settings) {
void Application::saveSettings(QSettings* settings) { void Application::saveSettings(QSettings* settings) {
if (!settings) settings = getSettings(); if (!settings) {
settings = getSettings();
}
settings->setValue("headCameraPitchYawScale", _headCameraPitchYawScale); settings->setValue("headCameraPitchYawScale", _headCameraPitchYawScale);
settings->beginGroup("View Frustum Offset Camera"); settings->beginGroup("View Frustum Offset Camera");
settings->setValue("viewFrustumOffsetYaw", _viewFrustumOffsetYaw); settings->setValue("viewFrustumOffsetYaw", _viewFrustumOffsetYaw);
settings->setValue("viewFrustumOffsetPitch", _viewFrustumOffsetPitch); settings->setValue("viewFrustumOffsetPitch", _viewFrustumOffsetPitch);

9
interface/src/Util.cpp
View file

@ -497,17 +497,10 @@ void runTimingTests() {
} }
float loadSetting(QSettings* settings, const char* name, float defaultValue) { float loadSetting(QSettings* settings, const char* name, float defaultValue) {
float value = settings->value(name, 0.0f).toFloat(); float value = settings->value(name, 0.0f).toFloat();
if (isnan(value)) { if (isnan(value)) {
value = defaultValue; value = defaultValue;
} }
return value; return value;
} }