From: curt Date: Thu, 6 Aug 1998 12:45:20 +0000 (+0000) Subject: Modified to bring in stars in 8 increments based on magnitude, not number X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=737b4cc6b84424bc3451cfe32b3072e991780cc1;p=flightgear.git Modified to bring in stars in 8 increments based on magnitude, not number of stars. --- diff --git a/Astro/stars.cxx b/Astro/stars.cxx index be7989eef..c559e07e0 100644 --- a/Astro/stars.cxx +++ b/Astro/stars.cxx @@ -69,9 +69,10 @@ int fgStarsInit( void ) { char line[256], name[256]; char *front, *end; double right_ascension, declination, magnitude; + double min_magnitude[FG_STAR_LEVELS]; /* double ra_save, decl_save; */ /* double ra_save1, decl_save1; */ - int count, i, max_stars; + int i; fgPrintf( FG_ASTRO, FG_INFO, "Initializing stars\n"); @@ -80,11 +81,24 @@ int fgStarsInit( void ) { strcat(path, "/Scenery/"); strcat(path, "Stars"); - max_stars = FG_MAX_STARS; + if ( FG_STAR_LEVELS < 4 ) { + fgPrintf( FG_ASTRO, FG_EXIT, "Big whups in stars.cxx\n"); + } + + min_magnitude[0] = 4.2; + min_magnitude[1] = 3.6; + min_magnitude[2] = 3.0; + min_magnitude[3] = 2.4; + min_magnitude[4] = 1.8; + min_magnitude[5] = 1.2; + min_magnitude[6] = 0.6; + min_magnitude[7] = 0.0; + for ( i = 0; i < FG_STAR_LEVELS; i++ ) { fgPrintf( FG_ASTRO, FG_INFO, - " Loading %d Stars: %s\n", max_stars, path); + " Loading stars brighter than %.2f from %2\n", + min_magnitude[i], path); if ( (fd = fgopen(path, "rb")) == NULL ) { strcpy(gzpath, path); @@ -101,8 +115,7 @@ int fgStarsInit( void ) { xglBegin( GL_POINTS ); /* read in each line of the file */ - count = 0; - while ( (fggets(fd, line, 256) != NULL) && (count < max_stars) ) { + while ( fggets(fd, line, 256) != NULL ) { front = line; /* printf(" Read line = %s", front); */ @@ -150,24 +163,27 @@ int fgStarsInit( void ) { } */ - /* scale magnitudes to (0.0 - 1.0) */ - magnitude = (0.0 - magnitude) / 5.0 + 1.0; - - /* scale magnitudes again so they look ok */ - if ( magnitude > 1.0 ) { magnitude = 1.0; } - if ( magnitude < 0.0 ) { magnitude = 0.0; } - magnitude = - magnitude * 0.7 + (((FG_STAR_LEVELS - 1) - i) * 0.1); - /* printf(" Found star: %d %s, %.3f %.3f %.3f\n", count, - name, right_ascension, declination, magnitude); */ - - xglColor3f( magnitude, magnitude, magnitude ); - /*xglColor3f(0,0,0);*/ - xglVertex3f( 50000.0 * cos(right_ascension) * cos(declination), - 50000.0 * sin(right_ascension) * cos(declination), - 50000.0 * sin(declination) ); - - count++; + if ( magnitude < min_magnitude[i] ) { + /* scale magnitudes to (0.0 - 1.0) */ + magnitude = (0.0 - magnitude) / 5.0 + 1.0; + + /* scale magnitudes again so they look ok */ + if ( magnitude > 1.0 ) { magnitude = 1.0; } + if ( magnitude < 0.0 ) { magnitude = 0.0; } + /* magnitude = + magnitude * 0.7 + (((FG_STAR_LEVELS - 1) - i) * 0.042); + */ + magnitude = magnitude * 0.9 + + (((FG_STAR_LEVELS - 1) - i) * 0.014); + /* printf(" Found star: %d %s, %.3f %.3f %.3f\n", count, + name, right_ascension, declination, magnitude); */ + + xglColor3f( magnitude, magnitude, magnitude ); + /*xglColor3f(0,0,0);*/ + xglVertex3f( 50000.0*cos(right_ascension)*cos(declination), + 50000.0*sin(right_ascension)*cos(declination), + 50000.0*sin(declination) ); + } } // valid line } /* while */ @@ -213,8 +229,6 @@ int fgStarsInit( void ) { */ xglEndList(); - - max_stars /= 2; } return 1; // OK, we got here because initialization worked. @@ -241,14 +255,22 @@ void fgStarsRender( void ) { /* render the stars */ if ( l->sun_angle > (FG_PI_2 + 5 * DEG_TO_RAD ) ) { /* determine which star structure to draw */ - if ( l->sun_angle > (FG_PI_2 + 7.25 * DEG_TO_RAD ) ) { + if ( l->sun_angle > (FG_PI_2 + 10.0 * DEG_TO_RAD ) ) { i = 0; - } else if ( l->sun_angle > (FG_PI_2 + 6.50 * DEG_TO_RAD ) ) { + } else if ( l->sun_angle > (FG_PI_2 + 8.8 * DEG_TO_RAD ) ) { i = 1; - } else if ( l->sun_angle > (FG_PI_2 + 5.75 * DEG_TO_RAD ) ) { + } else if ( l->sun_angle > (FG_PI_2 + 7.5 * DEG_TO_RAD ) ) { i = 2; - } else { + } else if ( l->sun_angle > (FG_PI_2 + 7.0 * DEG_TO_RAD ) ) { i = 3; + } else if ( l->sun_angle > (FG_PI_2 + 6.5 * DEG_TO_RAD ) ) { + i = 4; + } else if ( l->sun_angle > (FG_PI_2 + 6.0 * DEG_TO_RAD ) ) { + i = 5; + } else if ( l->sun_angle > (FG_PI_2 + 5.5 * DEG_TO_RAD ) ) { + i = 6; + } else { + i = 7; } /* printf("RENDERING STARS = %d (night)\n", i); */ @@ -261,9 +283,13 @@ void fgStarsRender( void ) { /* $Log$ -/* Revision 1.8 1998/07/13 21:00:10 curt -/* Wrote access functions for current fgOPTIONS. +/* Revision 1.9 1998/08/06 12:45:20 curt +/* Modified to bring in stars in 8 increments based on magnitude, not number +/* of stars. /* + * Revision 1.8 1998/07/13 21:00:10 curt + * Wrote access functions for current fgOPTIONS. + * * Revision 1.7 1998/05/29 20:35:42 curt * Added zlib support for reading in compressed data files. * diff --git a/Astro/stars.hxx b/Astro/stars.hxx index 678e2d8f3..a5a4ba14f 100644 --- a/Astro/stars.hxx +++ b/Astro/stars.hxx @@ -33,9 +33,7 @@ #endif -#define FG_MAX_STARS 500 -#define FG_STAR_LEVELS 4 /* how many star transitions */ -#define FG_MIN_STAR_MAG 0.738750 /* magnitude of weakest star we'll display */ +#define FG_STAR_LEVELS 8 /* how many star transitions */ /* Initialize the Star Management Subsystem */ int fgStarsInit( void ); @@ -51,9 +49,13 @@ extern fgTIME cur_time_params; /* $Log$ -/* Revision 1.2 1998/04/28 01:19:03 curt -/* Type-ified fgTIME and fgVIEW +/* Revision 1.3 1998/08/06 12:45:20 curt +/* Modified to bring in stars in 8 increments based on magnitude, not number +/* of stars. /* + * Revision 1.2 1998/04/28 01:19:03 curt + * Type-ified fgTIME and fgVIEW + * * Revision 1.1 1998/04/22 13:21:35 curt * C++ - ifing the code a bit. *