From e6ffd00442a83480d43ce3024823c15a6f15196c Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 6 Apr 1999 16:58:22 +0000 Subject: [PATCH] Clean ups and reorganizations: - Additional Thanks entry - more info on getting gfc library - converted some C style comments to C++ style. --- Simulator/Cockpit/cockpit.cxx | 13 +-- Simulator/Cockpit/cockpit.hxx | 150 +++++++++++++++++----------------- Simulator/Time/fg_time.cxx | 11 ++- Simulator/Time/fg_timer.hxx | 124 ++++++++++++++-------------- Thanks | 4 + configure.in | 13 ++- 6 files changed, 171 insertions(+), 144 deletions(-) diff --git a/Simulator/Cockpit/cockpit.cxx b/Simulator/Cockpit/cockpit.cxx index dc5daff9b..a8beb991f 100644 --- a/Simulator/Cockpit/cockpit.cxx +++ b/Simulator/Cockpit/cockpit.cxx @@ -1,4 +1,3 @@ -//************************************************************************* // cockpit.cxx -- routines to draw a cockpit (initial draft) // // Written by Michele America, started September 1997. @@ -21,7 +20,6 @@ // // $Id$ // (Log is kept at end of this file) -//*************************************************************************/ #ifdef HAVE_CONFIG_H @@ -63,7 +61,6 @@ static pCockpit ac_cockpit; // The following routines obtain information concerntin the aircraft's // current state and return it to calling instrument display routines. // They should eventually be member functions of the aircraft. -// double get_latitude( void ) { @@ -261,8 +258,14 @@ void fgCockpitUpdate( void ) { // $Log$ -// Revision 1.1 1999/04/05 21:32:48 curt -// Initial revision +// Revision 1.2 1999/04/06 16:58:29 curt +// Clean ups and reorganizations: +// - Additional Thanks entry +// - more info on getting gfc library +// - converted some C style comments to C++ style. +// +// Revision 1.1.1.1 1999/04/05 21:32:48 curt +// Start of 0.6.x branch. // // Revision 1.31 1999/03/08 21:56:08 curt // Added panel changes sent in by Friedemann. diff --git a/Simulator/Cockpit/cockpit.hxx b/Simulator/Cockpit/cockpit.hxx index 55918cdb4..8ffcff960 100644 --- a/Simulator/Cockpit/cockpit.hxx +++ b/Simulator/Cockpit/cockpit.hxx @@ -1,27 +1,25 @@ -/************************************************************************** - * cockpit.hxx -- cockpit defines and prototypes (initial draft) - * - * Written by Michele America, started September 1997. - * - * Copyright (C) 1997 Michele F. America - nomimarketing@mail.telepac.pt - * - * 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) - **************************************************************************/ +// cockpit.hxx -- cockpit defines and prototypes (initial draft) +// +// Written by Michele America, started September 1997. +// +// Copyright (C) 1997 Michele F. America - nomimarketing@mail.telepac.pt +// +// 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 _COCKPIT_HXX @@ -37,7 +35,7 @@ #include "panel.hxx" // Class fg_Cockpit This class is a holder for the heads up display -// and is initialized with a +// and is initialized with a class fg_Cockpit { private: int Code; @@ -56,53 +54,59 @@ bool fgCockpitInit( fgAIRCRAFT *cur_aircraft ); void fgCockpitUpdate( void ); -#endif /* _COCKPIT_HXX */ +#endif // _COCKPIT_HXX -/* $Log$ -/* Revision 1.1 1999/04/05 21:32:48 curt -/* Initial revision -/* - * Revision 1.4 1998/07/13 21:00:46 curt - * Integrated Charlies latest HUD updates. - * Wrote access functions for current fgOPTIONS. - * - * Revision 1.3 1998/06/27 16:47:54 curt - * Incorporated Friedemann Reinhard's - * first pass at an isntrument panel. - * - * Revision 1.2 1998/05/11 18:13:10 curt - * Complete C++ rewrite of all cockpit code by Charlie Hotchkiss. - * - * Revision 1.1 1998/04/24 00:45:55 curt - * C++-ifing the code a bit. - * - * Revision 1.8 1998/04/22 13:26:19 curt - * C++ - ifing the code a bit. - * - * Revision 1.7 1998/04/21 17:02:34 curt - * Prepairing for C++ integration. - * - * Revision 1.6 1998/02/07 15:29:33 curt - * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss - * - * - * Revision 1.5 1998/01/22 02:59:29 curt - * Changed #ifdef FILE_H to #ifdef _FILE_H - * - * Revision 1.4 1998/01/19 19:27:01 curt - * Merged in make system changes from Bob Kuehne - * This should simplify things tremendously. - * - * Revision 1.3 1998/01/19 18:40:19 curt - * Tons of little changes to clean up the code and to remove fatal errors - * when building with the c++ compiler. - * - * Revision 1.2 1997/12/10 22:37:39 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.1 1997/08/29 18:03:21 curt - * Initial revision. - * - */ +// $Log$ +// Revision 1.2 1999/04/06 16:58:30 curt +// Clean ups and reorganizations: +// - Additional Thanks entry +// - more info on getting gfc library +// - converted some C style comments to C++ style. +// +// Revision 1.1.1.1 1999/04/05 21:32:48 curt +// Start of 0.6.x branch. +// +// Revision 1.4 1998/07/13 21:00:46 curt +// Integrated Charlies latest HUD updates. +// Wrote access functions for current fgOPTIONS. +// +// Revision 1.3 1998/06/27 16:47:54 curt +// Incorporated Friedemann Reinhard's +// first pass at an isntrument panel. +// +// Revision 1.2 1998/05/11 18:13:10 curt +// Complete C++ rewrite of all cockpit code by Charlie Hotchkiss. +// +// Revision 1.1 1998/04/24 00:45:55 curt +// C++-ifing the code a bit. +// +// Revision 1.8 1998/04/22 13:26:19 curt +// C++ - ifing the code a bit. +// +// Revision 1.7 1998/04/21 17:02:34 curt +// Prepairing for C++ integration. +// +// Revision 1.6 1998/02/07 15:29:33 curt +// Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss +// +// +// Revision 1.5 1998/01/22 02:59:29 curt +// Changed #ifdef FILE_H to #ifdef _FILE_H +// +// Revision 1.4 1998/01/19 19:27:01 curt +// Merged in make system changes from Bob Kuehne +// This should simplify things tremendously. +// +// Revision 1.3 1998/01/19 18:40:19 curt +// Tons of little changes to clean up the code and to remove fatal errors +// when building with the c++ compiler. +// +// Revision 1.2 1997/12/10 22:37:39 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.1 1997/08/29 18:03:21 curt +// Initial revision. +// + diff --git a/Simulator/Time/fg_time.cxx b/Simulator/Time/fg_time.cxx index 2cef15af1..f0ea5bfdb 100644 --- a/Simulator/Time/fg_time.cxx +++ b/Simulator/Time/fg_time.cxx @@ -1,4 +1,3 @@ -// // fg_time.cxx -- data structures and routines for managing time related stuff. // // Written by Curtis Olson, started August 1997. @@ -399,8 +398,14 @@ void fgTimeUpdate(FGInterface *f, fgTIME *t) { // $Log$ -// Revision 1.1 1999/04/05 21:32:47 curt -// Initial revision +// Revision 1.2 1999/04/06 16:58:34 curt +// Clean ups and reorganizations: +// - Additional Thanks entry +// - more info on getting gfc library +// - converted some C style comments to C++ style. +// +// Revision 1.1.1.1 1999/04/05 21:32:47 curt +// Start of 0.6.x branch. // // Revision 1.32 1999/02/26 22:10:10 curt // Added initial support for native SGI compilers. diff --git a/Simulator/Time/fg_timer.hxx b/Simulator/Time/fg_timer.hxx index 26eb68a1f..e6f847843 100644 --- a/Simulator/Time/fg_timer.hxx +++ b/Simulator/Time/fg_timer.hxx @@ -1,27 +1,25 @@ -/************************************************************************** - * fg_timer.hxx -- time handling routines - * - * Written by Curtis Olson, started June 1997. - * - * Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com - * - * 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) - **************************************************************************/ +// fg_timer.hxx -- time handling routines +// +// Written by Curtis Olson, started June 1997. +// +// Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com +// +// 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 _FG_TIMER_HXX @@ -35,46 +33,52 @@ extern unsigned long int fgSimTime; -/* this routine initializes the interval timer to generate a SIGALRM - * after the specified interval (dt) the function f() will be called - * at each signal */ +// this routine initializes the interval timer to generate a SIGALRM +// after the specified interval (dt) the function f() will be called +// at each signal void fgTimerInit( float dt, void (*f)( int ) ); -/* This function returns the number of milleseconds since the last - time it was called. */ +// This function returns the number of milleseconds since the last +// time it was called. int fgGetTimeInterval( void ); -#endif /* _FG_TIMER_HXX */ +#endif // _FG_TIMER_HXX -/* $Log$ -/* Revision 1.1 1999/04/05 21:32:47 curt -/* Initial revision -/* - * Revision 1.1 1998/04/24 00:52:30 curt - * Wrapped "#include " in "#ifdef HAVE_CONFIG_H" - * Fog color fixes. - * Separated out lighting calcs into their own file. - * - * Revision 1.5 1998/04/21 17:01:45 curt - * Fixed a problems where a pointer to a function was being passed around. In - * one place this functions arguments were defined as ( void ) while in another - * place they were defined as ( int ). The correct answer was ( int ). - * - * Prepairing for C++ integration. - * - * Revision 1.4 1998/01/22 02:59:43 curt - * Changed #ifdef FILE_H to #ifdef _FILE_H - * - * Revision 1.3 1998/01/19 18:40:40 curt - * Tons of little changes to clean up the code and to remove fatal errors - * when building with the c++ compiler. - * - * Revision 1.2 1997/07/23 21:52:27 curt - * Put comments around the text after an #endif for increased portability. - * - * Revision 1.1 1997/06/16 19:24:20 curt - * Initial revision. - * - */ +// $Log$ +// Revision 1.2 1999/04/06 16:58:35 curt +// Clean ups and reorganizations: +// - Additional Thanks entry +// - more info on getting gfc library +// - converted some C style comments to C++ style. +// +// Revision 1.1.1.1 1999/04/05 21:32:47 curt +// Start of 0.6.x branch. +// +// Revision 1.1 1998/04/24 00:52:30 curt +// Wrapped "#include " in "#ifdef HAVE_CONFIG_H" +// Fog color fixes. +// Separated out lighting calcs into their own file. +// +// Revision 1.5 1998/04/21 17:01:45 curt +// Fixed a problems where a pointer to a function was being passed around. In +// one place this functions arguments were defined as ( void ) while in another +// place they were defined as ( int ). The correct answer was ( int ). +// +// Prepairing for C++ integration. +// +// Revision 1.4 1998/01/22 02:59:43 curt +// Changed #ifdef FILE_H to #ifdef _FILE_H +// +// Revision 1.3 1998/01/19 18:40:40 curt +// Tons of little changes to clean up the code and to remove fatal errors +// when building with the c++ compiler. +// +// Revision 1.2 1997/07/23 21:52:27 curt +// Put comments around the text after an #endif for increased portability. +// +// Revision 1.1 1997/06/16 19:24:20 curt +// Initial revision. +// + diff --git a/Thanks b/Thanks index cfdabb9b8..e8fc1dcc9 100644 --- a/Thanks +++ b/Thanks @@ -212,6 +212,10 @@ Norman Vine related contributions. +Roland Voegtli + Great photorealistic textures. + + Carmelo Volpe Porting Flight Gear to the Metro Works development environment (PC/Mac) diff --git a/configure.in b/configure.in index 9214e0634..960e0da10 100644 --- a/configure.in +++ b/configure.in @@ -261,8 +261,8 @@ if test "x$ac_cv_header_gpc_h" != "xyes"; then echo echo "Please see README.gpc for more details." echo - echo "(pausing 5 seconds)" - sleep 5 + echo "(pausing 2 seconds)" + sleep 2 fi dnl Check if Geographic Foundation Classes library is installed @@ -273,10 +273,17 @@ if test "x$ac_cv_header_gfc_gdbf_h" != "xyes"; then echo "You need to have the GFC library installed on your system to build" echo "some of the scenery generation tools, otherwise, they may fail." echo - echo "You can get the library from:" + echo "You can get the original library from:" echo echo " http://www.geog.psu.edu/~qian/gfc/index.html" echo + echo "However, I recommend you grab a copy with a couple modifications I" + echo "have made which should eliminate several gfc build problems:" + echo + echo " ftp://ftp.flightgear.org/pub/fgfs/Source/gfc-0.8.8.1a.tar.gz" + echo + echo "(pausing 5 seconds)" + sleep 5 fi dnl Checks for header files. -- 2.39.5