From b4a352285fa423acd694b6a7ad5125780295566d Mon Sep 17 00:00:00 2001 From: Titus Tscharntke Date: Wed, 30 Mar 2011 23:27:21 +0000 Subject: [PATCH] minimap transparent again but with border --- source/glest_game/graphics/renderer.cpp | 47 +++++++++++++++++++++---- 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp index 226db8b3..2734855e 100644 --- a/source/glest_game/graphics/renderer.cpp +++ b/source/glest_game/graphics/renderer.cpp @@ -2869,16 +2869,49 @@ void Renderer::renderMinimap(){ // glDisable(GL_TEXTURE_2D); + // render minimap border Vec4f col= game->getGui()->getDisplay()->getColor(); - glBegin(GL_QUADS); glColor4f(col.x*0.5f,col.y*0.5f,col.z*0.5f,1.0 ); - glVertex2i(mx-4, my-4); - glVertex2i(mx-4, my+mh+4); - glVertex2i(mx+mw+4, my+mh+4); - glVertex2i(mx+mw+4, my-4); + glBegin(GL_QUADS); + glVertex2i(mx-4, my-4); + glVertex2i(mx-4, my); + glVertex2i(mx+mw+4, my); + glVertex2i(mx+mw+4, my-4); glEnd(); + glBegin(GL_QUADS); + glVertex2i(mx-4, my+mh+4); + glVertex2i(mx-4, my+mh); + glVertex2i(mx+mw+4, my+mh); + glVertex2i(mx+mw+4, my+mh+4); + glEnd(); + + glBegin(GL_QUADS); + glVertex2i(mx-4, my); + glVertex2i(mx-4, my+mh); + glVertex2i(mx, my+mh); + glVertex2i(mx, my); + glEnd(); + + glBegin(GL_QUADS); + glVertex2i(mx+mw, my); + glVertex2i(mx+mw, my+mh); + glVertex2i(mx+mw+4, my+mh); + glVertex2i(mx+mw+4, my); + glEnd(); + + +// Vec4f col= game->getGui()->getDisplay()->getColor(); +// glBegin(GL_QUADS); +// glColor4f(col.x*0.5f,col.y*0.5f,col.z*0.5f,1.0 ); +// glVertex2i(mx-4, my-4); +// glVertex2i(mx-4, my+mh+4); +// glVertex2i(mx+mw+4, my+mh+4); +// glVertex2i(mx+mw+4, my-4); +// +// glEnd(); + assertGl(); @@ -2948,7 +2981,9 @@ void Renderer::renderMinimap(){ glDisableClientState(GL_TEXTURE_COORD_ARRAY); */ - glColor4f(0.3f, 0.3f, 0.3f, 0.90f); + //glColor4f(0.3f, 0.3f, 0.3f, 0.90f); + glColor4f(0.5f, 0.5f, 0.5f, 0.1f); + glBegin(GL_TRIANGLE_STRIP); glTexCoord2f(0.0f, 1.0f); glMultiTexCoord2f(fowTexUnit, 0.0f, 1.0f);