Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-09 07:53:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #105 from birarda/master

Browse source 
fix the size of the heads of other avatars
This commit is contained in:
birarda 2013-04-22 16:31:33 -07:00
commit 93c47aa6e6
1 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
interface/src/Head.cpp
View file

@ -718,41 +718,25 @@ void Head::renderHead(int faceToFace) {
glPushMatrix(); glPushMatrix();
if (_usingBodySprings) { if (_usingBodySprings) {
glTranslatef glTranslatef(_bone[ AVATAR_BONE_HEAD ].springyPosition.x,
(
_bone[ AVATAR_BONE_HEAD ].springyPosition.x,
_bone[ AVATAR_BONE_HEAD ].springyPosition.y, _bone[ AVATAR_BONE_HEAD ].springyPosition.y,
_bone[ AVATAR_BONE_HEAD ].springyPosition.z _bone[ AVATAR_BONE_HEAD ].springyPosition.z);
);
} }
else { else {
glTranslatef glTranslatef(_bone[ AVATAR_BONE_HEAD ].position.x,
(
_bone[ AVATAR_BONE_HEAD ].position.x,
_bone[ AVATAR_BONE_HEAD ].position.y, _bone[ AVATAR_BONE_HEAD ].position.y,
_bone[ AVATAR_BONE_HEAD ].position.z _bone[ AVATAR_BONE_HEAD ].position.z);
);
} }
glScalef( 0.03, 0.03, 0.03 ); glScalef( 0.03, 0.03, 0.03 );
glRotatef(_head.yaw, 0, 1, 0); glRotatef(_head.yaw, 0, 1, 0);
glRotatef(_head.pitch, 1, 0, 0); glRotatef(_head.pitch, 1, 0, 0);
glRotatef(_head.roll, 0, 0, 1); glRotatef(_head.roll, 0, 0, 1);
// Overall scale of head glScalef(2.0, 2.0, 2.0);
if (faceToFace) glScalef(2.0, 2.0, 2.0);
else glScalef(0.75, 1.0, 1.0);
// Head
if (_isMine) {
glColor3fv(skinColor); glColor3fv(skinColor);
}
else {
glColor3f(0,0,1); // Temp: Other people are BLUE
}
glutSolidSphere(1, 30, 30); glutSolidSphere(1, 30, 30);
// Ears // Ears