diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-11-20 08:08:57 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-11-20 08:08:57 -0500 |
| commit | 2bd8234fe574ec08eed8d9c04e938482315dbc27 (patch) | |
| tree | 9b8e9bb539e88f9c95885a039a952d5bc8bc4e5e /indra/newview/llvoavatar.cpp | |
| parent | 3d66c31156cdde6240f5f27e18275060205f8ce9 (diff) | |
SL-271 WIP - color base and extended bones differently.
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 7d38cd116d..cf49cd2589 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -1382,6 +1382,7 @@ void LLVOAvatar::renderBones() ostr << jointp->getName() << ", "; jointp->updateWorldMatrix(); + LLJoint::SupportCategory sc = jointp->getSupport(); gGL.pushMatrix(); gGL.multMatrix( &jointp->getXform()->getWorldMatrix().mMatrix[0][0] ); @@ -1398,7 +1399,15 @@ void LLVOAvatar::renderBones() LLGLDepthTest normal_depth(GL_TRUE); // Unoccluded bone portions - gGL.diffuseColor3f( 1.f, 1.f, 1.f ); + if (sc == LLJoint::SupportCategory::SUPPORT_BASE) + { + gGL.diffuseColor3f( 1.0f, 0.5f, 0.5f ); + } + else + { + gGL.diffuseColor3f( 0.5f, 1.0f, 0.5f ); + } + gGL.vertex3fv(v[0].mV); gGL.vertex3fv(v[1].mV); @@ -1406,7 +1415,14 @@ void LLVOAvatar::renderBones() LLGLDepthTest depth_under(GL_TRUE, GL_FALSE, GL_GREATER); // Unoccluded bone portions - gGL.diffuseColor3f( 1.0f, 0.f, 0.0f ); + if (sc == LLJoint::SupportCategory::SUPPORT_BASE) + { + gGL.diffuseColor3f( 1.0f, 0.0f, 0.0f ); + } + else + { + gGL.diffuseColor3f( 0.0f, 1.0f, 0.0f ); + } gGL.vertex3fv(v[0].mV); gGL.vertex3fv(v[1].mV); |