From f8e23d2fbb64d6da5c7d4c39f42ecf9e40ad7c1b Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 25 Aug 1998 15:34:54 +0000 Subject: [PATCH] Moved airports.* to ../Airports/ --- Main/Makefile.am | 5 +- Main/airports.cxx | 133 ---------------------------------------------- Main/airports.hxx | 114 --------------------------------------- 3 files changed, 2 insertions(+), 250 deletions(-) delete mode 100644 Main/airports.cxx delete mode 100644 Main/airports.hxx diff --git a/Main/Makefile.am b/Main/Makefile.am index d9fe4d691..fa00d0d18 100644 --- a/Main/Makefile.am +++ b/Main/Makefile.am @@ -24,9 +24,7 @@ bin_PROGRAMS = fgfs bin_SCRIPTS = runfgfs runfgfs.bat fgfs_SOURCES = \ - GLUTkey.cxx GLUTkey.hxx \ - GLUTmain.cxx \ - airports.cxx airports.hxx \ + GLUTkey.cxx GLUTkey.hxx GLUTmain.cxx \ fg_config.h \ fg_init.cxx fg_init.hxx \ options.cxx options.hxx \ @@ -35,6 +33,7 @@ fgfs_SOURCES = \ fgfs_LDADD = \ $(top_builddir)/Simulator/Aircraft/libAircraft.a \ + $(top_builddir)/Simulator/Airports/libAirports.a \ $(top_builddir)/Simulator/Astro/libAstro.a \ $(top_builddir)/Simulator/Autopilot/libAutopilot.a \ $(top_builddir)/Simulator/Cockpit/libCockpit.a \ diff --git a/Main/airports.cxx b/Main/airports.cxx deleted file mode 100644 index 0baa23d42..000000000 --- a/Main/airports.cxx +++ /dev/null @@ -1,133 +0,0 @@ -// -// airports.cxx -- a really simplistic class to manage airport ID, -// lat, lon of the center of one of it's runways, and -// elevation in feet. -// -// Written by Curtis Olson, started April 1998. -// -// Copyright (C) 1998 Curtis L. Olson - curt@me.umn.edu -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License as -// published by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -// -// $Id$ -// (Log is kept at end of this file) - - -#include - -#include -#include -#include
- -#include "airports.hxx" - - -// Constructor -fgAIRPORTS::fgAIRPORTS( void ) { -} - - -// load the data -int fgAIRPORTS::load( char *file ) { - fgAIRPORT a; - char path[256], fgpath[256], line[256]; - char id[5]; - string id_str; - fgFile f; - - // build the path name to the airport file - current_options.get_fg_root(path); - strcat(path, "/Scenery/"); - strcat(path, "Airports"); - strcpy(fgpath, path); - strcat(fgpath, ".gz"); - - // first try "path.gz" - if ( (f = fgopen(fgpath, "rb")) == NULL ) { - // next try "path" - if ( (f = fgopen(path, "rb")) == NULL ) { - fgPrintf(FG_GENERAL, FG_EXIT, "Cannot open file: %s\n", path); - } - } - - while ( fggets(f, line, 250) != NULL ) { - // printf("%s", line); - - sscanf( line, "%s %lf %lf %lfl\n", id, &a.longitude, &a.latitude, - &a.elevation ); - id_str = id; - airports[id_str] = a; - } - - fgclose(f); - - return(1); -} - - -// search for the specified id -fgAIRPORT fgAIRPORTS::search( char *id ) { - map < string, fgAIRPORT, less > :: iterator find; - fgAIRPORT a; - - find = airports.find(id); - if ( find == airports.end() ) { - // not found - a.longitude = a.latitude = a.elevation = 0; - } else { - a = (*find).second; - } - - return(a); -} - - -// Destructor -fgAIRPORTS::~fgAIRPORTS( void ) { -} - - -// $Log$ -// Revision 1.8 1998/07/13 21:01:37 curt -// Wrote access functions for current fgOPTIONS. -// -// Revision 1.7 1998/06/03 22:01:07 curt -// Tweaking sound library usage. -// -// Revision 1.6 1998/06/03 00:47:13 curt -// Updated to compile in audio support if OSS available. -// Updated for new version of Steve's audio library. -// STL includes don't use .h -// Small view optimizations. -// -// Revision 1.5 1998/05/29 20:37:22 curt -// Tweaked material properties & lighting a bit in GLUTmain.cxx. -// Read airport list into a "map" STL for dynamic list sizing and fast tree -// based lookups. -// -// Revision 1.4 1998/05/13 18:26:25 curt -// Root path info moved to fgOPTIONS. -// -// Revision 1.3 1998/05/06 03:16:24 curt -// Added an averaged global frame rate counter. -// Added an option to control tile radius. -// -// Revision 1.2 1998/04/28 21:42:50 curt -// Wrapped zlib calls up so we can conditionally comment out zlib support. -// -// Revision 1.1 1998/04/25 15:11:11 curt -// Added an command line option to set starting position based on airport ID. -// -// diff --git a/Main/airports.hxx b/Main/airports.hxx deleted file mode 100644 index fb854e08a..000000000 --- a/Main/airports.hxx +++ /dev/null @@ -1,114 +0,0 @@ -// -// airports.hxx -- a really simplistic class to manage airport ID, -// lat, lon of the center of one of it's runways, and -// elevation in feet. -// -// Written by Curtis Olson, started April 1998. -// -// Copyright (C) 1998 Curtis L. Olson - curt@me.umn.edu -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License as -// published by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -// -// $Id$ -// (Log is kept at end of this file) - - -#ifndef _AIRPORTS_HXX -#define _AIRPORTS_HXX - - -#ifndef __cplusplus -# error This library requires C++ -#endif - - -#include // Standard C++ string library -#include // STL associative "array" - -#ifdef NEEDNAMESPACESTD -using namespace std; -#endif - - -typedef struct { - // char id[5]; - double longitude; - double latitude; - double elevation; -} fgAIRPORT; - - -class fgAIRPORTS { - map < string, fgAIRPORT, less > airports; - -public: - - // Constructor - fgAIRPORTS( void ); - - // load the data - int load( char *file ); - - // search for the specified id - fgAIRPORT search( char *id ); - - // Destructor - ~fgAIRPORTS( void ); - -}; - - -#endif /* _AIRPORTS_HXX */ - - -// $Log$ -// Revision 1.7 1998/07/24 21:39:09 curt -// Debugging output tweaks. -// Cast glGetString to (char *) to avoid compiler errors. -// Optimizations to fgGluLookAt() by Norman Vine. -// -// Revision 1.6 1998/07/06 21:34:19 curt -// Added an enable/disable splash screen option. -// Added an enable/disable intro music option. -// Added an enable/disable instrument panel option. -// Added an enable/disable mouse pointer option. -// Added using namespace std for compilers that support this. -// -// Revision 1.5 1998/06/17 21:35:11 curt -// Refined conditional audio support compilation. -// Moved texture parameter setup calls to ../Scenery/materials.cxx -// #include before various STL includes. -// Make HUD default state be enabled. -// -// Revision 1.4 1998/06/03 00:47:14 curt -// Updated to compile in audio support if OSS available. -// Updated for new version of Steve's audio library. -// STL includes don't use .h -// Small view optimizations. -// -// Revision 1.3 1998/06/01 17:54:42 curt -// Added Linux audio support. -// avoid glClear( COLOR_BUFFER_BIT ) when not using it to set the sky color. -// map stl tweaks. -// -// Revision 1.2 1998/05/29 20:37:22 curt -// Tweaked material properties & lighting a bit in GLUTmain.cxx. -// Read airport list into a "map" STL for dynamic list sizing and fast tree -// based lookups. -// -// Revision 1.1 1998/04/25 15:11:11 curt -// Added an command line option to set starting position based on airport ID. -// -//