From 664b1fa4a899f5e026201e6906edc48c76d2d0e1 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Tue, 21 Apr 1998 17:02:27 +0000
Subject: [PATCH] Prepairing for C++ integration.

---
 Aircraft/aircraft.h |   29 +-
 Astro/moon.h        |   22 +-
 Astro/orbits.h      |   21 +-
 Astro/planets.h     |   19 +-
 Astro/sky.h         |   17 +-
 Astro/stars.h       |   20 +-
 Astro/sun.h         |   17 +-
 Cockpit/cockpit.h   |   19 +-
 Controls/controls.h |   17 +-
 Main/GLUTkey.h      |   17 +-
 Main/GLUTmain.c     | 1210 -------------------------------------------
 Main/GLUTmain.cxx   | 1162 +++++++++++++++++++++++++++++++++++++++++
 Main/Makefile.am    |    2 +-
 Main/Makefile.in    |   26 +-
 Main/fg_getopt.h    |   17 +-
 Main/fg_init.h      |   19 +-
 Main/views.h        |   19 +-
 Scenery/obj.h       |   19 +-
 Scenery/scenery.h   |   17 +-
 Scenery/texload.h   |   10 +
 Scenery/tilecache.h |   17 +-
 Scenery/tilemgr.h   |   19 +-
 Weather/weather.h   |   18 +-
 23 files changed, 1485 insertions(+), 1268 deletions(-)
 delete mode 100644 Main/GLUTmain.c
 create mode 100644 Main/GLUTmain.cxx

diff --git a/Aircraft/aircraft.h b/Aircraft/aircraft.h
index cbdc86b19..e39985ab2 100644
--- a/Aircraft/aircraft.h
+++ b/Aircraft/aircraft.h
@@ -27,6 +27,12 @@
 #ifndef _AIRCRAFT_H
 #define _AIRCRAFT_H
 
+
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 #include <Flight/flight.h>
 #include <Controls/controls.h>
 
@@ -51,14 +57,22 @@ void fgAircraftInit( void );
 void fgAircraftOutputCurrent(fgAIRCRAFT *a);
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _AIRCRAFT_H */
 
 
 /* $Log$
-/* Revision 1.10  1998/02/07 15:29:32  curt
-/* Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
-/* <chotchkiss@namg.us.anritsu.com>
+/* Revision 1.11  1998/04/21 17:02:27  curt
+/* Prepairing for C++ integration.
 /*
+ * Revision 1.10  1998/02/07 15:29:32  curt
+ * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
  * Revision 1.9  1998/01/22 02:59:23  curt
  * Changed #ifdef FILE_H to #ifdef _FILE_H
  *
@@ -71,10 +85,13 @@ void fgAircraftOutputCurrent(fgAIRCRAFT *a);
 
 
 /* $Log$
-/* Revision 1.10  1998/02/07 15:29:32  curt
-/* Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
-/* <chotchkiss@namg.us.anritsu.com>
+/* Revision 1.11  1998/04/21 17:02:27  curt
+/* Prepairing for C++ integration.
 /*
+ * Revision 1.10  1998/02/07 15:29:32  curt
+ * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
  * Revision 1.9  1998/01/22 02:59:23  curt
  * Changed #ifdef FILE_H to #ifdef _FILE_H
  *
diff --git a/Astro/moon.h b/Astro/moon.h
index f43820ae1..ff7b21073 100644
--- a/Astro/moon.h
+++ b/Astro/moon.h
@@ -26,6 +26,11 @@
 #define _MOON_H
 
 
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 #include <Astro/orbits.h>
 
 #include <Time/fg_time.h>
@@ -44,15 +49,24 @@ struct CelestialCoord fgCalculateMoon(struct OrbElements Params,
 
 extern struct OrbElements pltOrbElements[9];
 
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _MOON_H */
 
 
 /* $Log$
-/* Revision 1.6  1998/02/23 19:07:54  curt
-/* Incorporated Durk's Astro/ tweaks.  Includes unifying the sun position
-/* calculation code between sun display, and other FG sections that use this
-/* for things like lighting.
+/* Revision 1.7  1998/04/21 17:02:30  curt
+/* Prepairing for C++ integration.
 /*
+ * Revision 1.6  1998/02/23 19:07:54  curt
+ * Incorporated Durk's Astro/ tweaks.  Includes unifying the sun position
+ * calculation code between sun display, and other FG sections that use this
+ * for things like lighting.
+ *
  * Revision 1.5  1998/02/02 20:53:21  curt
  * To version 0.29
  *
diff --git a/Astro/orbits.h b/Astro/orbits.h
index 377c41660..ab94bea58 100644
--- a/Astro/orbits.h
+++ b/Astro/orbits.h
@@ -27,6 +27,11 @@
 #define _ORBITS_H
 
 
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 #include <stdio.h>
 #include <math.h>
 
@@ -79,15 +84,23 @@ int  fgSolarSystemInit(struct fgTIME t);
 void fgSolarSystemUpdate(struct OrbElements *planets, struct fgTIME t);
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _ORBITS_H */
 
 
 /* $Log$
-/* Revision 1.6  1998/02/23 19:07:55  curt
-/* Incorporated Durk's Astro/ tweaks.  Includes unifying the sun position
-/* calculation code between sun display, and other FG sections that use this
-/* for things like lighting.
+/* Revision 1.7  1998/04/21 17:02:31  curt
+/* Prepairing for C++ integration.
 /*
+ * Revision 1.6  1998/02/23 19:07:55  curt
+ * Incorporated Durk's Astro/ tweaks.  Includes unifying the sun position
+ * calculation code between sun display, and other FG sections that use this
+ * for things like lighting.
+ *
  * Revision 1.5  1998/02/12 21:59:35  curt
  * Incorporated code changes contributed by Charlie Hotchkiss
  * <chotchkiss@namg.us.anritsu.com>
diff --git a/Astro/planets.h b/Astro/planets.h
index bdd1d7b5e..8c147ff44 100644
--- a/Astro/planets.h
+++ b/Astro/planets.h
@@ -27,6 +27,11 @@
 #define _PLANETS_H
 
 
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 struct CelestialCoord fgCalculatePlanet(struct OrbElements planet,
                                          struct OrbElements theSun,
                                          struct fgTIME t, int idx);
@@ -36,14 +41,22 @@ void fgPlanetsInit( void );
 void fgPlanetsRender( void );
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* PLANETS_H */
 
 
 /* $Log$
-/* Revision 1.4  1998/02/12 21:59:38  curt
-/* Incorporated code changes contributed by Charlie Hotchkiss
-/* <chotchkiss@namg.us.anritsu.com>
+/* Revision 1.5  1998/04/21 17:02:31  curt
+/* Prepairing for C++ integration.
 /*
+ * Revision 1.4  1998/02/12 21:59:38  curt
+ * Incorporated code changes contributed by Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
  * Revision 1.3  1998/02/02 20:53:23  curt
  * To version 0.29
  *
diff --git a/Astro/sky.h b/Astro/sky.h
index 7e1275ddc..065698635 100644
--- a/Astro/sky.h
+++ b/Astro/sky.h
@@ -28,6 +28,11 @@
 #define _SKY_H
 
 
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 /* (Re)generate the display list */
 void fgSkyInit( void );
 
@@ -38,13 +43,21 @@ void fgSkyColorsInit( void );
 void fgSkyRender( void );
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _SKY_H */
 
 
 /* $Log$
-/* Revision 1.3  1998/01/22 02:59:28  curt
-/* Changed #ifdef FILE_H to #ifdef _FILE_H
+/* Revision 1.4  1998/04/21 17:02:32  curt
+/* Prepairing for C++ integration.
 /*
+ * Revision 1.3  1998/01/22 02:59:28  curt
+ * Changed #ifdef FILE_H to #ifdef _FILE_H
+ *
  * Revision 1.2  1998/01/19 18:40:17  curt
  * Tons of little changes to clean up the code and to remove fatal errors
  * when building with the c++ compiler.
diff --git a/Astro/stars.h b/Astro/stars.h
index b56934cc3..c4247ab3a 100644
--- a/Astro/stars.h
+++ b/Astro/stars.h
@@ -28,6 +28,11 @@
 #define _STARS_H
 
 
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 #define FG_MAX_STARS 500
 #define FG_STAR_LEVELS 4         /* how many star transitions */
 #define FG_MIN_STAR_MAG 0.738750 /* magnitude of weakest star we'll display */
@@ -40,14 +45,23 @@ void fgStarsRender( void );
 extern struct OrbElements pltOrbElements[9];
 extern struct fgTIME cur_time_params;
 
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _STARS_H */
 
 
 /* $Log$
-/* Revision 1.4  1998/02/12 21:59:39  curt
-/* Incorporated code changes contributed by Charlie Hotchkiss
-/* <chotchkiss@namg.us.anritsu.com>
+/* Revision 1.5  1998/04/21 17:02:33  curt
+/* Prepairing for C++ integration.
 /*
+ * Revision 1.4  1998/02/12 21:59:39  curt
+ * Incorporated code changes contributed by Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
  * Revision 1.3  1998/01/22 02:59:28  curt
  * Changed #ifdef FILE_H to #ifdef _FILE_H
  *
diff --git a/Astro/sun.h b/Astro/sun.h
index b37a79341..b9f6f0b03 100644
--- a/Astro/sun.h
+++ b/Astro/sun.h
@@ -27,6 +27,11 @@
 #define _SUN_H
 
 
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 extern fgSUNPOS solarPosition;
 
 
@@ -40,13 +45,21 @@ void fgSunInit( void );
 void fgSunRender( void );
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _SUN_H */
 
 
 /* $Log$
-/* Revision 1.5  1998/03/09 22:47:26  curt
-/* Incorporated Durk's updates.
+/* Revision 1.6  1998/04/21 17:02:33  curt
+/* Prepairing for C++ integration.
 /*
+ * Revision 1.5  1998/03/09 22:47:26  curt
+ * Incorporated Durk's updates.
+ *
  * Revision 1.4  1998/02/23 19:07:57  curt
  * Incorporated Durk's Astro/ tweaks.  Includes unifying the sun position
  * calculation code between sun display, and other FG sections that use this
diff --git a/Cockpit/cockpit.h b/Cockpit/cockpit.h
index 237397b66..eefe9d3c5 100644
--- a/Cockpit/cockpit.h
+++ b/Cockpit/cockpit.h
@@ -28,6 +28,11 @@
 #define _COCKPIT_H
 
 
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 #include <Cockpit/hud.h>
 
 
@@ -46,14 +51,22 @@ fgCOCKPIT *fgCockpitInit( fgAIRCRAFT *cur_aircraft );
 void fgCockpitUpdate( void );
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _COCKPIT_H */
 
 
 /* $Log$
-/* Revision 1.6  1998/02/07 15:29:33  curt
-/* Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
-/* <chotchkiss@namg.us.anritsu.com>
+/* Revision 1.7  1998/04/21 17:02:34  curt
+/* Prepairing for C++ integration.
 /*
+ * Revision 1.6  1998/02/07 15:29:33  curt
+ * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
  * Revision 1.5  1998/01/22 02:59:29  curt
  * Changed #ifdef FILE_H to #ifdef _FILE_H
  *
diff --git a/Controls/controls.h b/Controls/controls.h
index 03671a995..485818046 100644
--- a/Controls/controls.h
+++ b/Controls/controls.h
@@ -28,6 +28,11 @@
 #define _CONTROLS_H
 
 
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 #include <Include/fg_limits.h>
 
 
@@ -78,13 +83,21 @@ void fgThrottleMove(int engine, double amt);
 void fgThrottleSet(int engine, double pos);
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _CONTROLS_H */
 
 
 /* $Log$
-/* Revision 1.12  1998/02/09 22:56:48  curt
-/* Removed "depend" files from cvs control.  Other minor make tweaks.
+/* Revision 1.13  1998/04/21 17:02:35  curt
+/* Prepairing for C++ integration.
 /*
+ * Revision 1.12  1998/02/09 22:56:48  curt
+ * Removed "depend" files from cvs control.  Other minor make tweaks.
+ *
  * Revision 1.11  1998/02/07 15:29:36  curt
  * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
  * <chotchkiss@namg.us.anritsu.com>
diff --git a/Main/GLUTkey.h b/Main/GLUTkey.h
index 1c1c6c901..1eb9ecbab 100644
--- a/Main/GLUTkey.h
+++ b/Main/GLUTkey.h
@@ -28,6 +28,11 @@
 #define _GLUTKEY_H
 
 
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 #include <config.h>
 
 #ifdef HAVE_WINDOWS_H
@@ -42,13 +47,21 @@ void GLUTkey(unsigned char k, int x, int y);
 void GLUTspecialkey(int k, int x, int y);
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _GLUTKEY_H */
 
 
 /* $Log$
-/* Revision 1.8  1998/04/03 22:09:02  curt
-/* Converting to Gnu autoconf system.
+/* Revision 1.9  1998/04/21 17:02:36  curt
+/* Prepairing for C++ integration.
 /*
+ * Revision 1.8  1998/04/03 22:09:02  curt
+ * Converting to Gnu autoconf system.
+ *
  * Revision 1.7  1998/02/12 21:59:44  curt
  * Incorporated code changes contributed by Charlie Hotchkiss
  * <chotchkiss@namg.us.anritsu.com>
diff --git a/Main/GLUTmain.c b/Main/GLUTmain.c
deleted file mode 100644
index acdfaba99..000000000
--- a/Main/GLUTmain.c
+++ /dev/null
@@ -1,1210 +0,0 @@
-/**************************************************************************
- * GLUTmain.c -- top level sim routines
- *
- * Written by Curtis Olson for OpenGL, started May 1997.
- *
- * Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id$
- * (Log is kept at end of this file)
- **************************************************************************/
-
-
-#include <config.h>
-
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>                     
-#endif
-
-#include <GL/glut.h>
-#include <XGL/xgl.h>
-#include <stdio.h>
-
-#ifdef HAVE_STDLIB_H
-#   include <stdlib.h>
-#endif
-#ifdef HAVE_GETOPT_H
-#   include <getopt.h>
-#endif
-
-#include <Debug/fg_debug.h>
-#include <Main/GLUTkey.h>
-#include <Main/fg_init.h>
-#include <Main/fg_getopt.h>
-#include <Main/views.h>
-
-#include <Include/cmdargs.h>       // Line to command line arguments
-#include <Include/fg_constants.h>  // for VERSION
-#include <Include/general.h>
-
-#include <Aircraft/aircraft.h>
-#include <Astro/moon.h>
-#include <Astro/planets.h>
-#include <Astro/sky.h>
-#include <Astro/stars.h>
-#include <Astro/sun.h>
-#include <Autopilot/autopilot.h>
-#include <Cockpit/cockpit.h>
-#include <Joystick/joystick.h>
-#include <Math/fg_geodesy.h>
-#include <Math/mat3.h>
-#include <Math/polar.h>
-#include <Scenery/scenery.h>
-#include <Scenery/tilemgr.h>
-#include <Time/event.h>
-#include <Time/fg_time.h>
-#include <Time/fg_timer.h>
-#include <Time/sunpos.h>
-#include <Weather/weather.h>
-
-
-/* This is a record containing global housekeeping information */
-fgGENERAL general;
-
-/* view parameters */
-static GLfloat win_ratio = 1.0;
-static GLint winWidth, winHeight;
-
-/* temporary hack */
-/* pointer to scenery structure */
-/* static GLint scenery, runway; */
-
-/* double Simtime; */
-
-/* Another hack */
-int use_signals = 0;
-
-/* Yet another hack. This one used by the HUD code. Michele */
-int show_hud;
-
-/* Yet another other hack. Used for my prototype instrument code. (Durk) */
-int displayInstruments; 
-
-// The following defines flight gear options. Because glutlib will also
-// want to parse its own options, those options must not be included here
-// or they will get parsed by the main program option parser. Hence case
-// is significant for any option added that might be in conflict with
-// glutlib's parser.
-//
-// glutlib parses for:
-//    -display
-//    -direct   (invalid in Win32)
-//    -geometry
-//    -gldebug
-//    -iconized
-//    -indirect (invalid in Win32)
-//    -synce
-//
-// Note that glutlib depends upon strings while this program's
-// option parser wants only initial characters followed by numbers
-// or pathnames.
-//
-const char *fg_cmdargopts = "a:c:Hhp:r:v:x:?";
-//
-// Where
-//   -a aircraftfilename    aircraft start over ride
-//   -c0x0000 - 0xffffffff  debug class setting
-//    H,h.? help on command line use (does not need Option struct)
-//   -p  priority
-//   -r flightgear          root path to program support files
-//   -v0 -v1                initial view mode (hud/no_hud currently)
-//   -xlogpathname          debug logfile name
-//
-// Defaults in arguments to indicate not set on command line.
-// Program defaults set variables from constants if neither command
-// options or environmental variables effect values.
-//
-
-char  acArgbuf          [ MAXPATH + 1] = "\0";
-int   debugArgValue                    = -2;
-int   priorityArgValue                 = -1;
-char  rootArgbuf        [ MAXPATH + 1] = "\0";
-int   viewArg                          = -1;
-char  logArgbuf         [ MAXPATH + 1] = "\0";
-
-// There is a reason for defining the option structs by name and then
-// creating an array of pointers to options. C++ is unfriendly to
-// initializing arrays of objects that are not built in types. Always
-// look forward. (Besides, you can follow what is going on better and
-// add or modify with greater security. -ch
-//
-Option aircraftOption = { 'a',
-                          OPT_STRING,
-                          acArgbuf,
-                          "Startup aircraft pathname override"
-                        };
-Option debugOption    = { 'c',
-                          OPT_LHEX,       // Long int (32 bits)
-                          &debugArgValue,
-                          "Debug trace level"
-                        };
-Option priorityOption = { 'p',
-                          OPT_INTEGER,
-                          &priorityArgValue,
-                          "Debug priority Threshold"
-                        };
-Option rootOption     = { 'r',
-                          OPT_STRING,
-                          rootArgbuf,
-                          "Root directory for execution"
-                        };
-Option hudOption      = { 'v',
-                          OPT_INTEGER,
-                          &viewArg,
-                          "View mode start" // Naked,HUD,Panel,Chase,Tower...
-                        };
-//
-// Only naked view and HUD are implemented at this time
-//
-Option logfileOption  = { 'x',
-                          OPT_STRING,
-                          logArgbuf,
-                          "Debug log file name"
-                        };
-
-//
-#define OptsDefined 6
-Option *CmdLineOptions[ OptsDefined ] = {
-  &aircraftOption,
-  &debugOption,
-  &hudOption,
-  &priorityOption,
-  &rootOption,
-  &logfileOption
-  };
-
-const char *DefaultRootDir  = "\\Flightgear";
-const char *DefaultAircraft = "Navion.acf";
-const char *DefaultDebuglog = "fgdebug.log";
-const int   DefaultViewMode = HUD_VIEW;
-//
-// Debug defaults handled in fg_debug.c
-//
-/**************************************************************************
- * fgInitVisuals() -- Initialize various GL/view parameters
- **************************************************************************/
-
-static void fgInitVisuals( void ) {
-    struct fgLIGHT *l;
-    struct fgWEATHER *w;
-
-    l = &cur_light_params;
-    w = &current_weather;
-
-    /* xglDisable( GL_DITHER ); */
-
-    /* If enabled, normal vectors specified with glNormal are scaled
-       to unit length after transformation.  See glNormal. */
-    xglEnable( GL_NORMALIZE );
-
-    xglEnable( GL_LIGHTING );
-    xglEnable( GL_LIGHT0 );
-    xglLightfv( GL_LIGHT0, GL_POSITION, l->sun_vec );
-
-    xglFogi (GL_FOG_MODE, GL_LINEAR);
-    xglFogf (GL_FOG_START, 10.0);
-    xglFogf (GL_FOG_END, w->visibility);
-    /* xglFogf (GL_FOG_DENSITY, w->visibility); */
-    xglHint (GL_FOG_HINT, GL_NICEST /* GL_FASTEST */ );
-
-    /* draw wire frame */
-    /* xglPolygonMode(GL_FRONT_AND_BACK,GL_LINE); */
-}
-
-
-/**************************************************************************
- * Update the view volume, position, and orientation
- **************************************************************************/
-
-static void fgUpdateViewParams( void ) {
-    fgFLIGHT *f;
-    struct fgLIGHT *l;
-//  struct fgTIME *t;
-    struct fgVIEW *v;
-
-    f = current_aircraft.flight;
-    l = &cur_light_params;
-//  t = &cur_time_params;
-    v = &current_view;
-
-    fgViewUpdate(f, v, l);
-
-    if (displayInstruments)
-      {
-	xglViewport(0, (GLint)(winHeight / 2 ) , (GLint)winWidth, (GLint)winHeight / 2);
-	/* Tell GL we are about to modify the projection parameters */
-	xglMatrixMode(GL_PROJECTION);
-	xglLoadIdentity();
-	gluPerspective(65.0, 2.0/win_ratio, 1.0, 100000.0);
-      }
-    else
-      {
-	xglViewport(0, 0 , (GLint)winWidth, (GLint) winHeight);
-	/* Tell GL we are about to modify the projection parameters */    
-	xglMatrixMode(GL_PROJECTION);
-	xglLoadIdentity();
-	gluPerspective(65.0, 1.0/win_ratio, 10.0, 100000.0);
-      }
-
-    xglMatrixMode(GL_MODELVIEW);
-    xglLoadIdentity();
-    
-    /* set up our view volume (default) */
-    gluLookAt(v->view_pos.x, v->view_pos.y, v->view_pos.z,
-	       v->view_pos.x + v->view_forward[0], 
-	       v->view_pos.y + v->view_forward[1], 
-	       v->view_pos.z + v->view_forward[2],
-	       v->view_up[0], v->view_up[1], v->view_up[2]);
-
-    /* look almost straight up (testing and eclipse watching) */
-    /* gluLookAt(v->view_pos.x, v->view_pos.y, v->view_pos.z,
-	       v->view_pos.x + v->view_up[0] + .001, 
-	       v->view_pos.y + v->view_up[1] + .001, 
-	       v->view_pos.z + v->view_up[2] + .001,
-	       v->view_up[0], v->view_up[1], v->view_up[2]); */
-
-    /* lock view horizontally towards sun (testing) */
-    /* gluLookAt(v->view_pos.x, v->view_pos.y, v->view_pos.z,
-	       v->view_pos.x + v->surface_to_sun[0], 
-	       v->view_pos.y + v->surface_to_sun[1], 
-	       v->view_pos.z + v->surface_to_sun[2],
-	       v->view_up[0], v->view_up[1], v->view_up[2]); */
-
-    /* lock view horizontally towards south (testing) */
-    /* gluLookAt(v->view_pos.x, v->view_pos.y, v->view_pos.z,
-	       v->view_pos.x + v->surface_south[0], 
-	       v->view_pos.y + v->surface_south[1], 
-	       v->view_pos.z + v->surface_south[2],
-	       v->view_up[0], v->view_up[1], v->view_up[2]); */
-
-    /* set the sun position */
-    xglLightfv( GL_LIGHT0, GL_POSITION, l->sun_vec );
-}
-
-
-/*************************************************************************
- * Draw a basic instrument panel
- ************************************************************************/
-static void fgUpdateInstrViewParams( void ) {
-    xglViewport(0, 0 , (GLint)winWidth, (GLint)winHeight / 2);
-  
-    xglMatrixMode(GL_PROJECTION);
-    xglPushMatrix();
-  
-    xglLoadIdentity();
-    gluOrtho2D(0, 640, 0, 480);
-    xglMatrixMode(GL_MODELVIEW);
-    xglPushMatrix();
-    xglLoadIdentity();
-
-    xglColor3f(1.0, 1.0, 1.0);
-    xglIndexi(7);
-  
-    xglDisable(GL_DEPTH_TEST);
-    xglDisable(GL_LIGHTING);
-  
-    xglLineWidth(1);
-    xglColor3f (0.5, 0.5, 0.5);
-
-    xglBegin(GL_QUADS);
-    xglVertex2f(0.0, 0.00);
-    xglVertex2f(0.0, 480.0);
-    xglVertex2f(640.0,480.0);
-    xglVertex2f(640.0, 0.0);
-    xglEnd();
-
-    xglRectf(0.0,0.0, 640, 480);
-    xglEnable(GL_DEPTH_TEST);
-    xglEnable(GL_LIGHTING);
-    xglMatrixMode(GL_PROJECTION);
-    xglPopMatrix();
-    xglMatrixMode(GL_MODELVIEW);
-    xglPopMatrix();
-}
-
-
-/**************************************************************************
- * Update all Visuals (redraws anything graphics related)
- **************************************************************************/
-
-static void fgRenderFrame( void ) {
-    struct fgLIGHT *l;
-    struct fgTIME *t;
-    struct fgVIEW *v;
-    double angle;
-    GLfloat white[4] = { 1.0, 1.0, 1.0, 1.0 };
-    GLfloat black[4] = { 0.0, 0.0, 0.0, 1.0 };
-
-    l = &cur_light_params;
-    t = &cur_time_params;
-    v = &current_view;
-
-    /* update view volume parameters */
-    fgUpdateViewParams();
-
-    xglClear( GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT );
-
-    /* Tell GL we are switching to model view parameters */
-    xglMatrixMode(GL_MODELVIEW);
-    /* xglLoadIdentity(); */
-
-    /* draw sky */
-    xglDisable( GL_DEPTH_TEST );
-    xglDisable( GL_LIGHTING );
-    xglDisable( GL_CULL_FACE );
-    xglDisable( GL_FOG );
-    xglShadeModel( GL_SMOOTH );
-    fgSkyRender();
-
-    /* setup transformation for drawing astronomical objects */
-    xglPushMatrix();
-    /* Translate to view position */
-    xglTranslatef( v->view_pos.x, v->view_pos.y, v->view_pos.z );
-    /* Rotate based on gst (sidereal time) */
-    angle = t->gst * 15.041085; /* should be 15.041085, Curt thought it was 15*/
-    /* printf("Rotating astro objects by %.2f degrees\n",angle); */
-    xglRotatef( angle, 0.0, 0.0, -1.0 );
-
-    /* draw stars and planets */
-    fgStarsRender();
-    fgPlanetsRender();
-
-    /* draw the sun */
-    fgSunRender();
-
-    /* render the moon */
-    xglEnable( GL_LIGHTING );
-    /* set lighting parameters */
-    xglLightfv(GL_LIGHT0, GL_AMBIENT, white );
-    xglLightfv(GL_LIGHT0, GL_DIFFUSE, white );
-    xglEnable( GL_CULL_FACE );
-    
-    /* Let's try some blending technique's (Durk)*/
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_ONE, GL_ONE);
-    fgMoonRender();
-    glDisable(GL_BLEND);
-
-    xglPopMatrix();
-
-    /* draw scenery */
-    xglShadeModel( /* GL_FLAT */ GL_SMOOTH ); 
-    xglEnable( GL_DEPTH_TEST );
-    xglEnable( GL_FOG );
-    xglFogfv (GL_FOG_COLOR, l->fog_color);
-    /* set lighting parameters */
-    xglLightfv(GL_LIGHT0, GL_AMBIENT, l->scene_ambient );
-    xglLightfv(GL_LIGHT0, GL_DIFFUSE, l->scene_diffuse );
-    /* texture parameters */
-    xglEnable( GL_TEXTURE_2D ); /* xglDisable( GL_TEXTURE_2D ); */
-    xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT ) ;
-    xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT ) ;
-    xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ) ;
-    xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, 
-		      GL_LINEAR /* GL_LINEAR_MIPMAP_LINEAR */ ) ;
-    xglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ) ;
-    xglHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST ) ;
-    /* set base color (I don't think this is doing anything here) */
-    xglColor4fv(white);
-
-    fgTileMgrRender();
-
-    xglDisable( GL_TEXTURE_2D );
-
-    /* display HUD */
-    if( show_hud ) {
-     	fgCockpitUpdate();
-    }
-
-    /* display instruments */
-    if (displayInstruments) {
-	fgUpdateInstrViewParams();
-    }
-
-    xglutSwapBuffers();
-}
-
-
-/**************************************************************************
- * Update internal time dependent calculations (i.e. flight model)
- **************************************************************************/
-
-void fgUpdateTimeDepCalcs(int multi_loop) {
-    fgFLIGHT *f;
-    struct fgTIME *t;
-    struct fgVIEW *v;
-    int i;
-
-    f = current_aircraft.flight;
-    t = &cur_time_params;
-    v = &current_view;
-
-    /* update the flight model */
-    if ( multi_loop < 0 ) {
-	multi_loop = DEFAULT_MULTILOOP;
-    }
-
-    /* printf("updating flight model x %d\n", multi_loop); */
-    fgFlightModelUpdate(FG_LARCSIM, f, multi_loop);
-
-    /* update the view angle */
-    for ( i = 0; i < multi_loop; i++ ) {
-	if ( fabs(v->goal_view_offset - v->view_offset) < 0.05 ) {
-	    v->view_offset = v->goal_view_offset;
-	    break;
-	} else {
-	    /* move v->view_offset towards v->goal_view_offset */
-	    if ( v->goal_view_offset > v->view_offset ) {
-		if ( v->goal_view_offset - v->view_offset < FG_PI ) {
-		    v->view_offset += 0.01;
-		} else {
-		    v->view_offset -= 0.01;
-		}
-	    } else {
-		if ( v->view_offset - v->goal_view_offset < FG_PI ) {
-		    v->view_offset -= 0.01;
-		} else {
-		    v->view_offset += 0.01;
-		}
-	    }
-	    if ( v->view_offset > FG_2PI ) {
-		v->view_offset -= FG_2PI;
-	    } else if ( v->view_offset < 0 ) {
-		v->view_offset += FG_2PI;
-	    }
-	}
-    }
-}
-
-
-void fgInitTimeDepCalcs( void ) {
-    /* initialize timer */
-
-#ifdef HAVE_SETITIMER
-    fgTimerInit( 1.0 / DEFAULT_TIMER_HZ, fgUpdateTimeDepCalcs );
-#endif HAVE_SETITIMER
-
-}
-
-
-/**************************************************************************
- * Scenery management routines
- **************************************************************************/
-
-/* static void fgSceneryInit_OLD() { */
-    /* make scenery */
-/*     scenery = fgSceneryCompile_OLD();
-    runway = fgRunwayHack_OLD(0.69, 53.07);
-} */
-
-
-/* create the scenery */
-/* GLint fgSceneryCompile_OLD() {
-    GLint scenery;
-
-    scenery = mesh2GL(mesh_ptr_OLD);
-
-    return(scenery);
-}
-*/
-
-/* hack in a runway */
-/* GLint fgRunwayHack_OLD(double width, double length) {
-    static GLfloat concrete[4] = { 0.5, 0.5, 0.5, 1.0 };
-    static GLfloat line[4]     = { 0.9, 0.9, 0.9, 1.0 };
-    int i;
-    int num_lines = 16;
-    float line_len, line_width_2, cur_pos;
-
-    runway = xglGenLists(1);
-    xglNewList(runway, GL_COMPILE);
-    */
-    /* draw concrete */
-/*    xglBegin(GL_POLYGON);
-    xglMaterialfv( GL_FRONT, GL_AMBIENT_AND_DIFFUSE, concrete );
-    xglNormal3f(0.0, 0.0, 1.0);
-
-    xglVertex3d( 0.0,   -width/2.0, 0.0);
-    xglVertex3d( 0.0,    width/2.0, 0.0);
-    xglVertex3d(length,  width/2.0, 0.0);
-    xglVertex3d(length, -width/2.0, 0.0);
-    xglEnd();
-    */
-    /* draw center line */
-/*    xglMaterialfv( GL_FRONT, GL_AMBIENT_AND_DIFFUSE, line );
-    line_len = length / ( 2 * num_lines + 1);
-    printf("line_len = %.3f\n", line_len);
-    line_width_2 = 0.02;
-    cur_pos = line_len;
-    for ( i = 0; i < num_lines; i++ ) {
-	xglBegin(GL_POLYGON);
-	xglVertex3d( cur_pos, -line_width_2, 0.005);
-	xglVertex3d( cur_pos,  line_width_2, 0.005);
-	cur_pos += line_len;
-	xglVertex3d( cur_pos,  line_width_2, 0.005);
-	xglVertex3d( cur_pos, -line_width_2, 0.005);
-	cur_pos += line_len;
-	xglEnd();
-    }
-
-    xglEndList();
-
-    return(runway);
-}
-*/
-
-/* draw the scenery */
-/*static void fgSceneryDraw_OLD() {
-    static float z = 32.35;
-
-    xglPushMatrix();
-
-    xglCallList(scenery);
-
-    printf("*** Drawing runway at %.2f\n", z);
-
-    xglTranslatef( -398391.28, 120070.41, 32.35);
-    xglRotatef(170.0, 0.0, 0.0, 1.0);
-    xglCallList(runway);
-
-    xglPopMatrix();
-}
-*/
-
-
-/* What should we do when we have nothing else to do?  How about get
- * ready for the next move and update the display? */
-static void fgMainLoop( void ) {
-    static int remainder = 0;
-    int elapsed, multi_loop;
-    double cur_elev;
-    /* double joy_x, joy_y; */
-    /* int joy_b1, joy_b2; */
-    fgAIRCRAFT *a;
-    fgFLIGHT *f;
-    struct fgTIME *t;
-
-    fgPrintf( FG_ALL, FG_DEBUG, "Running Main Loop\n");
-    fgPrintf( FG_ALL, FG_DEBUG, "======= ==== ====\n");
-
-    a = &current_aircraft;
-    f = a->flight;
-    t = &cur_time_params;
-
-    /* update "time" */
-    fgTimeUpdate(f, t);
-
-    /* Read joystick */
-    /* fgJoystickRead( &joy_x, &joy_y, &joy_b1, &joy_b2 );
-    printf( "Joystick X %f  Y %f  B1 %d  B2 %d\n",  
-	    joy_x, joy_y, joy_b1, joy_b2 );
-    fgElevSet( -joy_y );
-    fgAileronSet( joy_x ); */
-
-    /* Calculate model iterations needed */
-    elapsed = fgGetTimeInterval();
-    fgPrintf( FG_ALL, FG_BULK, 
-	      "Time interval is = %d, previous remainder is = %d\n", 
-	      elapsed, remainder);
-    fgPrintf( FG_ALL, FG_BULK, 
-	      "--> Frame rate is = %.2f\n", 1000.0 / (float)elapsed);
-    elapsed += remainder;
-
-    multi_loop = (int)(((float)elapsed * 0.001) * DEFAULT_MODEL_HZ);
-    remainder = elapsed - ((multi_loop*1000) / DEFAULT_MODEL_HZ);
-    fgPrintf( FG_ALL, FG_BULK, 
-	      "Model iterations needed = %d, new remainder = %d\n", 
-	      multi_loop, remainder);
-	
-	//Insertion by Jeff Goeke-Smith for Autopilot.
-	// Where should this really go?  
-	// Maybe this should run in tandem with the Flight model.
-	
-	/* run Autopilot system */
-	fgPrintf( FG_ALL, FG_BULK,"Attempting autopilot run\n");
-	              
-	fgAPRun();
-	
-	// end of insertion 
-	
-
-    /* Run flight model */
-    if ( ! use_signals ) {
-	/* flight model */
-	fgUpdateTimeDepCalcs(multi_loop);
-    }
-
-    /* I'm just sticking this here for now, it should probably move 
-     * eventually */
-    /* cur_elev = mesh_altitude(FG_Longitude * RAD_TO_ARCSEC, 
-			       FG_Latitude  * RAD_TO_ARCSEC); */
-    /* there is no ground collision detection really, so for now I
-     * just hard code the ground elevation to be 0 */
-    cur_elev = 0;
-
-    /* printf("Ground elevation is %.2f meters here.\n", cur_elev); */
-    /* FG_Runway_altitude = cur_elev * METER_TO_FEET; */
-
-    if ( FG_Altitude * FEET_TO_METER < cur_elev + 3.758099) {
-	/* set this here, otherwise if we set runway height above our
-	   current height we get a really nasty bounce. */
-	FG_Runway_altitude = FG_Altitude - 3.758099;
-
-	/* now set aircraft altitude above ground */
-	FG_Altitude = cur_elev * METER_TO_FEET + 3.758099;
-	fgPrintf( FG_ALL, FG_BULK, "<*> resetting altitude to %.0f meters\n", 
-	       FG_Altitude * FEET_TO_METER);
-    }
-
-    fgAircraftOutputCurrent(a);
-
-    /* see if we need to load any new scenery tiles */
-    fgTileMgrUpdate();
-
-    /* Process/manage pending events */
-    fgEventProcess();
-
-    /* redraw display */
-    fgRenderFrame();
-
-    fgPrintf( FG_ALL, FG_DEBUG, "\n");
-}
-
-
-/**************************************************************************
- * Handle new window size or exposure
- **************************************************************************/
-
-static void fgReshape( int width, int height ) {
-    /* Do this so we can call fgReshape(0,0) ourselves without having to know
-     * what the values of width & height are. */
-    if ( (height > 0) && (width > 0) ) {
-	win_ratio = (GLfloat) height / (GLfloat) width;
-    }
-
-    winWidth = width;
-    winHeight = height;
-
-    /* Inform gl of our view window size (now handled elsewhere) */
-    /* xglViewport(0, 0, (GLint)width, (GLint)height); */
-
-    fgUpdateViewParams();
-    
-    /* xglClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); */
-}
-
-
-/**************************************************************************
- * Main ...
- **************************************************************************/
-
-int main( int argc, char *argv[] ) {
-    fgFLIGHT *f;
-    int parse_result;  // Used in command line argument.
-
-    f = current_aircraft.flight;
-    //  First things first... We must have startup options dealt with.
-
-    printf("Flight Gear:  Version %s\n\n", VERSION);
-
-     /*********************************************************************
-     * Initialize the Window/Graphics environment.
-     **********************************************************************/
-
-    /* initialize GLUT */
-    xglutInit(&argc, argv);
-
-    /* Define Display Parameters */
-    xglutInitDisplayMode( GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE );
-
-    /* Define initial window size */
-    xglutInitWindowSize(640, 480);
-
-    /* Initialize windows */
-    xglutCreateWindow("Flight Gear");
-
-    // xglutInit above will extract all non-general program command line.
-    // We only need wory about our own.
-
-    parse_result = getargs( argc, argv, OptsDefined, CmdLineOptions, NULL);
-
-    switch( parse_result ) {
-    case ALLDONE:
-	break;
-
-    case HELP:
-        print_desc( OptsDefined, CmdLineOptions );
-        exit(0);
-
-    case INVALID:
-    default:
-        printf( "Flight Gear: Command line invalid.");
-        exit(0);
-    }
-
-    // Deal with the effects of options no set by manipulating the command
-    // line, or possibly set to invalid states.
-
-    if(( viewArg >= 0) && (viewArg <= 1)) {
-	show_hud = viewArg; // For now view_mode TRUE - no HUD, else show_hud.
-    } else {
-	show_hud = DefaultViewMode;
-    }
-
-    // All other command line option responses are handled in the various
-    // initialization routines (or ignored if not implemented.
-
-    // This is the general house keeping init routine. It initializes the
-    // debug trail scheme and then any other stuff.
-
-    if( !fgInitGeneral()) {
-
-	// This is the top level init routine which calls all the other
-	// subsystem initialization routines.  If you are adding a
-	// subsystem to flight gear, its initialization call should
-	// located in this routine.
-	if( !fgInitSubsystems()) {
-
-	    // setup view parameters, only makes GL calls
-	    fgInitVisuals();
-
-	    if ( use_signals ) {
-		/* init timer routines, signals, etc.  Arrange for an alarm
-		   signal to be generated, etc. */
-		fgInitTimeDepCalcs();
-	    }
-
-	    /**********************************************************
-	     * Initialize the GLUT Event Handlers.
-	     **********************************************************/
-
-	    // call fgReshape() on window resizes
-	    xglutReshapeFunc( fgReshape );
-
-	    // call key() on keyboard event
-	    xglutKeyboardFunc( GLUTkey );
-	    glutSpecialFunc( GLUTspecialkey );
-
-	    // call fgMainLoop() whenever there is
-	    // nothing else to do
-	    xglutIdleFunc( fgMainLoop );
-
-	    // draw the scene
-	    xglutDisplayFunc( fgRenderFrame );
-
-	    // pass control off to the GLUT event handler
-	    glutMainLoop();
-
-        }  // End if subsystems initialize ok
-    } // End if general initializations went ok
-
-    if( fg_DebugOutput ) {
-	fclose( fg_DebugOutput );
-    }
-    return(0);
-}
-
-
-#ifdef __SUNPRO_CC
-extern "C" {
-    void __eprintf( void ) {
-    }
-}
-#endif
-
-/* $Log$
-/* Revision 1.71  1998/04/18 04:11:26  curt
-/* Moved fg_debug to it's own library, added zlib support.
-/*
- * Revision 1.70  1998/04/14 02:21:02  curt
- * Incorporated autopilot heading hold contributed by:  Jeff Goeke-Smith
- * <jgoeke@voyager.net>
- *
- * Revision 1.69  1998/04/08 23:35:34  curt
- * Tweaks to Gnu automake/autoconf system.
- *
- * Revision 1.68  1998/04/03 22:09:03  curt
- * Converting to Gnu autoconf system.
- *
- * Revision 1.67  1998/03/23 21:24:37  curt
- * Source code formating tweaks.
- *
- * Revision 1.66  1998/03/14 00:31:20  curt
- * Beginning initial terrain texturing experiments.
- *
- * Revision 1.65  1998/03/09 22:45:57  curt
- * Minor tweaks for building on sparc platform.
- *
- * Revision 1.64  1998/02/20 00:16:23  curt
- * Thursday's tweaks.
- *
- * Revision 1.63  1998/02/16 16:17:39  curt
- * Minor tweaks.
- *
- * Revision 1.62  1998/02/16 13:39:42  curt
- * Miscellaneous weekend tweaks.  Fixed? a cache problem that caused whole
- * tiles to occasionally be missing.
- *
- * Revision 1.61  1998/02/12 21:59:46  curt
- * Incorporated code changes contributed by Charlie Hotchkiss
- * <chotchkiss@namg.us.anritsu.com>
- *
- * Revision 1.60  1998/02/11 02:50:40  curt
- * Minor changes.
- *
- * Revision 1.59  1998/02/09 22:56:54  curt
- * Removed "depend" files from cvs control.  Other minor make tweaks.
- *
- * Revision 1.58  1998/02/09 15:07:49  curt
- * Minor tweaks.
- *
- * Revision 1.57  1998/02/07 15:29:40  curt
- * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
- * <chotchkiss@namg.us.anritsu.com>
- *
- * Revision 1.56  1998/02/03 23:20:23  curt
- * Lots of little tweaks to fix various consistency problems discovered by
- * Solaris' CC.  Fixed a bug in fg_debug.c with how the fgPrintf() wrapper
- * passed arguments along to the real printf().  Also incorporated HUD changes
- * by Michele America.
- *
- * Revision 1.55  1998/02/02 20:53:58  curt
- * Incorporated Durk's changes.
- *
- * Revision 1.54  1998/01/31 00:43:10  curt
- * Added MetroWorks patches from Carmen Volpe.
- *
- * Revision 1.53  1998/01/27 18:35:54  curt
- * Minor tweaks.
- *
- * Revision 1.52  1998/01/27 00:47:56  curt
- * Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
- * system and commandline/config file processing code.
- *
- * Revision 1.51  1998/01/26 15:57:05  curt
- * Tweaks for dynamic scenery development.
- *
- * Revision 1.50  1998/01/19 19:27:07  curt
- * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
- * This should simplify things tremendously.
- *
- * Revision 1.49  1998/01/19 18:40:31  curt
- * Tons of little changes to clean up the code and to remove fatal errors
- * when building with the c++ compiler.
- *
- * Revision 1.48  1998/01/19 18:35:46  curt
- * Minor tweaks and fixes for cygwin32.
- *
- * Revision 1.47  1998/01/13 00:23:08  curt
- * Initial changes to support loading and management of scenery tiles.  Note,
- * there's still a fair amount of work left to be done.
- *
- * Revision 1.46  1998/01/08 02:22:06  curt
- * Beginning to integrate Tile management subsystem.
- *
- * Revision 1.45  1998/01/07 03:18:55  curt
- * Moved astronomical stuff from .../Src/Scenery to .../Src/Astro/
- *
- * Revision 1.44  1997/12/30 22:22:31  curt
- * Further integration of event manager.
- *
- * Revision 1.43  1997/12/30 20:47:43  curt
- * Integrated new event manager with subsystem initializations.
- *
- * Revision 1.42  1997/12/30 16:36:47  curt
- * Merged in Durk's changes ...
- *
- * Revision 1.41  1997/12/30 13:06:56  curt
- * A couple lighting tweaks ...
- *
- * Revision 1.40  1997/12/30 01:38:37  curt
- * Switched back to per vertex normals and smooth shading for terrain.
- *
- * Revision 1.39  1997/12/22 23:45:45  curt
- * First stab at sunset/sunrise sky glow effects.
- *
- * Revision 1.38  1997/12/22 04:14:28  curt
- * Aligned sky with sun so dusk/dawn effects can be correct relative to the sun.
- *
- * Revision 1.37  1997/12/19 23:34:03  curt
- * Lot's of tweaking with sky rendering and lighting.
- *
- * Revision 1.36  1997/12/19 16:44:57  curt
- * Working on scene rendering order and options.
- *
- * Revision 1.35  1997/12/18 23:32:32  curt
- * First stab at sky dome actually starting to look reasonable. :-)
- *
- * Revision 1.34  1997/12/17 23:13:34  curt
- * Began working on rendering a sky.
- *
- * Revision 1.33  1997/12/15 23:54:45  curt
- * Add xgl wrappers for debugging.
- * Generate terrain normals on the fly.
- *
- * 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.
- *
- * Revision 1.29  1997/12/11 04:43:54  curt
- * Fixed sun vector and lighting problems.  I thing the moon is now lit
- * correctly.
- *
- * Revision 1.28  1997/12/10 22:37:45  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.27  1997/12/09 05:11:54  curt
- * Working on tweaking lighting.
- *
- * Revision 1.26  1997/12/09 04:25:29  curt
- * Working on adding a global lighting params structure.
- *
- * Revision 1.25  1997/12/08 22:54:09  curt
- * Enabled GL_CULL_FACE.
- *
- * Revision 1.24  1997/11/25 19:25:32  curt
- * Changes to integrate Durk's moon/sun code updates + clean up.
- *
- * Revision 1.23  1997/11/15 18:16:34  curt
- * minor tweaks.
- *
- * Revision 1.22  1997/10/30 12:38:41  curt
- * Working on new scenery subsystem.
- *
- * Revision 1.21  1997/09/23 00:29:38  curt
- * Tweaks to get things to compile with gcc-win32.
- *
- * Revision 1.20  1997/09/22 14:44:19  curt
- * Continuing to try to align stars correctly.
- *
- * Revision 1.19  1997/09/18 16:20:08  curt
- * At dusk/dawn add/remove stars in stages.
- *
- * Revision 1.18  1997/09/16 22:14:51  curt
- * Tweaked time of day lighting equations.  Don't draw stars during the day.
- *
- * Revision 1.17  1997/09/16 15:50:29  curt
- * Working on star alignment and time issues.
- *
- * Revision 1.16  1997/09/13 02:00:06  curt
- * Mostly working on stars and generating sidereal time for accurate star
- * placement.
- *
- * Revision 1.15  1997/09/05 14:17:27  curt
- * More tweaking with stars.
- *
- * Revision 1.14  1997/09/05 01:35:53  curt
- * Working on getting stars right.
- *
- * Revision 1.13  1997/09/04 02:17:34  curt
- * Shufflin' stuff.
- *
- * Revision 1.12  1997/08/27 21:32:24  curt
- * Restructured view calculation code.  Added stars.
- *
- * Revision 1.11  1997/08/27 03:30:16  curt
- * Changed naming scheme of basic shared structures.
- *
- * Revision 1.10  1997/08/25 20:27:22  curt
- * Merged in initial HUD and Joystick code.
- *
- * Revision 1.9  1997/08/22 21:34:39  curt
- * Doing a bit of reorganizing and house cleaning.
- *
- * Revision 1.8  1997/08/19 23:55:03  curt
- * Worked on better simulating real lighting.
- *
- * Revision 1.7  1997/08/16 12:22:38  curt
- * Working on improving the lighting/shading.
- *
- * Revision 1.6  1997/08/13 20:24:56  curt
- * Changes due to changing sunpos interface.
- *
- * Revision 1.5  1997/08/06 21:08:32  curt
- * Sun position now *really* works (I think) ... I still have sun time warping
- * code in place, probably should remove it soon.
- *
- * Revision 1.4  1997/08/06 15:41:26  curt
- * Working on correct sun position.
- *
- * Revision 1.3  1997/08/06 00:24:22  curt
- * Working on correct real time sun lighting.
- *
- * Revision 1.2  1997/08/04 20:25:15  curt
- * Organizational tweaking.
- *
- * Revision 1.1  1997/08/02 18:45:00  curt
- * Renamed GLmain.c GLUTmain.c
- *
- * Revision 1.43  1997/08/02 16:23:47  curt
- * Misc. tweaks.
- *
- * Revision 1.42  1997/08/01 19:43:33  curt
- * Making progress with coordinate system overhaul.
- *
- * Revision 1.41  1997/07/31 22:52:37  curt
- * Working on redoing internal coordinate systems & scenery transformations.
- *
- * Revision 1.40  1997/07/30 16:12:42  curt
- * Moved fg_random routines from Util/ to Math/
- *
- * Revision 1.39  1997/07/21 14:45:01  curt
- * Minor tweaks.
- *
- * Revision 1.38  1997/07/19 23:04:47  curt
- * Added an initial weather section.
- *
- * Revision 1.37  1997/07/19 22:34:02  curt
- * Moved PI definitions to ../constants.h
- * Moved random() stuff to ../Utils/ and renamed fg_random()
- *
- * Revision 1.36  1997/07/18 23:41:25  curt
- * Tweaks for building with Cygnus Win32 compiler.
- *
- * Revision 1.35  1997/07/18 14:28:34  curt
- * Hacked in some support for wind/turbulence.
- *
- * Revision 1.34  1997/07/16 20:04:48  curt
- * Minor tweaks to aid Win32 port.
- *
- * Revision 1.33  1997/07/12 03:50:20  curt
- * Added an #include <Windows32/Base.h> to help compiling for Win32
- *
- * Revision 1.32  1997/07/11 03:23:18  curt
- * Solved some scenery display/orientation problems.  Still have a positioning
- * (or transformation?) problem.
- *
- * Revision 1.31  1997/07/11 01:29:58  curt
- * More tweaking of terrian floor.
- *
- * Revision 1.30  1997/07/10 04:26:37  curt
- * We now can interpolated ground elevation for any position in the grid.  We
- * can use this to enforce a "hard" ground.  We still need to enforce some
- * bounds checking so that we don't try to lookup data points outside the
- * grid data set.
- *
- * Revision 1.29  1997/07/09 21:31:12  curt
- * Working on making the ground "hard."
- *
- * Revision 1.28  1997/07/08 18:20:12  curt
- * Working on establishing a hard ground.
- *
- * Revision 1.27  1997/07/07 20:59:49  curt
- * Working on scenery transformations to enable us to fly fluidly over the
- * poles with no discontinuity/distortion in scenery.
- *
- * Revision 1.26  1997/07/05 20:43:34  curt
- * renamed mat3 directory to Math so we could add other math related routines.
- *
- * Revision 1.25  1997/06/29 21:19:17  curt
- * Working on scenery management system.
- *
- * Revision 1.24  1997/06/26 22:14:53  curt
- * Beginning work on a scenery management system.
- *
- * Revision 1.23  1997/06/26 19:08:33  curt
- * Restructuring make, adding automatic "make dep" support.
- *
- * Revision 1.22  1997/06/25 15:39:47  curt
- * Minor changes to compile with rsxnt/win32.
- *
- * Revision 1.21  1997/06/22 21:44:41  curt
- * Working on intergrating the VRML (subset) parser.
- *
- * Revision 1.20  1997/06/21 17:12:53  curt
- * Capitalized subdirectory names.
- *
- * Revision 1.19  1997/06/18 04:10:31  curt
- * A couple more runway tweaks ...
- *
- * Revision 1.18  1997/06/18 02:21:24  curt
- * Hacked in a runway
- *
- * Revision 1.17  1997/06/17 16:51:58  curt
- * Timer interval stuff now uses gettimeofday() instead of ftime()
- *
- * Revision 1.16  1997/06/17 04:19:16  curt
- * More timer related tweaks with respect to view direction changes.
- *
- * Revision 1.15  1997/06/17 03:41:10  curt
- * Nonsignal based interval timing is now working.
- * This would be a good time to look at cleaning up the code structure a bit.
- *
- * Revision 1.14  1997/06/16 19:32:51  curt
- * Starting to add general timer support.
- *
- * Revision 1.13  1997/06/02 03:40:06  curt
- * A tiny bit more view tweaking.
- *
- * Revision 1.12  1997/06/02 03:01:38  curt
- * Working on views (side, front, back, transitions, etc.)
- *
- * Revision 1.11  1997/05/31 19:16:25  curt
- * Elevator trim added.
- *
- * Revision 1.10  1997/05/31 04:13:52  curt
- * WE CAN NOW FLY!!!
- *
- * Continuing work on the LaRCsim flight model integration.
- * Added some MSFS-like keyboard input handling.
- *
- * Revision 1.9  1997/05/30 19:27:01  curt
- * The LaRCsim flight model is starting to look like it is working.
- *
- * Revision 1.8  1997/05/30 03:54:10  curt
- * Made a bit more progress towards integrating the LaRCsim flight model.
- *
- * Revision 1.7  1997/05/29 22:39:49  curt
- * Working on incorporating the LaRCsim flight model.
- *
- * Revision 1.6  1997/05/29 12:31:39  curt
- * Minor tweaks, moving towards general flight model integration.
- *
- * 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!
- *
- * Revision 1.2  1997/05/23 00:35:12  curt
- * Trying to get fog to work ...
- *
- * Revision 1.1  1997/05/21 15:57:51  curt
- * Renamed due to added GLUT support.
- *
- * Revision 1.3  1997/05/19 18:22:42  curt
- * Parameter tweaking ... starting to stub in fog support.
- *
- * Revision 1.2  1997/05/17 00:17:34  curt
- * Trying to stub in support for standard OpenGL.
- *
- * Revision 1.1  1997/05/16 16:05:52  curt
- * Initial revision.
- *
- */
diff --git a/Main/GLUTmain.cxx b/Main/GLUTmain.cxx
new file mode 100644
index 000000000..fbfde978d
--- /dev/null
+++ b/Main/GLUTmain.cxx
@@ -0,0 +1,1162 @@
+//
+// GLUTmain.cxx -- top level sim routines
+//
+// Written by Curtis Olson for OpenGL, started May 1997.
+//
+// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+// $Id$
+// (Log is kept at end of this file)
+
+
+#include <config.h>
+
+#ifdef HAVE_WINDOWS_H
+#  include <windows.h>                     
+#endif
+
+#include <GL/glut.h>
+#include <XGL/xgl.h>
+#include <stdio.h>
+
+#ifdef HAVE_STDLIB_H
+#   include <stdlib.h>
+#endif
+#ifdef HAVE_GETOPT_H
+#   include <getopt.h>
+#endif
+
+#include <Debug/fg_debug.h>
+#include <Main/GLUTkey.h>
+#include <Main/fg_init.h>
+#include <Main/fg_getopt.h>
+#include <Main/views.h>
+
+#include <Include/cmdargs.h>       // Line to command line arguments
+#include <Include/fg_constants.h>  // for VERSION
+#include <Include/general.h>
+
+#include <Aircraft/aircraft.h>
+#include <Astro/moon.h>
+#include <Astro/planets.h>
+#include <Astro/sky.h>
+#include <Astro/stars.h>
+#include <Astro/sun.h>
+#include <Cockpit/cockpit.h>
+#include <Joystick/joystick.h>
+#include <Math/fg_geodesy.h>
+#include <Math/mat3.h>
+#include <Math/polar.h>
+#include <Scenery/scenery.h>
+#include <Scenery/tilemgr.h>
+#include <Time/event.h>
+#include <Time/fg_time.h>
+#include <Time/fg_timer.h>
+#include <Time/sunpos.h>
+#include <Weather/weather.h>
+
+
+// This is a record containing global housekeeping information
+fgGENERAL general;
+
+// view parameters
+static GLfloat win_ratio = 1.0;
+static GLint winWidth, winHeight;
+
+// Another hack
+int use_signals = 0;
+
+// Yet another hack. This one used by the HUD code. Michele
+int show_hud;
+
+// Yet another other hack. Used for my prototype instrument code. (Durk)
+int displayInstruments; 
+
+// The following defines flight gear options. Because glutlib will also
+// want to parse its own options, those options must not be included here
+// or they will get parsed by the main program option parser. Hence case
+// is significant for any option added that might be in conflict with
+// glutlib's parser.
+//
+// glutlib parses for:
+//    -display
+//    -direct   (invalid in Win32)
+//    -geometry
+//    -gldebug
+//    -iconized
+//    -indirect (invalid in Win32)
+//    -synce
+//
+// Note that glutlib depends upon strings while this program's
+// option parser wants only initial characters followed by numbers
+// or pathnames.
+//
+const char *fg_cmdargopts = "a:c:Hhp:r:v:x:?";
+//
+// Where
+//   -a aircraftfilename    aircraft start over ride
+//   -c0x0000 - 0xffffffff  debug class setting
+//    H,h.? help on command line use (does not need Option struct)
+//   -p  priority
+//   -r flightgear          root path to program support files
+//   -v0 -v1                initial view mode (hud/no_hud currently)
+//   -xlogpathname          debug logfile name
+//
+// Defaults in arguments to indicate not set on command line.
+// Program defaults set variables from constants if neither command
+// options or environmental variables effect values.
+//
+
+char  acArgbuf          [ MAXPATH + 1] = "\0";
+int   debugArgValue                    = -2;
+int   priorityArgValue                 = -1;
+char  rootArgbuf        [ MAXPATH + 1] = "\0";
+int   viewArg                          = -1;
+char  logArgbuf         [ MAXPATH + 1] = "\0";
+
+// There is a reason for defining the option structs by name and then
+// creating an array of pointers to options. C++ is unfriendly to
+// initializing arrays of objects that are not built in types. Always
+// look forward. (Besides, you can follow what is going on better and
+// add or modify with greater security. -ch
+//
+Option aircraftOption = { 'a',
+                          OPT_STRING,
+                          acArgbuf,
+                          "Startup aircraft pathname override"
+                        };
+Option debugOption    = { 'c',
+                          OPT_LHEX,       // Long int (32 bits)
+                          &debugArgValue,
+                          "Debug trace level"
+                        };
+Option priorityOption = { 'p',
+                          OPT_INTEGER,
+                          &priorityArgValue,
+                          "Debug priority Threshold"
+                        };
+Option rootOption     = { 'r',
+                          OPT_STRING,
+                          rootArgbuf,
+                          "Root directory for execution"
+                        };
+Option hudOption      = { 'v',
+                          OPT_INTEGER,
+                          &viewArg,
+                          "View mode start" // Naked,HUD,Panel,Chase,Tower...
+                        };
+
+// Only naked view and HUD are implemented at this time
+Option logfileOption  = { 'x',
+                          OPT_STRING,
+                          logArgbuf,
+                          "Debug log file name"
+                        };
+
+#define OptsDefined 6
+Option *CmdLineOptions[ OptsDefined ] = {
+  &aircraftOption,
+  &debugOption,
+  &hudOption,
+  &priorityOption,
+  &rootOption,
+  &logfileOption
+  };
+
+const char *DefaultRootDir  = "\\Flightgear";
+const char *DefaultAircraft = "Navion.acf";
+const char *DefaultDebuglog = "fgdebug.log";
+const int   DefaultViewMode = HUD_VIEW;
+
+// Debug defaults handled in fg_debug.c
+
+// fgInitVisuals() -- Initialize various GL/view parameters
+static void fgInitVisuals( void ) {
+    struct fgLIGHT *l;
+    struct fgWEATHER *w;
+
+    l = &cur_light_params;
+    w = &current_weather;
+
+    // xglDisable( GL_DITHER );
+
+    // If enabled, normal vectors specified with glNormal are scaled
+    // to unit length after transformation.  See glNormal.
+    xglEnable( GL_NORMALIZE );
+
+    xglEnable( GL_LIGHTING );
+    xglEnable( GL_LIGHT0 );
+    xglLightfv( GL_LIGHT0, GL_POSITION, l->sun_vec );
+
+    xglFogi (GL_FOG_MODE, GL_LINEAR);
+    xglFogf (GL_FOG_START, 10.0);
+    xglFogf (GL_FOG_END, w->visibility);
+    // xglFogf (GL_FOG_DENSITY, w->visibility);
+    xglHint (GL_FOG_HINT, GL_NICEST /* GL_FASTEST */ );
+
+    // draw wire frame
+    // xglPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
+}
+
+
+// Update the view volume, position, and orientation
+static void fgUpdateViewParams( void ) {
+    fgFLIGHT *f;
+    struct fgLIGHT *l;
+    // struct fgTIME *t;
+    struct fgVIEW *v;
+
+    f = current_aircraft.flight;
+    l = &cur_light_params;
+    // t = &cur_time_params;
+    v = &current_view;
+
+    fgViewUpdate(f, v, l);
+
+    if (displayInstruments) {
+	xglViewport( 0, (GLint)(winHeight / 2 ) , 
+		     (GLint)winWidth, (GLint)winHeight / 2 );
+	// Tell GL we are about to modify the projection parameters
+	xglMatrixMode(GL_PROJECTION);
+	xglLoadIdentity();
+	gluPerspective(65.0, 2.0/win_ratio, 1.0, 100000.0);
+    } else {
+	xglViewport(0, 0 , (GLint)winWidth, (GLint) winHeight);
+	// Tell GL we are about to modify the projection parameters
+	xglMatrixMode(GL_PROJECTION);
+	xglLoadIdentity();
+	gluPerspective(65.0, 1.0/win_ratio, 10.0, 100000.0);
+    }
+
+    xglMatrixMode(GL_MODELVIEW);
+    xglLoadIdentity();
+    
+    // set up our view volume (default)
+    gluLookAt(v->view_pos.x, v->view_pos.y, v->view_pos.z,
+	       v->view_pos.x + v->view_forward[0], 
+	       v->view_pos.y + v->view_forward[1], 
+	       v->view_pos.z + v->view_forward[2],
+	       v->view_up[0], v->view_up[1], v->view_up[2]);
+
+    // look almost straight up (testing and eclipse watching)
+    /* gluLookAt(v->view_pos.x, v->view_pos.y, v->view_pos.z,
+	       v->view_pos.x + v->view_up[0] + .001, 
+	       v->view_pos.y + v->view_up[1] + .001, 
+	       v->view_pos.z + v->view_up[2] + .001,
+	       v->view_up[0], v->view_up[1], v->view_up[2]); */
+
+    // lock view horizontally towards sun (testing)
+    /* gluLookAt(v->view_pos.x, v->view_pos.y, v->view_pos.z,
+	       v->view_pos.x + v->surface_to_sun[0], 
+	       v->view_pos.y + v->surface_to_sun[1], 
+	       v->view_pos.z + v->surface_to_sun[2],
+	       v->view_up[0], v->view_up[1], v->view_up[2]); */
+
+    // lock view horizontally towards south (testing)
+    /* gluLookAt(v->view_pos.x, v->view_pos.y, v->view_pos.z,
+	       v->view_pos.x + v->surface_south[0], 
+	       v->view_pos.y + v->surface_south[1], 
+	       v->view_pos.z + v->surface_south[2],
+	       v->view_up[0], v->view_up[1], v->view_up[2]); */
+
+    // set the sun position
+    xglLightfv( GL_LIGHT0, GL_POSITION, l->sun_vec );
+}
+
+
+// Draw a basic instrument panel
+static void fgUpdateInstrViewParams( void ) {
+    xglViewport(0, 0 , (GLint)winWidth, (GLint)winHeight / 2);
+  
+    xglMatrixMode(GL_PROJECTION);
+    xglPushMatrix();
+  
+    xglLoadIdentity();
+    gluOrtho2D(0, 640, 0, 480);
+    xglMatrixMode(GL_MODELVIEW);
+    xglPushMatrix();
+    xglLoadIdentity();
+
+    xglColor3f(1.0, 1.0, 1.0);
+    xglIndexi(7);
+  
+    xglDisable(GL_DEPTH_TEST);
+    xglDisable(GL_LIGHTING);
+  
+    xglLineWidth(1);
+    xglColor3f (0.5, 0.5, 0.5);
+
+    xglBegin(GL_QUADS);
+    xglVertex2f(0.0, 0.00);
+    xglVertex2f(0.0, 480.0);
+    xglVertex2f(640.0,480.0);
+    xglVertex2f(640.0, 0.0);
+    xglEnd();
+
+    xglRectf(0.0,0.0, 640, 480);
+    xglEnable(GL_DEPTH_TEST);
+    xglEnable(GL_LIGHTING);
+    xglMatrixMode(GL_PROJECTION);
+    xglPopMatrix();
+    xglMatrixMode(GL_MODELVIEW);
+    xglPopMatrix();
+}
+
+
+// Update all Visuals (redraws anything graphics related)
+static void fgRenderFrame( void ) {
+    struct fgLIGHT *l;
+    struct fgTIME *t;
+    struct fgVIEW *v;
+    double angle;
+    GLfloat white[4] = { 1.0, 1.0, 1.0, 1.0 };
+    GLfloat black[4] = { 0.0, 0.0, 0.0, 1.0 };
+
+    l = &cur_light_params;
+    t = &cur_time_params;
+    v = &current_view;
+
+    // update view volume parameters
+    fgUpdateViewParams();
+
+    xglClear( GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT );
+
+    // Tell GL we are switching to model view parameters
+    xglMatrixMode(GL_MODELVIEW);
+    // xglLoadIdentity();
+
+    // draw sky
+    xglDisable( GL_DEPTH_TEST );
+    xglDisable( GL_LIGHTING );
+    xglDisable( GL_CULL_FACE );
+    xglDisable( GL_FOG );
+    xglShadeModel( GL_SMOOTH );
+    fgSkyRender();
+
+    // setup transformation for drawing astronomical objects
+    xglPushMatrix();
+    // Translate to view position
+    xglTranslatef( v->view_pos.x, v->view_pos.y, v->view_pos.z );
+    // Rotate based on gst (sidereal time)
+    angle = t->gst * 15.041085; /* should be 15.041085, Curt thought it was 15*/
+    // printf("Rotating astro objects by %.2f degrees\n",angle);
+    xglRotatef( angle, 0.0, 0.0, -1.0 );
+
+    // draw stars and planets
+    fgStarsRender();
+    fgPlanetsRender();
+
+    // draw the sun
+    fgSunRender();
+
+    // render the moon
+    xglEnable( GL_LIGHTING );
+    // set lighting parameters
+    xglLightfv(GL_LIGHT0, GL_AMBIENT, white );
+    xglLightfv(GL_LIGHT0, GL_DIFFUSE, white );
+    xglEnable( GL_CULL_FACE );
+    
+    // Let's try some blending technique's (Durk)
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_ONE, GL_ONE);
+    fgMoonRender();
+    glDisable(GL_BLEND);
+
+    xglPopMatrix();
+
+    // draw scenery
+    xglShadeModel( /* GL_FLAT */ GL_SMOOTH ); 
+    xglEnable( GL_DEPTH_TEST );
+    xglEnable( GL_FOG );
+    xglFogfv (GL_FOG_COLOR, l->fog_color);
+    // set lighting parameters
+    xglLightfv(GL_LIGHT0, GL_AMBIENT, l->scene_ambient );
+    xglLightfv(GL_LIGHT0, GL_DIFFUSE, l->scene_diffuse );
+    // texture parameters
+    xglEnable( GL_TEXTURE_2D ); /* xglDisable( GL_TEXTURE_2D ); */
+    xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT ) ;
+    xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT ) ;
+    xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ) ;
+    xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, 
+		      GL_LINEAR /* GL_LINEAR_MIPMAP_LINEAR */ ) ;
+    xglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ) ;
+    xglHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST ) ;
+    // set base color (I don't think this is doing anything here)
+    xglColor4fv(white);
+
+    fgTileMgrRender();
+
+    xglDisable( GL_TEXTURE_2D );
+
+    // display HUD
+    if( show_hud ) {
+     	fgCockpitUpdate();
+    }
+
+    // display instruments
+    if (displayInstruments) {
+	fgUpdateInstrViewParams();
+    }
+
+    xglutSwapBuffers();
+}
+
+
+// Update internal time dependent calculations (i.e. flight model)
+void fgUpdateTimeDepCalcs(int multi_loop) {
+    fgFLIGHT *f;
+    struct fgTIME *t;
+    struct fgVIEW *v;
+    int i;
+
+    f = current_aircraft.flight;
+    t = &cur_time_params;
+    v = &current_view;
+
+    // update the flight model
+    if ( multi_loop < 0 ) {
+	multi_loop = DEFAULT_MULTILOOP;
+    }
+
+    // printf("updating flight model x %d\n", multi_loop);
+    fgFlightModelUpdate(FG_LARCSIM, f, multi_loop);
+
+    // update the view angle
+    for ( i = 0; i < multi_loop; i++ ) {
+	if ( fabs(v->goal_view_offset - v->view_offset) < 0.05 ) {
+	    v->view_offset = v->goal_view_offset;
+	    break;
+	} else {
+	    // move v->view_offset towards v->goal_view_offset
+	    if ( v->goal_view_offset > v->view_offset ) {
+		if ( v->goal_view_offset - v->view_offset < FG_PI ) {
+		    v->view_offset += 0.01;
+		} else {
+		    v->view_offset -= 0.01;
+		}
+	    } else {
+		if ( v->view_offset - v->goal_view_offset < FG_PI ) {
+		    v->view_offset -= 0.01;
+		} else {
+		    v->view_offset += 0.01;
+		}
+	    }
+	    if ( v->view_offset > FG_2PI ) {
+		v->view_offset -= FG_2PI;
+	    } else if ( v->view_offset < 0 ) {
+		v->view_offset += FG_2PI;
+	    }
+	}
+    }
+}
+
+
+void fgInitTimeDepCalcs( void ) {
+    // initialize timer
+
+#ifdef HAVE_SETITIMER
+    fgTimerInit( 1.0 / DEFAULT_TIMER_HZ, fgUpdateTimeDepCalcs );
+#endif HAVE_SETITIMER
+
+}
+
+
+// Scenery management routines
+
+/* static void fgSceneryInit_OLD() { */
+    /* make scenery */
+/*     scenery = fgSceneryCompile_OLD();
+    runway = fgRunwayHack_OLD(0.69, 53.07);
+} */
+
+
+/* create the scenery */
+/* GLint fgSceneryCompile_OLD() {
+    GLint scenery;
+
+    scenery = mesh2GL(mesh_ptr_OLD);
+
+    return(scenery);
+}
+*/
+
+/* hack in a runway */
+/* GLint fgRunwayHack_OLD(double width, double length) {
+    static GLfloat concrete[4] = { 0.5, 0.5, 0.5, 1.0 };
+    static GLfloat line[4]     = { 0.9, 0.9, 0.9, 1.0 };
+    int i;
+    int num_lines = 16;
+    float line_len, line_width_2, cur_pos;
+
+    runway = xglGenLists(1);
+    xglNewList(runway, GL_COMPILE);
+    */
+    /* draw concrete */
+/*    xglBegin(GL_POLYGON);
+    xglMaterialfv( GL_FRONT, GL_AMBIENT_AND_DIFFUSE, concrete );
+    xglNormal3f(0.0, 0.0, 1.0);
+
+    xglVertex3d( 0.0,   -width/2.0, 0.0);
+    xglVertex3d( 0.0,    width/2.0, 0.0);
+    xglVertex3d(length,  width/2.0, 0.0);
+    xglVertex3d(length, -width/2.0, 0.0);
+    xglEnd();
+    */
+    /* draw center line */
+/*    xglMaterialfv( GL_FRONT, GL_AMBIENT_AND_DIFFUSE, line );
+    line_len = length / ( 2 * num_lines + 1);
+    printf("line_len = %.3f\n", line_len);
+    line_width_2 = 0.02;
+    cur_pos = line_len;
+    for ( i = 0; i < num_lines; i++ ) {
+	xglBegin(GL_POLYGON);
+	xglVertex3d( cur_pos, -line_width_2, 0.005);
+	xglVertex3d( cur_pos,  line_width_2, 0.005);
+	cur_pos += line_len;
+	xglVertex3d( cur_pos,  line_width_2, 0.005);
+	xglVertex3d( cur_pos, -line_width_2, 0.005);
+	cur_pos += line_len;
+	xglEnd();
+    }
+
+    xglEndList();
+
+    return(runway);
+}
+*/
+
+/* draw the scenery */
+/*static void fgSceneryDraw_OLD() {
+    static float z = 32.35;
+
+    xglPushMatrix();
+
+    xglCallList(scenery);
+
+    printf("*** Drawing runway at %.2f\n", z);
+
+    xglTranslatef( -398391.28, 120070.41, 32.35);
+    xglRotatef(170.0, 0.0, 0.0, 1.0);
+    xglCallList(runway);
+
+    xglPopMatrix();
+}
+*/
+
+
+// What should we do when we have nothing else to do?  How about get
+// ready for the next move and update the display?
+static void fgMainLoop( void ) {
+    static int remainder = 0;
+    int elapsed, multi_loop;
+    double cur_elev;
+    // double joy_x, joy_y;
+    // int joy_b1, joy_b2;
+    fgAIRCRAFT *a;
+    fgFLIGHT *f;
+    struct fgTIME *t;
+
+    fgPrintf( FG_ALL, FG_DEBUG, "Running Main Loop\n");
+    fgPrintf( FG_ALL, FG_DEBUG, "======= ==== ====\n");
+
+    a = &current_aircraft;
+    f = a->flight;
+    t = &cur_time_params;
+
+    // update "time"
+    fgTimeUpdate(f, t);
+
+    // Read joystick
+    /* fgJoystickRead( &joy_x, &joy_y, &joy_b1, &joy_b2 );
+    printf( "Joystick X %f  Y %f  B1 %d  B2 %d\n",  
+	    joy_x, joy_y, joy_b1, joy_b2 );
+    fgElevSet( -joy_y );
+    fgAileronSet( joy_x ); */
+
+    // Calculate model iterations needed
+    elapsed = fgGetTimeInterval();
+    fgPrintf( FG_ALL, FG_BULK, 
+	      "Time interval is = %d, previous remainder is = %d\n", 
+	      elapsed, remainder);
+    fgPrintf( FG_ALL, FG_BULK, 
+	      "--> Frame rate is = %.2f\n", 1000.0 / (float)elapsed);
+    elapsed += remainder;
+
+    multi_loop = (int)(((float)elapsed * 0.001) * DEFAULT_MODEL_HZ);
+    remainder = elapsed - ((multi_loop*1000) / DEFAULT_MODEL_HZ);
+    fgPrintf( FG_ALL, FG_BULK, 
+	      "Model iterations needed = %d, new remainder = %d\n", 
+	      multi_loop, remainder);
+	
+    // Run flight model
+    if ( ! use_signals ) {
+	// flight model
+	fgUpdateTimeDepCalcs(multi_loop);
+    }
+
+    // I'm just sticking this here for now, it should probably move
+    // eventually
+    /* cur_elev = mesh_altitude(FG_Longitude * RAD_TO_ARCSEC, 
+			       FG_Latitude  * RAD_TO_ARCSEC); */
+    // there is no ground collision detection really, so for now I
+    // just hard code the ground elevation to be 0 */
+    cur_elev = 0;
+
+    // printf("Ground elevation is %.2f meters here.\n", cur_elev);
+    // FG_Runway_altitude = cur_elev * METER_TO_FEET;
+
+    if ( FG_Altitude * FEET_TO_METER < cur_elev + 3.758099) {
+	// set this here, otherwise if we set runway height above our
+	// current height we get a really nasty bounce.
+	FG_Runway_altitude = FG_Altitude - 3.758099;
+
+	// now set aircraft altitude above ground
+	FG_Altitude = cur_elev * METER_TO_FEET + 3.758099;
+	fgPrintf( FG_ALL, FG_BULK, "<*> resetting altitude to %.0f meters\n", 
+	       FG_Altitude * FEET_TO_METER);
+    }
+
+    fgAircraftOutputCurrent(a);
+
+    // see if we need to load any new scenery tiles
+    fgTileMgrUpdate();
+
+    // Process/manage pending events
+    fgEventProcess();
+
+    // redraw display
+    fgRenderFrame();
+
+    fgPrintf( FG_ALL, FG_DEBUG, "\n");
+}
+
+
+// Handle new window size or exposure
+static void fgReshape( int width, int height ) {
+    // Do this so we can call fgReshape(0,0) ourselves without having
+    // to know what the values of width & height are.
+    if ( (height > 0) && (width > 0) ) {
+	win_ratio = (GLfloat) height / (GLfloat) width;
+    }
+
+    winWidth = width;
+    winHeight = height;
+
+    // Inform gl of our view window size (now handled elsewhere)
+    // xglViewport(0, 0, (GLint)width, (GLint)height);
+    fgUpdateViewParams();
+    
+    // xglClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
+}
+
+
+// Main ...
+int main( int argc, char *argv[] ) {
+    fgFLIGHT *f;
+    int parse_result;  // Used in command line argument.
+
+    f = current_aircraft.flight;
+    //  First things first... We must have startup options dealt with.
+
+    printf("Flight Gear:  Version %s\n\n", VERSION);
+
+    // Initialize the Window/Graphics environment.
+
+    // initialize GLUT
+    xglutInit(&argc, argv);
+
+    // Define Display Parameters
+    xglutInitDisplayMode( GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE );
+
+    // Define initial window size
+    xglutInitWindowSize(640, 480);
+
+    // Initialize windows
+    xglutCreateWindow("Flight Gear");
+
+    // xglutInit above will extract all non-general program command line.
+    // We only need wory about our own.
+
+    parse_result = getargs( argc, argv, OptsDefined, CmdLineOptions, NULL);
+
+    switch( parse_result ) {
+    case ALLDONE:
+	break;
+
+    case HELP:
+        print_desc( OptsDefined, CmdLineOptions );
+        exit(0);
+
+    case INVALID:
+    default:
+        printf( "Flight Gear: Command line invalid.");
+        exit(0);
+    }
+
+    // Deal with the effects of options no set by manipulating the command
+    // line, or possibly set to invalid states.
+
+    if(( viewArg >= 0) && (viewArg <= 1)) {
+	show_hud = viewArg; // For now view_mode TRUE - no HUD, else show_hud.
+    } else {
+	show_hud = DefaultViewMode;
+    }
+
+    // All other command line option responses are handled in the various
+    // initialization routines (or ignored if not implemented.
+
+    // This is the general house keeping init routine. It initializes the
+    // debug trail scheme and then any other stuff.
+
+    if( !fgInitGeneral()) {
+
+	// This is the top level init routine which calls all the other
+	// subsystem initialization routines.  If you are adding a
+	// subsystem to flight gear, its initialization call should
+	// located in this routine.
+	if( !fgInitSubsystems()) {
+
+	    // setup view parameters, only makes GL calls
+	    fgInitVisuals();
+
+	    if ( use_signals ) {
+		// init timer routines, signals, etc.  Arrange for an
+		// alarm signal to be generated, etc.
+		fgInitTimeDepCalcs();
+	    }
+
+	    // Initialize the GLUT Event Handlers.
+
+	    // call fgReshape() on window resizes
+	    xglutReshapeFunc( fgReshape );
+
+	    // call key() on keyboard event
+	    xglutKeyboardFunc( GLUTkey );
+	    glutSpecialFunc( GLUTspecialkey );
+
+	    // call fgMainLoop() whenever there is
+	    // nothing else to do
+	    xglutIdleFunc( fgMainLoop );
+
+	    // draw the scene
+	    xglutDisplayFunc( fgRenderFrame );
+
+	    // pass control off to the GLUT event handler
+	    glutMainLoop();
+
+        }  // End if subsystems initialize ok
+    } // End if general initializations went ok
+
+    if( fg_DebugOutput ) {
+	fclose( fg_DebugOutput );
+    }
+    return(0);
+}
+
+
+#ifdef __SUNPRO_CC
+extern "C" {
+    void __eprintf( void ) {
+    }
+}
+#endif
+
+
+// $Log$
+// Revision 1.1  1998/04/21 17:02:39  curt
+// Prepairing for C++ integration.
+//
+// Revision 1.71  1998/04/18 04:11:26  curt
+// Moved fg_debug to it's own library, added zlib support.
+//
+// Revision 1.70  1998/04/14 02:21:02  curt
+// Incorporated autopilot heading hold contributed by:  Jeff Goeke-Smith
+// <jgoeke@voyager.net>
+//
+// Revision 1.69  1998/04/08 23:35:34  curt
+// Tweaks to Gnu automake/autoconf system.
+//
+// Revision 1.68  1998/04/03 22:09:03  curt
+// Converting to Gnu autoconf system.
+//
+// Revision 1.67  1998/03/23 21:24:37  curt
+// Source code formating tweaks.
+//
+// Revision 1.66  1998/03/14 00:31:20  curt
+// Beginning initial terrain texturing experiments.
+//
+// Revision 1.65  1998/03/09 22:45:57  curt
+// Minor tweaks for building on sparc platform.
+//
+// Revision 1.64  1998/02/20 00:16:23  curt
+// Thursday's tweaks.
+//
+// Revision 1.63  1998/02/16 16:17:39  curt
+// Minor tweaks.
+//
+// Revision 1.62  1998/02/16 13:39:42  curt
+// Miscellaneous weekend tweaks.  Fixed? a cache problem that caused whole
+// tiles to occasionally be missing.
+//
+// Revision 1.61  1998/02/12 21:59:46  curt
+// Incorporated code changes contributed by Charlie Hotchkiss
+// <chotchkiss@namg.us.anritsu.com>
+//
+// Revision 1.60  1998/02/11 02:50:40  curt
+// Minor changes.
+//
+// Revision 1.59  1998/02/09 22:56:54  curt
+// Removed "depend" files from cvs control.  Other minor make tweaks.
+//
+// Revision 1.58  1998/02/09 15:07:49  curt
+// Minor tweaks.
+//
+// Revision 1.57  1998/02/07 15:29:40  curt
+// Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+// <chotchkiss@namg.us.anritsu.com>
+//
+// Revision 1.56  1998/02/03 23:20:23  curt
+// Lots of little tweaks to fix various consistency problems discovered by
+// Solaris' CC.  Fixed a bug in fg_debug.c with how the fgPrintf() wrapper
+// passed arguments along to the real printf().  Also incorporated HUD changes
+// by Michele America.
+//
+// Revision 1.55  1998/02/02 20:53:58  curt
+// Incorporated Durk's changes.
+//
+// Revision 1.54  1998/01/31 00:43:10  curt
+// Added MetroWorks patches from Carmen Volpe.
+//
+// Revision 1.53  1998/01/27 18:35:54  curt
+// Minor tweaks.
+//
+// Revision 1.52  1998/01/27 00:47:56  curt
+// Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
+// system and commandline/config file processing code.
+//
+// Revision 1.51  1998/01/26 15:57:05  curt
+// Tweaks for dynamic scenery development.
+//
+// Revision 1.50  1998/01/19 19:27:07  curt
+// Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+// This should simplify things tremendously.
+//
+// Revision 1.49  1998/01/19 18:40:31  curt
+// Tons of little changes to clean up the code and to remove fatal errors
+// when building with the c++ compiler.
+//
+// Revision 1.48  1998/01/19 18:35:46  curt
+// Minor tweaks and fixes for cygwin32.
+//
+// Revision 1.47  1998/01/13 00:23:08  curt
+// Initial changes to support loading and management of scenery tiles.  Note,
+// there's still a fair amount of work left to be done.
+//
+// Revision 1.46  1998/01/08 02:22:06  curt
+// Beginning to integrate Tile management subsystem.
+//
+// Revision 1.45  1998/01/07 03:18:55  curt
+// Moved astronomical stuff from .../Src/Scenery to .../Src/Astro/
+//
+// Revision 1.44  1997/12/30 22:22:31  curt
+// Further integration of event manager.
+//
+// Revision 1.43  1997/12/30 20:47:43  curt
+// Integrated new event manager with subsystem initializations.
+//
+// Revision 1.42  1997/12/30 16:36:47  curt
+// Merged in Durk's changes ...
+//
+// Revision 1.41  1997/12/30 13:06:56  curt
+// A couple lighting tweaks ...
+//
+// Revision 1.40  1997/12/30 01:38:37  curt
+// Switched back to per vertex normals and smooth shading for terrain.
+//
+// Revision 1.39  1997/12/22 23:45:45  curt
+// First stab at sunset/sunrise sky glow effects.
+//
+// Revision 1.38  1997/12/22 04:14:28  curt
+// Aligned sky with sun so dusk/dawn effects can be correct relative to the sun.
+//
+// Revision 1.37  1997/12/19 23:34:03  curt
+// Lot's of tweaking with sky rendering and lighting.
+//
+// Revision 1.36  1997/12/19 16:44:57  curt
+// Working on scene rendering order and options.
+//
+// Revision 1.35  1997/12/18 23:32:32  curt
+// First stab at sky dome actually starting to look reasonable. :-)
+//
+// Revision 1.34  1997/12/17 23:13:34  curt
+// Began working on rendering a sky.
+//
+// Revision 1.33  1997/12/15 23:54:45  curt
+// Add xgl wrappers for debugging.
+// Generate terrain normals on the fly.
+//
+// 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.
+//
+// Revision 1.29  1997/12/11 04:43:54  curt
+// Fixed sun vector and lighting problems.  I thing the moon is now lit
+// correctly.
+//
+// Revision 1.28  1997/12/10 22:37:45  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.27  1997/12/09 05:11:54  curt
+// Working on tweaking lighting.
+//
+// Revision 1.26  1997/12/09 04:25:29  curt
+// Working on adding a global lighting params structure.
+//
+// Revision 1.25  1997/12/08 22:54:09  curt
+// Enabled GL_CULL_FACE.
+//
+// Revision 1.24  1997/11/25 19:25:32  curt
+// Changes to integrate Durk's moon/sun code updates + clean up.
+//
+// Revision 1.23  1997/11/15 18:16:34  curt
+// minor tweaks.
+//
+// Revision 1.22  1997/10/30 12:38:41  curt
+// Working on new scenery subsystem.
+//
+// Revision 1.21  1997/09/23 00:29:38  curt
+// Tweaks to get things to compile with gcc-win32.
+//
+// Revision 1.20  1997/09/22 14:44:19  curt
+// Continuing to try to align stars correctly.
+//
+// Revision 1.19  1997/09/18 16:20:08  curt
+// At dusk/dawn add/remove stars in stages.
+//
+// Revision 1.18  1997/09/16 22:14:51  curt
+// Tweaked time of day lighting equations.  Don't draw stars during the day.
+//
+// Revision 1.17  1997/09/16 15:50:29  curt
+// Working on star alignment and time issues.
+//
+// Revision 1.16  1997/09/13 02:00:06  curt
+// Mostly working on stars and generating sidereal time for accurate star
+// placement.
+//
+// Revision 1.15  1997/09/05 14:17:27  curt
+// More tweaking with stars.
+//
+// Revision 1.14  1997/09/05 01:35:53  curt
+// Working on getting stars right.
+//
+// Revision 1.13  1997/09/04 02:17:34  curt
+// Shufflin' stuff.
+//
+// Revision 1.12  1997/08/27 21:32:24  curt
+// Restructured view calculation code.  Added stars.
+//
+// Revision 1.11  1997/08/27 03:30:16  curt
+// Changed naming scheme of basic shared structures.
+//
+// Revision 1.10  1997/08/25 20:27:22  curt
+// Merged in initial HUD and Joystick code.
+//
+// Revision 1.9  1997/08/22 21:34:39  curt
+// Doing a bit of reorganizing and house cleaning.
+//
+// Revision 1.8  1997/08/19 23:55:03  curt
+// Worked on better simulating real lighting.
+//
+// Revision 1.7  1997/08/16 12:22:38  curt
+// Working on improving the lighting/shading.
+//
+// Revision 1.6  1997/08/13 20:24:56  curt
+// Changes due to changing sunpos interface.
+//
+// Revision 1.5  1997/08/06 21:08:32  curt
+// Sun position now//really* works (I think) ... I still have sun time warping
+// code in place, probably should remove it soon.
+//
+// Revision 1.4  1997/08/06 15:41:26  curt
+// Working on correct sun position.
+//
+// Revision 1.3  1997/08/06 00:24:22  curt
+// Working on correct real time sun lighting.
+//
+// Revision 1.2  1997/08/04 20:25:15  curt
+// Organizational tweaking.
+//
+// Revision 1.1  1997/08/02 18:45:00  curt
+// Renamed GLmain.c GLUTmain.c
+//
+// Revision 1.43  1997/08/02 16:23:47  curt
+// Misc. tweaks.
+//
+// Revision 1.42  1997/08/01 19:43:33  curt
+// Making progress with coordinate system overhaul.
+//
+// Revision 1.41  1997/07/31 22:52:37  curt
+// Working on redoing internal coordinate systems & scenery transformations.
+//
+// Revision 1.40  1997/07/30 16:12:42  curt
+// Moved fg_random routines from Util/ to Math/
+//
+// Revision 1.39  1997/07/21 14:45:01  curt
+// Minor tweaks.
+//
+// Revision 1.38  1997/07/19 23:04:47  curt
+// Added an initial weather section.
+//
+// Revision 1.37  1997/07/19 22:34:02  curt
+// Moved PI definitions to ../constants.h
+// Moved random() stuff to ../Utils/ and renamed fg_random()
+//
+// Revision 1.36  1997/07/18 23:41:25  curt
+// Tweaks for building with Cygnus Win32 compiler.
+//
+// Revision 1.35  1997/07/18 14:28:34  curt
+// Hacked in some support for wind/turbulence.
+//
+// Revision 1.34  1997/07/16 20:04:48  curt
+// Minor tweaks to aid Win32 port.
+//
+// Revision 1.33  1997/07/12 03:50:20  curt
+// Added an #include <Windows32/Base.h> to help compiling for Win32
+//
+// Revision 1.32  1997/07/11 03:23:18  curt
+// Solved some scenery display/orientation problems.  Still have a positioning
+// (or transformation?) problem.
+//
+// Revision 1.31  1997/07/11 01:29:58  curt
+// More tweaking of terrian floor.
+//
+// Revision 1.30  1997/07/10 04:26:37  curt
+// We now can interpolated ground elevation for any position in the grid.  We
+// can use this to enforce a "hard" ground.  We still need to enforce some
+// bounds checking so that we don't try to lookup data points outside the
+// grid data set.
+//
+// Revision 1.29  1997/07/09 21:31:12  curt
+// Working on making the ground "hard."
+//
+// Revision 1.28  1997/07/08 18:20:12  curt
+// Working on establishing a hard ground.
+//
+// Revision 1.27  1997/07/07 20:59:49  curt
+// Working on scenery transformations to enable us to fly fluidly over the
+// poles with no discontinuity/distortion in scenery.
+//
+// Revision 1.26  1997/07/05 20:43:34  curt
+// renamed mat3 directory to Math so we could add other math related routines.
+//
+// Revision 1.25  1997/06/29 21:19:17  curt
+// Working on scenery management system.
+//
+// Revision 1.24  1997/06/26 22:14:53  curt
+// Beginning work on a scenery management system.
+//
+// Revision 1.23  1997/06/26 19:08:33  curt
+// Restructuring make, adding automatic "make dep" support.
+//
+// Revision 1.22  1997/06/25 15:39:47  curt
+// Minor changes to compile with rsxnt/win32.
+//
+// Revision 1.21  1997/06/22 21:44:41  curt
+// Working on intergrating the VRML (subset) parser.
+//
+// Revision 1.20  1997/06/21 17:12:53  curt
+// Capitalized subdirectory names.
+//
+// Revision 1.19  1997/06/18 04:10:31  curt
+// A couple more runway tweaks ...
+//
+// Revision 1.18  1997/06/18 02:21:24  curt
+// Hacked in a runway
+//
+// Revision 1.17  1997/06/17 16:51:58  curt
+// Timer interval stuff now uses gettimeofday() instead of ftime()
+//
+// Revision 1.16  1997/06/17 04:19:16  curt
+// More timer related tweaks with respect to view direction changes.
+//
+// Revision 1.15  1997/06/17 03:41:10  curt
+// Nonsignal based interval timing is now working.
+// This would be a good time to look at cleaning up the code structure a bit.
+//
+// Revision 1.14  1997/06/16 19:32:51  curt
+// Starting to add general timer support.
+//
+// Revision 1.13  1997/06/02 03:40:06  curt
+// A tiny bit more view tweaking.
+//
+// Revision 1.12  1997/06/02 03:01:38  curt
+// Working on views (side, front, back, transitions, etc.)
+//
+// Revision 1.11  1997/05/31 19:16:25  curt
+// Elevator trim added.
+//
+// Revision 1.10  1997/05/31 04:13:52  curt
+// WE CAN NOW FLY!!!
+//
+// Continuing work on the LaRCsim flight model integration.
+// Added some MSFS-like keyboard input handling.
+//
+// Revision 1.9  1997/05/30 19:27:01  curt
+// The LaRCsim flight model is starting to look like it is working.
+//
+// Revision 1.8  1997/05/30 03:54:10  curt
+// Made a bit more progress towards integrating the LaRCsim flight model.
+//
+// Revision 1.7  1997/05/29 22:39:49  curt
+// Working on incorporating the LaRCsim flight model.
+//
+// Revision 1.6  1997/05/29 12:31:39  curt
+// Minor tweaks, moving towards general flight model integration.
+//
+// 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!
+//
+// Revision 1.2  1997/05/23 00:35:12  curt
+// Trying to get fog to work ...
+//
+// Revision 1.1  1997/05/21 15:57:51  curt
+// Renamed due to added GLUT support.
+//
+// Revision 1.3  1997/05/19 18:22:42  curt
+// Parameter tweaking ... starting to stub in fog support.
+//
+// Revision 1.2  1997/05/17 00:17:34  curt
+// Trying to stub in support for standard OpenGL.
+//
+// Revision 1.1  1997/05/16 16:05:52  curt
+// Initial revision.
+//
diff --git a/Main/Makefile.am b/Main/Makefile.am
index 26f85ba7b..37e0e4400 100644
--- a/Main/Makefile.am
+++ b/Main/Makefile.am
@@ -6,7 +6,7 @@ bin_SCRIPTS = runfg runfg.bat
 
 fg_SOURCES = \
 	GLUTkey.c GLUTkey.h \
-	GLUTmain.c \
+	GLUTmain.cxx \
 	fg_config.h \
 	fg_getopt.c fg_getopt.h \
 	fg_init.c fg_init.h \
diff --git a/Main/Makefile.in b/Main/Makefile.in
index f6ed44eb7..b358d4699 100644
--- a/Main/Makefile.in
+++ b/Main/Makefile.in
@@ -79,7 +79,7 @@ bin_SCRIPTS = runfg runfg.bat
 
 fg_SOURCES = \
 	GLUTkey.c GLUTkey.h \
-	GLUTmain.c \
+	GLUTmain.cxx \
 	fg_config.h \
 	fg_getopt.c fg_getopt.h \
 	fg_init.c fg_init.h \
@@ -135,6 +135,10 @@ $(top_builddir)/Lib/Debug/libDebug.la $(top_builddir)/Lib/zlib/libz.la
 fg_LDFLAGS = 
 SCRIPTS =  $(bin_SCRIPTS)
 
+CXXFLAGS = @CXXFLAGS@
+CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
+CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -148,13 +152,14 @@ TAR = tar
 GZIP = --best
 DEP_FILES =  .deps/GLUTkey.P .deps/GLUTmain.P .deps/fg_getopt.P \
 .deps/fg_init.P .deps/views.P
+CXXMKDEP = $(CXX) -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
 SOURCES = $(fg_SOURCES)
 OBJECTS = $(fg_OBJECTS)
 
 all: Makefile $(PROGRAMS) $(SCRIPTS)
 
 .SUFFIXES:
-.SUFFIXES: .S .c .lo .o .s
+.SUFFIXES: .S .c .cxx .lo .o .s
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu Simulator/Main/Makefile
 
@@ -226,7 +231,7 @@ maintainer-clean-libtool:
 
 fg: $(fg_OBJECTS) $(fg_DEPENDENCIES)
 	@rm -f fg
-	$(LINK) $(fg_LDFLAGS) $(fg_OBJECTS) $(fg_LDADD) $(LIBS)
+	$(CXXLINK) $(fg_LDFLAGS) $(fg_OBJECTS) $(fg_LDADD) $(LIBS)
 
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
@@ -246,6 +251,10 @@ uninstall-binSCRIPTS:
 	list='$(bin_SCRIPTS)'; for p in $$list; do \
 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
 	done
+.cxx.o:
+	$(CXXCOMPILE) -c $<
+.cxx.lo:
+	$(LTCXXCOMPILE) -c $<
 
 tags: TAGS
 
@@ -312,6 +321,17 @@ maintainer-clean-depend:
 	@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
 	  < .deps/$(*F).p > .deps/$(*F).P
 	@-rm -f .deps/$(*F).p
+
+%.o: %.cxx
+	@echo '$(CXXCOMPILE) -c $<'; \
+	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).P -c $<
+
+%.lo: %.cxx
+	@echo '$(LTCXXCOMPILE) -c $<'; \
+	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).p -c $<
+	@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
+	  < .deps/$(*F).p > .deps/$(*F).P
+	@-rm -f .deps/$(*F).p
 info:
 dvi:
 check: all
diff --git a/Main/fg_getopt.h b/Main/fg_getopt.h
index 7e50d1cc1..4c12f99ac 100644
--- a/Main/fg_getopt.h
+++ b/Main/fg_getopt.h
@@ -30,9 +30,16 @@
 *
 ****************************************************************************/
 
+
 #ifndef __GETOPT_H
 #define __GETOPT_H
 
+
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 //#ifndef __DEBUG_H
 //#include "debug.h"
 //#endif
@@ -100,9 +107,6 @@ typedef struct {
 
 #define NUM_OPT(a)  sizeof(a) / sizeof(Option)
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 /*--------------------------- Global variables ---------------------------*/
 
@@ -126,7 +130,10 @@ extern void print_desc(int num_opt, Option **optarr);  // Not original code
 
 
 /* $Log$
-/* Revision 1.1  1998/02/13 00:23:39  curt
-/* Initial revision.
+/* Revision 1.2  1998/04/21 17:02:41  curt
+/* Prepairing for C++ integration.
 /*
+ * Revision 1.1  1998/02/13 00:23:39  curt
+ * Initial revision.
+ *
  */
diff --git a/Main/fg_init.h b/Main/fg_init.h
index 30dc5230d..139af9fd2 100644
--- a/Main/fg_init.h
+++ b/Main/fg_init.h
@@ -28,6 +28,11 @@
 #define _FG_INIT_H
 
 
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 // General house keeping initializations
 int fgInitGeneral ( void );
 
@@ -37,14 +42,22 @@ int fgInitGeneral ( void );
 int fgInitSubsystems( void );
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _FG_INIT_H */
 
 
 /* $Log$
-/* Revision 1.3  1998/02/12 21:59:50  curt
-/* Incorporated code changes contributed by Charlie Hotchkiss
-/* <chotchkiss@namg.us.anritsu.com>
+/* Revision 1.4  1998/04/21 17:02:41  curt
+/* Prepairing for C++ integration.
 /*
+ * Revision 1.3  1998/02/12 21:59:50  curt
+ * Incorporated code changes contributed by Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
  * Revision 1.2  1998/01/22 02:59:38  curt
  * Changed #ifdef FILE_H to #ifdef _FILE_H
  *
diff --git a/Main/views.h b/Main/views.h
index f3987b7c0..29f2da646 100644
--- a/Main/views.h
+++ b/Main/views.h
@@ -28,6 +28,11 @@
 #define _VIEWS_H
 
 
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 #include <Include/fg_types.h>
 #include <Flight/flight.h>
 #include <Math/mat3.h>
@@ -88,14 +93,22 @@ void fgViewInit(struct fgVIEW *v);
 void fgViewUpdate(fgFLIGHT *f, struct fgVIEW *v, struct fgLIGHT *l);
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _VIEWS_H */
 
 
 /* $Log$
-/* Revision 1.10  1998/02/07 15:29:45  curt
-/* Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
-/* <chotchkiss@namg.us.anritsu.com>
+/* Revision 1.11  1998/04/21 17:02:42  curt
+/* Prepairing for C++ integration.
 /*
+ * Revision 1.10  1998/02/07 15:29:45  curt
+ * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
  * Revision 1.9  1998/01/29 00:50:29  curt
  * Added a view record field for absolute x, y, z position.
  *
diff --git a/Scenery/obj.h b/Scenery/obj.h
index 030033c62..9d8fdb2d5 100644
--- a/Scenery/obj.h
+++ b/Scenery/obj.h
@@ -1,5 +1,5 @@
 /**************************************************************************
- * obj.h -- routines to handle WaveFront .obj format files.
+ * obj.h -- routines to handle WaveFront .obj-ish format files.
  *
  * Written by Curtis Olson, started October 1997.
  *
@@ -28,6 +28,11 @@
 #define _OBJ_H
 
 
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 #include <config.h>
 
 #ifdef HAVE_WINDOWS_H
@@ -43,13 +48,21 @@
 GLint fgObjLoad(char *path, struct fgCartesianPoint *ref, double *radius);
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _OBJ_H */
 
 
 /* $Log$
-/* Revision 1.7  1998/04/03 22:11:37  curt
-/* Converting to Gnu autoconf system.
+/* Revision 1.8  1998/04/21 17:02:43  curt
+/* Prepairing for C++ integration.
 /*
+ * Revision 1.7  1998/04/03 22:11:37  curt
+ * Converting to Gnu autoconf system.
+ *
  * Revision 1.6  1998/01/31 00:43:25  curt
  * Added MetroWorks patches from Carmen Volpe.
  *
diff --git a/Scenery/scenery.h b/Scenery/scenery.h
index 8c5943950..09b1d98e0 100644
--- a/Scenery/scenery.h
+++ b/Scenery/scenery.h
@@ -28,6 +28,11 @@
 #define _SCENERY_H
 
 
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 #include <Include/fg_types.h>
 
 
@@ -62,13 +67,21 @@ void fgSceneryUpdate(double lon, double lat, double elev);
 void fgSceneryRender( void );
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _SCENERY_H */
 
 
 /* $Log$
-/* Revision 1.18  1998/03/14 00:30:51  curt
-/* Beginning initial terrain texturing experiments.
+/* Revision 1.19  1998/04/21 17:02:43  curt
+/* Prepairing for C++ integration.
 /*
+ * Revision 1.18  1998/03/14 00:30:51  curt
+ * Beginning initial terrain texturing experiments.
+ *
  * Revision 1.17  1998/02/20 00:16:24  curt
  * Thursday's tweaks.
  *
diff --git a/Scenery/texload.h b/Scenery/texload.h
index 2c9335741..348f45014 100644
--- a/Scenery/texload.h
+++ b/Scenery/texload.h
@@ -10,10 +10,20 @@
 #define _TEXLOAD_H
 
 
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 #include <GL/glut.h>
 
 extern GLubyte *read_alpha_texture(char *name, int *width, int *height);
 extern GLubyte * read_rgb_texture(char *name, int *width, int *height);
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _TEXLOAD_H */
diff --git a/Scenery/tilecache.h b/Scenery/tilecache.h
index 1b4cd7eaf..10c204b93 100644
--- a/Scenery/tilecache.h
+++ b/Scenery/tilecache.h
@@ -28,6 +28,11 @@
 #define _TILECACHE_H
 
 
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 #include <config.h>
 
 #ifdef HAVE_WINDOWS_H
@@ -77,13 +82,21 @@ void fgTileCacheEntryInfo( int index, GLint *display_list,
 			   struct fgCartesianPoint *local_ref );
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _TILECACHE_H */
 
 
 /* $Log$
-/* Revision 1.9  1998/04/14 02:23:17  curt
-/* Code reorganizations.  Added a Lib/ directory for more general libraries.
+/* Revision 1.10  1998/04/21 17:02:45  curt
+/* Prepairing for C++ integration.
 /*
+ * Revision 1.9  1998/04/14 02:23:17  curt
+ * Code reorganizations.  Added a Lib/ directory for more general libraries.
+ *
  * Revision 1.8  1998/04/08 23:30:08  curt
  * Adopted Gnu automake/autoconf system.
  *
diff --git a/Scenery/tilemgr.h b/Scenery/tilemgr.h
index 955314807..fb9b1492a 100644
--- a/Scenery/tilemgr.h
+++ b/Scenery/tilemgr.h
@@ -28,6 +28,11 @@
 #define _TILEMGR_H
 
 
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 /* Initialize the Tile Manager subsystem */
 int fgTileMgrInit( void );
 
@@ -41,14 +46,22 @@ int fgTileMgrUpdate( void );
 void fgTileMgrRender( void );
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _TILEMGR_H */
 
 
 /* $Log$
-/* Revision 1.5  1998/02/12 21:59:53  curt
-/* Incorporated code changes contributed by Charlie Hotchkiss
-/* <chotchkiss@namg.us.anritsu.com>
+/* Revision 1.6  1998/04/21 17:02:45  curt
+/* Prepairing for C++ integration.
 /*
+ * Revision 1.5  1998/02/12 21:59:53  curt
+ * Incorporated code changes contributed by Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
  * Revision 1.4  1998/01/22 02:59:42  curt
  * Changed #ifdef FILE_H to #ifdef _FILE_H
  *
diff --git a/Weather/weather.h b/Weather/weather.h
index 21fc749be..9a35efa1b 100644
--- a/Weather/weather.h
+++ b/Weather/weather.h
@@ -28,6 +28,11 @@
 #define _WEATHER_H
 
 
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 /* holds the current weather values */
 struct fgWEATHER {
     float visibility;
@@ -39,17 +44,26 @@ extern struct fgWEATHER current_weather;
 /* Initialize the weather modeling subsystem */
 void fgWeatherInit( void );
 
+
 /* Update the weather parameters for the current position */
 void fgWeatherUpdate( void );
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _WEATHER_H */
 
 
 /* $Log$
-/* Revision 1.8  1998/01/22 02:59:44  curt
-/* Changed #ifdef FILE_H to #ifdef _FILE_H
+/* Revision 1.9  1998/04/21 17:02:46  curt
+/* Prepairing for C++ integration.
 /*
+ * Revision 1.8  1998/01/22 02:59:44  curt
+ * Changed #ifdef FILE_H to #ifdef _FILE_H
+ *
  * Revision 1.7  1998/01/19 18:40:41  curt
  * Tons of little changes to clean up the code and to remove fatal errors
  * when building with the c++ compiler.
-- 
2.39.2