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

Merge pull request #1658 from ey6es/master

Browse source 
Remove eyes' hovering on mouse avatar, voxels.  Closes #1643.
This commit is contained in:
Philip Rosedale 2014-01-23 12:26:21 -08:00
commit 8c92c0b663
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/Application.cpp
View file

@ -2008,15 +2008,9 @@ void Application::updateMyAvatarLookAtPosition(glm::vec3& lookAtSpot, glm::vec3&
_viewFrustum.computePickRay(0.5f, 0.5f, rayOrigin, rayDirection); _viewFrustum.computePickRay(0.5f, 0.5f, rayOrigin, rayDirection);
lookAtSpot = rayOrigin + rayDirection * FAR_AWAY_STARE; lookAtSpot = rayOrigin + rayDirection * FAR_AWAY_STARE;
} else if (!_lookatTargetAvatar) { } else {
if (_isHoverVoxel) { // just look in direction of the mouse ray
// Look at the hovered voxel lookAtSpot = lookAtRayOrigin + lookAtRayDirection * FAR_AWAY_STARE;
lookAtSpot = getMouseVoxelWorldCoordinates(_hoverVoxel);
} else {
// Just look in direction of the mouse ray
lookAtSpot = lookAtRayOrigin + lookAtRayDirection * FAR_AWAY_STARE;
}
} }
if (_faceshift.isActive()) { if (_faceshift.isActive()) {
// deflect using Faceshift gaze data // deflect using Faceshift gaze data