From 13762da7d822a63dfe28d25b9fd5345a24aa5bb2 Mon Sep 17 00:00:00 2001 From: atlante45 Date: Tue, 16 Jul 2013 12:03:07 -0700 Subject: [PATCH 1/2] Changed shortcuts to ALT+ +/- --- interface/src/Application.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 644d5524f0..67763ae3bf 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1669,8 +1669,8 @@ void Application::initMenu() { "First Person", this, SLOT(setRenderFirstPerson(bool)), Qt::Key_P))->setCheckable(true); (_manualThirdPerson = renderMenu->addAction( "Third Person", this, SLOT(setRenderThirdPerson(bool))))->setCheckable(true); - renderMenu->addAction("Increase Avatar Size", this, SLOT(increaseAvatarSize()), Qt::SHIFT | Qt::Key_Plus); - renderMenu->addAction("Decrease Avatar Size", this, SLOT(decreaseAvatarSize()), Qt::SHIFT | Qt::Key_Minus); + renderMenu->addAction("Increase Avatar Size", this, SLOT(increaseAvatarSize()), Qt::ALT | Qt::Key_Plus); + renderMenu->addAction("Decrease Avatar Size", this, SLOT(decreaseAvatarSize()), Qt::ALT | Qt::Key_Minus); QMenu* toolsMenu = menuBar->addMenu("Tools"); From f713bb961db2fbb1f34cd1ee2416fb447705abcf Mon Sep 17 00:00:00 2001 From: atlante45 Date: Tue, 16 Jul 2013 12:04:22 -0700 Subject: [PATCH 2/2] Adapt avatar message size to the avatars --- interface/src/Avatar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index a1175e3b23..d67a2ffdb9 100755 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -1047,7 +1047,7 @@ void Avatar::render(bool lookingInMirror, bool renderAvatarBalls) { } 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); glm::quat chatRotation = Application::getInstance()->getCamera()->getRotation(); glm::vec3 chatAxis = glm::axis(chatRotation); @@ -1057,7 +1057,7 @@ void Avatar::render(bool lookingInMirror, bool renderAvatarBalls) { glColor3f(0, 0.8, 0); glRotatef(180, 0, 1, 0); glRotatef(180, 0, 0, 1); - glScalef(chatMessageScale, chatMessageScale, 1.0f); + glScalef(_scale * chatMessageScale, _scale * chatMessageScale, 1.0f); glDisable(GL_LIGHTING); glDepthMask(false);