Updated to reflect changing interfaces in other "modules."

diff --git a/Main/GLmain.c b/Main/GLmain.c
index 1a564d0ee6411cf30dd58055707cd31d0d5dfb72..f5531f74df9a38bef2911f139299da0d19c25c7e 100644 (file)
--- a/Main/GLmain.c
+++ b/Main/GLmain.c
@@ -61,7 +61,7 @@ static GLint mesh;
 double fogDensity = 2000.0;
 
 /* Another hack */
-#define DEFAULT_MODEL_HZ 120
+#define DEFAULT_MODEL_HZ 20
 double Simtime;
 int Overrun;
 int model_dt;
@@ -224,7 +224,7 @@ static void fgSceneryDraw() {
  * ready for the next move?*/
 static void fgMainLoop( void )
 {
-    slew_update();
+    fgSlewUpdate();
     aircraft_debug(1);
 
     fgUpdateVisuals();
@@ -288,9 +288,9 @@ int main( int argc, char *argv[] ) {
     fgInitVisuals();
 
     /* Set initial position and slew parameters */
-    /* slew_init(-398391.3, 120070.4, 244, 3.1415); */ /* GLOBE Airport */
-    /* slew_init(-335340,162540, 15, 4.38); */
-    slew_init(-398673.28,120625.64, 53, 4.38);
+    /* fgSlewInit(-398391.3, 120070.4, 244, 3.1415); */ /* GLOBE Airport */
+    /* fgSlewInit(-335340,162540, 15, 4.38); */
+    fgSlewInit(-398673.28,120625.64, 53, 4.38);
 
     /* build all objects */
     fgSceneryInit();
@@ -339,10 +339,14 @@ int main( int argc, char *argv[] ) {
 
 
 /* $Log$
-/* Revision 1.4  1997/05/27 17:44:31  curt
-/* Renamed & rearranged variables and routines.   Added some initial simple
-/* timer/alarm routines so the flight model can be updated on a regular interval.
+/* Revision 1.5  1997/05/29 02:33:23  curt
+/* Updated to reflect changing interfaces in other "modules."
 /*
+ * Revision 1.4  1997/05/27 17:44:31  curt
+ * Renamed & rearranged variables and routines.   Added some initial simple
+ * timer/alarm routines so the flight model can be updated on a regular 
+ * interval.
+ *
  * Revision 1.3  1997/05/23 15:40:25  curt
  * Added GNU copyright headers.
  * Fog now works!

diff --git a/Main/Makefile b/Main/Makefile
index 7cfb8e00d1b33eda8dff230b1fbd36d15e8c3ce4..abf568b2cafea5787944027a2a3d4b34d8f4ea03 100644 (file)
--- a/Main/Makefile
+++ b/Main/Makefile
@@ -66,7 +66,8 @@ LIBS =  $(INTERFACE_LIBS) $(GRAPHICS_LIBS) -lm -lfl
 
 CFILES = GLmain.c $(INTERFACE_FILES) mesh2GL.c
 OFILES = $(CFILES:.c=.o)
-AFILES = ../flight/libflight.a ../aircraft/libaircraft.a ../scenery/libscenery.a
+AFILES = ../flight/libflight.a ../flight/slew/libslew.a \
+       ../aircraft/libaircraft.a ../scenery/libscenery.a
 
 
 
@@ -102,6 +103,9 @@ mesh2GL.o: mesh2GL.c ../scenery/mesh.h
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.6  1997/05/29 02:33:23  curt
+# Updated to reflect changing interfaces in other "modules."
+#
 # Revision 1.5  1997/05/27 17:44:32  curt
 # Renamed & rearranged variables and routines.   Added some initial simple
 # timer/alarm routines so the flight model can be updated on a regular interval.

diff --git a/Main/mesh2GL.c b/Main/mesh2GL.c
index 9b6015b19a58b3cb1a137dc919a0d0ae9291a5ab..8232718f5fec19c9e08c955f98be288b7ff81665 100644 (file)
--- a/Main/mesh2GL.c
+++ b/Main/mesh2GL.c
@@ -59,7 +59,7 @@ GLint mesh2GL(struct mesh *m) {
     int i, j, istep, jstep, iend, jend;
     float temp;
 
-    istep = jstep = 5;  /* Detail level 1 - 1200 ... */
+    istep = jstep = 4;  /* Detail level 1 -- 1200 ... */
 
     mesh = glGenLists(1);
     glNewList(mesh, GL_COMPILE);
@@ -119,10 +119,14 @@ GLint mesh2GL(struct mesh *m) {
 
 
 /* $Log$
-/* Revision 1.6  1997/05/27 17:44:32  curt
-/* Renamed & rearranged variables and routines.   Added some initial simple
-/* timer/alarm routines so the flight model can be updated on a regular interval.
+/* Revision 1.7  1997/05/29 02:33:24  curt
+/* Updated to reflect changing interfaces in other "modules."
 /*
+ * Revision 1.6  1997/05/27 17:44:32  curt
+ * Renamed & rearranged variables and routines.   Added some initial simple
+ * timer/alarm routines so the flight model can be updated on a regular 
+ * interval.
+ *
  * Revision 1.5  1997/05/24 01:45:32  curt
  * Fixed surface normals for triangle mesh.
  *