Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:17:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct text position for default and non default meshes

Browse source 
Bounding box for text background is now text dependent, much nicer now
This commit is contained in:
Jose Carlos 2014-02-21 00:29:52 +01:00
parent fa490acb8d
commit 354c9bff09
3 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,7 +59,7 @@ const float CHAT_MESSAGE_HEIGHT = 0.1f;
const float DISPLAYNAME_FADE_TIME = 0.5f; const float DISPLAYNAME_FADE_TIME = 0.5f;
const float DISPLAYNAME_FADE_FACTOR = pow(0.01f, 1.0f / DISPLAYNAME_FADE_TIME); const float DISPLAYNAME_FADE_FACTOR = pow(0.01f, 1.0f / DISPLAYNAME_FADE_TIME);
const float DISPLAYNAME_ALPHA = 0.95f; const float DISPLAYNAME_ALPHA = 0.95f;
const float DISPLAYNAME_BACKGROUND_ALPHA = 0.2f; const float DISPLAYNAME_BACKGROUND_ALPHA = 0.4f;
Avatar::Avatar() : Avatar::Avatar() :
AvatarData(), AvatarData(),
@ -218,7 +218,7 @@ void Avatar::render(bool forceRenderHead) {
glPopMatrix(); glPopMatrix();
} }
} }
const float DISPLAYNAME_DISTANCE = 4.0f; const float DISPLAYNAME_DISTANCE = 10.0f;
setShowDisplayName(lengthToTarget < DISPLAYNAME_DISTANCE); setShowDisplayName(lengthToTarget < DISPLAYNAME_DISTANCE);
renderDisplayName(); renderDisplayName();
@ -301,7 +301,10 @@ void Avatar::renderDisplayName() {
glDisable(GL_LIGHTING); glDisable(GL_LIGHTING);
glPushMatrix(); glPushMatrix();
glm::vec3 textPosition = getPosition() + getBodyUpDirection() * ((getSkeletonHeight() + getHeadHeight()) / 1.5f); glm::vec3 textPosition;
getSkeletonModel().getNeckPosition(textPosition);
textPosition += getBodyUpDirection() * getHeadHeight() * 1.1f;
glTranslatef(textPosition.x, textPosition.y, textPosition.z); glTranslatef(textPosition.x, textPosition.y, textPosition.z);
// we need "always facing camera": we must remove the camera rotation from the stack // we need "always facing camera": we must remove the camera rotation from the stack
@ -340,11 +343,19 @@ void Avatar::renderDisplayName() {
float scaleFactor = (textWindowHeight > EPSILON) ? 1.0f / textWindowHeight : 1.0f; float scaleFactor = (textWindowHeight > EPSILON) ? 1.0f / textWindowHeight : 1.0f;
glScalef(scaleFactor, scaleFactor, 1.0); glScalef(scaleFactor, scaleFactor, 1.0);
glScalef(1.0f, -1.0f, 1.0f); // TextRenderer::draw paints the text upside down in y axis
int text_x = -_displayNameBoundingRect.width() / 2;
int text_y = -_displayNameBoundingRect.height() / 2;
// draw a gray background // draw a gray background
QFontMetrics metrics = textRenderer(DISPLAYNAME)->metrics(); QRect rect = textRenderer(DISPLAYNAME)->metrics().tightBoundingRect(_displayName);
int bottom = -metrics.descent(), top = bottom + metrics.height();
int left = -_displayNameWidth/2, right = _displayNameWidth/2; int left = text_x + rect.x();
const int border = 5; int right = left + rect.width();
int bottom = text_y + rect.y();
int top = bottom + rect.height();
const int border = 8;
bottom -= border; bottom -= border;
left -= border; left -= border;
top += border; top += border;
@ -362,14 +373,14 @@ void Avatar::renderDisplayName() {
glVertex2f(left, top); glVertex2f(left, top);
glEnd(); glEnd();
glScalef(1.0f, -1.0f, 1.0f); // TextRenderer::draw paints the text upside down in y axis
glColor4f(0.93f, 0.93f, 0.93f, _displayNameAlpha); glColor4f(0.93f, 0.93f, 0.93f, _displayNameAlpha);
QByteArray ba = _displayName.toLocal8Bit(); QByteArray ba = _displayName.toLocal8Bit();
const char* text = ba.data(); const char* text = ba.data();
glDisable(GL_POLYGON_OFFSET_FILL); glDisable(GL_POLYGON_OFFSET_FILL);
textRenderer(DISPLAYNAME)->draw(-_displayNameWidth / 2, 0, text); textRenderer(DISPLAYNAME)->draw(text_x, text_y, text);
} }
@ -490,11 +501,7 @@ void Avatar::setSkeletonModelURL(const QUrl &skeletonModelURL) {
void Avatar::setDisplayName(const QString& displayName) { void Avatar::setDisplayName(const QString& displayName) {
AvatarData::setDisplayName(displayName); AvatarData::setDisplayName(displayName);
int width = 0; _displayNameBoundingRect = textRenderer(DISPLAYNAME)->metrics().tightBoundingRect(displayName);
for (int i = 0; i < displayName.size(); i++) {
width += (textRenderer(DISPLAYNAME)->computeWidth(displayName[i].toLatin1()));
}
_displayNameWidth = width;
} }
int Avatar::parseData(const QByteArray& packet) { int Avatar::parseData(const QByteArray& packet) {

2
libraries/avatars/src/AvatarData.cpp
View file

@ -36,7 +36,7 @@ AvatarData::AvatarData() :
_isChatCirclingEnabled(false), _isChatCirclingEnabled(false),
_headData(NULL), _headData(NULL),
_handData(NULL), _handData(NULL),
_displayNameWidth(0), _displayNameBoundingRect(),
_displayNameTargetAlpha(0.0f), _displayNameTargetAlpha(0.0f),
_displayNameAlpha(0.0f) _displayNameAlpha(0.0f)
{ {

3
libraries/avatars/src/AvatarData.h
View file

@ -33,6 +33,7 @@ typedef unsigned long long quint64;
#include <QtCore/QUrl> #include <QtCore/QUrl>
#include <QtCore/QUuid> #include <QtCore/QUuid>
#include <QtCore/QVariantMap> #include <QtCore/QVariantMap>
#include <QRect>
#include <CollisionInfo.h> #include <CollisionInfo.h>
#include <RegisteredMetaTypes.h> #include <RegisteredMetaTypes.h>
@ -187,7 +188,7 @@ protected:
QUrl _skeletonModelURL; QUrl _skeletonModelURL;
QString _displayName; QString _displayName;
int _displayNameWidth; QRect _displayNameBoundingRect;
float _displayNameTargetAlpha; float _displayNameTargetAlpha;
float _displayNameAlpha; float _displayNameAlpha;