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

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

Browse source
This commit is contained in:
Andrzej Kapolka 2014-02-25 16:50:59 -08:00
parent 5d99b06a48
commit 8554c1dfbf
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Application.cpp
View file

@ -2056,7 +2056,10 @@ void Application::updateMyAvatarLookAtPosition() {
} else if (_isHoverVoxel) { } else if (_isHoverVoxel) {
distance = glm::distance(_mouseRayOrigin, getMouseVoxelWorldCoordinates(_hoverVoxel)); distance = glm::distance(_mouseRayOrigin, getMouseVoxelWorldCoordinates(_hoverVoxel));
} }
lookAtSpot = _mouseRayOrigin + _mouseRayDirection * distance; const float FIXED_MIN_EYE_DISTANCE = 0.3f;
float minEyeDistance = FIXED_MIN_EYE_DISTANCE + (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON ? 0.0f :
glm::distance(_mouseRayOrigin, _myAvatar->getHead()->calculateAverageEyePosition()));
lookAtSpot = _mouseRayOrigin + _mouseRayDirection * qMax(minEyeDistance, distance);
} }
bool trackerActive = false; bool trackerActive = false;
float eyePitch, eyeYaw; float eyePitch, eyeYaw;