Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-07 00:32:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Adjustments

Browse source 
* Adjustments
* Don't show local stats.
This commit is contained in:
Armored-Dragon 2024-11-21 19:04:01 -06:00 committed by GitHub
parent 9503fae612
commit 3c92c88156
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
View file

@ -994,9 +994,9 @@ void Avatar::renderDisplayName(gpu::Batch& batch, const ViewFrustum& view, const
QString statsFormat = QString("(%1 Kbps, %2 Hz)"); QString statsFormat = QString("(%1 Kbps, %2 Hz)");
if (!renderedDisplayName.isEmpty()) { if (!renderedDisplayName.isEmpty()) {
statsFormat.prepend(" - "); statsFormat.append("\n");
} }
renderedDisplayName += statsFormat.arg(QString::number(kilobitsPerSecond, 'f', 2)).arg(getReceiveRate()); renderedDisplayName = statsFormat.arg(QString::number(kilobitsPerSecond, 'f', 2)).arg(getReceiveRate()) + renderedDisplayName;
} }
// Compute display name extent/position offset // Compute display name extent/position offset
@ -1020,8 +1020,7 @@ void Avatar::renderDisplayName(gpu::Batch& batch, const ViewFrustum& view, const
// Display name and background colors // Display name and background colors
glm::vec4 textColor(0.93f, 0.93f, 0.93f, _displayNameAlpha); glm::vec4 textColor(0.93f, 0.93f, 0.93f, _displayNameAlpha);
glm::vec4 backgroundColor(0.2f, 0.2f, 0.2f, glm::vec4 backgroundColor(0.2f, 0.2f, 0.2f,(_displayNameAlpha / DISPLAYNAME_ALPHA) * DISPLAYNAME_BACKGROUND_ALPHA);
(_displayNameAlpha / DISPLAYNAME_ALPHA) * DISPLAYNAME_BACKGROUND_ALPHA);
// Compute display name transform // Compute display name transform
auto textTransform = calculateDisplayNameTransform(view, textPosition); auto textTransform = calculateDisplayNameTransform(view, textPosition);
@ -1029,12 +1028,11 @@ void Avatar::renderDisplayName(gpu::Batch& batch, const ViewFrustum& view, const
textTransform.postScale(1.0f / height); textTransform.postScale(1.0f / height);
batch.setModelTransform(textTransform); batch.setModelTransform(textTransform);
{ // {
PROFILE_RANGE_BATCH(batch, __FUNCTION__":renderBevelCornersRect"); // PROFILE_RANGE_BATCH(batch, __FUNCTION__":renderBevelCornersRect");
DependencyManager::get<GeometryCache>()->bindSimpleProgram(batch, false, false, true, true, true, forward); // DependencyManager::get<GeometryCache>()->bindSimpleProgram(batch, false, false, true, true, true, forward);
DependencyManager::get<GeometryCache>()->renderBevelCornersRect(batch, left, bottom, width, height, // DependencyManager::get<GeometryCache>()->renderBevelCornersRect(batch, left, bottom, width, height, bevelDistance, backgroundColor, _nameRectGeometryID);
bevelDistance, backgroundColor, _nameRectGeometryID); // }
}
// Render actual name // Render actual name
QByteArray nameUTF8 = renderedDisplayName.toLocal8Bit(); QByteArray nameUTF8 = renderedDisplayName.toLocal8Bit();
@ -1044,7 +1042,7 @@ void Avatar::renderDisplayName(gpu::Batch& batch, const ViewFrustum& view, const
batch.setModelTransform(textTransform); batch.setModelTransform(textTransform);
{ {
PROFILE_RANGE_BATCH(batch, __FUNCTION__":renderText"); PROFILE_RANGE_BATCH(batch, __FUNCTION__":renderText");
displayNameRenderer->draw(batch, { nameUTF8.data(), textColor, { text_x, -text_y }, glm::vec2(-1.0f), forward }); displayNameRenderer->draw(batch, { nameUTF8.data(), textColor, { text_x, -text_y }, glm::vec2(10.0f), forward, TextAlignment::CENTER });
} }
} }
} }

5
libraries/render-utils/src/text/Font.h
View file

@ -71,8 +71,9 @@ public:
bool forward, bool mirror) : bool forward, bool mirror) :
str(str), color(color), effectColor(effectColor), origin(origin), bounds(bounds), scale(scale), effectThickness(effectThickness), str(str), color(color), effectColor(effectColor), origin(origin), bounds(bounds), scale(scale), effectThickness(effectThickness),
effect(effect), alignment(alignment), verticalAlignment(verticalAlignment), unlit(unlit), forward(forward), mirror(mirror) {} effect(effect), alignment(alignment), verticalAlignment(verticalAlignment), unlit(unlit), forward(forward), mirror(mirror) {}
DrawProps(const QString& str, const glm::vec4& color, const glm::vec2& origin, const glm::vec2& bounds, bool forward) :
str(str), color(color), origin(origin), bounds(bounds), forward(forward) {} DrawProps(const QString& str, const glm::vec4& color, const glm::vec2& origin, const glm::vec2& bounds, bool forward, TextAlignment alignment) :
str(str), color(color), origin(origin), bounds(bounds), forward(forward), alignment(alignment) {}
const QString& str; const QString& str;
const glm::vec4& color; const glm::vec4& color;