History

Tweaking the growing heads.

Andrzej Kapolka committed 13 years ago

Commit 0a54c2f1 parent a6795173 files · +26 −10Browse files

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

Unified · Split

interface/src/Application.cpp+4−4
@@ -1644,9 +1644,9 @@ Avatar* Application::findLookatTargetAvatar(const glm::vec3& mouseRayOrigin, con · 1643 unmodified lines
16441644 glm::vec3 headPosition = avatar->getHead().getPosition();
16451645 float distance;
16461646 if (rayIntersectsSphere(mouseRayOrigin, mouseRayDirection, headPosition,
1647− HEAD_SPHERE_RADIUS * avatar->getScale(), distance)) {
1647+ HEAD_SPHERE_RADIUS * avatar->getHead().getScale(), distance)) {
16481648 eyePosition = avatar->getHead().getEyePosition();
1649− _lookatIndicatorScale = avatar->getScale();
1649+ _lookatIndicatorScale = avatar->getHead().getScale();
16501650 _lookatOtherPosition = headPosition;
16511651 nodeID = avatar->getOwningNode()->getNodeID();
16521652 return avatar;
@@ -1787,8 +1787,8 @@ void Application::update(float deltaTime) { · 134 unmodified lines
17871787 _faceshift.getEstimatedEyePitch(), _faceshift.getEstimatedEyeYaw(), 0.0f))) * glm::vec3(0.0f, 0.0f, -1.0f);
17881788 }
17891789
1790− updateLookatTargetAvatar(lookAtRayOrigin, lookAtRayDirection, lookAtSpot);
1791− if (_lookatTargetAvatar) {
1790+ updateLookatTargetAvatar(mouseRayOrigin, mouseRayDirection, lookAtSpot);
1791+ if (_lookatTargetAvatar && !_faceshift.isActive()) {
17921792 // If the mouse is over another avatar's head...
17931793 _myAvatar.getHead().setLookAtPosition(lookAtSpot);
17941794 } 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