From 9d608dd593400e84c000ad585199deaf4b1af0cc Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 25 Aug 1998 20:53:24 +0000 Subject: [PATCH] Shuffled $FG_ROOT file layout. --- Airports/simple.cxx | 7 +++++-- Astro/orbits.cxx | 11 +++++++---- Astro/stars.cxx | 15 +++++++++------ Main/fg_init.cxx | 5 ++++- Objects/material.cxx | 7 +++++-- Time/light.cxx | 15 +++++++++------ 6 files changed, 39 insertions(+), 21 deletions(-) diff --git a/Airports/simple.cxx b/Airports/simple.cxx index d23726f0c..5b0bae9aa 100644 --- a/Airports/simple.cxx +++ b/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/ // diff --git a/Astro/orbits.cxx b/Astro/orbits.cxx index 0ce7e3bcf..ac74a2226 100644 --- a/Astro/orbits.cxx +++ b/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, "Planets"); + strcat(path, "/Astro/"); + 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 -/* Minor tweaks to avoid using unitialized memory. +/* Revision 1.9 1998/08/25 20:53:28 curt +/* 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. * diff --git a/Astro/stars.cxx b/Astro/stars.cxx index 4c4ec73f5..b3954bd3b 100644 --- a/Astro/stars.cxx +++ b/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, "Stars"); + strcat(path, "/Astro/"); + 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 -/* Rewrote star loading and rendering to: -/* 1. significantly improve load speed -/* 2. transition from no stars to stars through eight stages. +/* Revision 1.11 1998/08/25 20:53:29 curt +/* Shuffled $FG_ROOT file layout. /* + * 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. diff --git a/Main/fg_init.cxx b/Main/fg_init.cxx index 4d0d84858..2989c1f4e 100644 --- a/Main/fg_init.cxx +++ b/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. // diff --git a/Objects/material.cxx b/Objects/material.cxx index 7912c4107..8806853e1 100644 --- a/Objects/material.cxx +++ b/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, "Materials"); + strcat(mpath, "/"); + 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 // diff --git a/Time/light.cxx b/Time/light.cxx index fffe715d2..0ce30e69a 100644 --- a/Time/light.cxx +++ b/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, "Ambient"); + strcat(path, "/Lighting/"); + 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, "Diffuse"); + strcat(path, "/Lighting/"); + 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, "Sky"); + strcat(path, "/Lighting/"); + 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 ... // -- 2.39.5