Shuffled $FG_ROOT file layout.

Airports/simple.cxx

@@ -49,8 +49,8 @@ int fgAIRPORTS::load( char *file ) {
 
     // build the path name to the airport file
     current_options.get_fg_root(path);
-    strcat(path, "/Scenery/");
+    strcat(path, "/Airports/");
-    strcat(path, "Airports");
+    strcat(path, file);
     strcpy(fgpath, path);
     strcat(fgpath, ".gz");
 
@@ -100,6 +100,9 @@ fgAIRPORTS::~fgAIRPORTS( void ) {
 
 
 // $Log$
+// Revision 1.2  1998/08/25 20:53:24  curt
+// Shuffled $FG_ROOT file layout.
+//
 // Revision 1.1  1998/08/25 17:19:13  curt
 // Moved from ../Main/
 //

Astro/orbits.cxx

@@ -121,8 +121,8 @@ int fgSolarSystemInit(fgTIME t)
 
     /* build the full path name to the orbital elements database file */
     current_options.get_fg_root(path);
-    strcat(path, "/Scenery/");
+    strcat(path, "/Astro/");
-    strcat(path, "Planets");
+    strcat(path, "planets");
 
     if ( (data = fgopen(path, "rb")) == NULL ) {
 	strcpy(gzpath, path);
@@ -170,9 +170,12 @@ void fgSolarSystemUpdate(struct OrbElements *planet, fgTIME t)
 
 
 /* $Log$
-/* Revision 1.8  1998/08/22 01:18:59  curt
+/* Revision 1.9  1998/08/25 20:53:28  curt
-/* Minor tweaks to avoid using unitialized memory.
+/* Shuffled $FG_ROOT file layout.
 /*
+ * Revision 1.8  1998/08/22 01:18:59  curt
+ * Minor tweaks to avoid using unitialized memory.
+ *
  * Revision 1.7  1998/07/13 21:00:09  curt
  * Wrote access functions for current fgOPTIONS.
  *

Astro/stars.cxx

@@ -80,8 +80,8 @@ int fgStarsInit( void ) {
 
     /* build the full path name to the stars data base file */
     current_options.get_fg_root(path);
-    strcat(path, "/Scenery/");
+    strcat(path, "/Astro/");
-    strcat(path, "Stars");
+    strcat(path, "stars");
 
     if ( FG_STAR_LEVELS < 4 ) {
 	fgPrintf( FG_ASTRO, FG_EXIT, "Big whups in stars.cxx\n");
@@ -288,11 +288,14 @@ void fgStarsRender( void ) {
 
 
 /* $Log$
-/* Revision 1.10  1998/08/10 20:33:09  curt
+/* Revision 1.11  1998/08/25 20:53:29  curt
-/* Rewrote star loading and rendering to:
+/* Shuffled $FG_ROOT file layout.
-/*   1. significantly improve load speed
-/*   2. transition from no stars to stars through eight stages.
 /*
+ * Revision 1.10  1998/08/10 20:33:09  curt
+ * Rewrote star loading and rendering to:
+ *   1. significantly improve load speed
+ *   2. transition from no stars to stars through eight stages.
+ *
  * Revision 1.9  1998/08/06 12:45:20  curt
  * Modified to bring in stars in 8 increments based on magnitude, not number
  * of stars.

Main/fg_init.cxx

@@ -90,7 +90,7 @@ int fgInitPosition( void ) {
 		  "Attempting to set starting position from airport code %s.\n",
 		  id);
 
-	airports.load("Airports");
+	airports.load("apt_simple");
 	a = airports.search(id);
 	if ( (fabs(a.longitude) < FG_EPSILON) &&
 	     (fabs(a.latitude) < FG_EPSILON) &&
@@ -388,6 +388,9 @@ int fgInitSubsystems( void ) {
 
 
 // $Log$
+// Revision 1.33  1998/08/25 20:53:32  curt
+// Shuffled $FG_ROOT file layout.
+//
 // Revision 1.32  1998/08/25 16:59:09  curt
 // Directory reshuffling.
 //

Objects/material.cxx

@@ -84,8 +84,8 @@ int fgMATERIAL_MGR::load_lib ( void ) {
 
     // build the path name to the material db
     current_options.get_fg_root(mpath);
-    strcat(mpath, "/Scenery/");
+    strcat(mpath, "/");
-    strcat(mpath, "Materials");
+    strcat(mpath, "materials");
     strcpy(fg_mpath, mpath);
     strcat(fg_mpath, ".gz");
 
@@ -303,6 +303,9 @@ fgMATERIAL_MGR::~fgMATERIAL_MGR ( void ) {
 
 
 // $Log$
+// Revision 1.2  1998/08/25 20:53:33  curt
+// Shuffled $FG_ROOT file layout.
+//
 // Revision 1.1  1998/08/25 16:51:24  curt
 // Moved from ../Scenery
 //

Time/light.cxx

@@ -67,22 +67,22 @@ void fgLIGHT::Init( void ) {
 
     // build the path name to the ambient lookup table
     current_options.get_fg_root(path);
-    strcat(path, "/Scenery/");
+    strcat(path, "/Lighting/");
-    strcat(path, "Ambient");
+    strcat(path, "ambient");
     // initialize ambient table
     ambient_tbl = new fgINTERPTABLE(path);
 
     // build the path name to the diffuse lookup table
     current_options.get_fg_root(path);
-    strcat(path, "/Scenery/");
+    strcat(path, "/Lighting/");
-    strcat(path, "Diffuse");
+    strcat(path, "diffuse");
     // initialize diffuse table
     diffuse_tbl = new fgINTERPTABLE(path);
     
     // build the path name to the sky lookup table
     current_options.get_fg_root(path);
-    strcat(path, "/Scenery/");
+    strcat(path, "/Lighting/");
-    strcat(path, "Sky");
+    strcat(path, "sky");
     // initialize sky table
     sky_tbl = new fgINTERPTABLE(path);
 }
@@ -227,6 +227,9 @@ void fgLightUpdate ( void ) {
 
 
 // $Log$
+// Revision 1.15  1998/08/25 20:53:33  curt
+// Shuffled $FG_ROOT file layout.
+//
 // Revision 1.14  1998/08/06 12:47:22  curt
 // Adjusted dusk/dawn lighting ...
 //