Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all
Unified · Split
| @@ -200,6 +200,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 199 unmodified lines | ||
| 200 | 200 | _mouseVoxelScale(1.0f / 1024.0f), |
| 201 | 201 | _justEditedVoxel(false), |
| 202 | 202 | _isLookingAtOtherAvatar(false), |
| 203 | + _lookatIndicatorScale(1.0f), | |
| 203 | 204 | _paintOn(false), |
| 204 | 205 | _dominantColor(0), |
| 205 | 206 | _perfStatsOn(false), |
| @@ -1942,6 +1943,7 @@ bool Application::isLookingAtOtherAvatar(glm::vec3& mouseRayOrigin, glm::vec3& m · 1736 unmodified lines | ||
| 1942 | 1943 | glm::vec3 headPosition = avatar->getHead().getPosition(); |
| 1943 | 1944 | if (rayIntersectsSphere(mouseRayOrigin, mouseRayDirection, headPosition, HEAD_SPHERE_RADIUS)) { |
| 1944 | 1945 | eyePosition = avatar->getHead().getEyeLevelPosition(); |
| 1946 | + _lookatIndicatorScale = avatar->getScale(); | |
| 1945 | 1947 | _lookatOtherPosition = headPosition; |
| 1946 | 1948 | return true; |
| 1947 | 1949 | } |
| @@ -1952,8 +1954,8 @@ bool Application::isLookingAtOtherAvatar(glm::vec3& mouseRayOrigin, glm::vec3& m · 4 unmodified lines | ||
| 1952 | 1954 | |
| 1953 | 1955 | void Application::renderLookatIndicator(glm::vec3 pointOfInterest, Camera& whichCamera) { |
| 1954 | 1956 | |
| 1955 | − const float DISTANCE_FROM_HEAD_SPHERE = 0.1f; | |
| 1956 | − const float INDICATOR_RADIUS = 0.1f; | |
| 1957 | + const float DISTANCE_FROM_HEAD_SPHERE = 0.1f * _lookatIndicatorScale; | |
| 1958 | + const float INDICATOR_RADIUS = 0.1f * _lookatIndicatorScale; | |
| 1957 | 1959 | const float YELLOW[] = { 1.0f, 1.0f, 0.0f }; |
| 1958 | 1960 | const int NUM_SEGMENTS = 30; |
| 1959 | 1961 | glm::vec3 haloOrigin(pointOfInterest.x, pointOfInterest.y + DISTANCE_FROM_HEAD_SPHERE, pointOfInterest.z); |