Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-17 03:30:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3780 from ctrlaltdavid/20182

Browse source 
CR for Job #20182 - Add ability to set alpha on text overlays
This commit is contained in:
Brad Hefta-Gaub 2014-11-12 16:26:59 -08:00
commit 99dd20f828
5 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
examples/overlaysExample.js
View file

@ -68,7 +68,8 @@ var text = Overlays.addOverlay("text", {
color: { red: 255, green: 0, blue: 0},
topMargin: 4,
leftMargin: 4,
text: "Here is some text.\nAnd a second line."
text: "Here is some text.\nAnd a second line.",
alpha: 0.7
});
// This will create an image overlay, which starts out as invisible

12
interface/src/ui/TextRenderer.cpp
View file

@ -69,14 +69,16 @@ int TextRenderer::calculateHeight(const char* str) {
return maxHeight;
}
int TextRenderer::draw(int x, int y, const char* str) {
int TextRenderer::draw(int x, int y, const char* str, float alpha) {
// Grab the current color
float currentColor[4];
glGetFloatv(GL_CURRENT_COLOR, currentColor);
int compactColor = ((int( currentColor[0] * 255.f) & 0xFF)) |
((int( currentColor[1] * 255.f) & 0xFF) << 8) |
((int( currentColor[2] * 255.f) & 0xFF) << 16) |
((int( currentColor[3] * 255.f) & 0xFF) << 24);
alpha = std::max(0.f, std::min(alpha, 1.f));
currentColor[3] *= alpha;
int compactColor = ((int(currentColor[0] * 255.f) & 0xFF)) |
((int(currentColor[1] * 255.f) & 0xFF) << 8) |
((int(currentColor[2] * 255.f) & 0xFF) << 16) |
((int(currentColor[3] * 255.f) & 0xFF) << 24);
// TODO: Remove that code once we test for performance improvments
//glEnable(GL_TEXTURE_2D);

2
interface/src/ui/TextRenderer.h
View file

@ -63,7 +63,7 @@ public:
int calculateHeight(const char* str);
// also returns the height of the tallest character
int draw(int x, int y, const char* str);
int draw(int x, int y, const char* str, float alpha = 1.f);
int computeWidth(char ch);
int computeWidth(const char* str);

2
interface/src/ui/overlays/Text3DOverlay.cpp
View file

@ -112,7 +112,7 @@ void Text3DOverlay::render(RenderArgs* args) {
QStringList lines = _text.split("\n");
int lineOffset = maxHeight;
foreach(QString thisLine, lines) {
textRenderer->draw(0, lineOffset, qPrintable(thisLine));
textRenderer->draw(0, lineOffset, qPrintable(thisLine), alpha);
lineOffset += maxHeight;
}

2
interface/src/ui/overlays/TextOverlay.cpp
View file

@ -82,7 +82,7 @@ void TextOverlay::render(RenderArgs* args) {
if (lineOffset == 0) {
lineOffset = textRenderer->calculateHeight(qPrintable(thisLine));
}
lineOffset += textRenderer->draw(x, y + lineOffset, qPrintable(thisLine));
lineOffset += textRenderer->draw(x, y + lineOffset, qPrintable(thisLine), alpha);
const int lineGap = 2;
lineOffset += lineGap;