fly/flightgear
1
0
Fork 0
Code Activity

fade out text, too; cosmetics

Browse source
This commit is contained in:
mfranz 2005-05-06 15:48:48 +00:00
parent 48f45296ce
commit 97811e8832
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Main/splash.cxx
View file

@ -53,7 +53,7 @@
static const int fontsize = 19; static const int fontsize = 19;
static const char fontname[] = "default.txf"; static const char fontname[] = "default.txf";
static const char *text = 0; static const char *progress_text = 0;
static SGTexture splash; static SGTexture splash;
@ -125,7 +125,7 @@ void fgSplashInit ( const char *splash_texture ) {
void fgSplashProgress ( const char *s ) void fgSplashProgress ( const char *s )
{ {
text = s; progress_text = s;
fgRequestRedraw(); fgRequestRedraw();
} }
@ -185,7 +185,7 @@ void fgSplashUpdate ( float alpha ) {
glEnd(); glEnd();
} }
if (text && fgGetBool("/sim/startup/splash-progress", true)) { if (progress_text && fgGetBool("/sim/startup/splash-progress", true)) {
glEnable(GL_ALPHA_TEST); glEnable(GL_ALPHA_TEST);
glEnable(GL_BLEND); glEnable(GL_BLEND);
glAlphaFunc(GL_GREATER, 0.1f); glAlphaFunc(GL_GREATER, 0.1f);
@ -195,10 +195,10 @@ void fgSplashUpdate ( float alpha ) {
float left, right, bot, top; float left, right, bot, top;
info.begin(); info.begin();
glColor3f(1.0, 0.9, 0.0); glColor4f(1.0, 0.9, 0.0, alpha);
font.getBBox(text, fontsize, 0, &left, &right, &bot, &top); font.getBBox(progress_text, fontsize, 0, &left, &right, &bot, &top);
info.start2f((screen_width - right) / 2.0, 10.0 - bot); info.start2f((screen_width - right) / 2.0, 10.0 - bot);
info.puts(text); info.puts(progress_text);
const char *s = fgGetString("/sim/startup/splash-title", ""); const char *s = fgGetString("/sim/startup/splash-title", "");
font.getBBox(s, fontsize, 0, &left, &right, &bot, &top); font.getBBox(s, fontsize, 0, &left, &right, &bot, &top);