Tweaks for verion 0.15 release.

diff --git a/Main/Makefile b/Main/Makefile
index 053b12ab5a195936b9056fec28c37c76ee3e3c02..ccd4fc5c9221ac35a283ef78138549c8712c3801 100644 (file)
--- a/Main/Makefile
+++ b/Main/Makefile
@@ -54,7 +54,8 @@ $(TARGET): $(OFILES) $(AFILES)
 all: $(TARGET)
 
 clean:
-       rm -f *.o $(TARGET) $(TARGET).exe lib*.a *.os2 *~ core
+       rm -f *.o $(TARGET) $(TARGET).exe \
+               fg$(VERSION_MAJOR) fg$(VERSION_MAJOR).exe lib*.a *.os2 *~ core
 
 
 #---------------------------------------------------------------------------
@@ -81,6 +82,9 @@ views.o:
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.36  1997/12/10 01:19:47  curt
+# Tweaks for verion 0.15 release.
+#
 # Revision 1.35  1997/10/28 21:11:22  curt
 # Organizational changes.
 #

diff --git a/Scenery/obj.c b/Scenery/obj.c
index 7635648293e0eef2cd79eb7b7c74fd85a919e781..a3ddb81fb77269966549f29c3d3209844030221b 100644 (file)
--- a/Scenery/obj.c
+++ b/Scenery/obj.c
@@ -229,17 +229,19 @@ GLint fgObjLoad(char *path) {
     glEnd();
 
     /* Draw normal vectors (for visually verifying normals)*/
-/*     glBegin(GL_LINES); */
-/*     glColor3f(0.0, 0.0, 0.0); */
-/*     for ( i = 0; i < ncount; i++ ) { */
-/*     glVertex3d(nodes[i][0] - ref.x,  */
-/*                nodes[i][1] - ref.y,  */
-/*                nodes[i][2] - ref.z); */
-/*     glVertex3d(nodes[i][0] - ref.x + 1000*normals[i][0],  */
-/*                nodes[i][1] - ref.y + 1000*normals[i][1],  */
-/*                nodes[i][2] - ref.z + 1000*normals[i][2]); */
-/*     } */
-/*     glEnd(); */
+    /*
+    glBegin(GL_LINES);
+    glColor3f(0.0, 0.0, 0.0);
+    for ( i = 0; i < ncount; i++ ) {
+       glVertex3d(nodes[i][0] - ref.x,
+                  nodes[i][1] - ref.y,
+                  nodes[i][2] - ref.z);
+       glVertex3d(nodes[i][0] - ref.x + 500*normals[i][0],
+                  nodes[i][1] - ref.y + 500*normals[i][1],
+                  nodes[i][2] - ref.z + 500*normals[i][2]);
+    } 
+    glEnd();
+    */
 
     glEndList();
 
@@ -250,11 +252,14 @@ GLint fgObjLoad(char *path) {
 
 
 /* $Log$
-/* Revision 1.7  1997/12/08 22:51:17  curt
-/* Enhanced to handle ccw and cw tri-stripe winding.  This is a temporary
-/* admission of defeat.  I will eventually go back and get all the stripes
-/* wound the same way (ccw).
+/* Revision 1.8  1997/12/10 01:19:51  curt
+/* Tweaks for verion 0.15 release.
 /*
+ * Revision 1.7  1997/12/08 22:51:17  curt
+ * Enhanced to handle ccw and cw tri-stripe winding.  This is a temporary
+ * admission of defeat.  I will eventually go back and get all the stripes
+ * wound the same way (ccw).
+ *
  * Revision 1.6  1997/11/25 19:25:35  curt
  * Changes to integrate Durk's moon/sun code updates + clean up.
  *

diff --git a/Simulator/Makefile b/Simulator/Makefile
index 109decca9c0aa9a99f4b39b2dc3490bd5200ea77..8f56cf81b1b5e3d820eec4b9e92af38ed9ac8d31 100644 (file)
--- a/Simulator/Makefile
+++ b/Simulator/Makefile
@@ -77,21 +77,27 @@ scenery-zip:
        zip -r scenery-$(VERSION).zip FlightGear/Scenery)
 
 bin-tar: all
-       cp GLUT/fg0 GLUT/runfg ..
+       cp Main/fg-$(VERSION) runfg ..
+       $(LN) ../fg-$(VERSION) ../fg$(VERSION_MAJOR)
        (cd ../..; \
-       tar cvzf bin-$(VERSION).tar.gz FlightGear/fgtop FlightGear/fg0 \
+       tar cvzf bin-$(VERSION).tar.gz FlightGear/fgtop \
+       FlightGear/fg-$(VERSION) FlightGear/fg$(VERSION_MAJOR) \
        FlightGear/runfg FlightGear/COPYING FlightGear/Docs FlightGear/Thanks)
 
 bin-zip: 
-       cp GLUT/fg0.exe GLUT/runfg.bat GLUT/cygwin.dll ..
+       cp Main/fg$(VERSION_MAJOR).exe Main/cygwin.dll runfg.bat ..
        (cd ../..; \
-       zip -r bin-$(VERSION).zip FlightGear/fgtop FlightGear/fg0.exe \
-       FlightGear/runfg.bat FlightGear/cygwin.dll FlightGear/COPYING \
-       FlightGear/Docs FlightGear/Thanks)
+       zip -r bin-$(VERSION).zip FlightGear/fgtop \
+       FlightGear/fg$(VERSION_MAJOR).exe FlightGear/runfg.bat \
+       FlightGear/cygwin.dll FlightGear/COPYING FlightGear/Docs \
+       FlightGear/Thanks)
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.30  1997/12/10 01:19:42  curt
+# Tweaks for verion 0.15 release.
+#
 # Revision 1.29  1997/10/30 12:38:35  curt
 # Working on new scenery subsystem.
 #

diff --git a/Simulator/make.inc b/Simulator/make.inc
index 96be415d144a4cab09393f0ef2e3aa457e37419e..f78c3904ae65b1320097c639880c317b2c97bc57 100644 (file)
--- a/Simulator/make.inc
+++ b/Simulator/make.inc
@@ -30,7 +30,7 @@
 #---------------------------------------------------------------------------
 
 VERSION_MAJOR = 0
-VERSION_MINOR = 15
+VERSION_MINOR = 16
 VERSION = $(VERSION_MAJOR).$(VERSION_MINOR)
 
 
@@ -131,6 +131,9 @@ FG_CFLAGS = $(GLOBAL_CFLAGS)
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.21  1997/12/10 01:19:42  curt
+# Tweaks for verion 0.15 release.
+#
 # Revision 1.20  1997/12/09 04:25:25  curt
 # Working on adding a global lighting params structure.
 #

diff --git a/Time/fg_time.c b/Time/fg_time.c
index 0c040a22a3ff0f613acfbf047238bab84244249f..c059f8144d9fae04c15d945e08c704448a7d09a6 100644 (file)
--- a/Time/fg_time.c
+++ b/Time/fg_time.c
@@ -233,7 +233,7 @@ void fgTimeUpdate(struct FLIGHT *f, struct fgTIME *t) {
     /* get current Unix calendar time (in seconds) */
     warp += 60; 
     /* warp = 0; */
-    t->cur_time = time(NULL) + (12) * 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 FLIGHT *f, struct fgTIME *t) {
 
 
 /* $Log$
-/* Revision 1.13  1997/12/09 05:11:56  curt
-/* Working on tweaking lighting.
+/* Revision 1.14  1997/12/10 01:19:52  curt
+/* Tweaks for verion 0.15 release.
 /*
+ * Revision 1.13  1997/12/09 05:11:56  curt
+ * Working on tweaking lighting.
+ *
  * Revision 1.12  1997/12/09 04:25:37  curt
  * Working on adding a global lighting params structure.
  *