Cloud texcoord fixes to tie apparent cloud position to earth even though

[simgear.git] / simgear / sky / oursun.cxx

diff --git a/simgear/sky/oursun.cxx b/simgear/sky/oursun.cxx
index 0761fc5056a0523db379474e65c28a2745ad4c54..6890b8b3ac4d1c32c2610b267e1a3d09a23d364e 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 );
 
@@ -231,13 +234,15 @@ ssgBranch * SGSun::build( FGPath path, double sun_size ) {
     path.append( "halo.rgba" );
     halo_state = new ssgSimpleState();
     halo_state->setTexture( (char *)path.c_str() );
-    // halo_state->setTexture( sun_texid );
     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 ) ;
@@ -274,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;
@@ -307,6 +312,9 @@ bool SGSun::repaint( double sun_angle ) {
                   (ambient * 12.0) - 3.6, // minimum value = 0.0
                   1.0 );
     
+       // temp test, forces the color to always be white
+       // sgSetVec4( color, 1.0, 1.0, 1.0, 1.0 );
+
        if (color[0] > 1.0) color[0] = 1.0;
        if (color[1] > 1.0) color[1] = 1.0;
        if (color[2] > 1.0) color[2] = 1.0;
@@ -348,8 +356,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;