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
471 float aspectRatio = ((float)width/(float)height); // based on screen resize471 float aspectRatio = ((float)width/(float)height); // based on screen resize
472 472
473 // reset the camera FOV to our preference...473 // reset the camera FOV to our preference...
474 _myCamera.setFieldOfView(_horizontalFieldOfView);474 _myCamera.setFieldOfView(_fieldOfView);
475 475
476 // get the lens details from the current camera476 // get the lens details from the current camera
477 Camera& camera = _viewFrustumFromOffset->isChecked() ? _viewFrustumOffsetCamera : _myCamera;477 Camera& camera = _viewFrustumFromOffset->isChecked() ? _viewFrustumOffsetCamera : _myCamera;
@@ -492,7 +492,7 @@ void Application::resizeGL(int width, int height) { · 14 unmodified lines
492 }492 }
493 } else {493 } else {
494 camera.setAspectRatio(aspectRatio);494 camera.setAspectRatio(aspectRatio);
495 camera.setFieldOfView(fov = _horizontalFieldOfView);495 camera.setFieldOfView(fov = _fieldOfView);
496 }496 }
497 497
498 // Tell our viewFrustum about this change498 // Tell our viewFrustum about this change
@@ -1295,11 +1295,11 @@ void Application::editPreferences() { · 796 unmodified lines
1295 avatarURL->setMinimumWidth(QLINE_MINIMUM_WIDTH);1295 avatarURL->setMinimumWidth(QLINE_MINIMUM_WIDTH);
1296 form->addRow("Avatar URL:", avatarURL);1296 form->addRow("Avatar URL:", avatarURL);
1297 1297
1298 QSpinBox* horizontalFieldOfView = new QSpinBox();1298 QSpinBox* fieldOfView = new QSpinBox();
1299 horizontalFieldOfView->setMaximum(180);1299 fieldOfView->setMaximum(180);
1300 horizontalFieldOfView->setMinimum(1);1300 fieldOfView->setMinimum(1);
1301 horizontalFieldOfView->setValue(_horizontalFieldOfView);1301 fieldOfView->setValue(_fieldOfView);
1302 form->addRow("Horizontal field of view (degrees):", horizontalFieldOfView);1302 form->addRow("Vertical Field of View (Degrees):", fieldOfView);
1303 1303
1304 QDoubleSpinBox* gyroCameraSensitivity = new QDoubleSpinBox();1304 QDoubleSpinBox* gyroCameraSensitivity = new QDoubleSpinBox();
1305 gyroCameraSensitivity->setValue(_gyroCameraSensitivity);1305 gyroCameraSensitivity->setValue(_gyroCameraSensitivity);
@@ -1359,7 +1359,7 @@ void Application::editPreferences() { · 53 unmodified lines
1359 if (!shouldDynamicallySetJitterBuffer()) {1359 if (!shouldDynamicallySetJitterBuffer()) {
1360 _audio.setJitterBufferSamples(_audioJitterBufferSamples);1360 _audio.setJitterBufferSamples(_audioJitterBufferSamples);
1361 }1361 }
1362 _horizontalFieldOfView = horizontalFieldOfView->value();1362 _fieldOfView = fieldOfView->value();
1363 resizeGL(_glWidget->width(), _glWidget->height());1363 resizeGL(_glWidget->width(), _glWidget->height());
1364 1364
1365}1365}
@@ -4139,7 +4139,7 @@ void Application::loadSettings(QSettings* settings) { · 2773 unmodified lines
4139 4139
4140 _gyroCameraSensitivity = loadSetting(settings, "gyroCameraSensitivity", 0.5f);4140 _gyroCameraSensitivity = loadSetting(settings, "gyroCameraSensitivity", 0.5f);
4141 _audioJitterBufferSamples = loadSetting(settings, "audioJitterBufferSamples", 0);4141 _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);
4143 4143
4144 settings->beginGroup("View Frustum Offset Camera");4144 settings->beginGroup("View Frustum Offset Camera");
4145 // in case settings is corrupt or missing loadSetting() will check for NaN4145 // in case settings is corrupt or missing loadSetting() will check for NaN
@@ -4163,7 +4163,7 @@ void Application::saveSettings(QSettings* settings) { · 17 unmodified lines
4163 4163
4164 settings->setValue("gyroCameraSensitivity", _gyroCameraSensitivity);4164 settings->setValue("gyroCameraSensitivity", _gyroCameraSensitivity);
4165 settings->setValue("audioJitterBufferSamples", _audioJitterBufferSamples);4165 settings->setValue("audioJitterBufferSamples", _audioJitterBufferSamples);
4166 settings->setValue("horizontalFieldOfView", _horizontalFieldOfView);4166 settings->setValue("fieldOfView", _fieldOfView);
4167 settings->beginGroup("View Frustum Offset Camera");4167 settings->beginGroup("View Frustum Offset Camera");
4168 settings->setValue("viewFrustumOffsetYaw", _viewFrustumOffsetYaw);4168 settings->setValue("viewFrustumOffsetYaw", _viewFrustumOffsetYaw);
4169 settings->setValue("viewFrustumOffsetPitch", _viewFrustumOffsetPitch);4169 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