diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp index d0648933..b179c457 100644 --- a/source/src/renderhud.cpp +++ b/source/src/renderhud.cpp @@ -428,12 +428,32 @@ void loadingscreen(const char *fmt, ...) static void bar(float bar, int o, float r, float g, float b) { - int side = 50; + int side = 2*FONTH; + float x1 = side, x2 = bar*(VIRTW-2*side)+side; + float y1 = o*FONTH; glColor3f(r, g, b); - glVertex2f(side, o*FONTH); - glVertex2f(bar*(VIRTW-2*side)+side, o*FONTH); - glVertex2f(bar*(VIRTW-2*side)+side, (o+2)*FONTH); - glVertex2f(side, (o+2)*FONTH); + glBegin(GL_TRIANGLE_STRIP); + loopk(10) + { + float c = cosf(M_PI/2 + k/9.0f*M_PI), s = 1 + sinf(M_PI/2 + k/9.0f*M_PI); + glVertex2f(x2 - c*FONTH, y1 + s*FONTH); + glVertex2f(x1 + c*FONTH, y1 + s*FONTH); + } + glEnd(); + + glColor3f(0.3f, 0.3f, 0.3f); + glBegin(GL_LINE_LOOP); + loopk(10) + { + float c = cosf(M_PI/2 + k/9.0f*M_PI), s = 1 + sinf(M_PI/2 + k/9.0f*M_PI); + glVertex2f(x1 + c*FONTH, y1 + s*FONTH); + } + loopk(10) + { + float c = cosf(M_PI/2 + k/9.0f*M_PI), s = 1 - sinf(M_PI/2 + k/9.0f*M_PI); + glVertex2f(x2 - c*FONTH, y1 + s*FONTH); + } + glEnd(); } void show_out_of_renderloop_progress(float bar1, const char *text1, float bar2, const char *text2) // also used during loading @@ -449,27 +469,27 @@ void show_out_of_renderloop_progress(float bar1, const char *text1, float bar2, glLoadIdentity(); glOrtho(0, VIRTW, VIRTH, 0, -1, 1); - glBegin(GL_QUADS); + glLineWidth(3); if(text1) { - bar(1, 1, 0.1f, 0.1f, 0.1f); - bar(bar1, 1, 0.2f, 0.2f, 0.2f); + bar(1, 1, 0.1f, 0.1f, 0.1f); + if(bar1>0) bar(bar1, 1, 0.2f, 0.2f, 0.2f); } if(bar2>0) { - bar(1, 3, 0.1f, 0.1f, 0.1f); + bar(1, 3, 0.1f, 0.1f, 0.1f); bar(bar2, 3, 0.2f, 0.2f, 0.2f); } - glEnd(); + glLineWidth(1); glEnable(GL_BLEND); glEnable(GL_TEXTURE_2D); - if(text1) draw_text(text1, 70, 1*FONTH + FONTH/2); - if(bar2>0) draw_text(text2, 70, 3*FONTH + FONTH/2); + if(text1) draw_text(text1, 2*FONTH, 1*FONTH + FONTH/2); + if(bar2>0) draw_text(text2, 2*FONTH, 3*FONTH + FONTH/2); glDisable(GL_TEXTURE_2D); glDisable(GL_BLEND);