Moved where glBlendFunc() is reset to main.cxx

Reset glBlendFunc() here to.
Set glBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ; when done drawing
1999-10-22 15:15:43 +00:00 · 1999-10-22 12:58:39 +00:00 · 1999-10-22 12:34:06 +00:00 · 1999-10-11 21:09:21 +00:00 · 1999-10-07 21:08:50 +00:00
4 changed files with 14 additions and 11 deletions
--- a/simgear/ephemeris/celestialBody.cxx
+++ b/simgear/ephemeris/celestialBody.cxx
@@ -22,8 +22,6 @@
 * $Id$
 **************************************************************************/

-#include "celestialBody.hxx"
-#include "star.hxx"
 #include <Debug/logstream.hxx>

 #ifdef FG_MATH_EXCEPTION_CLASH
@@ -31,6 +29,10 @@
 #endif
 #include <math.h>

+#include "celestialBody.hxx"
+#include "star.hxx"
+
+
 /**************************************************************************
 * void CelestialBody::updatePosition(fgTIME *t, Star *ourSun)
 *
--- a/simgear/ephemeris/moon.cxx
+++ b/simgear/ephemeris/moon.cxx
@@ -22,10 +22,8 @@
 * $Id$
 **************************************************************************/

-#include <FDM/flight.hxx>

 #include <string.h>
-#include "moon.hxx"

 #include <Debug/logstream.hxx>
 #include <Main/options.hxx>
@@ -37,6 +35,9 @@
 #endif
 #include <math.h>

+#include <FDM/flight.hxx>
+
+#include "moon.hxx"

 /*************************************************************************
 * Moon::Moon(FGTime *t)
--- a/simgear/ephemeris/star.cxx
+++ b/simgear/ephemeris/star.cxx
@@ -235,8 +235,8 @@ void Star::newImage(void)
      xglTranslatef(0,60000,0);
      if (current_options.get_textures())
 	{
-	  glEnable(GL_TEXTURE_2D);                                             // TEXTURE ENABLED
-	  glEnable(GL_BLEND);                                                  // BLEND ENABLED
+	  glEnable(GL_TEXTURE_2D); // TEXTURE ENABLED
+	  glEnable(GL_BLEND);	// BLEND ENABLED
 	  
 	  glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 	  glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);  
@@ -254,8 +254,8 @@ void Star::newImage(void)
    }

    glPopMatrix();
-    glDisable(GL_LIGHTING);	//LIGHTING DISABLED
-    glDisable(GL_BLEND);	//BLEND DISABLED
+    glDisable(GL_LIGHTING);	// LIGHTING DISABLED
+    glDisable(GL_BLEND);	// BLEND DISABLED
    glPushMatrix();
    {     
      xglRotatef(((RAD_TO_DEG * rightAscension)- 90.0), 0.0, 0.0, 1.0);
@@ -265,7 +265,7 @@ void Star::newImage(void)
      gluSphere( SunObject,  sun_size, 10, 10 );
      }
    glPopMatrix();
-    glDisable(GL_TEXTURE_2D);                                             // TEXTURE DISABLED
-    glDisable(GL_BLEND);                                                  // BLEND DISABLED  
+    glDisable(GL_TEXTURE_2D);	// TEXTURE DISABLED
+    glDisable(GL_BLEND);	// BLEND DISABLED  
  }
 }
--- a/simgear/ephemeris/stars.cxx
+++ b/simgear/ephemeris/stars.cxx
@@ -61,7 +61,7 @@

 #include "stars.hxx"

-FG_USING_STD(getline);
+// FG_USING_STD(getline);

 #define EpochStart           (631065600)
 #define DaysSinceEpoch(secs) (((secs)-EpochStart)*(1.0/(24*3600)))
Author	SHA1	Message	Date
curt	ca07b64af0	Moved where glBlendFunc() is reset to main.cxx	1999-10-22 15:15:43 +00:00
curt	2fde2ce581	Reset glBlendFunc() here to.	1999-10-22 12:58:39 +00:00
curt	cb0da2ca5e	Set glBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ; when done drawing the Sun so that the cloud texture alpha blending will work correctly.	1999-10-22 12:34:06 +00:00
curt	c0422839b9	MSVC++ portability fix.	1999-10-11 21:09:21 +00:00
curt	862b884f02	Various SGI portability tweaks.	1999-10-07 21:08:50 +00:00