X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fsky%2Fstars.cxx;h=d1d999c7bc9b27512620b78b30ab8210fb7934d1;hb=1e53bedca5afda25517dabcfa298f13acab0d4bd;hp=62a99bcfe317eb5d25edc3d06d58a3f5073e3e38;hpb=68a19bd39f85ca20d21997baf080bb1001a4cff0;p=simgear.git diff --git a/simgear/sky/stars.cxx b/simgear/sky/stars.cxx index 62a99bcf..d1d999c7 100644 --- a/simgear/sky/stars.cxx +++ b/simgear/sky/stars.cxx @@ -24,15 +24,23 @@ // $Id$ +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include +#include #include -#include - #include "stars.hxx" +#ifdef _MSC_VER +FG_USING_STD(cout); +FG_USING_STD(endl); +#endif + // Set up star rendering call backs static int sgStarPreDraw( ssgEntity *e ) { @@ -80,6 +88,8 @@ ssgBranch * SGStars::build( int num, sgdVec3 *star_data, double star_dist ) { state->disable( GL_TEXTURE_2D ); state->enable( GL_COLOR_MATERIAL ); state->setColourMaterial( GL_AMBIENT_AND_DIFFUSE ); + state->setMaterial( GL_EMISSION, 0, 0, 0, 1 ); + state->setMaterial( GL_SPECULAR, 0, 0, 0, 1 ); state->enable( GL_BLEND ); state->disable( GL_ALPHA_TEST ); @@ -137,26 +147,26 @@ bool SGStars::repaint( double sun_angle, int num, sgdVec3 *star_data ) { float *color; // determine which star structure to draw - if ( sun_angle > (FG_PI_2 + 10.0 * DEG_TO_RAD ) ) { + if ( sun_angle > (0.5 * SGD_PI + 10.0 * SGD_DEGREES_TO_RADIANS ) ) { // deep night factor = 1.0; cutoff = 4.5; - } else if ( sun_angle > (FG_PI_2 + 8.8 * DEG_TO_RAD ) ) { + } else if ( sun_angle > (0.5 * SGD_PI + 8.8 * SGD_DEGREES_TO_RADIANS ) ) { factor = 1.0; cutoff = 3.8; - } else if ( sun_angle > (FG_PI_2 + 7.5 * DEG_TO_RAD ) ) { + } else if ( sun_angle > (0.5 * SGD_PI + 7.5 * SGD_DEGREES_TO_RADIANS ) ) { factor = 0.95; cutoff = 3.1; - } else if ( sun_angle > (FG_PI_2 + 7.0 * DEG_TO_RAD ) ) { + } else if ( sun_angle > (0.5 * SGD_PI + 7.0 * SGD_DEGREES_TO_RADIANS ) ) { factor = 0.9; cutoff = 2.4; - } else if ( sun_angle > (FG_PI_2 + 6.5 * DEG_TO_RAD ) ) { + } else if ( sun_angle > (0.5 * SGD_PI + 6.5 * SGD_DEGREES_TO_RADIANS ) ) { factor = 0.85; cutoff = 1.8; - } else if ( sun_angle > (FG_PI_2 + 6.0 * DEG_TO_RAD ) ) { + } else if ( sun_angle > (0.5 * SGD_PI + 6.0 * SGD_DEGREES_TO_RADIANS ) ) { factor = 0.8; cutoff = 1.2; - } else if ( sun_angle > (FG_PI_2 + 5.5 * DEG_TO_RAD ) ) { + } else if ( sun_angle > (0.5 * SGD_PI + 5.5 * SGD_DEGREES_TO_RADIANS ) ) { factor = 0.75; cutoff = 0.6; } else {