History

Tuned gyro look, added better preferences

Philip Rosedale committed 13 years ago

Commit 120bbbd1 parent 58cb8526 files · +37 −37Browse files

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

Unified · Split

interface/src/Application.cpp+10−13
@@ -1290,9 +1290,9 @@ void Application::editPreferences() { · 1289 unmodified lines
12901290 horizontalFieldOfView->setValue(_horizontalFieldOfView);
12911291 form->addRow("Horizontal field of view (degrees):", horizontalFieldOfView);
12921292
1293− QDoubleSpinBox* headCameraPitchYawScale = new QDoubleSpinBox();
1294− headCameraPitchYawScale->setValue(_headCameraPitchYawScale);
1295− form->addRow("Head Camera Pitch/Yaw Scale:", headCameraPitchYawScale);
1293+ QDoubleSpinBox* gyroCameraSensitivity = new QDoubleSpinBox();
1294+ gyroCameraSensitivity->setValue(_gyroCameraSensitivity);
1295+ form->addRow("Gyro Camera Sensitivity (0 - 1):", gyroCameraSensitivity);
12961296
12971297 QDoubleSpinBox* leanScale = new QDoubleSpinBox();
12981298 leanScale->setValue(_myAvatar.getLeanScale());
@@ -1342,7 +1342,7 @@ void Application::editPreferences() { · 43 unmodified lines
13421342 _myAvatar.getVoxels()->setVoxelURL(url);
13431343 sendAvatarVoxelURLMessage(url);
13441344
1345− _headCameraPitchYawScale = headCameraPitchYawScale->value();
1345+ _gyroCameraSensitivity = gyroCameraSensitivity->value();
13461346 _myAvatar.setLeanScale(leanScale->value());
13471347 _audioJitterBufferSamples = audioJitterBufferSamples->value();
13481348 if (!shouldDynamicallySetJitterBuffer()) {
@@ -2500,7 +2500,7 @@ void Application::update(float deltaTime) { · 1151 unmodified lines
25002500 if (!avatar->isInitialized()) {
25012501 avatar->init();
25022502 }
2503− avatar->simulate(deltaTime, NULL);
2503+ avatar->simulate(deltaTime, NULL, 0.f);
25042504 avatar->setMouseRay(mouseRayOrigin, mouseRayDirection);
25052505 }
25062506 node->unlock();
@@ -2515,9 +2515,9 @@ void Application::update(float deltaTime) { · 8 unmodified lines
25152515 }
25162516
25172517 if (_transmitterDrives->isChecked() && _myTransmitter.isConnected()) {
2518− _myAvatar.simulate(deltaTime, &_myTransmitter);
2518+ _myAvatar.simulate(deltaTime, &_myTransmitter, _gyroCameraSensitivity);
25192519 } else {
2520− _myAvatar.simulate(deltaTime, NULL);
2520+ _myAvatar.simulate(deltaTime, NULL, _gyroCameraSensitivity);
25212521 }
25222522
25232523 if (!OculusManager::isConnected()) {
@@ -2584,9 +2584,6 @@ void Application::updateAvatar(float deltaTime) { · 60 unmodified lines
25842584
25852585 // Update my avatar's state from gyros and/or webcam
25862586 _myAvatar.updateFromGyrosAndOrWebcam(_gyroLook->isChecked(),
2587− glm::vec3(_headCameraPitchYawScale,
2588− _headCameraPitchYawScale,
2589− _headCameraPitchYawScale),
25902587 _pitchFromTouch);
25912588
25922589 if (_serialHeadSensor.isActive()) {
@@ -3951,11 +3948,11 @@ void Application::saveAction(QSettings* set, QAction* action) { · 1358 unmodified lines
39513948 }
39523949
39533950 void Application::loadSettings(QSettings* settings) {
3954− if (!settings) {
3951+ if (!settings) {
39553952 settings = getSettings();
39563953 }
39573954
3958− _headCameraPitchYawScale = loadSetting(settings, "headCameraPitchYawScale", 0.0f);
3955+ _gyroCameraSensitivity = loadSetting(settings, "gyroCameraSensitivity", 0.5f);
39593956 _audioJitterBufferSamples = loadSetting(settings, "audioJitterBufferSamples", 0);
39603957 _horizontalFieldOfView = loadSetting(settings, "horizontalFieldOfView", HORIZONTAL_FIELD_OF_VIEW_DEGREES);
39613958
@@ -3979,7 +3976,7 @@ void Application::saveSettings(QSettings* settings) { · 17 unmodified lines
39793976 settings = getSettings();
39803977 }
39813978
3982− settings->setValue("headCameraPitchYawScale", _headCameraPitchYawScale);
3979+ settings->setValue("gyroCameraSensitivity", _gyroCameraSensitivity);
39833980 settings->setValue("audioJitterBufferSamples", _audioJitterBufferSamples);
39843981 settings->setValue("horizontalFieldOfView", _horizontalFieldOfView);
39853982 settings->beginGroup("View Frustum Offset Camera");

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