From 39499e4a9269e36cdd71c69387556c7cfb96ed52 Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Wed, 29 May 2013 11:26:06 -0700 Subject: [PATCH 1/3] fix to head transparency --- interface/src/Avatar.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index 403918c830..4118debd14 100644 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -1123,6 +1123,10 @@ void Avatar::renderBody(bool lookingInMirror) { float alpha = glm::clamp((distanceToCamera - RENDER_TRANSLUCENT_BEYOND) / (RENDER_OPAQUE_BEYOND - RENDER_TRANSLUCENT_BEYOND), 0.f, 1.f); + if (lookingInMirror || _owningAgent) { + alpha = 1.0f; + } + // Always render other people, and render myself when beyond threshold distance if (b == AVATAR_JOINT_HEAD_BASE) { // the head is rendered as a special case if (lookingInMirror || _owningAgent || distanceToCamera > RENDER_OPAQUE_BEYOND * 0.5) { From 350bd878fcb0f27d450f7deff9d38ce21a155484 Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Wed, 29 May 2013 11:39:53 -0700 Subject: [PATCH 2/3] fix --- interface/src/AvatarTouch.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/AvatarTouch.cpp b/interface/src/AvatarTouch.cpp index 18f4847d33..93899c8400 100644 --- a/interface/src/AvatarTouch.cpp +++ b/interface/src/AvatarTouch.cpp @@ -13,7 +13,7 @@ const float THREAD_RADIUS = 0.007; const float HANDS_CLOSE_ENOUGH_TO_GRASP = 0.2; -const float AVATAR_FACING_THRESHOLD = 0.1f; // (-1 to 1) (larger value indicates narrower angle of influence +const float AVATAR_FACING_THRESHOLD = -0.5f; // (-1 to 1) (larger value indicates narrower angle of influence AvatarTouch::AvatarTouch() { From ab3b0c8aa34b04e7fde20cd2466e024d85d8338c Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Wed, 29 May 2013 11:43:42 -0700 Subject: [PATCH 3/3] alpha --- interface/src/Avatar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index d861623c6f..ac021689c0 100644 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -1126,11 +1126,11 @@ void Avatar::renderBody(bool lookingInMirror) { if (lookingInMirror || _owningAgent) { alpha = 1.0f; } - + // Always render other people, and render myself when beyond threshold distance if (b == AVATAR_JOINT_HEAD_BASE) { // the head is rendered as a special if (lookingInMirror || _owningAgent || distanceToCamera > RENDER_OPAQUE_BEYOND * 0.5) { - _head.render(lookingInMirror, _cameraPosition, 1.f); + _head.render(lookingInMirror, _cameraPosition, alpha); } } else if (_owningAgent || distanceToCamera > RENDER_TRANSLUCENT_BEYOND || b == AVATAR_JOINT_RIGHT_ELBOW