From 0c141d4016c629394cde1b2147022df244ae0951 Mon Sep 17 00:00:00 2001 From: sireus Date: Mon, 25 Apr 2011 21:01:38 +0000 Subject: [PATCH] flag icon transparency fix git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6341 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/renderhud.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp index 95c0743f..5e3f885c 100644 --- a/source/src/renderhud.cpp +++ b/source/src/renderhud.cpp @@ -7,11 +7,11 @@ void drawicon(Texture *tex, float x, float y, float s, int col, int row, float t if(tex && tex->xs == tex->ys) quad(tex->id, x, y, s, ts*col, ts*row, ts); } -inline void turn_on_transparency() +inline void turn_on_transparency(int alpha = 255) { glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glColor4ub(255, 255, 255, 255); + glColor4ub(255, 255, 255, alpha); } void drawequipicon(float x, float y, int col, int row, float blend) @@ -38,13 +38,13 @@ void drawradaricon(float x, float y, float s, int col, int row) } } -void drawctficon(float x, float y, float s, int col, int row, float ts) +void drawctficon(float x, float y, float s, int col, int row, float ts, int alpha) { static Texture *ctftex = NULL, *htftex = NULL, *ktftex = NULL; if(!ctftex) ctftex = textureload("packages/misc/ctficons.png", 3); if(!htftex) htftex = textureload("packages/misc/htficons.png", 3); if(!ktftex) ktftex = textureload("packages/misc/ktficons.png", 3); - turn_on_transparency(); + turn_on_transparency(alpha); if(m_htf) { if(htftex) drawicon(htftex, x, y, s, col, row, ts); @@ -57,7 +57,7 @@ void drawctficon(float x, float y, float s, int col, int row, float ts) { if(ctftex) drawicon(ctftex, x, y, s, col, row, ts); } - glDisable(GL_BLEND); + glDisable(GL_BLEND); } void drawvoteicon(float x, float y, int col, int row, bool noblend) @@ -976,8 +976,7 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat loopi(2) // flag state { - if(flaginfos[i].state == CTFF_INBASE) glDisable(GL_BLEND); else glEnable(GL_BLEND); - drawctficon(i*120+VIRTW/4.0f*3.0f, 1650, 120, i, 0, 1/4.0f); + drawctficon(i*120+VIRTW/4.0f*3.0f, 1650, 120, i, 0, 1/4.0f, flaginfos[i].state == CTFF_INBASE ? 255 : 100); } // big flag-stolen icon @@ -987,7 +986,7 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat { glColor4f(1.0f, 1.0f, 1.0f, (sinf(lastmillis/100.0f)+1.0f) / 2.0f); glEnable(GL_BLEND); - drawctficon(VIRTW-225-10, VIRTH*5/8, 225, ft, 1, 1/2.0f); + drawctficon(VIRTW-225-10, VIRTH*5/8, 225, ft, 1, 1/2.0f, 255); glDisable(GL_BLEND); } }