Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-06 00:47:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi

Browse source
This commit is contained in:
Stephen Birarda 2014-03-06 14:53:57 -08:00
commit 721047234c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/avatar/Avatar.cpp
View file

@ -412,10 +412,10 @@ void Avatar::renderDisplayName() {
glGetIntegerv(GL_VIEWPORT, viewportMatrix); glGetIntegerv(GL_VIEWPORT, viewportMatrix);
GLdouble result0[3], result1[3]; GLdouble result0[3], result1[3];
glm::dvec3 upVector(modelViewMatrix[1]); // The up vector must be relative to the rotation current rotation matrix:
// we set the identity
glm::dvec3 testPoint0 = glm::dvec3(textPosition); glm::dvec3 testPoint0 = glm::dvec3(textPosition);
glm::dvec3 testPoint1 = glm::dvec3(textPosition) + upVector; glm::dvec3 testPoint1 = glm::dvec3(textPosition) + glm::dvec3(IDENTITY_UP);
bool success; bool success;
success = gluProject(testPoint0.x, testPoint0.y, testPoint0.z, success = gluProject(testPoint0.x, testPoint0.y, testPoint0.z,