From 5b779f520055787bd7add0cc1de6b78c04723f2f Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Thu, 11 Dec 1997 04:43:53 +0000
Subject: [PATCH] Fixed sun vector and lighting problems.  I thing the moon is
 now lit correctly.

---
 Scenery/astro.c | 13 +++++++------
 Scenery/astro.h |  9 ++++++---
 Scenery/moon.h  |  9 ++++++---
 Scenery/sun.h   |  9 ++++++---
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/Scenery/astro.c b/Scenery/astro.c
index 6246a713..a9f10392 100644
--- a/Scenery/astro.c
+++ b/Scenery/astro.c
@@ -89,9 +89,6 @@ void fgAstroRender() {
     /* Disable fog effects */
     glDisable( GL_FOG );
 
-    /* reverse light direction so the moon is displayed properly */
-    glLightfv( GL_LIGHT0, GL_POSITION, l->sun_vec_inv );
-
     glPushMatrix();
 
     /* Translate to view position */
@@ -121,10 +118,14 @@ void fgAstroRender() {
 
 
 /* $Log$
-/* Revision 1.3  1997/12/10 22:37:49  curt
-/* Prepended "fg" on the name of all global structures that didn't have it yet.
-/* i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
+/* Revision 1.4  1997/12/11 04:43:56  curt
+/* Fixed sun vector and lighting problems.  I thing the moon is now lit
+/* correctly.
 /*
+ * Revision 1.3  1997/12/10 22:37:49  curt
+ * Prepended "fg" on the name of all global structures that didn't have it yet.
+ * i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
+ *
  * Revision 1.2  1997/12/09 04:25:33  curt
  * Working on adding a global lighting params structure.
  *
diff --git a/Scenery/astro.h b/Scenery/astro.h
index c273d1a8..a6b8ff2d 100644
--- a/Scenery/astro.h
+++ b/Scenery/astro.h
@@ -35,7 +35,6 @@ extern struct CelestialCoord
 extern float xMoon, yMoon, zMoon, xSun, ySun, zSun;
 extern GLint moon, sun;
 extern GLint stars[FG_STAR_LEVELS];
-extern GLfloat fgClearColor[4];
 
 
 /* Initialize Astronomical Objects */
@@ -49,7 +48,11 @@ void fgAstroRender();
 
 
 /* $Log$
-/* Revision 1.1  1997/11/25 23:20:23  curt
-/* Initial revision.
+/* Revision 1.2  1997/12/11 04:43:56  curt
+/* Fixed sun vector and lighting problems.  I thing the moon is now lit
+/* correctly.
 /*
+ * Revision 1.1  1997/11/25 23:20:23  curt
+ * Initial revision.
+ *
  */
diff --git a/Scenery/moon.h b/Scenery/moon.h
index 8c0ae98b..a8e90386 100644
--- a/Scenery/moon.h
+++ b/Scenery/moon.h
@@ -46,15 +46,18 @@ struct CelestialCoord fgCalculateMoon(struct OrbElements Params,
                                       struct fgTIME t);
 
 extern struct OrbElements pltOrbElements[9];
-extern GLfloat fgClearColor[4];
 
 #endif /* _MOON_H_ */
 
 
 /* $Log$
-/* Revision 1.3  1997/11/25 19:25:35  curt
-/* Changes to integrate Durk's moon/sun code updates + clean up.
+/* Revision 1.4  1997/12/11 04:43:56  curt
+/* Fixed sun vector and lighting problems.  I thing the moon is now lit
+/* correctly.
 /*
+ * Revision 1.3  1997/11/25 19:25:35  curt
+ * Changes to integrate Durk's moon/sun code updates + clean up.
+ *
  * Revision 1.2  1997/10/25 03:24:23  curt
  * Incorporated sun, moon, and star positioning code contributed by Durk Talsma.
  *
diff --git a/Scenery/sun.h b/Scenery/sun.h
index fe06244f..9d597d27 100644
--- a/Scenery/sun.h
+++ b/Scenery/sun.h
@@ -29,7 +29,6 @@
 
 struct SunPos fgCalcSunPos(struct OrbElements sunParams);
 extern struct OrbElements pltOrbElements[9];
-extern GLfloat fgClearColor[4];
 
 /* Initialize the Sun */
 void fgSunInit();
@@ -42,9 +41,13 @@ void fgSunRender();
 
 
 /* $Log$
-/* Revision 1.2  1997/11/25 19:25:39  curt
-/* Changes to integrate Durk's moon/sun code updates + clean up.
+/* Revision 1.3  1997/12/11 04:43:56  curt
+/* Fixed sun vector and lighting problems.  I thing the moon is now lit
+/* correctly.
 /*
+ * Revision 1.2  1997/11/25 19:25:39  curt
+ * Changes to integrate Durk's moon/sun code updates + clean up.
+ *
  * Revision 1.1  1997/10/25 03:16:12  curt
  * Initial revision of code contributed by Durk Talsma.
  *
-- 
2.39.5