Patch from Melchior Franz:

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

diff --git a/simgear/sky/oursun.cxx b/simgear/sky/oursun.cxx
index 915f7b28c33ecf8fadf34b3e7a803322d016512a..e423db02328fea5e5cbf8b7c71fa22f001720d5e 100644 (file)
--- a/simgear/sky/oursun.cxx
+++ b/simgear/sky/oursun.cxx
@@ -25,12 +25,10 @@
 // $Id$
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include <simgear/compiler.h>
 
 #include <stdio.h>
-#include <iostream>
+#include STL_IOSTREAM
 
 #include <plib/sg.h>
 #include <plib/ssg.h>
@@ -43,6 +41,13 @@
 static int sgSunOrbPreDraw( ssgEntity *e ) {
     /* cout << endl << "Sun orb pre draw" << endl << "----------------" 
         << endl << endl; */
+
+    ssgLeaf *f = (ssgLeaf *)e;
+    if ( f -> hasState () ) f->getState()->apply() ;
+
+    glPushAttrib( GL_DEPTH_BUFFER_BIT | GL_FOG_BIT );
+    // cout << "push error = " << glGetError() << endl;
+
     glDisable( GL_DEPTH_TEST );
     glDisable( GL_FOG );
 
@@ -52,8 +57,12 @@ static int sgSunOrbPreDraw( ssgEntity *e ) {
 static int sgSunOrbPostDraw( ssgEntity *e ) {
     /* cout << endl << "Sun orb post draw" << endl << "----------------" 
         << endl << endl; */
-    glEnable( GL_DEPTH_TEST );
-    glEnable( GL_FOG );
+
+    glPopAttrib();
+    // cout << "pop error = " << glGetError() << endl;
+
+    // glEnable( GL_DEPTH_TEST );
+    // glEnable( GL_FOG );
 
     return true;
 }
@@ -61,6 +70,13 @@ static int sgSunOrbPostDraw( ssgEntity *e ) {
 static int sgSunHaloPreDraw( ssgEntity *e ) {
     /* cout << endl << "Sun halo pre draw" << endl << "----------------" 
         << endl << endl; */
+
+    ssgLeaf *f = (ssgLeaf *)e;
+    if ( f -> hasState () ) f->getState()->apply() ;
+
+    glPushAttrib( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_FOG_BIT );
+    // cout << "push error = " << glGetError() << endl;
+
     glDisable( GL_DEPTH_TEST );
     glDisable( GL_FOG );
     glBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ;
@@ -71,8 +87,12 @@ static int sgSunHaloPreDraw( ssgEntity *e ) {
 static int sgSunHaloPostDraw( ssgEntity *e ) {
     /* cout << endl << "Sun halo post draw" << endl << "----------------" 
         << endl << endl; */
-    glEnable( GL_DEPTH_TEST );
-    glEnable( GL_FOG );
+
+    glPopAttrib();
+    // cout << "pop error = " << glGetError() << endl;
+
+    // glEnable( GL_DEPTH_TEST );
+    // glEnable( GL_FOG );
 
     return true;
 }
@@ -198,7 +218,7 @@ void my_glWritePPMFile(const char *filename, GLubyte *buffer, int win_width, int
 
 
 // initialize the sun object and connect it into our scene graph root
-ssgBranch * SGSun::build( FGPath path, double sun_size ) {
+ssgBranch * SGSun::build( SGPath path, double sun_size ) {
 
     // set up the orb state
     orb_state = new ssgSimpleState();