History

Merge branch 'master' of https://github.com/worklist/hifi

Philip Rosedale committed 13 years ago

Commit bcb3e082 parents 8dc84fc e437ae86 files · +37 −16Browse files

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

Unified · Split

interface/src/Application.cpp+4−4
@@ -1651,9 +1651,9 @@ Avatar* Application::findLookatTargetAvatar(const glm::vec3& mouseRayOrigin, con · 1650 unmodified lines
1651 glm::vec3 headPosition = avatar->getHead().getPosition();1651 glm::vec3 headPosition = avatar->getHead().getPosition();
1652 float distance;1652 float distance;
1653 if (rayIntersectsSphere(mouseRayOrigin, mouseRayDirection, headPosition,1653 if (rayIntersectsSphere(mouseRayOrigin, mouseRayDirection, headPosition,
1654 HEAD_SPHERE_RADIUS * avatar->getScale(), distance)) {1654 HEAD_SPHERE_RADIUS * avatar->getHead().getScale(), distance)) {
1655 eyePosition = avatar->getHead().getEyePosition();1655 eyePosition = avatar->getHead().getEyePosition();
1656 _lookatIndicatorScale = avatar->getScale();1656 _lookatIndicatorScale = avatar->getHead().getScale();
1657 _lookatOtherPosition = headPosition;1657 _lookatOtherPosition = headPosition;
1658 nodeID = avatar->getOwningNode()->getNodeID();1658 nodeID = avatar->getOwningNode()->getNodeID();
1659 return avatar;1659 return avatar;
@@ -1794,8 +1794,8 @@ void Application::update(float deltaTime) { · 134 unmodified lines
1794 _faceshift.getEstimatedEyePitch(), _faceshift.getEstimatedEyeYaw(), 0.0f))) * glm::vec3(0.0f, 0.0f, -1.0f);1794 _faceshift.getEstimatedEyePitch(), _faceshift.getEstimatedEyeYaw(), 0.0f))) * glm::vec3(0.0f, 0.0f, -1.0f);
1795 }1795 }
1796 1796
1797 updateLookatTargetAvatar(lookAtRayOrigin, lookAtRayDirection, lookAtSpot);1797 updateLookatTargetAvatar(mouseRayOrigin, mouseRayDirection, lookAtSpot);
1798 if (_lookatTargetAvatar) {1798 if (_lookatTargetAvatar && !_faceshift.isActive()) {
1799 // If the mouse is over another avatar's head...1799 // If the mouse is over another avatar's head...
1800 _myAvatar.getHead().setLookAtPosition(lookAtSpot);1800 _myAvatar.getHead().setLookAtPosition(lookAtSpot);
1801 } else if (_isHoverVoxel && !_faceshift.isActive()) {1801 } else if (_isHoverVoxel && !_faceshift.isActive()) {

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