Adapt avatar message size to the avatars

This commit is contained in:
atlante45 2013-07-16 12:04:22 -07:00
parent 13762da7d8
commit f713bb961d

View file

@ -1047,7 +1047,7 @@ void Avatar::render(bool lookingInMirror, bool renderAvatarBalls) {
} }
glPushMatrix(); glPushMatrix();
glm::vec3 chatPosition = _bodyBall[BODY_BALL_HEAD_BASE].position + getBodyUpDirection() * chatMessageHeight; glm::vec3 chatPosition = _bodyBall[BODY_BALL_HEAD_BASE].position + getBodyUpDirection() * chatMessageHeight * _scale;
glTranslatef(chatPosition.x, chatPosition.y, chatPosition.z); glTranslatef(chatPosition.x, chatPosition.y, chatPosition.z);
glm::quat chatRotation = Application::getInstance()->getCamera()->getRotation(); glm::quat chatRotation = Application::getInstance()->getCamera()->getRotation();
glm::vec3 chatAxis = glm::axis(chatRotation); glm::vec3 chatAxis = glm::axis(chatRotation);
@ -1057,7 +1057,7 @@ void Avatar::render(bool lookingInMirror, bool renderAvatarBalls) {
glColor3f(0, 0.8, 0); glColor3f(0, 0.8, 0);
glRotatef(180, 0, 1, 0); glRotatef(180, 0, 1, 0);
glRotatef(180, 0, 0, 1); glRotatef(180, 0, 0, 1);
glScalef(chatMessageScale, chatMessageScale, 1.0f); glScalef(_scale * chatMessageScale, _scale * chatMessageScale, 1.0f);
glDisable(GL_LIGHTING); glDisable(GL_LIGHTING);
glDepthMask(false); glDepthMask(false);