History

Force a minimum convergence distance on the eyes. Closes #2100.

Andrzej Kapolka committed 12 years ago

Commit 8554c1d1 parent 5d99b061 file · +4 −1Browse files

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

Unified · Split

interface/src/Application.cpp+4−1
@@ -2056,7 +2056,10 @@ void Application::updateMyAvatarLookAtPosition() { · 2055 unmodified lines
2056 } else if (_isHoverVoxel) {2056 } else if (_isHoverVoxel) {
2057 distance = glm::distance(_mouseRayOrigin, getMouseVoxelWorldCoordinates(_hoverVoxel));2057 distance = glm::distance(_mouseRayOrigin, getMouseVoxelWorldCoordinates(_hoverVoxel));
2058 }2058 }
2059 lookAtSpot = _mouseRayOrigin + _mouseRayDirection * distance;2059 const float FIXED_MIN_EYE_DISTANCE = 0.3f;
2060 float minEyeDistance = FIXED_MIN_EYE_DISTANCE + (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON ? 0.0f :
2061 glm::distance(_mouseRayOrigin, _myAvatar->getHead()->calculateAverageEyePosition()));
2062 lookAtSpot = _mouseRayOrigin + _mouseRayDirection * qMax(minEyeDistance, distance);
2060 }2063 }
2061 bool trackerActive = false;2064 bool trackerActive = false;
2062 float eyePitch, eyeYaw;2065 float eyePitch, eyeYaw;

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