Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 03:13:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add field of view as an option in preferences

Browse source
This commit is contained in:
Philip Rosedale 2013-07-01 23:00:39 -07:00
parent 6fbab462f0
commit e7113d26f8
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/src/Application.cpp
View file

@ -450,7 +450,7 @@ void Application::resizeGL(int width, int height) {
} }
} else { } else {
camera.setAspectRatio(aspectRatio); camera.setAspectRatio(aspectRatio);
camera.setFieldOfView(fov = HORIZONTAL_FIELD_OF_VIEW_DEGREES); camera.setFieldOfView(fov = _horizontalFieldOfView);
} }
// Tell our viewFrustum about this change // Tell our viewFrustum about this change
@ -1046,6 +1046,12 @@ void Application::editPreferences() {
avatarURL->setMinimumWidth(400); avatarURL->setMinimumWidth(400);
form->addRow("Avatar URL:", avatarURL); form->addRow("Avatar URL:", avatarURL);
QSpinBox* horizontalFieldOfView = new QSpinBox();
horizontalFieldOfView->setMaximum(180);
horizontalFieldOfView->setMinimum(1);
horizontalFieldOfView->setValue(_horizontalFieldOfView);
form->addRow("Horizontal field of view (degrees):", horizontalFieldOfView);
QDoubleSpinBox* headCameraPitchYawScale = new QDoubleSpinBox(); QDoubleSpinBox* headCameraPitchYawScale = new QDoubleSpinBox();
headCameraPitchYawScale->setValue(_headCameraPitchYawScale); headCameraPitchYawScale->setValue(_headCameraPitchYawScale);
form->addRow("Head Camera Pitch/Yaw Scale:", headCameraPitchYawScale); form->addRow("Head Camera Pitch/Yaw Scale:", headCameraPitchYawScale);
@ -1077,6 +1083,9 @@ void Application::editPreferences() {
if (!shouldDynamicallySetJitterBuffer()) { if (!shouldDynamicallySetJitterBuffer()) {
_audio.setJitterBufferSamples(_audioJitterBufferSamples); _audio.setJitterBufferSamples(_audioJitterBufferSamples);
} }
_horizontalFieldOfView = horizontalFieldOfView->value();
resizeGL(_glWidget->width(), _glWidget->height());
} }
void Application::pair() { void Application::pair() {
@ -2909,6 +2918,8 @@ void Application::loadSettings(QSettings* settings) {
_headCameraPitchYawScale = loadSetting(settings, "headCameraPitchYawScale", 0.0f); _headCameraPitchYawScale = loadSetting(settings, "headCameraPitchYawScale", 0.0f);
_audioJitterBufferSamples = loadSetting(settings, "audioJitterBufferSamples", 0); _audioJitterBufferSamples = loadSetting(settings, "audioJitterBufferSamples", 0);
_horizontalFieldOfView = loadSetting(settings, "horizontalFieldOfView", HORIZONTAL_FIELD_OF_VIEW_DEGREES);
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
_viewFrustumOffsetYaw = loadSetting(settings, "viewFrustumOffsetYaw" , 0.0f); _viewFrustumOffsetYaw = loadSetting(settings, "viewFrustumOffsetYaw" , 0.0f);
@ -2930,6 +2941,7 @@ void Application::saveSettings(QSettings* settings) {
settings->setValue("headCameraPitchYawScale", _headCameraPitchYawScale); settings->setValue("headCameraPitchYawScale", _headCameraPitchYawScale);
settings->setValue("audioJitterBufferSamples", _audioJitterBufferSamples); settings->setValue("audioJitterBufferSamples", _audioJitterBufferSamples);
settings->setValue("horizontalFieldOfView", _horizontalFieldOfView);
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);

2
interface/src/Application.h
View file

@ -297,6 +297,8 @@ private:
int _audioJitterBufferSamples; // Number of extra samples to wait before starting audio playback int _audioJitterBufferSamples; // Number of extra samples to wait before starting audio playback
float _horizontalFieldOfView; // In Degrees, doesn't apply to HMD like Oculus
HandControl _handControl; HandControl _handControl;
int _mouseX; int _mouseX;