Misc. tweaks.

diff --git a/Main/GLUTmain.c b/Main/GLUTmain.c
index f81cb95821da1e6791d375afdb54bc3f7c87bc4d..7f74979f6a81e1d25b8dffc10b57ae308c15f75a 100644 (file)
--- a/Main/GLUTmain.c
+++ b/Main/GLUTmain.c
@@ -58,18 +58,10 @@ struct fgGENERAL general;
 /* view parameters */
 static GLfloat win_ratio = 1.0;
 
-/* sun direction */
-/* static GLfloat sun_vec[4] = {1.0, 0.0, 0.0, 0.0 }; */
-
 /* fog color */
 static GLfloat fgFogColor[4] =   {0.65, 0.65, 0.85, 1.0};
 
 /* temporary hack */
-/* extern struct mesh *mesh_ptr; */
-/* Function prototypes */
-/* GLint fgSceneryCompile_OLD(); */
-/* static void fgSceneryDraw_OLD(); */
-
 /* pointer to scenery structure */
 /* static GLint scenery, runway; */
 
@@ -99,6 +91,8 @@ static void fgInitVisuals() {
     /* glFrontFace(GL_CW); */
     glEnable( GL_CULL_FACE );
     
+    /* glDisable( GL_DITHER ); */
+
     /* If enabled, normal vectors specified with glNormal are scaled
        to unit length after transformation.  See glNormal. */
     glEnable( GL_NORMALIZE );
@@ -570,9 +564,12 @@ int main( int argc, char *argv[] ) {
 
 
 /* $Log$
-/* Revision 1.31  1997/12/12 21:41:25  curt
-/* More light/material property tweaking ... still a ways off.
+/* Revision 1.32  1997/12/15 20:59:08  curt
+/* Misc. tweaks.
 /*
+ * Revision 1.31  1997/12/12 21:41:25  curt
+ * More light/material property tweaking ... still a ways off.
+ *
  * Revision 1.30  1997/12/12 19:52:47  curt
  * Working on lightling and material properties.
  *

diff --git a/Main/fg_init.c b/Main/fg_init.c
index d26e278c5c061c69cdc747fec7f40031106a66ba..afbc2fb87da663a209b9fc16ea8f37f57dae336c 100644 (file)
--- a/Main/fg_init.c
+++ b/Main/fg_init.c
@@ -115,7 +115,7 @@ void fgInitSubsystems( void ) {
     /* A random test position */
     /* FG_Longitude = ( 88128.00 / 3600.0 ) * DEG_TO_RAD; */
     /* FG_Latitude  = ( 93312.00 / 3600.0 ) * DEG_TO_RAD; */
-    FG_Runway_altitude = 8500.0;
+    FG_Runway_altitude = 4000.0;
     FG_Altitude = FG_Runway_altitude + 3.758099;
 
     printf("Initial position is: (%.4f, %.4f, %.2f)\n", 
@@ -218,9 +218,12 @@ void fgInitSubsystems( void ) {
 
 
 /* $Log$
-/* Revision 1.16  1997/12/12 19:52:48  curt
-/* Working on lightling and material properties.
+/* Revision 1.17  1997/12/15 20:59:09  curt
+/* Misc. tweaks.
 /*
+ * Revision 1.16  1997/12/12 19:52:48  curt
+ * Working on lightling and material properties.
+ *
  * Revision 1.15  1997/12/11 04:43:55  curt
  * Fixed sun vector and lighting problems.  I thing the moon is now lit
  * correctly.

diff --git a/Scenery/astro.c b/Scenery/astro.c
index f742a1b51fe9677b0da5dcc01d272d4d68920a97..6bd4e0d2cc92310faab0cb68187bd153ea9167ff 100644 (file)
--- a/Scenery/astro.c
+++ b/Scenery/astro.c
@@ -90,7 +90,7 @@ void fgAstroRender() {
     glDisable( GL_FOG );
 
     /* set the sun position */
-    /* glLightfv( GL_LIGHT0, GL_POSITION, l->sun_vec_inv );*/
+    glLightfv( GL_LIGHT0, GL_POSITION, l->sun_vec_inv );
 
     glPushMatrix();
 
@@ -104,15 +104,15 @@ void fgAstroRender() {
 #endif
     glRotatef( angle, 0.0, 0.0, -1.0 );
 
+    /* render the moon */
+    fgMoonRender();
+
     /* render the stars */
     fgStarsRender();
 
     /* render the sun */
     fgSunRender();
 
-    /* render the moon */
-    fgMoonRender();
-
     glPopMatrix();
 
     /* reenable fog effects */
@@ -121,9 +121,12 @@ void fgAstroRender() {
 
 
 /* $Log$
-/* Revision 1.6  1997/12/12 21:41:27  curt
-/* More light/material property tweaking ... still a ways off.
+/* Revision 1.7  1997/12/15 20:59:09  curt
+/* Misc. tweaks.
 /*
+ * Revision 1.6  1997/12/12 21:41:27  curt
+ * More light/material property tweaking ... still a ways off.
+ *
  * Revision 1.5  1997/12/12 19:52:54  curt
  * Working on lightling and material properties.
  *

diff --git a/Scenery/moon.c b/Scenery/moon.c
index 2cbaf79194c07429ba688194454eed970f35375d..e72404f9ec7d69b59a23f36791cfeb96418d7cf2 100644 (file)
--- a/Scenery/moon.c
+++ b/Scenery/moon.c
@@ -252,7 +252,7 @@ void fgMoonInit() {
     yMoon = 60000.0 * sin(moonPos.RightAscension) * cos(moonPos.Declination);
     zMoon = 60000.0 * sin(moonPos.Declination);
 
-    glutSolidSphere(1.0, 10, 10);
+    glutSolidSphere(1.0, 15, 15);
 
     glEndList();
 }
@@ -270,7 +270,8 @@ void fgMoonRender() {
     glLightfv(GL_LIGHT0, GL_AMBIENT, l->scene_clear );
     glLightfv(GL_LIGHT0, GL_DIFFUSE, moon_color );
 
-    glMaterialfv(GL_FRONT, GL_AMBIENT, black);
+    glMaterialfv(GL_FRONT, GL_AMBIENT, l->scene_clear );
+    glMaterialfv(GL_FRONT, GL_AMBIENT, moon_color );
     glMaterialfv(GL_FRONT, GL_DIFFUSE, moon_color);
 
     glPushMatrix();

diff --git a/Simulator/Makefile b/Simulator/Makefile
index 8f56cf81b1b5e3d820eec4b9e92af38ed9ac8d31..412a54ba736ba4a4c6adc5336bfd39c24cd557b4 100644 (file)
--- a/Simulator/Makefile
+++ b/Simulator/Makefile
@@ -60,41 +60,44 @@ clean:
 
 source-tar: clean
        (cd ../..; \
-       tar cvzf source-$(VERSION).tar.gz FlightGear/fgtop FlightGear/COPYING \
-       FlightGear/Docs FlightGear/Src FlightGear/Thanks)
+       tar cvzf source-$(FG_VERSION).tar.gz FlightGear/fgtop \
+       FlightGear/COPYING FlightGear/Docs FlightGear/Src FlightGear/Thanks)
 
 source-zip: clean
        (cd ../..; \
-       zip -r source-$(VERSION).zip FlightGear/fgtop FlightGear/COPYING \
-       FlightGear/Docs FlightGear/Src FlightGear/Thanks)
+       zip -r source-$(FG_VERSION).zip FlightGear/fgtop 
+       FlightGear/COPYING FlightGear/Docs FlightGear/Src FlightGear/Thanks)
 
 scenery-tar:
        (cd ../..; \
-       tar cvzf scenery-$(VERSION).tar.gz FlightGear/Scenery)
+       tar cvzf scenery-$(FG_VERSION).tar.gz FlightGear/Scenery)
 
 scenery-zip:
        (cd ../..; \
-       zip -r scenery-$(VERSION).zip FlightGear/Scenery)
+       zip -r scenery-$(FG_VERSION).zip FlightGear/Scenery)
 
 bin-tar: all
-       cp Main/fg-$(VERSION) runfg ..
-       $(LN) ../fg-$(VERSION) ../fg$(VERSION_MAJOR)
+       cp Main/fg-$(FG_VERSION) runfg ..
+       $(LN) ../fg-$(FG_VERSION) ../fg$(FG_VERSION_MAJOR)
        (cd ../..; \
-       tar cvzf bin-$(VERSION).tar.gz FlightGear/fgtop \
-       FlightGear/fg-$(VERSION) FlightGear/fg$(VERSION_MAJOR) \
+       tar cvzf bin-$(FG_VERSION).tar.gz FlightGear/fgtop \
+       FlightGear/fg-$(FG_VERSION) FlightGear/fg$(FG_VERSION_MAJOR) \
        FlightGear/runfg FlightGear/COPYING FlightGear/Docs FlightGear/Thanks)
 
 bin-zip: 
-       cp Main/fg$(VERSION_MAJOR).exe Main/cygwin.dll runfg.bat ..
+       cp Main/fg$(FG_VERSION_MAJOR).exe Main/cygwin.dll runfg.bat ..
        (cd ../..; \
-       zip -r bin-$(VERSION).zip FlightGear/fgtop \
-       FlightGear/fg$(VERSION_MAJOR).exe FlightGear/runfg.bat \
+       zip -r bin-$(FG_VERSION).zip FlightGear/fgtop \
+       FlightGear/fg$(FG_VERSION_MAJOR).exe FlightGear/runfg.bat \
        FlightGear/cygwin.dll FlightGear/COPYING FlightGear/Docs \
        FlightGear/Thanks)
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.31  1997/12/15 20:59:08  curt
+# Misc. tweaks.
+#
 # Revision 1.30  1997/12/10 01:19:42  curt
 # Tweaks for verion 0.15 release.
 #

diff --git a/Time/fg_time.c b/Time/fg_time.c
index 87000c24113dc511c17ca3443f5356f65197e212..513b5c181ce7cf047da70559c17af01534f4e458 100644 (file)
--- a/Time/fg_time.c
+++ b/Time/fg_time.c
@@ -233,7 +233,7 @@ void fgTimeUpdate(struct fgFLIGHT *f, struct fgTIME *t) {
     /* get current Unix calendar time (in seconds) */
     /* warp = 60; */
     warp += 0;
-    t->cur_time = time(NULL) + (3) * 60 * 60;
+    t->cur_time = time(NULL) + (0) * 60 * 60;
     t->cur_time += warp;
     printf("Current Unix calendar time = %ld  warp = %ld\n", t->cur_time, warp);
 
@@ -285,9 +285,12 @@ void fgTimeUpdate(struct fgFLIGHT *f, struct fgTIME *t) {
 
 
 /* $Log$
-/* Revision 1.18  1997/12/12 21:41:31  curt
-/* More light/material property tweaking ... still a ways off.
+/* Revision 1.19  1997/12/15 20:59:10  curt
+/* Misc. tweaks.
 /*
+ * Revision 1.18  1997/12/12 21:41:31  curt
+ * More light/material property tweaking ... still a ways off.
+ *
  * Revision 1.17  1997/12/12 19:53:04  curt
  * Working on lightling and material properties.
  *