History

Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels

Andrzej Kapolka committed 12 years ago

Commit e80eb032 parents 61d9745 8c92c0b3 files · +85 −112Browse files

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

Unified · Split

interface/src/Application.cpp+3−9
@@ -2004,15 +2004,9 @@ void Application::updateMyAvatarLookAtPosition(glm::vec3& lookAtSpot) { · 2003 unmodified lines
20042004 _viewFrustum.computePickRay(0.5f, 0.5f, rayOrigin, rayDirection);
20052005 lookAtSpot = rayOrigin + rayDirection * FAR_AWAY_STARE;
20062006
2007− } else if (!_lookatTargetAvatar) {
2008− if (_isHoverVoxel) {
2009− // Look at the hovered voxel
2010− lookAtSpot = getMouseVoxelWorldCoordinates(_hoverVoxel);
2011−
2012− } else {
2013− // Just look in direction of the mouse ray
2014− lookAtSpot = _mouseRayOrigin + _mouseRayDirection * FAR_AWAY_STARE;
2015− }
2007+ } else {
2008+ // just look in direction of the mouse ray
2009+ lookAtSpot = _mouseRayOrigin + _mouseRayDirection * FAR_AWAY_STARE;
20162010 }
20172011 if (_faceshift.isActive()) {
20182012 // deflect using Faceshift gaze data

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