Minor fiddling with material properties *trying* to chase down a visual bug

where the scene get's brighter or dimmer depending on whether or not the sun
or moon is in the field of view.

diff --git a/simgear/sky/dome.cxx b/simgear/sky/dome.cxx
index 6f2a2c59768afa4f465099d8e0161ae0503420d6..b83f2730fa25e31128b823c36f1e61f4df6b32b9 100644 (file)
--- a/simgear/sky/dome.cxx
+++ b/simgear/sky/dome.cxx
@@ -108,6 +108,8 @@ ssgBranch * SGSkyDome::build( ) {
     dome_state->disable( GL_TEXTURE_2D );
     dome_state->enable( GL_COLOR_MATERIAL );
     dome_state->setColourMaterial( GL_AMBIENT_AND_DIFFUSE );
+    dome_state->setMaterial( GL_EMISSION, 0, 0, 0, 1 );
+    dome_state->setMaterial( GL_SPECULAR, 0, 0, 0, 1 );
     dome_state->disable( GL_BLEND );
     dome_state->disable( GL_ALPHA_TEST );
 

diff --git a/simgear/sky/moon.cxx b/simgear/sky/moon.cxx
index 34fd97fdc791bb8479736c77311a6075bea796fb..3923ed2fe3da7a45a97ce44c348797bb38b36bdb 100644 (file)
--- a/simgear/sky/moon.cxx
+++ b/simgear/sky/moon.cxx
@@ -57,6 +57,14 @@ static int sgMoonOrbPostDraw( ssgEntity *e ) {
     glEnable( GL_FOG );
     glBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ;
 
+    /* test
+    glDisable( GL_LIGHTING );
+    glDisable( GL_CULL_FACE );
+    glEnable( GL_COLOR_MATERIAL );
+    glColorMaterial( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE );
+    glEnable( GL_CULL_FACE );
+    glEnable( GL_LIGHTING ); */
+
     return true;
 }
 
@@ -104,8 +112,9 @@ ssgBranch * SGMoon::build( FGPath path, double moon_size ) {
     orb_state->enable( GL_TEXTURE_2D );
     orb_state->enable( GL_COLOR_MATERIAL );
     orb_state->setColourMaterial( GL_DIFFUSE );
-    orb_state->setMaterial( GL_AMBIENT, 0.0, 0.0, 0.0, 1.0 );
-    orb_state->setMaterial( GL_SPECULAR, 0.0, 0.0, 0.0, 1.0 );
+    orb_state->setMaterial( GL_AMBIENT, 0, 0, 0, 1.0 );
+    orb_state->setMaterial( GL_EMISSION, 0, 0, 0, 1 );
+    orb_state->setMaterial( GL_SPECULAR, 0, 0, 0, 1 );
     orb_state->enable( GL_BLEND );
     orb_state->enable( GL_ALPHA_TEST );
     orb_state->setAlphaClamp( 0.01 );
@@ -139,8 +148,8 @@ ssgBranch * SGMoon::build( FGPath path, double moon_size ) {
     halo_state->disable( GL_COLOR_MATERIAL );
     halo_state->setColourMaterial( GL_AMBIENT_AND_DIFFUSE );
     halo_state->setMaterial ( GL_AMBIENT_AND_DIFFUSE, 1, 1, 1, 1 ) ;
-    halo_state -> setMaterial ( GL_EMISSION, 0, 0, 0, 1 ) ;
-    halo_state -> setMaterial ( GL_SPECULAR, 0, 0, 0, 1 ) ;
+    halo_state->setMaterial ( GL_EMISSION, 0, 0, 0, 1 ) ;
+    halo_state->setMaterial ( GL_SPECULAR, 0, 0, 0, 1 ) ;
     // halo_state -> setShininess ( 0 ) ;
     halo_state->enable( GL_ALPHA_TEST );
     halo_state->setAlphaClamp(0.01);
@@ -253,8 +262,8 @@ bool SGMoon::reposition( sgVec3 p, double angle,
     sgSetVec3( axis, 1.0, 0.0, 0.0 );
     sgMakeRotMat4( DEC, declination * RAD_TO_DEG, axis );
 
-    // xglTranslatef(0,60000,0);
-    sgSetVec3( v, 0.0, 60000.0, 0.0 );
+    // xglTranslatef(0,moon_dist);
+    sgSetVec3( v, 0.0, moon_dist, 0.0 );
     sgMakeTransMat4( T2, v );
 
     sgMat4 TRANSFORM;
@@ -271,3 +280,4 @@ bool SGMoon::reposition( sgVec3 p, double angle,
 
     return true;
 }
+

diff --git a/simgear/sky/oursun.cxx b/simgear/sky/oursun.cxx
index 6b03214bc3a1e2c122f4ffb0a4fada288a64ffb7..62d97867ca8d42e53a583942ff517af73258623f 100644 (file)
--- a/simgear/sky/oursun.cxx
+++ b/simgear/sky/oursun.cxx
@@ -204,10 +204,13 @@ ssgBranch * SGSun::build( FGPath path, double sun_size ) {
     orb_state = new ssgSimpleState();
     orb_state->setShadeModel( GL_SMOOTH );
     orb_state->disable( GL_LIGHTING );
+    // orb_state->enable( GL_LIGHTING );
     orb_state->disable( GL_CULL_FACE );
     orb_state->disable( GL_TEXTURE_2D );
     orb_state->enable( GL_COLOR_MATERIAL );
     orb_state->setColourMaterial( GL_AMBIENT_AND_DIFFUSE );
+    orb_state->setMaterial( GL_EMISSION, 0, 0, 0, 1 );
+    orb_state->setMaterial( GL_SPECULAR, 0, 0, 0, 1 );
     orb_state->disable( GL_BLEND );
     orb_state->disable( GL_ALPHA_TEST );
 
@@ -233,10 +236,13 @@ ssgBranch * SGSun::build( FGPath path, double sun_size ) {
     halo_state->setTexture( (char *)path.c_str() );
     halo_state->enable( GL_TEXTURE_2D );
     halo_state->disable( GL_LIGHTING );
+    // halo_state->enable( GL_LIGHTING );
     halo_state->setShadeModel( GL_SMOOTH );
     halo_state->disable( GL_CULL_FACE );
     halo_state->enable( GL_COLOR_MATERIAL );
     halo_state->setColourMaterial( GL_AMBIENT_AND_DIFFUSE );
+    halo_state->setMaterial( GL_EMISSION, 0, 0, 0, 1 );
+    halo_state->setMaterial( GL_SPECULAR, 0, 0, 0, 1 );
     halo_state->enable( GL_ALPHA_TEST );
     halo_state->setAlphaClamp(0.01);
     halo_state->enable ( GL_BLEND ) ;
@@ -273,9 +279,9 @@ ssgBranch * SGSun::build( FGPath path, double sun_size ) {
     // into the provide scene graph branch
     sun_transform = new ssgTransform;
 
-    sun_transform->addKid( halo );
     halo->setCallback( SSG_CALLBACK_PREDRAW, sgSunHaloPreDraw );
     halo->setCallback( SSG_CALLBACK_POSTDRAW, sgSunHaloPostDraw );
+    sun_transform->addKid( halo );
     sun_transform->addKid( orb );
 
     return sun_transform;
@@ -347,8 +353,8 @@ bool SGSun::reposition( sgVec3 p, double angle,
     sgSetVec3( axis, 1.0, 0.0, 0.0 );
     sgMakeRotMat4( DEC, declination * RAD_TO_DEG, axis );
 
-    // xglTranslatef(0,60000,0);
-    sgSetVec3( v, 0.0, 60000.0, 0.0 );
+    // xglTranslatef(0,sun_dist);
+    sgSetVec3( v, 0.0, sun_dist, 0.0 );
     sgMakeTransMat4( T2, v );
 
     sgMat4 TRANSFORM;

diff --git a/simgear/sky/stars.cxx b/simgear/sky/stars.cxx
index bc709ccf3ce1d9b14a7b8fe13031ed8f80d00be6..42a347327a82950cbd40c9f292bbc232f70ce534 100644 (file)
--- a/simgear/sky/stars.cxx
+++ b/simgear/sky/stars.cxx
@@ -88,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 );