History

Merge branch 'master' of https://github.com/worklist/hifi

atlante45 committed 13 years ago

Commit 6fb76d32 parents c48652c b8b07614 files · +13 −13Browse files

Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all

Unified · Split

interface/src/Application.cpp+10−10
@@ -471,7 +471,7 @@ void Application::resizeGL(int width, int height) { · 470 unmodified lines
471471 float aspectRatio = ((float)width/(float)height); // based on screen resize
472472
473473 // reset the camera FOV to our preference...
474− _myCamera.setFieldOfView(_horizontalFieldOfView);
474+ _myCamera.setFieldOfView(_fieldOfView);
475475
476476 // get the lens details from the current camera
477477 Camera& camera = _viewFrustumFromOffset->isChecked() ? _viewFrustumOffsetCamera : _myCamera;
@@ -492,7 +492,7 @@ void Application::resizeGL(int width, int height) { · 14 unmodified lines
492492 }
493493 } else {
494494 camera.setAspectRatio(aspectRatio);
495− camera.setFieldOfView(fov = _horizontalFieldOfView);
495+ camera.setFieldOfView(fov = _fieldOfView);
496496 }
497497
498498 // Tell our viewFrustum about this change
@@ -1295,11 +1295,11 @@ void Application::editPreferences() { · 796 unmodified lines
12951295 avatarURL->setMinimumWidth(QLINE_MINIMUM_WIDTH);
12961296 form->addRow("Avatar URL:", avatarURL);
12971297
1298− QSpinBox* horizontalFieldOfView = new QSpinBox();
1299− horizontalFieldOfView->setMaximum(180);
1300− horizontalFieldOfView->setMinimum(1);
1301− horizontalFieldOfView->setValue(_horizontalFieldOfView);
1302− form->addRow("Horizontal field of view (degrees):", horizontalFieldOfView);
1298+ QSpinBox* fieldOfView = new QSpinBox();
1299+ fieldOfView->setMaximum(180);
1300+ fieldOfView->setMinimum(1);
1301+ fieldOfView->setValue(_fieldOfView);
1302+ form->addRow("Vertical Field of View (Degrees):", fieldOfView);
13031303
13041304 QDoubleSpinBox* gyroCameraSensitivity = new QDoubleSpinBox();
13051305 gyroCameraSensitivity->setValue(_gyroCameraSensitivity);
@@ -1359,7 +1359,7 @@ void Application::editPreferences() { · 53 unmodified lines
13591359 if (!shouldDynamicallySetJitterBuffer()) {
13601360 _audio.setJitterBufferSamples(_audioJitterBufferSamples);
13611361 }
1362− _horizontalFieldOfView = horizontalFieldOfView->value();
1362+ _fieldOfView = fieldOfView->value();
13631363 resizeGL(_glWidget->width(), _glWidget->height());
13641364
13651365 }
@@ -4139,7 +4139,7 @@ void Application::loadSettings(QSettings* settings) { · 2773 unmodified lines
41394139
41404140 _gyroCameraSensitivity = loadSetting(settings, "gyroCameraSensitivity", 0.5f);
41414141 _audioJitterBufferSamples = loadSetting(settings, "audioJitterBufferSamples", 0);
4142− _horizontalFieldOfView = loadSetting(settings, "horizontalFieldOfView", HORIZONTAL_FIELD_OF_VIEW_DEGREES);
4142+ _fieldOfView = loadSetting(settings, "fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES);
41434143
41444144 settings->beginGroup("View Frustum Offset Camera");
41454145 // in case settings is corrupt or missing loadSetting() will check for NaN
@@ -4163,7 +4163,7 @@ void Application::saveSettings(QSettings* settings) { · 17 unmodified lines
41634163
41644164 settings->setValue("gyroCameraSensitivity", _gyroCameraSensitivity);
41654165 settings->setValue("audioJitterBufferSamples", _audioJitterBufferSamples);
4166− settings->setValue("horizontalFieldOfView", _horizontalFieldOfView);
4166+ settings->setValue("fieldOfView", _fieldOfView);
41674167 settings->beginGroup("View Frustum Offset Camera");
41684168 settings->setValue("viewFrustumOffsetYaw", _viewFrustumOffsetYaw);
41694169 settings->setValue("viewFrustumOffsetPitch", _viewFrustumOffsetPitch);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t