From 1b4daa8eb968e1496d30bb634f63432f86861867 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Wed, 9 Oct 2013 10:17:41 -0700 Subject: [PATCH] No glow on own avatar, only on others when farther than five units away. --- interface/src/avatar/Avatar.cpp | 7 ++++--- interface/src/avatar/MyAvatar.cpp | 3 --- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index c278f9b697..5e95dcafdf 100755 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -465,15 +465,16 @@ void Avatar::render(bool lookingInMirror, bool renderAvatarBalls) { renderDiskShadow(_position, glm::vec3(0.0f, 1.0f, 0.0f), _scale * 0.1f, 0.2f); { - // glow when moving - Glower glower(_moving ? 1.0f : 0.0f); + // glow when moving in the distance + glm::vec3 toTarget = _position - Application::getInstance()->getAvatar()->getPosition(); + const float GLOW_DISTANCE = 5.0f; + Glower glower(_moving && glm::length(toTarget) > GLOW_DISTANCE ? 1.0f : 0.0f); // render body renderBody(lookingInMirror, renderAvatarBalls); // render sphere when far away const float MAX_ANGLE = 10.f; - glm::vec3 toTarget = _position - Application::getInstance()->getAvatar()->getPosition(); glm::vec3 delta = _height * (_head.getCameraOrientation() * IDENTITY_UP) / 2.f; float angle = abs(angleBetween(toTarget + delta, toTarget - delta)); diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index f7c26e75aa..57a8954ba3 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -555,9 +555,6 @@ void MyAvatar::renderBody(bool lookingInMirror, bool renderAvatarBalls) { return; } - // glow when moving - Glower glower(_moving ? 1.0f : 0.0f); - if (_head.getFace().isFullFrame()) { // Render the full-frame video float alpha = getBallRenderAlpha(BODY_BALL_HEAD_BASE, lookingInMirror);