Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all
Unified · Split
| @@ -1644,9 +1644,9 @@ Avatar* Application::findLookatTargetAvatar(const glm::vec3& mouseRayOrigin, con · 1643 unmodified lines | ||
| 1644 | 1644 | glm::vec3 headPosition = avatar->getHead().getPosition(); |
| 1645 | 1645 | float distance; |
| 1646 | 1646 | if (rayIntersectsSphere(mouseRayOrigin, mouseRayDirection, headPosition, |
| 1647 | − HEAD_SPHERE_RADIUS * avatar->getScale(), distance)) { | |
| 1647 | + HEAD_SPHERE_RADIUS * avatar->getHead().getScale(), distance)) { | |
| 1648 | 1648 | eyePosition = avatar->getHead().getEyePosition(); |
| 1649 | − _lookatIndicatorScale = avatar->getScale(); | |
| 1649 | + _lookatIndicatorScale = avatar->getHead().getScale(); | |
| 1650 | 1650 | _lookatOtherPosition = headPosition; |
| 1651 | 1651 | nodeID = avatar->getOwningNode()->getNodeID(); |
| 1652 | 1652 | return avatar; |
| @@ -1787,8 +1787,8 @@ void Application::update(float deltaTime) { · 134 unmodified lines | ||
| 1787 | 1787 | _faceshift.getEstimatedEyePitch(), _faceshift.getEstimatedEyeYaw(), 0.0f))) * glm::vec3(0.0f, 0.0f, -1.0f); |
| 1788 | 1788 | } |
| 1789 | 1789 | |
| 1790 | − updateLookatTargetAvatar(lookAtRayOrigin, lookAtRayDirection, lookAtSpot); | |
| 1791 | − if (_lookatTargetAvatar) { | |
| 1790 | + updateLookatTargetAvatar(mouseRayOrigin, mouseRayDirection, lookAtSpot); | |
| 1791 | + if (_lookatTargetAvatar && !_faceshift.isActive()) { | |
| 1792 | 1792 | // If the mouse is over another avatar's head... |
| 1793 | 1793 | _myAvatar.getHead().setLookAtPosition(lookAtSpot); |
| 1794 | 1794 | } else if (_isHoverVoxel && !_faceshift.isActive()) { |