From 5bcbfe96b81448c2aa6bac564efc0afd0f58b392 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 2 Oct 2014 10:19:08 -0700 Subject: [PATCH] add alpha color support to billboard overlay --- interface/src/ui/overlays/BillboardOverlay.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/interface/src/ui/overlays/BillboardOverlay.cpp b/interface/src/ui/overlays/BillboardOverlay.cpp index 8c99b587bc..5c5fea2a14 100644 --- a/interface/src/ui/overlays/BillboardOverlay.cpp +++ b/interface/src/ui/overlays/BillboardOverlay.cpp @@ -73,7 +73,10 @@ void BillboardOverlay::render() { float x = _fromImage.width() / (2.0f * maxSize); float y = -_fromImage.height() / (2.0f * maxSize); - glColor3f(1.0f, 1.0f, 1.0f); + const float MAX_COLOR = 255; + xColor color = getColor(); + float alpha = getAlpha(); + glColor4f(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha); glBegin(GL_QUADS); { glTexCoord2f((float)_fromImage.x() / (float)_size.width(), (float)_fromImage.y() / (float)_size.height());