Changed naming scheme of basic shared structures.

[flightgear.git] / Scenery / scenery.c

diff --git a/Scenery/scenery.c b/Scenery/scenery.c
index a865663747c1eeb5db8d97459d7e3db72a2bd6a7..834c25b5beec17b333b7608044e31f2feeb6bf8f 100644 (file)
--- a/Scenery/scenery.c
+++ b/Scenery/scenery.c
@@ -29,6 +29,10 @@
 #endif
 
 #include <GL/glut.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "../general.h"
 
 #include "scenery.h"
 #include "parsevrml.h"
@@ -39,24 +43,36 @@ GLint mesh_hack;
 
 
 /* Shared structure to hold current scenery parameters */
-struct scenery_params cur_scenery_params;
+struct SCENERY scenery;
 
 
 /* Initialize the Scenery Management system */
 void fgSceneryInit() {
     /* set the default terrain detail level */
-    cur_scenery_params.terrain_skip = 5;
+    scenery.terrain_skip = 4;
 }
 
 
 /* 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;
+    char path[1024];
+
+    g = &general;
+
     /* a hardcoded hack follows */
 
     /* this routine should parse the file, and make calls back to the
      * scenery management system to build the appropriate structures */
-    fgParseVRML("mesa-e.wrl");
+    path[0] = '\0';
+    strcat(path, g->root_dir);
+    strcat(path, "/Scenery/");
+    strcat(path, "mesa-e.wrl");
+
+    printf("Loading Scenery: %s\n", path);
+
+    fgParseVRML(path);
 }
 
 
@@ -69,9 +85,27 @@ void fgSceneryRender() {
 
 
 /* $Log$
-/* Revision 1.9  1997/08/04 17:08:11  curt
-/* Testing cvs on IRIX 6.x
+/* Revision 1.15  1997/08/27 03:30:32  curt
+/* Changed naming scheme of basic shared structures.
 /*
+ * Revision 1.14  1997/08/25 20:27:24  curt
+ * Merged in initial HUD and Joystick code.
+ *
+ * Revision 1.13  1997/08/22 21:34:41  curt
+ * Doing a bit of reorganizing and house cleaning.
+ *
+ * Revision 1.12  1997/08/19 23:55:08  curt
+ * Worked on better simulating real lighting.
+ *
+ * Revision 1.11  1997/08/13 20:24:22  curt
+ * Changed default detail level.
+ *
+ * Revision 1.10  1997/08/06 00:24:30  curt
+ * Working on correct real time sun lighting.
+ *
+ * Revision 1.9  1997/08/04 17:08:11  curt
+ * Testing cvs on IRIX 6.x
+ *
  * Revision 1.8  1997/07/18 23:41:27  curt
  * Tweaks for building with Cygnus Win32 compiler.
  *