History

Transmit the eye offset position along with the rest of the frustum parameters.

Andrzej Kapolka committed 13 years ago

Commit 49619131 parent dd8a40d5 files · +11 −2Browse files

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

Unified · Split

interface/src/Application.cpp+2−1
@@ -1803,7 +1803,7 @@ void Application::update(float deltaTime) { · 1802 unmodified lines
1803 1803
1804 if (Menu::getInstance()->isOptionChecked(MenuOption::OffAxisProjection)) {1804 if (Menu::getInstance()->isOptionChecked(MenuOption::OffAxisProjection)) {
1805 if (_faceshift.isActive()) {1805 if (_faceshift.isActive()) {
1806 const float EYE_OFFSET_SCALE = 0.1f;1806 const float EYE_OFFSET_SCALE = 0.005f;
1807 glm::vec3 position = _faceshift.getHeadTranslation() * EYE_OFFSET_SCALE;1807 glm::vec3 position = _faceshift.getHeadTranslation() * EYE_OFFSET_SCALE;
1808 _myCamera.setEyeOffsetPosition(glm::vec3(-position.x, position.y, position.z)); 1808 _myCamera.setEyeOffsetPosition(glm::vec3(-position.x, position.y, position.z));
1809 resizeGL(_glWidget->width(), _glWidget->height());1809 resizeGL(_glWidget->width(), _glWidget->height());
@@ -1912,6 +1912,7 @@ void Application::updateAvatar(float deltaTime) { · 102 unmodified lines
1912 _myAvatar.setCameraAspectRatio(_viewFrustum.getAspectRatio());1912 _myAvatar.setCameraAspectRatio(_viewFrustum.getAspectRatio());
1913 _myAvatar.setCameraNearClip(_viewFrustum.getNearClip());1913 _myAvatar.setCameraNearClip(_viewFrustum.getNearClip());
1914 _myAvatar.setCameraFarClip(_viewFrustum.getFarClip());1914 _myAvatar.setCameraFarClip(_viewFrustum.getFarClip());
1915 _myAvatar.setCameraEyeOffsetPosition(_viewFrustum.getEyeOffsetPosition());
1915 1916
1916 NodeList* nodeList = NodeList::getInstance();1917 NodeList* nodeList = NodeList::getInstance();
1917 if (nodeList->getOwnerID() != UNKNOWN_NODE_ID) {1918 if (nodeList->getOwnerID() != UNKNOWN_NODE_ID) {

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