From fb703171f2aa278b41a6e3c242d935a487c7476e Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 22 Apr 2013 16:30:45 -0700 Subject: [PATCH] make other heads the same color and same size --- interface/src/Head.cpp | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp index 6c4b4a9d35..d75a3012fd 100644 --- a/interface/src/Head.cpp +++ b/interface/src/Head.cpp @@ -718,41 +718,25 @@ void Head::renderHead(int faceToFace) { glPushMatrix(); if (_usingBodySprings) { - glTranslatef - ( - _bone[ AVATAR_BONE_HEAD ].springyPosition.x, - _bone[ AVATAR_BONE_HEAD ].springyPosition.y, - _bone[ AVATAR_BONE_HEAD ].springyPosition.z - ); + glTranslatef(_bone[ AVATAR_BONE_HEAD ].springyPosition.x, + _bone[ AVATAR_BONE_HEAD ].springyPosition.y, + _bone[ AVATAR_BONE_HEAD ].springyPosition.z); } else { - glTranslatef - ( - _bone[ AVATAR_BONE_HEAD ].position.x, - _bone[ AVATAR_BONE_HEAD ].position.y, - _bone[ AVATAR_BONE_HEAD ].position.z - ); + glTranslatef(_bone[ AVATAR_BONE_HEAD ].position.x, + _bone[ AVATAR_BONE_HEAD ].position.y, + _bone[ AVATAR_BONE_HEAD ].position.z); } - glScalef( 0.03, 0.03, 0.03 ); glRotatef(_head.yaw, 0, 1, 0); glRotatef(_head.pitch, 1, 0, 0); glRotatef(_head.roll, 0, 0, 1); - // Overall scale of head - if (faceToFace) glScalef(2.0, 2.0, 2.0); - else glScalef(0.75, 1.0, 1.0); + glScalef(2.0, 2.0, 2.0); + glColor3fv(skinColor); - - // Head - if (_isMine) { - glColor3fv(skinColor); - } - else { - glColor3f(0,0,1); // Temp: Other people are BLUE - } glutSolidSphere(1, 30, 30); // Ears