Updated fgGENERAL to a "type" of struct.

[simgear.git] / Astro / sky.c

diff --git a/Astro/sky.c b/Astro/sky.c
index fd450831a2d23f3a3843f9eeee5bfdb092e435b5..a3c14035c5d6aa00c3dd3c75a344ce09e94b9a39 100644 (file)
--- a/Astro/sky.c
+++ b/Astro/sky.c
@@ -45,7 +45,7 @@
 
 #include <Aircraft/aircraft.h>
 #include <Flight/flight.h>
-#include <Include/constants.h>
+#include <Include/fg_constants.h>
 #include <Main/views.h>
 #include <Math/fg_random.h>
 
@@ -130,11 +130,11 @@ void fgSkyColorsInit( void ) {
     if ( (sun_angle > 80.0) && (sun_angle < 100.0) ) {
        /* 0.0 - 0.4 */
        outer_param[0] = (10.0 - fabs(90.0 - sun_angle)) / 25.0;
-       outer_param[1] = (10.0 - fabs(90.0 - sun_angle)) / 45.0;
+       outer_param[1] = (10.0 - fabs(90.0 - sun_angle)) / 35.0;
        outer_param[2] = 0.0;
 
-       middle_param[0] = (10.0 - fabs(90.0 - sun_angle)) / 40.0;
-       middle_param[1] = (10.0 - fabs(90.0 - sun_angle)) / 60.0;
+       middle_param[0] = (10.0 - fabs(90.0 - sun_angle)) / 20.0;
+       middle_param[1] = (10.0 - fabs(90.0 - sun_angle)) / 40.0;
        middle_param[2] = 0.0;
 
        outer_diff[0] = outer_param[0] / 6.0;
@@ -248,13 +248,13 @@ void fgSkyInit( void ) {
 
 /* Draw the Sky */
 void fgSkyRender( void ) {
-    struct fgFLIGHT *f;
+    fgFLIGHT *f;
     struct fgLIGHT *l;
     struct fgVIEW *v;
     float /* inner_color[4], middle_color[4], diff, */ east_dot, dot, angle;
     int i;
 
-    f = &current_aircraft.flight;
+    f = current_aircraft.flight;
     l = &cur_light_params;
     v = &current_view;
 
@@ -348,15 +348,32 @@ void fgSkyRender( void ) {
     xglColor4fv( outer_color[0] );
     xglVertex3fv( outer_vertex[0] );
     xglEnd();
+
     xglPopMatrix();
 }
 
 
 /* $Log$
-/* Revision 1.4  1998/01/26 15:54:28  curt
-/* Added a "skirt" to try to help hide gaps between scenery and sky.  This will
-/* have to be revisited in the future.
+/* Revision 1.8  1998/03/09 22:47:25  curt
+/* Incorporated Durk's updates.
 /*
+ * Revision 1.7  1998/02/19 13:05:49  curt
+ * Incorporated some HUD tweaks from Michelle America.
+ * Tweaked the sky's sunset/rise colors.
+ * Other misc. tweaks.
+ *
+ * Revision 1.6  1998/02/07 15:29:32  curt
+ * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
+ * Revision 1.5  1998/01/27 00:47:48  curt
+ * Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
+ * system and commandline/config file processing code.
+ *
+ * Revision 1.4  1998/01/26 15:54:28  curt
+ * Added a "skirt" to try to help hide gaps between scenery and sky.  This will
+ * have to be revisited in the future.
+ *
  * Revision 1.3  1998/01/19 19:26:59  curt
  * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
  * This should simplify things tremendously.