Minor tweaks and fixes for cygwin32.

[flightgear.git] / Main / GLUTmain.c

diff --git a/Main/GLUTmain.c b/Main/GLUTmain.c
index c0b7628eff493f02c0db57e1fcefa4aa66e52d6e..0a94cb303ee10b1da9074db76e53bc9aa56c2c17 100644 (file)
--- a/Main/GLUTmain.c
+++ b/Main/GLUTmain.c
@@ -51,6 +51,7 @@
 #include "../Math/polar.h"
 #include "../Scenery/mesh.h"
 #include "../Scenery/scenery.h"
+#include "../Scenery/tilemgr.h"
 #include "../Time/event.h"
 #include "../Time/fg_time.h"
 #include "../Time/fg_timer.h"
@@ -110,6 +111,9 @@ static void fgInitVisuals() {
     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); */
 }
 
 
@@ -282,7 +286,8 @@ static void fgRenderFrame( void ) {
     /* set lighting parameters */
     xglLightfv(GL_LIGHT0, GL_AMBIENT, l->scene_ambient );
     xglLightfv(GL_LIGHT0, GL_DIFFUSE, l->scene_diffuse );
-    fgSceneryRender();
+    fgTileMgrRender();
+    /* fgSceneryRender(); */
 
     /* display HUD */
     if( show_hud ) {
@@ -514,6 +519,9 @@ static void fgMainLoop( void ) {
 
     /* fgAircraftOutputCurrent(a); */
 
+    /* see if we need to load any new scenery tiles */
+    /* fgTileMgrUpdate(); */
+
     /* Process/manage pending events */
     fgEventProcess();
 
@@ -628,9 +636,19 @@ int main( int argc, char *argv[] ) {
 
 
 /* $Log$
-/* Revision 1.45  1998/01/07 03:18:55  curt
-/* Moved astronomical stuff from .../Src/Scenery to .../Src/Astro/
+/* 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.
  *