From c99ad77799abb0a49b3dad078b175f0f7be61dd0 Mon Sep 17 00:00:00 2001 From: dev Date: Mon, 29 Dec 2014 16:45:14 -0800 Subject: [PATCH] fixing the size of the name displayed on screen --- interface/src/avatar/Avatar.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index 4c309b2c8c..909bdde831 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -682,14 +682,16 @@ float Avatar::calculateDisplayNameScaleFactor(const glm::vec3& textPosition, boo double textWindowHeight; - GLCanvas::SharedPointer glCanvas = DependencyManager::get(); - float windowSizeX = glCanvas->getDeviceWidth(); - float windowSizeY = glCanvas->getDeviceHeight(); - + GLint viewportMatrix[4]; + glGetIntegerv(GL_VIEWPORT, viewportMatrix); glm::dmat4 modelViewMatrix; + float windowSizeX = viewportMatrix[2] - viewportMatrix[0]; + float windowSizeY = viewportMatrix[3] - viewportMatrix[1]; + glm::dmat4 projectionMatrix; Application::getInstance()->getModelViewMatrix(&modelViewMatrix); Application::getInstance()->getProjectionMatrix(&projectionMatrix); + glm::dvec4 p0 = modelViewMatrix * glm::dvec4(testPoint0, 1.0); p0 = projectionMatrix * p0;