Prepended "fg" on the name of all global structures that didn't have it yet.

[flightgear.git] / Scenery / scenery.c

diff --git a/Scenery/scenery.c b/Scenery/scenery.c
index c7d5fa4806aa194805fa075932a9ee10c88a23b0..7c27c8d5408d675fca16f7d83339411dd458ddf5 100644 (file)
--- a/Scenery/scenery.c
+++ b/Scenery/scenery.c
@@ -34,17 +34,18 @@
 
 #include "../general.h"
 
+#include "astro.h"
+#include "obj.h"
 #include "scenery.h"
-#include "parsevrml.h"
 #include "stars.h"
 
 
 /* Temporary hack until we get the scenery management system running */
-GLint mesh_hack;
+GLint area_terrain;
 
 
 /* Shared structure to hold current scenery parameters */
-struct SCENERY scenery;
+struct fgSCENERY scenery;
 
 
 /* Initialize the Scenery Management system */
@@ -57,7 +58,7 @@ void fgSceneryInit() {
 /* Tell the scenery manager where we are so it can load the proper data, and
  * build the proper structures. */
 void fgSceneryUpdate(double lon, double lat, double elev) {
-    struct GENERAL *g;
+    struct fgGENERAL *g;
     char path[1024];
 
     g = &general;
@@ -69,28 +70,51 @@ void fgSceneryUpdate(double lon, double lat, double elev) {
     path[0] = '\0';
     strcat(path, g->root_dir);
     strcat(path, "/Scenery/");
-    strcat(path, "mesa-e.wrl");
+    strcat(path, "mesa-e.obj");
 
     printf("Loading Scenery: %s\n", path);
 
-    fgParseVRML(path);
+    area_terrain = fgObjLoad(path);
 }
 
 
 /* Render out the current scene */
 void fgSceneryRender() {
-    glPushMatrix();
-    /* glCallList(mesh_hack); */
-    glPopMatrix();
+    glCallList(area_terrain);
 
-    fgStarsRender();
+    fgAstroRender();
 }
 
 
 /* $Log$
-/* Revision 1.18  1997/09/05 01:35:59  curt
-/* Working on getting stars right.
+/* Revision 1.25  1997/12/10 22:37:51  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.24  1997/12/08 22:51:18  curt
+ * Enhanced to handle ccw and cw tri-stripe winding.  This is a temporary
+ * admission of defeat.  I will eventually go back and get all the stripes
+ * wound the same way (ccw).
+ *
+ * Revision 1.23  1997/11/25 19:25:37  curt
+ * Changes to integrate Durk's moon/sun code updates + clean up.
+ *
+ * Revision 1.22  1997/10/28 21:00:22  curt
+ * Changing to new terrain format.
+ *
+ * Revision 1.21  1997/10/25 03:24:24  curt
+ * Incorporated sun, moon, and star positioning code contributed by Durk Talsma.
+ *
+ * Revision 1.20  1997/10/25 03:18:27  curt
+ * Incorporated sun, moon, and planet position and rendering code contributed
+ * by Durk Talsma.
+ *
+ * Revision 1.19  1997/09/05 14:17:30  curt
+ * More tweaking with stars.
+ *
+ * Revision 1.18  1997/09/05 01:35:59  curt
+ * Working on getting stars right.
+ *
  * Revision 1.17  1997/08/29 17:55:27  curt
  * Worked on properly aligning the stars.
  *