History

Merge pull request #3735 from ctrlaltdavid/20126

CR for Job #20126 - Rift HUD shouldn't move with head

Brad Hefta-Gaub committed 12 years ago

Commit 24c324f2 parents 583b7b1 a9040c16 files · +8 −18Browse files

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

Unified · Split

interface/src/Application.cpp+2−2
@@ -620,8 +620,8 @@ void Application::paintGL() { · 619 unmodified lines
620620
621621 } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
622622 static const float THIRD_PERSON_CAMERA_DISTANCE = 1.5f;
623− _myCamera.setPosition(_myAvatar->getUprightHeadPosition() +
624− _myAvatar->getOrientation() * glm::vec3(0.0f, 0.0f, 1.0f) * THIRD_PERSON_CAMERA_DISTANCE * _myAvatar->getScale());
623+ _myCamera.setPosition(_myAvatar->getDefaultEyePosition() +
624+ _myAvatar->getOrientation() * glm::vec3(0.0f, 0.0f, 1.0f) * THIRD_PERSON_CAMERA_DISTANCE * _myAvatar->getScale());
625625 if (OculusManager::isConnected()) {
626626 _myCamera.setRotation(_myAvatar->getWorldAlignedOrientation());
627627 } else {

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