From 7320d0f346ed6e78b707ce791abf5fe19c5a3212 Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 29 Sep 1998 14:56:30 +0000 Subject: [PATCH] c++-ified comments. --- Cockpit/cockpit.cxx | 255 +++++++++++++++++++------------------- Cockpit/hud.cxx | 296 ++++++++++++++++++++++---------------------- Cockpit/hud.hxx | 238 +++++++++++++++++------------------ FDM/flight.c | 181 +++++++++++++-------------- FDM/flight.h | 180 +++++++++++++-------------- 5 files changed, 577 insertions(+), 573 deletions(-) diff --git a/Cockpit/cockpit.cxx b/Cockpit/cockpit.cxx index 65fa506a7..01d83fe73 100644 --- a/Cockpit/cockpit.cxx +++ b/Cockpit/cockpit.cxx @@ -1,27 +1,27 @@ -/************************************************************************** - * cockpit.cxx -- routines to draw a cockpit (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.cxx -- routines to draw a cockpit (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) +//*************************************************************************/ #ifdef HAVE_CONFIG_H @@ -315,105 +315,108 @@ void fgCockpitUpdate( void ) { } -/* $Log$ -/* Revision 1.16 1998/09/29 02:01:06 curt -/* Added a "rate of climb" indicator. -/* - * Revision 1.15 1998/08/28 18:14:39 curt - * Added new cockpit code from Friedemann Reinhard - * - * - * Revision 1.14 1998/08/24 20:05:15 curt - * Added a second minimalistic HUD. - * Added code to display the number of triangles rendered. - * - * Revision 1.13 1998/08/22 01:19:27 curt - * Omit panel code because it's texture loading overruns array bounds. - * - * Revision 1.12 1998/07/13 21:28:00 curt - * Converted the aoa scale to a radio altimeter. - * - * Revision 1.11 1998/07/13 21:00:45 curt - * Integrated Charlies latest HUD updates. - * Wrote access functions for current fgOPTIONS. - * - * Revision 1.10 1998/07/08 14:41:08 curt - * Renamed polar3d.h to polar3d.hxx - * - * Revision 1.9 1998/06/27 16:47:53 curt - * Incorporated Friedemann Reinhard's - * first pass at an isntrument panel. - * - * Revision 1.8 1998/05/17 16:58:12 curt - * Added a View Frustum Culling ratio display to the hud. - * - * Revision 1.7 1998/05/16 13:04:13 curt - * New updates from Charlie Hotchkiss. - * - * Revision 1.6 1998/05/13 18:27:53 curt - * Added an fov to hud display. - * - * Revision 1.5 1998/05/11 18:13:10 curt - * Complete C++ rewrite of all cockpit code by Charlie Hotchkiss. - * - * Revision 1.4 1998/05/03 00:46:45 curt - * polar.h -> polar3d.h - * - * Revision 1.3 1998/04/30 12:36:02 curt - * C++-ifying a couple source files. - * - * Revision 1.2 1998/04/25 22:06:26 curt - * Edited cvs log messages in source files ... bad bad bad! - * - * Revision 1.1 1998/04/24 00:45:54 curt - * C++-ifing the code a bit. - * - * Revision 1.13 1998/04/18 04:14:01 curt - * Moved fg_debug.c to it's own library. - * - * Revision 1.12 1998/04/14 02:23:09 curt - * Code reorganizations. Added a Lib/ directory for more general libraries. - * - * Revision 1.11 1998/03/14 00:32:13 curt - * Changed a printf() to a fgPrintf(). - * - * Revision 1.10 1998/02/07 15:29:33 curt - * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss - * - * - * Revision 1.9 1998/02/03 23:20:14 curt - * Lots of little tweaks to fix various consistency problems discovered by - * Solaris' CC. Fixed a bug in fg_debug.c with how the fgPrintf() wrapper - * passed arguments along to the real printf(). Also incorporated HUD changes - * by Michele America. - * - * Revision 1.8 1998/01/31 00:43:03 curt - * Added MetroWorks patches from Carmen Volpe. - * - * Revision 1.7 1998/01/27 00:47:51 curt - * Incorporated Paul Bleisch's new debug message - * system and commandline/config file processing code. - * - * Revision 1.6 1998/01/19 19:27:01 curt - * Merged in make system changes from Bob Kuehne - * This should simplify things tremendously. - * - * Revision 1.5 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.4 1997/12/30 20:47:34 curt - * Integrated new event manager with subsystem initializations. - * - * Revision 1.3 1997/12/15 23:54:33 curt - * Add xgl wrappers for debugging. - * Generate terrain normals on the fly. - * - * Revision 1.2 1997/12/10 22:37:38 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:20 curt - * Initial revision. - * - */ +// $Log$ +// Revision 1.17 1998/09/29 14:56:30 curt +// c++-ified comments. +// +// Revision 1.16 1998/09/29 02:01:06 curt +// Added a "rate of climb" indicator. +// +// Revision 1.15 1998/08/28 18:14:39 curt +// Added new cockpit code from Friedemann Reinhard +// +// +// Revision 1.14 1998/08/24 20:05:15 curt +// Added a second minimalistic HUD. +// Added code to display the number of triangles rendered. +// +// Revision 1.13 1998/08/22 01:19:27 curt +// Omit panel code because it's texture loading overruns array bounds. +// +// Revision 1.12 1998/07/13 21:28:00 curt +// Converted the aoa scale to a radio altimeter. +// +// Revision 1.11 1998/07/13 21:00:45 curt +// Integrated Charlies latest HUD updates. +// Wrote access functions for current fgOPTIONS. +// +// Revision 1.10 1998/07/08 14:41:08 curt +// Renamed polar3d.h to polar3d.hxx +// +// Revision 1.9 1998/06/27 16:47:53 curt +// Incorporated Friedemann Reinhard's +// first pass at an isntrument panel. +// +// Revision 1.8 1998/05/17 16:58:12 curt +// Added a View Frustum Culling ratio display to the hud. +// +// Revision 1.7 1998/05/16 13:04:13 curt +// New updates from Charlie Hotchkiss. +// +// Revision 1.6 1998/05/13 18:27:53 curt +// Added an fov to hud display. +// +// Revision 1.5 1998/05/11 18:13:10 curt +// Complete C++ rewrite of all cockpit code by Charlie Hotchkiss. +// +// Revision 1.4 1998/05/03 00:46:45 curt +// polar.h -> polar3d.h +// +// Revision 1.3 1998/04/30 12:36:02 curt +// C++-ifying a couple source files. +// +// Revision 1.2 1998/04/25 22:06:26 curt +// Edited cvs log messages in source files ... bad bad bad! +// +// Revision 1.1 1998/04/24 00:45:54 curt +// C++-ifing the code a bit. +// +// Revision 1.13 1998/04/18 04:14:01 curt +// Moved fg_debug.c to it's own library. +// +// Revision 1.12 1998/04/14 02:23:09 curt +// Code reorganizations. Added a Lib/ directory for more general libraries. +// +// Revision 1.11 1998/03/14 00:32:13 curt +// Changed a printf() to a fgPrintf(). +// +// Revision 1.10 1998/02/07 15:29:33 curt +// Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss +// +// +// Revision 1.9 1998/02/03 23:20:14 curt +// Lots of little tweaks to fix various consistency problems discovered by +// Solaris' CC. Fixed a bug in fg_debug.c with how the fgPrintf() wrapper +// passed arguments along to the real printf(). Also incorporated HUD changes +// by Michele America. +// +// Revision 1.8 1998/01/31 00:43:03 curt +// Added MetroWorks patches from Carmen Volpe. +// +// Revision 1.7 1998/01/27 00:47:51 curt +// Incorporated Paul Bleisch's new debug message +// system and commandline/config file processing code. +// +// Revision 1.6 1998/01/19 19:27:01 curt +// Merged in make system changes from Bob Kuehne +// This should simplify things tremendously. +// +// Revision 1.5 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.4 1997/12/30 20:47:34 curt +// Integrated new event manager with subsystem initializations. +// +// Revision 1.3 1997/12/15 23:54:33 curt +// Add xgl wrappers for debugging. +// Generate terrain normals on the fly. +// +// Revision 1.2 1997/12/10 22:37:38 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:20 curt +// Initial revision. +// + diff --git a/Cockpit/hud.cxx b/Cockpit/hud.cxx index f5381064b..e568394fe 100644 --- a/Cockpit/hud.cxx +++ b/Cockpit/hud.cxx @@ -1,27 +1,25 @@ -/************************************************************************** - * hud.cxx -- hud defines and prototypes - * - * Written by Michele America, started September 1997. - * - * Copyright (C) 1997 Michele F. America - micheleamerica@geocities.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) - **************************************************************************/ +// hud.cxx -- hud defines and prototypes +// +// Written by Michele America, started September 1997. +// +// Copyright (C) 1997 Michele F. America - micheleamerica@geocities.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) #ifdef HAVE_CONFIG_H @@ -1098,127 +1096,129 @@ void fgUpdateHUD( void ) { glPopMatrix(); } -/* $Log$ -/* Revision 1.21 1998/09/29 02:01:07 curt -/* Added a "rate of climb" indicator. -/* - * Revision 1.20 1998/08/24 20:05:16 curt - * Added a second minimalistic HUD. - * Added code to display the number of triangles rendered. - * - * Revision 1.19 1998/07/30 23:44:05 curt - * Tweaks for sgi building. - * - * Revision 1.18 1998/07/20 12:47:55 curt - * Replace the hud rendering for loop (which linearly searches the the hud - * list to find the entry with the proper position) with a simple linear - * traversal using an "iterator." - * - * Revision 1.17 1998/07/13 21:28:02 curt - * Converted the aoa scale to a radio altimeter. - * - * Revision 1.16 1998/07/13 21:00:47 curt - * Integrated Charlies latest HUD updates. - * Wrote access functions for current fgOPTIONS. - * - * Revision 1.15 1998/07/08 14:41:08 curt - * Renamed polar3d.h to polar3d.hxx - * - * Revision 1.14 1998/07/06 21:31:20 curt - * Removed an extraneous ^M. - * - * Revision 1.13 1998/07/03 13:16:28 curt - * Added Charlie Hotchkiss's HUD updates and improvementes. - * - * Revision 1.11 1998/06/05 18:17:10 curt - * Added the declaration of memmove needed by the stl which apparently - * solaris only defines for cc compilations and not for c++ (__STDC__) - * - * Revision 1.10 1998/05/17 16:58:12 curt - * Added a View Frustum Culling ratio display to the hud. - * - * Revision 1.9 1998/05/16 13:04:14 curt - * New updates from Charlie Hotchkiss. - * - * Revision 1.8 1998/05/13 18:27:54 curt - * Added an fov to hud display. - * - * Revision 1.7 1998/05/11 18:13:11 curt - * Complete C++ rewrite of all cockpit code by Charlie Hotchkiss. - * - * Revision 1.22 1998/04/18 04:14:02 curt - * Moved fg_debug.c to it's own library. - * - * Revision 1.21 1998/04/03 21:55:28 curt - * Converting to Gnu autoconf system. - * Tweaks to hud.c - * - * Revision 1.20 1998/03/09 22:48:40 curt - * Minor "formatting" tweaks. - * - * Revision 1.19 1998/02/23 20:18:28 curt - * Incorporated Michele America's hud changes. - * - * Revision 1.18 1998/02/21 14:53:10 curt - * Added Charlie's HUD changes. - * - * Revision 1.17 1998/02/20 00:16:21 curt - * Thursday's tweaks. - * - * Revision 1.16 1998/02/19 13:05:49 curt - * Incorporated some HUD tweaks from Michelle America. - * Tweaked the sky's sunset/rise colors. - * Other misc. tweaks. - * - * Revision 1.15 1998/02/16 13:38:39 curt - * Integrated changes from Charlie Hotchkiss. - * - * Revision 1.14 1998/02/12 21:59:41 curt - * Incorporated code changes contributed by Charlie Hotchkiss - * - * - * Revision 1.12 1998/02/09 15:07:48 curt - * Minor tweaks. - * - * Revision 1.11 1998/02/07 15:29:34 curt - * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss - * - * - * Revision 1.10 1998/02/03 23:20:14 curt - * Lots of little tweaks to fix various consistency problems discovered by - * Solaris' CC. Fixed a bug in fg_debug.c with how the fgPrintf() wrapper - * passed arguments along to the real printf(). Also incorporated HUD changes - * by Michele America. - * - * Revision 1.9 1998/01/31 00:43:04 curt - * Added MetroWorks patches from Carmen Volpe. - * - * Revision 1.8 1998/01/27 00:47:51 curt - * Incorporated Paul Bleisch's new debug message - * system and commandline/config file processing code. - * - * Revision 1.7 1998/01/19 18:40:20 curt - * Tons of little changes to clean up the code and to remove fatal errors - * when building with the c++ compiler. - * - * Revision 1.6 1997/12/15 23:54:34 curt - * Add xgl wrappers for debugging. - * Generate terrain normals on the fly. - * - * Revision 1.5 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.4 1997/09/23 00:29:32 curt - * Tweaks to get things to compile with gcc-win32. - * - * Revision 1.3 1997/09/05 14:17:26 curt - * More tweaking with stars. - * - * Revision 1.2 1997/09/04 02:17:30 curt - * Shufflin' stuff. - * - * Revision 1.1 1997/08/29 18:03:22 curt - * Initial revision. - * - */ +// $Log$ +// Revision 1.22 1998/09/29 14:56:31 curt +// c++-ified comments. +// +// Revision 1.21 1998/09/29 02:01:07 curt +// Added a "rate of climb" indicator. +// +// Revision 1.20 1998/08/24 20:05:16 curt +// Added a second minimalistic HUD. +// Added code to display the number of triangles rendered. +// +// Revision 1.19 1998/07/30 23:44:05 curt +// Tweaks for sgi building. +// +// Revision 1.18 1998/07/20 12:47:55 curt +// Replace the hud rendering for loop (which linearly searches the the hud +// list to find the entry with the proper position) with a simple linear +// traversal using an "iterator." +// +// Revision 1.17 1998/07/13 21:28:02 curt +// Converted the aoa scale to a radio altimeter. +// +// Revision 1.16 1998/07/13 21:00:47 curt +// Integrated Charlies latest HUD updates. +// Wrote access functions for current fgOPTIONS. +// +// Revision 1.15 1998/07/08 14:41:08 curt +// Renamed polar3d.h to polar3d.hxx +// +// Revision 1.14 1998/07/06 21:31:20 curt +// Removed an extraneous ^M. +// +// Revision 1.13 1998/07/03 13:16:28 curt +// Added Charlie Hotchkiss's HUD updates and improvementes. +// +// Revision 1.11 1998/06/05 18:17:10 curt +// Added the declaration of memmove needed by the stl which apparently +// solaris only defines for cc compilations and not for c++ (__STDC__) +// +// Revision 1.10 1998/05/17 16:58:12 curt +// Added a View Frustum Culling ratio display to the hud. +// +// Revision 1.9 1998/05/16 13:04:14 curt +// New updates from Charlie Hotchkiss. +// +// Revision 1.8 1998/05/13 18:27:54 curt +// Added an fov to hud display. +// +// Revision 1.7 1998/05/11 18:13:11 curt +// Complete C++ rewrite of all cockpit code by Charlie Hotchkiss. +// +// Revision 1.22 1998/04/18 04:14:02 curt +// Moved fg_debug.c to it's own library. +// +// Revision 1.21 1998/04/03 21:55:28 curt +// Converting to Gnu autoconf system. +// Tweaks to hud.c +// +// Revision 1.20 1998/03/09 22:48:40 curt +// Minor "formatting" tweaks. +// +// Revision 1.19 1998/02/23 20:18:28 curt +// Incorporated Michele America's hud changes. +// +// Revision 1.18 1998/02/21 14:53:10 curt +// Added Charlie's HUD changes. +// +// Revision 1.17 1998/02/20 00:16:21 curt +// Thursday's tweaks. +// +// Revision 1.16 1998/02/19 13:05:49 curt +// Incorporated some HUD tweaks from Michelle America. +// Tweaked the sky's sunset/rise colors. +// Other misc. tweaks. +// +// Revision 1.15 1998/02/16 13:38:39 curt +// Integrated changes from Charlie Hotchkiss. +// +// Revision 1.14 1998/02/12 21:59:41 curt +// Incorporated code changes contributed by Charlie Hotchkiss +// +// +// Revision 1.12 1998/02/09 15:07:48 curt +// Minor tweaks. +// +// Revision 1.11 1998/02/07 15:29:34 curt +// Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss +// +// +// Revision 1.10 1998/02/03 23:20:14 curt +// Lots of little tweaks to fix various consistency problems discovered by +// Solaris' CC. Fixed a bug in fg_debug.c with how the fgPrintf() wrapper +// passed arguments along to the real printf(). Also incorporated HUD changes +// by Michele America. +// +// Revision 1.9 1998/01/31 00:43:04 curt +// Added MetroWorks patches from Carmen Volpe. +// +// Revision 1.8 1998/01/27 00:47:51 curt +// Incorporated Paul Bleisch's new debug message +// system and commandline/config file processing code. +// +// Revision 1.7 1998/01/19 18:40:20 curt +// Tons of little changes to clean up the code and to remove fatal errors +// when building with the c++ compiler. +// +// Revision 1.6 1997/12/15 23:54:34 curt +// Add xgl wrappers for debugging. +// Generate terrain normals on the fly. +// +// Revision 1.5 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.4 1997/09/23 00:29:32 curt +// Tweaks to get things to compile with gcc-win32. +// +// Revision 1.3 1997/09/05 14:17:26 curt +// More tweaking with stars. +// +// Revision 1.2 1997/09/04 02:17:30 curt +// Shufflin' stuff. +// +// Revision 1.1 1997/08/29 18:03:22 curt +// Initial revision. +// diff --git a/Cockpit/hud.hxx b/Cockpit/hud.hxx index 554c3d890..05974867e 100644 --- a/Cockpit/hud.hxx +++ b/Cockpit/hud.hxx @@ -1,27 +1,25 @@ -/************************************************************************** - * hud.hxx -- hud 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) - **************************************************************************/ +// hud.hxx -- hud 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 _HUD_HXX @@ -525,98 +523,100 @@ void fgHUDSetTimeMode( Hptr hud, int time_of_day ); #endif // _HUD_H -/* $Log$ -/* Revision 1.13 1998/09/29 02:01:09 curt -/* Added a "rate of climb" indicator. -/* - * Revision 1.12 1998/08/24 20:05:17 curt - * Added a second minimalistic HUD. - * Added code to display the number of triangles rendered. - * - * Revision 1.11 1998/07/24 21:36:55 curt - * Ran dos2unix to get rid of extraneous ^M's. Tweaked parameter in - * ImageGetRawData() to match usage. - * - * Revision 1.10 1998/07/13 21:28:02 curt - * Converted the aoa scale to a radio altimeter. - * - * Revision 1.9 1998/07/13 21:00:48 curt - * Integrated Charlies latest HUD updates. - * Wrote access functions for current fgOPTIONS. - * - * Revision 1.8 1998/07/03 13:16:29 curt - * Added Charlie Hotchkiss's HUD updates and improvementes. - * - * Revision 1.6 1998/06/03 00:43:28 curt - * No .h when including stl stuff. - * - * Revision 1.5 1998/05/17 16:58:13 curt - * Added a View Frustum Culling ratio display to the hud. - * - * Revision 1.4 1998/05/16 13:04:15 curt - * New updates from Charlie Hotchkiss. - * - * Revision 1.3 1998/05/13 18:27:55 curt - * Added an fov to hud display. - * - * Revision 1.2 1998/05/11 18:13:12 curt - * Complete C++ rewrite of all cockpit code by Charlie Hotchkiss. - * - * Revision 1.15 1998/02/23 19:07:57 curt - * Incorporated Durk's Astro/ tweaks. Includes unifying the sun position - * calculation code between sun display, and other FG sections that use this - * for things like lighting. - * - * Revision 1.14 1998/02/21 14:53:14 curt - * Added Charlie's HUD changes. - * - * Revision 1.13 1998/02/20 00:16:22 curt - * Thursday's tweaks. - * - * Revision 1.12 1998/02/19 13:05:52 curt - * Incorporated some HUD tweaks from Michelle America. - * Tweaked the sky's sunset/rise colors. - * Other misc. tweaks. - * - * Revision 1.11 1998/02/16 13:38:42 curt - * Integrated changes from Charlie Hotchkiss. - * - * Revision 1.11 1998/02/16 13:38:42 curt - * Integrated changes from Charlie Hotchkiss. - * - * Revision 1.10 1998/02/12 21:59:42 curt - * Incorporated code changes contributed by Charlie Hotchkiss - * - * - * Revision 1.8 1998/02/07 15:29:35 curt - * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss - * - * - * Revision 1.7 1998/02/03 23:20:15 curt - * Lots of little tweaks to fix various consistency problems discovered by - * Solaris' CC. Fixed a bug in fg_debug.c with how the fgPrintf() wrapper - * passed arguments along to the real printf(). Also incorporated HUD changes - * by Michele America. - * - * Revision 1.6 1998/01/22 02:59:30 curt - * Changed #ifdef FILE_H to #ifdef _FILE_H - * - * Revision 1.5 1998/01/19 19:27:01 curt - * Merged in make system changes from Bob Kuehne - * This should simplify things tremendously. - * - * Revision 1.4 1998/01/19 18:40:21 curt - * Tons of little changes to clean up the code and to remove fatal errors - * when building with the c++ compiler. - * - * Revision 1.3 1997/12/30 16:36:41 curt - * Merged in Durk's changes ... - * - * Revision 1.2 1997/12/10 22:37:40 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:22 curt - * Initial revision. - * - */ +// $Log$ +// Revision 1.14 1998/09/29 14:56:33 curt +// c++-ified comments. +// +// Revision 1.13 1998/09/29 02:01:09 curt +// Added a "rate of climb" indicator. +// +// Revision 1.12 1998/08/24 20:05:17 curt +// Added a second minimalistic HUD. +// Added code to display the number of triangles rendered. +// +// Revision 1.11 1998/07/24 21:36:55 curt +// Ran dos2unix to get rid of extraneous ^M's. Tweaked parameter in +// ImageGetRawData() to match usage. +// +// Revision 1.10 1998/07/13 21:28:02 curt +// Converted the aoa scale to a radio altimeter. +// +// Revision 1.9 1998/07/13 21:00:48 curt +// Integrated Charlies latest HUD updates. +// Wrote access functions for current fgOPTIONS. +// +// Revision 1.8 1998/07/03 13:16:29 curt +// Added Charlie Hotchkiss's HUD updates and improvementes. +// +// Revision 1.6 1998/06/03 00:43:28 curt +// No .h when including stl stuff. +// +// Revision 1.5 1998/05/17 16:58:13 curt +// Added a View Frustum Culling ratio display to the hud. +// +// Revision 1.4 1998/05/16 13:04:15 curt +// New updates from Charlie Hotchkiss. +// +// Revision 1.3 1998/05/13 18:27:55 curt +// Added an fov to hud display. +// +// Revision 1.2 1998/05/11 18:13:12 curt +// Complete C++ rewrite of all cockpit code by Charlie Hotchkiss. +// +// Revision 1.15 1998/02/23 19:07:57 curt +// Incorporated Durk's Astro/ tweaks. Includes unifying the sun position +// calculation code between sun display, and other FG sections that use this +// for things like lighting. +// +// Revision 1.14 1998/02/21 14:53:14 curt +// Added Charlie's HUD changes. +// +// Revision 1.13 1998/02/20 00:16:22 curt +// Thursday's tweaks. +// +// Revision 1.12 1998/02/19 13:05:52 curt +// Incorporated some HUD tweaks from Michelle America. +// Tweaked the sky's sunset/rise colors. +// Other misc. tweaks. +// +// Revision 1.11 1998/02/16 13:38:42 curt +// Integrated changes from Charlie Hotchkiss. +// +// Revision 1.11 1998/02/16 13:38:42 curt +// Integrated changes from Charlie Hotchkiss. +// +// Revision 1.10 1998/02/12 21:59:42 curt +// Incorporated code changes contributed by Charlie Hotchkiss +// +// +// Revision 1.8 1998/02/07 15:29:35 curt +// Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss +// +// +// Revision 1.7 1998/02/03 23:20:15 curt +// Lots of little tweaks to fix various consistency problems discovered by +// Solaris' CC. Fixed a bug in fg_debug.c with how the fgPrintf() wrapper +// passed arguments along to the real printf(). Also incorporated HUD changes +// by Michele America. +// +// Revision 1.6 1998/01/22 02:59:30 curt +// Changed #ifdef FILE_H to #ifdef _FILE_H +// +// Revision 1.5 1998/01/19 19:27:01 curt +// Merged in make system changes from Bob Kuehne +// This should simplify things tremendously. +// +// Revision 1.4 1998/01/19 18:40:21 curt +// Tons of little changes to clean up the code and to remove fatal errors +// when building with the c++ compiler. +// +// Revision 1.3 1997/12/30 16:36:41 curt +// Merged in Durk's changes ... +// +// Revision 1.2 1997/12/10 22:37:40 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:22 curt +// Initial revision. +// diff --git a/FDM/flight.c b/FDM/flight.c index d2bad6d42..ff281ec92 100644 --- a/FDM/flight.c +++ b/FDM/flight.c @@ -1,27 +1,26 @@ -/************************************************************************** - * flight.c -- a general interface to the various flight models - * - * Written by Curtis Olson, started May 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) - **************************************************************************/ +// flight.c -- a general interface to the various flight models +// +// Written by Curtis Olson, started May 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) + #include @@ -119,69 +118,71 @@ int fgFlightModelSetAltitude(int model, fgFLIGHT *f, double alt_meters) { } -/* $Log$ -/* Revision 1.18 1998/09/29 02:02:40 curt -/* Added a rate of climb calculation. -/* - * Revision 1.17 1998/08/24 20:09:07 curt - * . - * - * Revision 1.16 1998/08/22 14:49:55 curt - * Attempting to iron out seg faults and crashes. - * Did some shuffling to fix a initialization order problem between view - * position, scenery elevation. - * - * Revision 1.15 1998/07/30 23:44:36 curt - * Beginning to add support for multiple flight models. - * - * Revision 1.14 1998/07/12 03:08:27 curt - * Added fgFlightModelSetAltitude() to force the altitude to something - * other than the current altitude. LaRCsim doesn't let you do this by just - * changing FG_Altitude. - * - * Revision 1.13 1998/04/25 22:06:28 curt - * Edited cvs log messages in source files ... bad bad bad! - * - * Revision 1.12 1998/04/21 16:59:33 curt - * Integrated autopilot. - * Prepairing for C++ integration. - * - * Revision 1.11 1998/04/18 04:14:04 curt - * Moved fg_debug.c to it's own library. - * - * Revision 1.10 1998/02/07 15:29:37 curt - * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss - * - * - * Revision 1.9 1998/01/27 00:47:53 curt - * Incorporated Paul Bleisch's new debug message - * system and commandline/config file processing code. - * - * Revision 1.8 1998/01/19 19:27:03 curt - * Merged in make system changes from Bob Kuehne - * This should simplify things tremendously. - * - * Revision 1.7 1998/01/19 18:40:23 curt - * Tons of little changes to clean up the code and to remove fatal errors - * when building with the c++ compiler. - * - * Revision 1.6 1998/01/19 18:35:43 curt - * Minor tweaks and fixes for cygwin32. - * - * Revision 1.5 1997/12/30 20:47:37 curt - * Integrated new event manager with subsystem initializations. - * - * Revision 1.4 1997/12/10 22:37:42 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.3 1997/08/27 03:30:04 curt - * Changed naming scheme of basic shared structures. - * - * Revision 1.2 1997/05/29 22:39:57 curt - * Working on incorporating the LaRCsim flight model. - * - * Revision 1.1 1997/05/29 02:35:04 curt - * Initial revision. - * - */ +// $Log$ +// Revision 1.19 1998/09/29 14:57:38 curt +// c++-ified comments. +// +// Revision 1.18 1998/09/29 02:02:40 curt +// Added a rate of climb calculation. +// +// Revision 1.17 1998/08/24 20:09:07 curt +// . +// +// Revision 1.16 1998/08/22 14:49:55 curt +// Attempting to iron out seg faults and crashes. +// Did some shuffling to fix a initialization order problem between view +// position, scenery elevation. +// +// Revision 1.15 1998/07/30 23:44:36 curt +// Beginning to add support for multiple flight models. +// +// Revision 1.14 1998/07/12 03:08:27 curt +// Added fgFlightModelSetAltitude() to force the altitude to something +// other than the current altitude. LaRCsim doesn't let you do this by just +// changing FG_Altitude. +// +// Revision 1.13 1998/04/25 22:06:28 curt +// Edited cvs log messages in source files ... bad bad bad! +// +// Revision 1.12 1998/04/21 16:59:33 curt +// Integrated autopilot. +// Prepairing for C++ integration. +// +// Revision 1.11 1998/04/18 04:14:04 curt +// Moved fg_debug.c to it's own library. +// +// Revision 1.10 1998/02/07 15:29:37 curt +// Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss +// +// +// Revision 1.9 1998/01/27 00:47:53 curt +// Incorporated Paul Bleisch's new debug message +// system and commandline/config file processing code. +// +// Revision 1.8 1998/01/19 19:27:03 curt +// Merged in make system changes from Bob Kuehne +// This should simplify things tremendously. +// +// Revision 1.7 1998/01/19 18:40:23 curt +// Tons of little changes to clean up the code and to remove fatal errors +// when building with the c++ compiler. +// +// Revision 1.6 1998/01/19 18:35:43 curt +// Minor tweaks and fixes for cygwin32. +// +// Revision 1.5 1997/12/30 20:47:37 curt +// Integrated new event manager with subsystem initializations. +// +// Revision 1.4 1997/12/10 22:37:42 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.3 1997/08/27 03:30:04 curt +// Changed naming scheme of basic shared structures. +// +// Revision 1.2 1997/05/29 22:39:57 curt +// Working on incorporating the LaRCsim flight model. +// +// Revision 1.1 1997/05/29 02:35:04 curt +// Initial revision. +// diff --git a/FDM/flight.h b/FDM/flight.h index 4c0f9e7ef..202301623 100644 --- a/FDM/flight.h +++ b/FDM/flight.h @@ -1,27 +1,25 @@ -/************************************************************************** - * flight.h -- define shared flight model parameters - * - * Written by Curtis Olson, started May 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) - **************************************************************************/ +// flight.h -- define shared flight model parameters +// +// Written by Curtis Olson, started May 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 _FLIGHT_H @@ -416,69 +414,71 @@ int fgFlightModelSetAltitude(int model, fgFLIGHT *f, double alt_meters); #endif /* _FLIGHT_H */ -/* $Log$ -/* Revision 1.19 1998/09/29 02:02:41 curt -/* Added a rate of climb calculation. -/* - * Revision 1.18 1998/07/30 23:44:36 curt - * Beginning to add support for multiple flight models. - * - * Revision 1.17 1998/07/12 03:08:28 curt - * Added fgFlightModelSetAltitude() to force the altitude to something - * other than the current altitude. LaRCsim doesn't let you do this by just - * changing FG_Altitude. - * - * Revision 1.16 1998/04/22 13:26:20 curt - * C++ - ifing the code a bit. - * - * Revision 1.15 1998/04/21 16:59:33 curt - * Integrated autopilot. - * Prepairing for C++ integration. - * - * Revision 1.14 1998/02/07 15:29:37 curt - * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss - * - * - * Revision 1.13 1998/01/24 00:04:59 curt - * misc. tweaks. - * - * Revision 1.12 1998/01/22 02:59:32 curt - * Changed #ifdef FILE_H to #ifdef _FILE_H - * - * Revision 1.11 1998/01/19 19:27:03 curt - * Merged in make system changes from Bob Kuehne - * This should simplify things tremendously. - * - * Revision 1.10 1997/12/10 22:37:43 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.9 1997/09/04 02:17:33 curt - * Shufflin' stuff. - * - * Revision 1.8 1997/08/27 03:30:06 curt - * Changed naming scheme of basic shared structures. - * - * Revision 1.7 1997/07/23 21:52:19 curt - * Put comments around the text after an #endif for increased portability. - * - * Revision 1.6 1997/06/21 17:52:22 curt - * Continue directory shuffling ... everything should be compilable/runnable - * again. - * - * Revision 1.5 1997/06/21 17:12:49 curt - * Capitalized subdirectory names. - * - * Revision 1.4 1997/05/29 22:39:57 curt - * Working on incorporating the LaRCsim flight model. - * - * Revision 1.3 1997/05/29 02:32:25 curt - * Starting to build generic flight model interface. - * - * Revision 1.2 1997/05/23 15:40:37 curt - * Added GNU copyright headers. - * - * Revision 1.1 1997/05/16 16:04:45 curt - * Initial revision. - * - */ +// $Log$ +// Revision 1.20 1998/09/29 14:57:39 curt +// c++-ified comments. +// +// Revision 1.19 1998/09/29 02:02:41 curt +// Added a rate of climb calculation. +// +// Revision 1.18 1998/07/30 23:44:36 curt +// Beginning to add support for multiple flight models. +// +// Revision 1.17 1998/07/12 03:08:28 curt +// Added fgFlightModelSetAltitude() to force the altitude to something +// other than the current altitude. LaRCsim doesn't let you do this by just +// changing FG_Altitude. +// +// Revision 1.16 1998/04/22 13:26:20 curt +// C++ - ifing the code a bit. +// +// Revision 1.15 1998/04/21 16:59:33 curt +// Integrated autopilot. +// Prepairing for C++ integration. +// +// Revision 1.14 1998/02/07 15:29:37 curt +// Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss +// +// +// Revision 1.13 1998/01/24 00:04:59 curt +// misc. tweaks. +// +// Revision 1.12 1998/01/22 02:59:32 curt +// Changed #ifdef FILE_H to #ifdef _FILE_H +// +// Revision 1.11 1998/01/19 19:27:03 curt +// Merged in make system changes from Bob Kuehne +// This should simplify things tremendously. +// +// Revision 1.10 1997/12/10 22:37:43 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.9 1997/09/04 02:17:33 curt +// Shufflin' stuff. +// +// Revision 1.8 1997/08/27 03:30:06 curt +// Changed naming scheme of basic shared structures. +// +// Revision 1.7 1997/07/23 21:52:19 curt +// Put comments around the text after an #endif for increased portability. +// +// Revision 1.6 1997/06/21 17:52:22 curt +// Continue directory shuffling ... everything should be compilable/runnable +// again. +// +// Revision 1.5 1997/06/21 17:12:49 curt +// Capitalized subdirectory names. +// +// Revision 1.4 1997/05/29 22:39:57 curt +// Working on incorporating the LaRCsim flight model. +// +// Revision 1.3 1997/05/29 02:32:25 curt +// Starting to build generic flight model interface. +// +// Revision 1.2 1997/05/23 15:40:37 curt +// Added GNU copyright headers. +// +// Revision 1.1 1997/05/16 16:04:45 curt +// Initial revision. +// -- 2.39.2