1998-04-24 00:49:17 +00:00
|
|
|
// options.cxx -- class to handle command line options
|
|
|
|
//
|
|
|
|
// 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$
|
|
|
|
|
|
|
|
|
1998-04-26 05:01:19 +00:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
# include <config.h>
|
|
|
|
#endif
|
|
|
|
|
1999-03-11 23:09:26 +00:00
|
|
|
#if defined(FX) && defined(XMESA)
|
|
|
|
bool global_fullscreen = true;
|
|
|
|
#endif
|
|
|
|
|
2000-02-15 03:30:01 +00:00
|
|
|
#include <simgear/compiler.h>
|
1999-03-02 01:02:31 +00:00
|
|
|
|
1998-04-24 00:49:17 +00:00
|
|
|
#include <math.h> // rint()
|
|
|
|
#include <stdio.h>
|
1998-05-06 03:16:23 +00:00
|
|
|
#include <stdlib.h> // atof(), atoi()
|
1998-04-24 00:49:17 +00:00
|
|
|
#include <string.h>
|
1999-03-02 01:02:31 +00:00
|
|
|
|
|
|
|
#include STL_STRING
|
1998-04-24 00:49:17 +00:00
|
|
|
|
2000-02-15 03:30:01 +00:00
|
|
|
#include <simgear/constants.h>
|
2000-02-16 23:01:03 +00:00
|
|
|
#include <simgear/debug/logstream.hxx>
|
|
|
|
#include <simgear/misc/fgstream.hxx>
|
2000-07-03 20:09:56 +00:00
|
|
|
#include <simgear/misc/props.hxx>
|
2000-07-06 22:13:24 +00:00
|
|
|
#include <simgear/timing/sg_time.hxx>
|
2000-02-15 03:30:01 +00:00
|
|
|
|
1999-05-06 22:16:12 +00:00
|
|
|
#include <Include/general.hxx>
|
2000-10-12 01:08:09 +00:00
|
|
|
#include <Airports/simple.hxx>
|
1999-05-06 22:16:12 +00:00
|
|
|
#include <Cockpit/cockpit.hxx>
|
1999-02-01 21:33:23 +00:00
|
|
|
#include <FDM/flight.hxx>
|
2000-03-22 22:01:33 +00:00
|
|
|
#include <FDM/UIUCModel/uiuc_aircraftdir.h>
|
1999-06-30 20:21:04 +00:00
|
|
|
#ifdef FG_NETWORK_OLK
|
2000-01-12 18:09:35 +00:00
|
|
|
# include <NetworkOLK/network.h>
|
1999-06-30 20:21:04 +00:00
|
|
|
#endif
|
1998-04-24 00:49:17 +00:00
|
|
|
|
2000-10-12 01:08:09 +00:00
|
|
|
#include "fg_init.hxx"
|
2000-07-07 20:28:51 +00:00
|
|
|
#include "globals.hxx"
|
1999-05-06 22:16:12 +00:00
|
|
|
#include "options.hxx"
|
1998-11-16 13:59:58 +00:00
|
|
|
|
1999-03-02 01:02:31 +00:00
|
|
|
FG_USING_STD(string);
|
|
|
|
FG_USING_NAMESPACE(std);
|
|
|
|
|
2000-10-19 23:09:33 +00:00
|
|
|
// from main.cxx
|
1999-05-06 22:16:12 +00:00
|
|
|
extern void fgReshape( int width, int height );
|
1998-11-16 13:59:58 +00:00
|
|
|
|
1998-08-27 17:01:55 +00:00
|
|
|
inline double
|
|
|
|
atof( const string& str )
|
|
|
|
{
|
1999-04-27 19:27:45 +00:00
|
|
|
|
|
|
|
#ifdef __MWERKS__
|
|
|
|
// -dw- if ::atof is called, then we get an infinite loop
|
|
|
|
return std::atof( str.c_str() );
|
|
|
|
#else
|
1998-08-27 17:01:55 +00:00
|
|
|
return ::atof( str.c_str() );
|
1999-04-27 19:27:45 +00:00
|
|
|
#endif
|
1998-08-27 17:01:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
inline int
|
|
|
|
atoi( const string& str )
|
|
|
|
{
|
1999-04-27 19:27:45 +00:00
|
|
|
#ifdef __MWERKS__
|
|
|
|
// -dw- if ::atoi is called, then we get an infinite loop
|
|
|
|
return std::atoi( str.c_str() );
|
|
|
|
#else
|
1998-08-27 17:01:55 +00:00
|
|
|
return ::atoi( str.c_str() );
|
1999-04-27 19:27:45 +00:00
|
|
|
#endif
|
1998-08-27 17:01:55 +00:00
|
|
|
}
|
1998-04-24 00:49:17 +00:00
|
|
|
|
2000-02-29 17:13:02 +00:00
|
|
|
|
1998-04-24 00:49:17 +00:00
|
|
|
// Defined the shared options class here
|
2000-10-19 21:24:43 +00:00
|
|
|
// FGOptions current_options;
|
1998-04-24 00:49:17 +00:00
|
|
|
|
|
|
|
|
|
|
|
// Constructor
|
2000-10-19 21:24:43 +00:00
|
|
|
FGOptions::FGOptions() :
|
1998-08-27 17:01:55 +00:00
|
|
|
// starting longitude in degrees (west = -)
|
|
|
|
// starting latitude in degrees (south = -)
|
1998-07-30 23:48:24 +00:00
|
|
|
|
1998-08-27 17:01:55 +00:00
|
|
|
// Default initial position is Globe, AZ (P13)
|
|
|
|
lon(-110.6642444),
|
|
|
|
lat( 33.3528917),
|
1998-07-30 23:48:24 +00:00
|
|
|
|
|
|
|
// North of the city of Globe
|
1998-08-27 17:01:55 +00:00
|
|
|
// lon(-110.7),
|
|
|
|
// lat( 33.4),
|
1998-07-30 23:48:24 +00:00
|
|
|
|
|
|
|
// North of the city of Globe
|
1998-08-27 17:01:55 +00:00
|
|
|
// lon(-110.742578),
|
|
|
|
// lat( 33.507122),
|
1998-07-30 23:48:24 +00:00
|
|
|
|
|
|
|
// Near where I used to live in Globe, AZ
|
1998-08-27 17:01:55 +00:00
|
|
|
// lon(-110.766000),
|
|
|
|
// lat( 33.377778),
|
1998-07-30 23:48:24 +00:00
|
|
|
|
|
|
|
// 10125 Jewell St. NE
|
1998-08-27 17:01:55 +00:00
|
|
|
// lon(-93.15),
|
|
|
|
// lat( 45.15),
|
1998-07-30 23:48:24 +00:00
|
|
|
|
|
|
|
// Near KHSP (Hot Springs, VA)
|
1998-08-27 17:01:55 +00:00
|
|
|
// lon(-79.8338964 + 0.01),
|
|
|
|
// lat( 37.9514564 + 0.008),
|
1998-07-30 23:48:24 +00:00
|
|
|
|
|
|
|
// (SEZ) SEDONA airport
|
1998-08-27 17:01:55 +00:00
|
|
|
// lon(-111.7884614 + 0.01),
|
|
|
|
// lat( 34.8486289 - 0.015),
|
1998-07-30 23:48:24 +00:00
|
|
|
|
|
|
|
// Jim Brennon's Kingmont Observatory
|
1998-08-27 17:01:55 +00:00
|
|
|
// lon(-121.1131667),
|
|
|
|
// lat( 38.8293917),
|
1998-07-30 23:48:24 +00:00
|
|
|
|
|
|
|
// Huaras, Peru (S09d 31.871' W077d 31.498')
|
1998-08-27 17:01:55 +00:00
|
|
|
// lon(-77.5249667),
|
|
|
|
// lat( -9.5311833),
|
1998-07-30 23:48:24 +00:00
|
|
|
|
|
|
|
// Eclipse Watching w73.5 n10 (approx) 18:00 UT
|
1998-08-27 17:01:55 +00:00
|
|
|
// lon(-73.5),
|
|
|
|
// lat( 10.0),
|
1998-07-30 23:48:24 +00:00
|
|
|
|
|
|
|
// Timms Hill (WI)
|
1998-08-27 17:01:55 +00:00
|
|
|
// lon(-90.1953055556),
|
|
|
|
// lat( 45.4511388889),
|
1998-07-30 23:48:24 +00:00
|
|
|
|
1998-08-27 17:01:55 +00:00
|
|
|
// starting altitude in meters (this will be reset to ground level
|
|
|
|
// if it is lower than the terrain
|
|
|
|
altitude(-9999.0),
|
1998-07-30 23:48:24 +00:00
|
|
|
|
|
|
|
// Initial Orientation
|
1998-08-27 17:01:55 +00:00
|
|
|
heading(270.0), // heading (yaw) angle in degress (Psi)
|
|
|
|
roll(0.0), // roll angle in degrees (Phi)
|
|
|
|
pitch(0.424), // pitch angle in degrees (Theta)
|
1998-04-30 12:34:17 +00:00
|
|
|
|
1999-08-08 15:21:54 +00:00
|
|
|
// Initialize current options velocities to 0.0
|
I tested:
LaRCsim c172 on-ground and in-air starts, reset: all work
UIUC Cessna172 on-ground and in-air starts work as expected, reset
results in an aircraft that is upside down but does not crash FG. I
don't know what it was like before, so it may well be no change.
JSBSim c172 and X15 in-air starts work fine, resets now work (and are
trimmed), on-ground starts do not -- the c172 ends up on its back. I
suspect this is no worse than before.
I did not test:
Balloon (the weather code returns nan's for the atmosphere data --this
is in the weather module and apparently is a linux only bug)
ADA (don't know how)
MagicCarpet (needs work yet)
External (don't know how)
known to be broken:
LaRCsim c172 on-ground starts with a negative terrain altitude (this
happens at KPAO when the scenery is not present). The FDM inits to
about 50 feet AGL and the model falls to the ground. It does stay
upright, however, and seems to be fine once it settles out, FWIW.
To do:
--implement set_Model on the bus
--bring Christian's weather data into JSBSim
-- add default method to bus for updating things like the sin and cos of
latitude (for Balloon, MagicCarpet)
-- lots of cleanup
The files:
src/FDM/flight.cxx
src/FDM/flight.hxx
-- all data members now declared protected instead of private.
-- eliminated all but a small set of 'setters', no change to getters.
-- that small set is declared virtual, the default implementation
provided preserves the old behavior
-- all of the vector data members are now initialized.
-- added busdump() method -- FG_LOG's all the bus data when called,
useful for diagnostics.
src/FDM/ADA.cxx
-- bus data members now directly assigned to
src/FDM/Balloon.cxx
-- bus data members now directly assigned to
-- changed V_equiv_kts to V_calibrated_kts
src/FDM/JSBSim.cxx
src/FDM/JSBSim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with JSBSim specific
logic
-- changed the static FDMExec to a dynamic fdmex (needed so that the
JSBSim object can be deleted when a model change is called for)
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- added logic to bring up FGEngInterface objects and set the RPM and
throttle values.
src/FDM/LaRCsim.cxx
src/FDM/LaRCsim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with LaRCsim specific
logic, uses LaRCsimIC
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- moved default inertias to here from fg_init.cxx
-- eliminated the climb rate calculation. The equivalent, climb_rate =
-1*vdown, is now in copy_from_LaRCsim().
src/FDM/LaRCsimIC.cxx
src/FDM/LaRCsimIC.hxx
-- similar to FGInitialCondition, this class has all the logic needed to
turn data like Vc and Mach into the more fundamental quantities LaRCsim
needs to initialize.
-- put it in src/FDM since it is a class
src/FDM/MagicCarpet.cxx
-- bus data members now directly assigned to
src/FDM/Makefile.am
-- adds LaRCsimIC.hxx and cxx
src/FDM/JSBSim/FGAtmosphere.h
src/FDM/JSBSim/FGDefs.h
src/FDM/JSBSim/FGInitialCondition.cpp
src/FDM/JSBSim/FGInitialCondition.h
src/FDM/JSBSim/JSBSim.cpp
-- changes to accomodate the new bus
src/FDM/LaRCsim/atmos_62.h
src/FDM/LaRCsim/ls_geodesy.h
-- surrounded prototypes with #ifdef __cplusplus ... #endif , functions
here are needed in LaRCsimIC
src/FDM/LaRCsim/c172_main.c
src/FDM/LaRCsim/cherokee_aero.c
src/FDM/LaRCsim/ls_aux.c
src/FDM/LaRCsim/ls_constants.h
src/FDM/LaRCsim/ls_geodesy.c
src/FDM/LaRCsim/ls_geodesy.h
src/FDM/LaRCsim/ls_step.c
src/FDM/UIUCModel/uiuc_betaprobe.cpp
-- changed PI to LS_PI, eliminates preprocessor naming conflict with
weather module
src/FDM/LaRCsim/ls_interface.c
src/FDM/LaRCsim/ls_interface.h
-- added function ls_set_model_dt()
src/Main/bfi.cxx
-- eliminated calls that set the NED speeds to body components. They
are no longer needed and confuse the new bus.
src/Main/fg_init.cxx
-- eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). or set default values. The bus now handles the
defaults and updates itself when the setters are called (for LaRCsim and
JSBSim). A default method for doing this needs to be added to the bus.
-- added fgVelocityInit() to set the speed the user asked for. Both
JSBSim and LaRCsim can now be initialized using any of:
vc,mach, NED components, UVW components.
src/Main/main.cxx
--eliminated call to fgFDMSetGroundElevation, this data is now 'pulled'
onto the bus every update()
src/Main/options.cxx
src/Main/options.hxx
-- added enum to keep track of the speed requested by the user
-- eliminated calls to set NED velocity properties to body speeds, they
are no longer needed.
-- added options for the NED components.
src/Network/garmin.cxx
src/Network/nmea.cxx
--eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). The bus now updates itself when the setters are
called (for LaRCsim and JSBSim). A default method for doing this needs
to be added to the bus.
-- changed set_V_equiv_kts to set_V_calibrated_kts. set_V_equiv_kts no
longer exists ( get_V_equiv_kts still does, though)
src/WeatherCM/FGLocalWeatherDatabase.cpp
-- commented out the code to put the weather data on the bus, a
different scheme for this is needed.
2000-10-24 00:34:50 +00:00
|
|
|
speedset(FG_VC),
|
|
|
|
uBody(0.0), vBody(0.0), wBody(0.0),
|
|
|
|
vNorth(0.0),vEast(0.0), vDown(0.0),
|
|
|
|
vkcas(0.0), mach(0.0),
|
1999-08-08 15:21:54 +00:00
|
|
|
|
1998-07-06 21:34:17 +00:00
|
|
|
// Miscellaneous
|
1998-08-27 17:01:55 +00:00
|
|
|
game_mode(0),
|
|
|
|
splash_screen(1),
|
|
|
|
intro_music(1),
|
|
|
|
mouse_pointer(0),
|
1999-08-10 03:44:47 +00:00
|
|
|
control_mode(FG_JOYSTICK),
|
1999-10-06 20:58:57 +00:00
|
|
|
auto_coordination(FG_AUTO_COORD_NOT_SPECIFIED),
|
1998-07-06 21:34:17 +00:00
|
|
|
|
1998-04-30 12:34:17 +00:00
|
|
|
// Features
|
2000-07-22 23:25:49 +00:00
|
|
|
hud_status(0),
|
|
|
|
panel_status(1),
|
1998-08-27 17:01:55 +00:00
|
|
|
sound(1),
|
2000-05-13 00:02:43 +00:00
|
|
|
anti_alias_hud(0),
|
1998-04-30 12:34:17 +00:00
|
|
|
|
1998-07-30 23:48:24 +00:00
|
|
|
// Flight Model options
|
1999-08-10 03:44:47 +00:00
|
|
|
flight_model( FGInterface::FG_LARCSIM ),
|
1999-12-20 20:26:18 +00:00
|
|
|
aircraft( "c172" ),
|
1999-09-01 20:24:54 +00:00
|
|
|
model_hz( NEW_DEFAULT_MODEL_HZ ),
|
1999-08-10 03:44:47 +00:00
|
|
|
speed_up( 1 ),
|
2000-05-19 16:29:23 +00:00
|
|
|
trim(0),
|
1998-07-30 23:48:24 +00:00
|
|
|
|
1998-04-30 12:34:17 +00:00
|
|
|
// Rendering options
|
1998-08-27 17:01:55 +00:00
|
|
|
fog(FG_FOG_NICEST), // nicest
|
2000-10-19 21:24:43 +00:00
|
|
|
clouds(true),
|
1999-10-22 00:27:49 +00:00
|
|
|
clouds_asl(5000*FEET_TO_METER),
|
1998-08-27 17:01:55 +00:00
|
|
|
fullscreen(0),
|
|
|
|
shading(1),
|
|
|
|
skyblend(1),
|
|
|
|
textures(1),
|
|
|
|
wireframe(0),
|
2000-07-22 23:25:49 +00:00
|
|
|
xsize(800),
|
|
|
|
ysize(600),
|
2000-05-13 00:02:43 +00:00
|
|
|
bpp(16),
|
1999-10-15 13:55:44 +00:00
|
|
|
view_mode(FG_VIEW_PILOT),
|
The following changes were made to flightgear-0.7.5 code to implement the follow
ing features:
a) ADA Flight model - ADA.cxx, ADA.hxx, flight.hxx
b) Fighter a/c HUD - flight.hxx, hud.hxx, hud.cxx, cockpit.cxx, hud_ladr.c
xx, hud_card.cxx
c) 3-window display - options.hxx, options.cxx, viewer.cxx
d) Moving objects (ship) - main.cxx
e) Patches - main.cxx
ADA.cxx, ADA.hxx
--------------------------
Interface to the external ADA flight dynamics package.
flight.hxx
----------
Included prototypes for accepting additional data fron the External flight
model for fighter aircraft HUD
Hud.hxx
-------
Included prototypes for accepting additional data for fighter HUD from Exernal F
light model.
Defined FIGHTER_HUD pre-processor directive to enable compilation of fighter hud
code.
hud.cxx, cockpit.cxx, hud_ladr.cxx, hud_card.cxx
---------------------------------------
Included code to initialise additional reticles/text for fighter HUD which is co
nditionally
compiled if FIGHTER_HUD is defined.
options.hxx
-----------
Added window_offset, and function to retrieve its value for 3 windows
options.cxx
-----------
Changed few options to suit ADA/CEF projection system/screens and checks for win
dow offset.
views.cxx
---------
Added code to retrieve view offset for window.
Main.cxx
--------
Added code to load and move an aircraft carrier.
Patch to enable clouds from command line until Curtis fixes it. By default cloud
s are disabled.
2000-10-19 19:46:13 +00:00
|
|
|
default_view_offset(0),
|
2000-12-06 04:13:16 +00:00
|
|
|
visibility(-1.0),
|
1998-04-30 12:34:17 +00:00
|
|
|
|
1998-08-24 20:11:12 +00:00
|
|
|
// HUD options
|
1998-11-02 23:04:02 +00:00
|
|
|
units(FG_UNITS_FEET),
|
1998-08-27 17:01:55 +00:00
|
|
|
tris_or_culled(0),
|
1998-08-24 20:11:12 +00:00
|
|
|
|
1998-04-30 12:34:17 +00:00
|
|
|
// Time options
|
2000-02-28 04:16:12 +00:00
|
|
|
time_offset(0),
|
|
|
|
|
|
|
|
network_olk(false)
|
1998-08-27 17:01:55 +00:00
|
|
|
{
|
|
|
|
// set initial values/defaults
|
2000-07-07 21:52:45 +00:00
|
|
|
time_offset_type = FG_TIME_SYS_OFFSET;
|
1998-08-27 17:01:55 +00:00
|
|
|
char* envp = ::getenv( "FG_ROOT" );
|
1998-05-13 18:29:56 +00:00
|
|
|
|
1998-08-27 17:01:55 +00:00
|
|
|
if ( envp != NULL ) {
|
|
|
|
// fg_root could be anywhere, so default to environmental
|
|
|
|
// variable $FG_ROOT if it is set.
|
|
|
|
fg_root = envp;
|
|
|
|
} else {
|
2000-07-14 16:57:55 +00:00
|
|
|
// Otherwise, default to a random compiled-in location if
|
1998-08-27 17:01:55 +00:00
|
|
|
// $FG_ROOT is not set. This can still be overridden from the
|
|
|
|
// command line or a config file.
|
1998-05-13 18:29:56 +00:00
|
|
|
|
1999-04-27 19:27:45 +00:00
|
|
|
#if defined( WIN32 )
|
1998-08-27 17:01:55 +00:00
|
|
|
fg_root = "\\FlightGear";
|
2000-09-10 00:04:50 +00:00
|
|
|
#elif defined( macintosh )
|
1999-06-05 12:45:40 +00:00
|
|
|
fg_root = "";
|
1998-08-27 17:01:55 +00:00
|
|
|
#else
|
1999-06-04 20:35:47 +00:00
|
|
|
fg_root = PKGLIBDIR;
|
1998-08-27 17:01:55 +00:00
|
|
|
#endif
|
1998-05-13 18:29:56 +00:00
|
|
|
}
|
|
|
|
|
2000-07-14 16:57:55 +00:00
|
|
|
// set a possibly independent location for scenery data
|
|
|
|
envp = ::getenv( "FG_SCENERY" );
|
|
|
|
|
|
|
|
if ( envp != NULL ) {
|
|
|
|
// fg_root could be anywhere, so default to environmental
|
|
|
|
// variable $FG_ROOT if it is set.
|
|
|
|
fg_scenery = envp;
|
|
|
|
} else {
|
|
|
|
// Otherwise, default to Scenery being in $FG_ROOT/Scenery
|
2000-07-14 21:19:18 +00:00
|
|
|
fg_scenery = "";
|
2000-07-14 16:57:55 +00:00
|
|
|
}
|
|
|
|
|
2000-10-10 17:45:04 +00:00
|
|
|
airport_id = "KPAO"; // default airport id
|
1999-06-30 20:21:04 +00:00
|
|
|
net_id = "Johnney"; // default pilot's name
|
1998-11-25 01:33:58 +00:00
|
|
|
|
|
|
|
// initialize port config string list
|
1999-11-19 02:10:24 +00:00
|
|
|
channel_options_list.clear();
|
1998-05-13 18:29:56 +00:00
|
|
|
}
|
|
|
|
|
1999-05-06 22:16:12 +00:00
|
|
|
void
|
2000-10-19 21:24:43 +00:00
|
|
|
FGOptions::toggle_panel() {
|
1999-05-12 02:07:21 +00:00
|
|
|
|
2000-07-08 06:29:19 +00:00
|
|
|
bool freeze = globals->get_freeze();
|
|
|
|
|
|
|
|
if( !freeze )
|
|
|
|
globals->set_freeze(true);
|
1999-05-12 02:07:21 +00:00
|
|
|
|
1999-05-06 22:16:12 +00:00
|
|
|
if( panel_status ) {
|
|
|
|
panel_status = false;
|
User-visible
- knobs now continue to rotate when you hold down the mouse
- the middle mouse button makes knobs rotate much faster
- there are NAV1, NAV2, and ADF radios that can be tuned using the mouse
- there are standby frequencies for NAV1 and NAV2, and buttons to swap
- there is a crude, rather silly-looking DME, hard-wired to NAV1
- there is a crude, rather silly-looking autopilot that can lock
the heading (to the bug on the gyro), can lock to NAV1, and can lock
the current altitude
- the knobs for changing the radials on NAV1 and NAV2 look much better
and are in the right place
- tuning into an ILS frequency doesn't change the displayed radial for
NAV1
Code
- I've created a new module, sp_panel.[ch]xx, that constructs the
default single-prop panel; this works entirely outside of FGPanel,
so it is possible to construct similar modules for other sorts of
panels; all code specific to the default panel has been removed from
panel.cxx
- current_panel is now a pointer
- radiostack.[ch]xx keeps track both of the actual radial and of the
selected radial (they will differ with ILS); the NAV gauges should
not spin around automatically to show the actual radial (we need to
do something similar with the autopilot)
- the panel is initialized fairly early
- make sure that standby frequencies also get initialized
- I've started combining and clipping small textures to save texture
memory; there's a lot more to do, but at least I've made a start
2000-05-02 18:26:00 +00:00
|
|
|
if ( current_panel != NULL )
|
|
|
|
current_panel->setVisibility(false);
|
1999-05-06 22:16:12 +00:00
|
|
|
} else {
|
|
|
|
panel_status = true;
|
User-visible
- knobs now continue to rotate when you hold down the mouse
- the middle mouse button makes knobs rotate much faster
- there are NAV1, NAV2, and ADF radios that can be tuned using the mouse
- there are standby frequencies for NAV1 and NAV2, and buttons to swap
- there is a crude, rather silly-looking DME, hard-wired to NAV1
- there is a crude, rather silly-looking autopilot that can lock
the heading (to the bug on the gyro), can lock to NAV1, and can lock
the current altitude
- the knobs for changing the radials on NAV1 and NAV2 look much better
and are in the right place
- tuning into an ILS frequency doesn't change the displayed radial for
NAV1
Code
- I've created a new module, sp_panel.[ch]xx, that constructs the
default single-prop panel; this works entirely outside of FGPanel,
so it is possible to construct similar modules for other sorts of
panels; all code specific to the default panel has been removed from
panel.cxx
- current_panel is now a pointer
- radiostack.[ch]xx keeps track both of the actual radial and of the
selected radial (they will differ with ILS); the NAV gauges should
not spin around automatically to show the actual radial (we need to
do something similar with the autopilot)
- the panel is initialized fairly early
- make sure that standby frequencies also get initialized
- I've started combining and clipping small textures to save texture
memory; there's a lot more to do, but at least I've made a start
2000-05-02 18:26:00 +00:00
|
|
|
if ( current_panel != NULL )
|
|
|
|
current_panel->setVisibility(true);
|
1999-05-06 22:16:12 +00:00
|
|
|
}
|
2000-07-22 23:25:49 +00:00
|
|
|
|
2000-10-19 23:09:33 +00:00
|
|
|
fgReshape( xsize, ysize);
|
2000-05-13 00:02:43 +00:00
|
|
|
|
2000-07-08 06:29:19 +00:00
|
|
|
if( !freeze )
|
|
|
|
globals->set_freeze( false );
|
1999-05-06 22:16:12 +00:00
|
|
|
}
|
1998-05-13 18:29:56 +00:00
|
|
|
|
1998-08-27 17:01:55 +00:00
|
|
|
double
|
2000-10-19 21:24:43 +00:00
|
|
|
FGOptions::parse_time(const string& time_in) {
|
1998-08-27 17:01:55 +00:00
|
|
|
char *time_str, num[256];
|
1998-04-24 00:49:17 +00:00
|
|
|
double hours, minutes, seconds;
|
|
|
|
double result = 0.0;
|
|
|
|
int sign = 1;
|
|
|
|
int i;
|
|
|
|
|
1998-08-27 17:01:55 +00:00
|
|
|
time_str = (char *)time_in.c_str();
|
|
|
|
|
1998-04-24 00:49:17 +00:00
|
|
|
// printf("parse_time(): %s\n", time_str);
|
|
|
|
|
|
|
|
// check for sign
|
|
|
|
if ( strlen(time_str) ) {
|
|
|
|
if ( time_str[0] == '+' ) {
|
|
|
|
sign = 1;
|
|
|
|
time_str++;
|
|
|
|
} else if ( time_str[0] == '-' ) {
|
|
|
|
sign = -1;
|
|
|
|
time_str++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// printf("sign = %d\n", sign);
|
|
|
|
|
|
|
|
// get hours
|
|
|
|
if ( strlen(time_str) ) {
|
|
|
|
i = 0;
|
|
|
|
while ( (time_str[0] != ':') && (time_str[0] != '\0') ) {
|
|
|
|
num[i] = time_str[0];
|
|
|
|
time_str++;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
if ( time_str[0] == ':' ) {
|
|
|
|
time_str++;
|
|
|
|
}
|
|
|
|
num[i] = '\0';
|
|
|
|
hours = atof(num);
|
|
|
|
// printf("hours = %.2lf\n", hours);
|
|
|
|
|
1998-07-30 23:48:24 +00:00
|
|
|
result += hours;
|
1998-04-24 00:49:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// get minutes
|
|
|
|
if ( strlen(time_str) ) {
|
|
|
|
i = 0;
|
|
|
|
while ( (time_str[0] != ':') && (time_str[0] != '\0') ) {
|
|
|
|
num[i] = time_str[0];
|
|
|
|
time_str++;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
if ( time_str[0] == ':' ) {
|
|
|
|
time_str++;
|
|
|
|
}
|
|
|
|
num[i] = '\0';
|
|
|
|
minutes = atof(num);
|
|
|
|
// printf("minutes = %.2lf\n", minutes);
|
|
|
|
|
1998-07-30 23:48:24 +00:00
|
|
|
result += minutes / 60.0;
|
1998-04-24 00:49:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// get seconds
|
|
|
|
if ( strlen(time_str) ) {
|
|
|
|
i = 0;
|
|
|
|
while ( (time_str[0] != ':') && (time_str[0] != '\0') ) {
|
|
|
|
num[i] = time_str[0];
|
|
|
|
time_str++;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
num[i] = '\0';
|
|
|
|
seconds = atof(num);
|
|
|
|
// printf("seconds = %.2lf\n", seconds);
|
|
|
|
|
1998-07-30 23:48:24 +00:00
|
|
|
result += seconds / 3600.0;
|
1998-04-24 00:49:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return(sign * result);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-10-19 21:24:43 +00:00
|
|
|
long int FGOptions::parse_date( const string& date)
|
1999-04-11 13:19:29 +00:00
|
|
|
{
|
1999-05-12 02:07:21 +00:00
|
|
|
struct tm gmt;
|
|
|
|
char * date_str, num[256];
|
|
|
|
int i;
|
|
|
|
// initialize to zero
|
|
|
|
gmt.tm_sec = 0;
|
|
|
|
gmt.tm_min = 0;
|
|
|
|
gmt.tm_hour = 0;
|
|
|
|
gmt.tm_mday = 0;
|
|
|
|
gmt.tm_mon = 0;
|
|
|
|
gmt.tm_year = 0;
|
1999-09-07 23:09:43 +00:00
|
|
|
gmt.tm_isdst = 0; // ignore daylight savings time for the moment
|
1999-05-12 02:07:21 +00:00
|
|
|
date_str = (char *)date.c_str();
|
|
|
|
// get year
|
1999-04-11 13:19:29 +00:00
|
|
|
if ( strlen(date_str) ) {
|
|
|
|
i = 0;
|
|
|
|
while ( (date_str[0] != ':') && (date_str[0] != '\0') ) {
|
|
|
|
num[i] = date_str[0];
|
|
|
|
date_str++;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
if ( date_str[0] == ':' ) {
|
|
|
|
date_str++;
|
|
|
|
}
|
|
|
|
num[i] = '\0';
|
|
|
|
gmt.tm_year = atoi(num) - 1900;
|
|
|
|
}
|
1999-05-12 02:07:21 +00:00
|
|
|
// get month
|
1999-04-11 13:19:29 +00:00
|
|
|
if ( strlen(date_str) ) {
|
|
|
|
i = 0;
|
|
|
|
while ( (date_str[0] != ':') && (date_str[0] != '\0') ) {
|
|
|
|
num[i] = date_str[0];
|
|
|
|
date_str++;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
if ( date_str[0] == ':' ) {
|
|
|
|
date_str++;
|
|
|
|
}
|
|
|
|
num[i] = '\0';
|
|
|
|
gmt.tm_mon = atoi(num) -1;
|
|
|
|
}
|
|
|
|
// get day
|
|
|
|
if ( strlen(date_str) ) {
|
|
|
|
i = 0;
|
|
|
|
while ( (date_str[0] != ':') && (date_str[0] != '\0') ) {
|
|
|
|
num[i] = date_str[0];
|
|
|
|
date_str++;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
if ( date_str[0] == ':' ) {
|
|
|
|
date_str++;
|
|
|
|
}
|
|
|
|
num[i] = '\0';
|
|
|
|
gmt.tm_mday = atoi(num);
|
|
|
|
}
|
|
|
|
// get hour
|
|
|
|
if ( strlen(date_str) ) {
|
|
|
|
i = 0;
|
|
|
|
while ( (date_str[0] != ':') && (date_str[0] != '\0') ) {
|
|
|
|
num[i] = date_str[0];
|
|
|
|
date_str++;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
if ( date_str[0] == ':' ) {
|
|
|
|
date_str++;
|
|
|
|
}
|
|
|
|
num[i] = '\0';
|
|
|
|
gmt.tm_hour = atoi(num);
|
|
|
|
}
|
|
|
|
// get minute
|
|
|
|
if ( strlen(date_str) ) {
|
|
|
|
i = 0;
|
|
|
|
while ( (date_str[0] != ':') && (date_str[0] != '\0') ) {
|
|
|
|
num[i] = date_str[0];
|
|
|
|
date_str++;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
if ( date_str[0] == ':' ) {
|
|
|
|
date_str++;
|
|
|
|
}
|
|
|
|
num[i] = '\0';
|
|
|
|
gmt.tm_min = atoi(num);
|
|
|
|
}
|
|
|
|
// get second
|
|
|
|
if ( strlen(date_str) ) {
|
|
|
|
i = 0;
|
|
|
|
while ( (date_str[0] != ':') && (date_str[0] != '\0') ) {
|
|
|
|
num[i] = date_str[0];
|
|
|
|
date_str++;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
if ( date_str[0] == ':' ) {
|
|
|
|
date_str++;
|
|
|
|
}
|
|
|
|
num[i] = '\0';
|
|
|
|
gmt.tm_sec = atoi(num);
|
|
|
|
}
|
2000-07-07 23:56:43 +00:00
|
|
|
time_t theTime = sgTimeGetGMT( gmt.tm_year, gmt.tm_mon, gmt.tm_mday,
|
|
|
|
gmt.tm_hour, gmt.tm_min, gmt.tm_sec );
|
1999-04-11 13:19:29 +00:00
|
|
|
//printf ("Date is %s\n", ctime(&theTime));
|
|
|
|
//printf ("in seconds that is %d\n", theTime);
|
|
|
|
//exit(1);
|
|
|
|
return (theTime);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-07-30 23:48:24 +00:00
|
|
|
// parse degree in the form of [+/-]hhh:mm:ss
|
2000-10-19 21:24:43 +00:00
|
|
|
void FGOptions::parse_control( const string& mode ) {
|
1999-08-10 03:44:47 +00:00
|
|
|
if ( mode == "joystick" ) {
|
|
|
|
control_mode = FG_JOYSTICK;
|
|
|
|
} else if ( mode == "mouse" ) {
|
|
|
|
control_mode = FG_MOUSE;
|
|
|
|
} else {
|
|
|
|
control_mode = FG_KEYBOARD;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// parse degree in the form of [+/-]hhh:mm:ss
|
1998-08-27 17:01:55 +00:00
|
|
|
double
|
2000-10-19 21:24:43 +00:00
|
|
|
FGOptions::parse_degree( const string& degree_str) {
|
1998-08-27 17:01:55 +00:00
|
|
|
double result = parse_time( degree_str );
|
1998-07-30 23:48:24 +00:00
|
|
|
|
|
|
|
// printf("Degree = %.4f\n", result);
|
|
|
|
|
|
|
|
return(result);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-04-24 00:49:17 +00:00
|
|
|
// parse time offset command line option
|
1998-08-27 17:01:55 +00:00
|
|
|
int
|
2000-10-19 21:24:43 +00:00
|
|
|
FGOptions::parse_time_offset( const string& time_str) {
|
1998-04-24 00:49:17 +00:00
|
|
|
int result;
|
|
|
|
|
|
|
|
// printf("time offset = %s\n", time_str);
|
|
|
|
|
1998-04-26 05:01:19 +00:00
|
|
|
#ifdef HAVE_RINT
|
1998-07-30 23:48:24 +00:00
|
|
|
result = (int)rint(parse_time(time_str) * 3600.0);
|
1998-04-26 05:01:19 +00:00
|
|
|
#else
|
1998-07-30 23:48:24 +00:00
|
|
|
result = (int)(parse_time(time_str) * 3600.0);
|
1998-04-26 05:01:19 +00:00
|
|
|
#endif
|
1998-04-24 00:49:17 +00:00
|
|
|
|
1998-07-30 23:48:24 +00:00
|
|
|
// printf("parse_time_offset(): %d\n", result);
|
1998-04-24 00:49:17 +00:00
|
|
|
|
|
|
|
return( result );
|
1998-05-06 03:16:23 +00:00
|
|
|
}
|
|
|
|
|
1998-04-24 00:49:17 +00:00
|
|
|
|
1999-02-05 21:28:09 +00:00
|
|
|
// Parse --fdm=abcdefg type option
|
1998-08-27 17:01:55 +00:00
|
|
|
int
|
2000-10-19 21:24:43 +00:00
|
|
|
FGOptions::parse_fdm( const string& fm ) {
|
1999-12-20 20:26:18 +00:00
|
|
|
// cout << "fdm = " << fm << endl;
|
1998-07-30 23:48:24 +00:00
|
|
|
|
The following changes were made to flightgear-0.7.5 code to implement the follow
ing features:
a) ADA Flight model - ADA.cxx, ADA.hxx, flight.hxx
b) Fighter a/c HUD - flight.hxx, hud.hxx, hud.cxx, cockpit.cxx, hud_ladr.c
xx, hud_card.cxx
c) 3-window display - options.hxx, options.cxx, viewer.cxx
d) Moving objects (ship) - main.cxx
e) Patches - main.cxx
ADA.cxx, ADA.hxx
--------------------------
Interface to the external ADA flight dynamics package.
flight.hxx
----------
Included prototypes for accepting additional data fron the External flight
model for fighter aircraft HUD
Hud.hxx
-------
Included prototypes for accepting additional data for fighter HUD from Exernal F
light model.
Defined FIGHTER_HUD pre-processor directive to enable compilation of fighter hud
code.
hud.cxx, cockpit.cxx, hud_ladr.cxx, hud_card.cxx
---------------------------------------
Included code to initialise additional reticles/text for fighter HUD which is co
nditionally
compiled if FIGHTER_HUD is defined.
options.hxx
-----------
Added window_offset, and function to retrieve its value for 3 windows
options.cxx
-----------
Changed few options to suit ADA/CEF projection system/screens and checks for win
dow offset.
views.cxx
---------
Added code to retrieve view offset for window.
Main.cxx
--------
Added code to load and move an aircraft carrier.
Patch to enable clouds from command line until Curtis fixes it. By default cloud
s are disabled.
2000-10-19 19:46:13 +00:00
|
|
|
if ( fm == "ada" ) {
|
|
|
|
return FGInterface::FG_ADA;
|
|
|
|
} else if ( fm == "balloon" ) {
|
1999-10-14 01:53:43 +00:00
|
|
|
return FGInterface::FG_BALLOONSIM;
|
|
|
|
} else if ( fm == "external" ) {
|
|
|
|
return FGInterface::FG_EXTERNAL;
|
1999-02-05 21:28:09 +00:00
|
|
|
} else if ( fm == "jsb" ) {
|
|
|
|
return FGInterface::FG_JSBSIM;
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( (fm == "larcsim") || (fm == "LaRCsim") ) {
|
1999-02-05 21:28:09 +00:00
|
|
|
return FGInterface::FG_LARCSIM;
|
1999-10-14 01:53:43 +00:00
|
|
|
} else if ( fm == "magic" ) {
|
|
|
|
return FGInterface::FG_MAGICCARPET;
|
1998-07-30 23:48:24 +00:00
|
|
|
} else {
|
1999-02-05 21:28:09 +00:00
|
|
|
FG_LOG( FG_GENERAL, FG_ALERT, "Unknown fdm = " << fm );
|
1998-11-06 21:17:31 +00:00
|
|
|
exit(-1);
|
1998-07-30 23:48:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// we'll never get here, but it makes the compiler happy.
|
1998-11-06 21:17:31 +00:00
|
|
|
return -1;
|
1998-07-30 23:48:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-05-13 18:29:56 +00:00
|
|
|
// Parse --fov=x.xx type option
|
1998-08-27 17:01:55 +00:00
|
|
|
double
|
2000-10-19 21:24:43 +00:00
|
|
|
FGOptions::parse_fov( const string& arg ) {
|
1998-08-27 17:01:55 +00:00
|
|
|
double fov = atof(arg);
|
1998-05-13 18:29:56 +00:00
|
|
|
|
|
|
|
if ( fov < FG_FOV_MIN ) { fov = FG_FOV_MIN; }
|
|
|
|
if ( fov > FG_FOV_MAX ) { fov = FG_FOV_MAX; }
|
|
|
|
|
2000-11-01 23:27:32 +00:00
|
|
|
globals->get_current_view()->set_fov( fov );
|
|
|
|
|
1998-07-30 23:48:24 +00:00
|
|
|
// printf("parse_fov(): result = %.4f\n", fov);
|
1998-05-13 18:29:56 +00:00
|
|
|
|
2000-11-01 23:27:32 +00:00
|
|
|
return fov;
|
1998-05-13 18:29:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-11-19 02:10:24 +00:00
|
|
|
// Parse I/O channel option
|
1998-11-16 13:59:58 +00:00
|
|
|
//
|
1999-11-19 02:10:24 +00:00
|
|
|
// Format is "--protocol=medium,direction,hz,medium_options,..."
|
|
|
|
//
|
1999-11-23 05:51:14 +00:00
|
|
|
// protocol = { native, nmea, garmin, fgfs, rul, pve, etc. }
|
1999-11-19 02:10:24 +00:00
|
|
|
// medium = { serial, socket, file, etc. }
|
|
|
|
// direction = { in, out, bi }
|
|
|
|
// hz = number of times to process channel per second (floating
|
|
|
|
// point values are ok.
|
|
|
|
//
|
|
|
|
// Serial example "--nmea=serial,dir,hz,device,baud" where
|
1998-11-16 13:59:58 +00:00
|
|
|
//
|
1999-11-19 02:10:24 +00:00
|
|
|
// device = OS device name of serial line to be open()'ed
|
1998-11-16 13:59:58 +00:00
|
|
|
// baud = {300, 1200, 2400, ..., 230400}
|
1999-11-19 02:10:24 +00:00
|
|
|
//
|
2000-07-14 00:50:56 +00:00
|
|
|
// Socket exacmple "--native=socket,dir,hz,machine,port,style" where
|
1999-11-19 02:10:24 +00:00
|
|
|
//
|
1999-11-20 15:40:15 +00:00
|
|
|
// machine = machine name or ip address if client (leave empty if server)
|
1999-11-19 02:10:24 +00:00
|
|
|
// port = port, leave empty to let system choose
|
2000-07-14 00:50:56 +00:00
|
|
|
// style = tcp or udp
|
1999-11-19 02:10:24 +00:00
|
|
|
//
|
|
|
|
// File example "--garmin=file,dir,hz,filename" where
|
|
|
|
//
|
|
|
|
// filename = file system file name
|
1998-11-25 01:33:58 +00:00
|
|
|
|
1998-11-16 13:59:58 +00:00
|
|
|
bool
|
2000-10-19 21:24:43 +00:00
|
|
|
FGOptions::parse_channel( const string& type, const string& channel_str ) {
|
1999-11-19 02:10:24 +00:00
|
|
|
// cout << "Channel string = " << channel_str << endl;
|
|
|
|
|
|
|
|
channel_options_list.push_back( type + "," + channel_str );
|
1998-11-16 13:59:58 +00:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-10-12 01:08:09 +00:00
|
|
|
// Parse --wp=ID[,alt]
|
2000-10-19 21:24:43 +00:00
|
|
|
bool FGOptions::parse_wp( const string& arg ) {
|
2000-10-12 01:08:09 +00:00
|
|
|
string id, alt_str;
|
|
|
|
double alt = 0.0;
|
|
|
|
|
2000-10-13 23:34:54 +00:00
|
|
|
int pos = arg.find( "@" );
|
2000-10-12 01:08:09 +00:00
|
|
|
if ( pos != string::npos ) {
|
|
|
|
id = arg.substr( 0, pos );
|
|
|
|
alt_str = arg.substr( pos + 1 );
|
|
|
|
// cout << "id str = " << id << " alt str = " << alt_str << endl;
|
|
|
|
alt = atof( alt_str.c_str() );
|
|
|
|
if ( units == FG_UNITS_FEET ) {
|
|
|
|
alt *= FEET_TO_METER;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
id = arg;
|
|
|
|
}
|
|
|
|
|
|
|
|
FGAirport a;
|
|
|
|
if ( fgFindAirportID( id, &a ) ) {
|
|
|
|
SGWayPoint wp( a.longitude, a.latitude, alt, SGWayPoint::WGS84, id );
|
|
|
|
globals->get_route()->add_waypoint( wp );
|
|
|
|
|
|
|
|
return true;
|
|
|
|
} else {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-11-28 23:38:24 +00:00
|
|
|
// Parse --flight-plan=[file]
|
|
|
|
bool FGOptions::parse_flightplan(const string& arg)
|
|
|
|
{
|
|
|
|
fg_gzifstream infile(arg.c_str());
|
|
|
|
if (!infile) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
while ( true ) {
|
|
|
|
string line;
|
|
|
|
#ifdef GETLINE_NEEDS_TERMINATOR
|
|
|
|
getline( infile, line, '\n' );
|
|
|
|
#elif defined( macintosh )
|
|
|
|
getline( infile, line, '\r' );
|
|
|
|
#else
|
|
|
|
getline( infile, line );
|
|
|
|
#endif
|
|
|
|
if ( infile.eof() ) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
parse_wp(line);
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-05-13 18:29:56 +00:00
|
|
|
// Parse a single option
|
2000-10-19 21:24:43 +00:00
|
|
|
int FGOptions::parse_option( const string& arg ) {
|
1998-05-13 18:29:56 +00:00
|
|
|
// General Options
|
1998-08-27 17:01:55 +00:00
|
|
|
if ( (arg == "--help") || (arg == "-h") ) {
|
1998-05-13 18:29:56 +00:00
|
|
|
// help/usage request
|
|
|
|
return(FG_OPTIONS_HELP);
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg == "--disable-game-mode") {
|
|
|
|
game_mode = false;
|
|
|
|
} else if ( arg == "--enable-game-mode" ) {
|
|
|
|
game_mode = true;
|
|
|
|
} else if ( arg == "--disable-splash-screen" ) {
|
|
|
|
splash_screen = false;
|
|
|
|
} else if ( arg == "--enable-splash-screen" ) {
|
|
|
|
splash_screen = true;
|
|
|
|
} else if ( arg == "--disable-intro-music" ) {
|
|
|
|
intro_music = false;
|
|
|
|
} else if ( arg == "--enable-intro-music" ) {
|
|
|
|
intro_music = true;
|
|
|
|
} else if ( arg == "--disable-mouse-pointer" ) {
|
1998-07-06 21:34:17 +00:00
|
|
|
mouse_pointer = 1;
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg == "--enable-mouse-pointer" ) {
|
1998-07-06 21:34:17 +00:00
|
|
|
mouse_pointer = 2;
|
2000-07-08 06:29:19 +00:00
|
|
|
} else if ( arg == "--disable-freeze" ) {
|
|
|
|
globals->set_freeze( false );
|
|
|
|
} else if ( arg == "--enable-freeze" ) {
|
|
|
|
globals->set_freeze( true );
|
2000-05-13 00:02:43 +00:00
|
|
|
} else if ( arg == "--disable-anti-alias-hud" ) {
|
|
|
|
anti_alias_hud = false;
|
|
|
|
} else if ( arg == "--enable-anti-alias-hud" ) {
|
|
|
|
anti_alias_hud = true;
|
1999-08-10 03:44:47 +00:00
|
|
|
} else if ( arg.find( "--control=") != string::npos ) {
|
|
|
|
parse_control( arg.substr(10) );
|
1999-10-06 20:58:57 +00:00
|
|
|
} else if ( arg == "--disable-auto-coordination" ) {
|
|
|
|
auto_coordination = FG_AUTO_COORD_DISABLED;
|
|
|
|
} else if ( arg == "--enable-auto-coordination" ) {
|
|
|
|
auto_coordination = FG_AUTO_COORD_ENABLED;
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg == "--disable-hud" ) {
|
|
|
|
hud_status = false;
|
2000-12-19 23:29:16 +00:00
|
|
|
globals->get_props()->setBoolValue("/sim/hud/visibility", false);
|
2001-01-05 16:45:14 +00:00
|
|
|
} else if ( arg == "--enable-hud" ) {
|
2000-12-08 20:05:43 +00:00
|
|
|
hud_status = true;
|
2000-12-19 23:29:16 +00:00
|
|
|
globals->get_props()->setBoolValue("/sim/hud/visibility", true);
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg == "--disable-panel" ) {
|
|
|
|
panel_status = false;
|
2000-12-19 23:29:16 +00:00
|
|
|
globals->get_props()->setBoolValue("/sim/panel/visibility", false);
|
User-visible
- knobs now continue to rotate when you hold down the mouse
- the middle mouse button makes knobs rotate much faster
- there are NAV1, NAV2, and ADF radios that can be tuned using the mouse
- there are standby frequencies for NAV1 and NAV2, and buttons to swap
- there is a crude, rather silly-looking DME, hard-wired to NAV1
- there is a crude, rather silly-looking autopilot that can lock
the heading (to the bug on the gyro), can lock to NAV1, and can lock
the current altitude
- the knobs for changing the radials on NAV1 and NAV2 look much better
and are in the right place
- tuning into an ILS frequency doesn't change the displayed radial for
NAV1
Code
- I've created a new module, sp_panel.[ch]xx, that constructs the
default single-prop panel; this works entirely outside of FGPanel,
so it is possible to construct similar modules for other sorts of
panels; all code specific to the default panel has been removed from
panel.cxx
- current_panel is now a pointer
- radiostack.[ch]xx keeps track both of the actual radial and of the
selected radial (they will differ with ILS); the NAV gauges should
not spin around automatically to show the actual radial (we need to
do something similar with the autopilot)
- the panel is initialized fairly early
- make sure that standby frequencies also get initialized
- I've started combining and clipping small textures to save texture
memory; there's a lot more to do, but at least I've made a start
2000-05-02 18:26:00 +00:00
|
|
|
if ( current_panel != NULL )
|
|
|
|
current_panel->setVisibility(false);
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg == "--enable-panel" ) {
|
|
|
|
panel_status = true;
|
2000-12-19 23:29:16 +00:00
|
|
|
globals->get_props()->setBoolValue("/sim/panel/visibility", true);
|
User-visible
- knobs now continue to rotate when you hold down the mouse
- the middle mouse button makes knobs rotate much faster
- there are NAV1, NAV2, and ADF radios that can be tuned using the mouse
- there are standby frequencies for NAV1 and NAV2, and buttons to swap
- there is a crude, rather silly-looking DME, hard-wired to NAV1
- there is a crude, rather silly-looking autopilot that can lock
the heading (to the bug on the gyro), can lock to NAV1, and can lock
the current altitude
- the knobs for changing the radials on NAV1 and NAV2 look much better
and are in the right place
- tuning into an ILS frequency doesn't change the displayed radial for
NAV1
Code
- I've created a new module, sp_panel.[ch]xx, that constructs the
default single-prop panel; this works entirely outside of FGPanel,
so it is possible to construct similar modules for other sorts of
panels; all code specific to the default panel has been removed from
panel.cxx
- current_panel is now a pointer
- radiostack.[ch]xx keeps track both of the actual radial and of the
selected radial (they will differ with ILS); the NAV gauges should
not spin around automatically to show the actual radial (we need to
do something similar with the autopilot)
- the panel is initialized fairly early
- make sure that standby frequencies also get initialized
- I've started combining and clipping small textures to save texture
memory; there's a lot more to do, but at least I've made a start
2000-05-02 18:26:00 +00:00
|
|
|
if ( current_panel != NULL )
|
2000-07-22 23:25:49 +00:00
|
|
|
current_panel->setVisibility(true);
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg == "--disable-sound" ) {
|
|
|
|
sound = false;
|
|
|
|
} else if ( arg == "--enable-sound" ) {
|
|
|
|
sound = true;
|
|
|
|
} else if ( arg.find( "--airport-id=") != string::npos ) {
|
|
|
|
airport_id = arg.substr( 13 );
|
2000-12-19 23:29:16 +00:00
|
|
|
globals->get_props()->setStringValue("/position/airport-id", airport_id);
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg.find( "--lon=" ) != string::npos ) {
|
|
|
|
lon = parse_degree( arg.substr(6) );
|
2000-08-16 20:16:09 +00:00
|
|
|
airport_id = "";
|
2000-12-19 23:29:16 +00:00
|
|
|
globals->get_props()->setDoubleValue("/position/longitude", lon);
|
|
|
|
globals->get_props()->setStringValue("/position/airport-id", airport_id);
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg.find( "--lat=" ) != string::npos ) {
|
|
|
|
lat = parse_degree( arg.substr(6) );
|
2000-08-16 20:16:09 +00:00
|
|
|
airport_id = "";
|
2000-12-19 23:29:16 +00:00
|
|
|
globals->get_props()->setDoubleValue("/position/latitude", lat);
|
|
|
|
globals->get_props()->setStringValue("/position/airport-id", airport_id);
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg.find( "--altitude=" ) != string::npos ) {
|
1998-12-06 14:52:54 +00:00
|
|
|
if ( units == FG_UNITS_FEET ) {
|
|
|
|
altitude = atof( arg.substr(11) ) * FEET_TO_METER;
|
|
|
|
} else {
|
|
|
|
altitude = atof( arg.substr(11) );
|
|
|
|
}
|
2000-12-19 23:29:16 +00:00
|
|
|
globals->get_props()->setDoubleValue("/position/altitude", altitude);
|
1999-07-31 04:58:26 +00:00
|
|
|
} else if ( arg.find( "--uBody=" ) != string::npos ) {
|
I tested:
LaRCsim c172 on-ground and in-air starts, reset: all work
UIUC Cessna172 on-ground and in-air starts work as expected, reset
results in an aircraft that is upside down but does not crash FG. I
don't know what it was like before, so it may well be no change.
JSBSim c172 and X15 in-air starts work fine, resets now work (and are
trimmed), on-ground starts do not -- the c172 ends up on its back. I
suspect this is no worse than before.
I did not test:
Balloon (the weather code returns nan's for the atmosphere data --this
is in the weather module and apparently is a linux only bug)
ADA (don't know how)
MagicCarpet (needs work yet)
External (don't know how)
known to be broken:
LaRCsim c172 on-ground starts with a negative terrain altitude (this
happens at KPAO when the scenery is not present). The FDM inits to
about 50 feet AGL and the model falls to the ground. It does stay
upright, however, and seems to be fine once it settles out, FWIW.
To do:
--implement set_Model on the bus
--bring Christian's weather data into JSBSim
-- add default method to bus for updating things like the sin and cos of
latitude (for Balloon, MagicCarpet)
-- lots of cleanup
The files:
src/FDM/flight.cxx
src/FDM/flight.hxx
-- all data members now declared protected instead of private.
-- eliminated all but a small set of 'setters', no change to getters.
-- that small set is declared virtual, the default implementation
provided preserves the old behavior
-- all of the vector data members are now initialized.
-- added busdump() method -- FG_LOG's all the bus data when called,
useful for diagnostics.
src/FDM/ADA.cxx
-- bus data members now directly assigned to
src/FDM/Balloon.cxx
-- bus data members now directly assigned to
-- changed V_equiv_kts to V_calibrated_kts
src/FDM/JSBSim.cxx
src/FDM/JSBSim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with JSBSim specific
logic
-- changed the static FDMExec to a dynamic fdmex (needed so that the
JSBSim object can be deleted when a model change is called for)
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- added logic to bring up FGEngInterface objects and set the RPM and
throttle values.
src/FDM/LaRCsim.cxx
src/FDM/LaRCsim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with LaRCsim specific
logic, uses LaRCsimIC
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- moved default inertias to here from fg_init.cxx
-- eliminated the climb rate calculation. The equivalent, climb_rate =
-1*vdown, is now in copy_from_LaRCsim().
src/FDM/LaRCsimIC.cxx
src/FDM/LaRCsimIC.hxx
-- similar to FGInitialCondition, this class has all the logic needed to
turn data like Vc and Mach into the more fundamental quantities LaRCsim
needs to initialize.
-- put it in src/FDM since it is a class
src/FDM/MagicCarpet.cxx
-- bus data members now directly assigned to
src/FDM/Makefile.am
-- adds LaRCsimIC.hxx and cxx
src/FDM/JSBSim/FGAtmosphere.h
src/FDM/JSBSim/FGDefs.h
src/FDM/JSBSim/FGInitialCondition.cpp
src/FDM/JSBSim/FGInitialCondition.h
src/FDM/JSBSim/JSBSim.cpp
-- changes to accomodate the new bus
src/FDM/LaRCsim/atmos_62.h
src/FDM/LaRCsim/ls_geodesy.h
-- surrounded prototypes with #ifdef __cplusplus ... #endif , functions
here are needed in LaRCsimIC
src/FDM/LaRCsim/c172_main.c
src/FDM/LaRCsim/cherokee_aero.c
src/FDM/LaRCsim/ls_aux.c
src/FDM/LaRCsim/ls_constants.h
src/FDM/LaRCsim/ls_geodesy.c
src/FDM/LaRCsim/ls_geodesy.h
src/FDM/LaRCsim/ls_step.c
src/FDM/UIUCModel/uiuc_betaprobe.cpp
-- changed PI to LS_PI, eliminates preprocessor naming conflict with
weather module
src/FDM/LaRCsim/ls_interface.c
src/FDM/LaRCsim/ls_interface.h
-- added function ls_set_model_dt()
src/Main/bfi.cxx
-- eliminated calls that set the NED speeds to body components. They
are no longer needed and confuse the new bus.
src/Main/fg_init.cxx
-- eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). or set default values. The bus now handles the
defaults and updates itself when the setters are called (for LaRCsim and
JSBSim). A default method for doing this needs to be added to the bus.
-- added fgVelocityInit() to set the speed the user asked for. Both
JSBSim and LaRCsim can now be initialized using any of:
vc,mach, NED components, UVW components.
src/Main/main.cxx
--eliminated call to fgFDMSetGroundElevation, this data is now 'pulled'
onto the bus every update()
src/Main/options.cxx
src/Main/options.hxx
-- added enum to keep track of the speed requested by the user
-- eliminated calls to set NED velocity properties to body speeds, they
are no longer needed.
-- added options for the NED components.
src/Network/garmin.cxx
src/Network/nmea.cxx
--eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). The bus now updates itself when the setters are
called (for LaRCsim and JSBSim). A default method for doing this needs
to be added to the bus.
-- changed set_V_equiv_kts to set_V_calibrated_kts. set_V_equiv_kts no
longer exists ( get_V_equiv_kts still does, though)
src/WeatherCM/FGLocalWeatherDatabase.cpp
-- commented out the code to put the weather data on the bus, a
different scheme for this is needed.
2000-10-24 00:34:50 +00:00
|
|
|
speedset = FG_VTUVW;
|
1999-07-31 04:58:26 +00:00
|
|
|
if ( units == FG_UNITS_FEET ) {
|
|
|
|
uBody = atof( arg.substr(8) );
|
1999-12-30 17:42:24 +00:00
|
|
|
} else {
|
|
|
|
uBody = atof( arg.substr(8) ) * FEET_TO_METER;
|
1999-07-31 04:58:26 +00:00
|
|
|
}
|
2000-12-19 23:29:16 +00:00
|
|
|
//globals->get_props()->setDoubleValue("/velocities/speed-north", uBody);
|
1999-07-31 04:58:26 +00:00
|
|
|
} else if ( arg.find( "--vBody=" ) != string::npos ) {
|
I tested:
LaRCsim c172 on-ground and in-air starts, reset: all work
UIUC Cessna172 on-ground and in-air starts work as expected, reset
results in an aircraft that is upside down but does not crash FG. I
don't know what it was like before, so it may well be no change.
JSBSim c172 and X15 in-air starts work fine, resets now work (and are
trimmed), on-ground starts do not -- the c172 ends up on its back. I
suspect this is no worse than before.
I did not test:
Balloon (the weather code returns nan's for the atmosphere data --this
is in the weather module and apparently is a linux only bug)
ADA (don't know how)
MagicCarpet (needs work yet)
External (don't know how)
known to be broken:
LaRCsim c172 on-ground starts with a negative terrain altitude (this
happens at KPAO when the scenery is not present). The FDM inits to
about 50 feet AGL and the model falls to the ground. It does stay
upright, however, and seems to be fine once it settles out, FWIW.
To do:
--implement set_Model on the bus
--bring Christian's weather data into JSBSim
-- add default method to bus for updating things like the sin and cos of
latitude (for Balloon, MagicCarpet)
-- lots of cleanup
The files:
src/FDM/flight.cxx
src/FDM/flight.hxx
-- all data members now declared protected instead of private.
-- eliminated all but a small set of 'setters', no change to getters.
-- that small set is declared virtual, the default implementation
provided preserves the old behavior
-- all of the vector data members are now initialized.
-- added busdump() method -- FG_LOG's all the bus data when called,
useful for diagnostics.
src/FDM/ADA.cxx
-- bus data members now directly assigned to
src/FDM/Balloon.cxx
-- bus data members now directly assigned to
-- changed V_equiv_kts to V_calibrated_kts
src/FDM/JSBSim.cxx
src/FDM/JSBSim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with JSBSim specific
logic
-- changed the static FDMExec to a dynamic fdmex (needed so that the
JSBSim object can be deleted when a model change is called for)
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- added logic to bring up FGEngInterface objects and set the RPM and
throttle values.
src/FDM/LaRCsim.cxx
src/FDM/LaRCsim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with LaRCsim specific
logic, uses LaRCsimIC
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- moved default inertias to here from fg_init.cxx
-- eliminated the climb rate calculation. The equivalent, climb_rate =
-1*vdown, is now in copy_from_LaRCsim().
src/FDM/LaRCsimIC.cxx
src/FDM/LaRCsimIC.hxx
-- similar to FGInitialCondition, this class has all the logic needed to
turn data like Vc and Mach into the more fundamental quantities LaRCsim
needs to initialize.
-- put it in src/FDM since it is a class
src/FDM/MagicCarpet.cxx
-- bus data members now directly assigned to
src/FDM/Makefile.am
-- adds LaRCsimIC.hxx and cxx
src/FDM/JSBSim/FGAtmosphere.h
src/FDM/JSBSim/FGDefs.h
src/FDM/JSBSim/FGInitialCondition.cpp
src/FDM/JSBSim/FGInitialCondition.h
src/FDM/JSBSim/JSBSim.cpp
-- changes to accomodate the new bus
src/FDM/LaRCsim/atmos_62.h
src/FDM/LaRCsim/ls_geodesy.h
-- surrounded prototypes with #ifdef __cplusplus ... #endif , functions
here are needed in LaRCsimIC
src/FDM/LaRCsim/c172_main.c
src/FDM/LaRCsim/cherokee_aero.c
src/FDM/LaRCsim/ls_aux.c
src/FDM/LaRCsim/ls_constants.h
src/FDM/LaRCsim/ls_geodesy.c
src/FDM/LaRCsim/ls_geodesy.h
src/FDM/LaRCsim/ls_step.c
src/FDM/UIUCModel/uiuc_betaprobe.cpp
-- changed PI to LS_PI, eliminates preprocessor naming conflict with
weather module
src/FDM/LaRCsim/ls_interface.c
src/FDM/LaRCsim/ls_interface.h
-- added function ls_set_model_dt()
src/Main/bfi.cxx
-- eliminated calls that set the NED speeds to body components. They
are no longer needed and confuse the new bus.
src/Main/fg_init.cxx
-- eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). or set default values. The bus now handles the
defaults and updates itself when the setters are called (for LaRCsim and
JSBSim). A default method for doing this needs to be added to the bus.
-- added fgVelocityInit() to set the speed the user asked for. Both
JSBSim and LaRCsim can now be initialized using any of:
vc,mach, NED components, UVW components.
src/Main/main.cxx
--eliminated call to fgFDMSetGroundElevation, this data is now 'pulled'
onto the bus every update()
src/Main/options.cxx
src/Main/options.hxx
-- added enum to keep track of the speed requested by the user
-- eliminated calls to set NED velocity properties to body speeds, they
are no longer needed.
-- added options for the NED components.
src/Network/garmin.cxx
src/Network/nmea.cxx
--eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). The bus now updates itself when the setters are
called (for LaRCsim and JSBSim). A default method for doing this needs
to be added to the bus.
-- changed set_V_equiv_kts to set_V_calibrated_kts. set_V_equiv_kts no
longer exists ( get_V_equiv_kts still does, though)
src/WeatherCM/FGLocalWeatherDatabase.cpp
-- commented out the code to put the weather data on the bus, a
different scheme for this is needed.
2000-10-24 00:34:50 +00:00
|
|
|
speedset = FG_VTUVW;
|
1999-07-31 04:58:26 +00:00
|
|
|
if ( units == FG_UNITS_FEET ) {
|
|
|
|
vBody = atof( arg.substr(8) );
|
1999-12-30 17:42:24 +00:00
|
|
|
} else {
|
|
|
|
vBody = atof( arg.substr(8) ) * FEET_TO_METER;
|
1999-07-31 04:58:26 +00:00
|
|
|
}
|
2000-12-19 23:29:16 +00:00
|
|
|
//globals->get_props()->setDoubleValue("/velocities/speed-east", vBody);
|
1999-07-31 04:58:26 +00:00
|
|
|
} else if ( arg.find( "--wBody=" ) != string::npos ) {
|
I tested:
LaRCsim c172 on-ground and in-air starts, reset: all work
UIUC Cessna172 on-ground and in-air starts work as expected, reset
results in an aircraft that is upside down but does not crash FG. I
don't know what it was like before, so it may well be no change.
JSBSim c172 and X15 in-air starts work fine, resets now work (and are
trimmed), on-ground starts do not -- the c172 ends up on its back. I
suspect this is no worse than before.
I did not test:
Balloon (the weather code returns nan's for the atmosphere data --this
is in the weather module and apparently is a linux only bug)
ADA (don't know how)
MagicCarpet (needs work yet)
External (don't know how)
known to be broken:
LaRCsim c172 on-ground starts with a negative terrain altitude (this
happens at KPAO when the scenery is not present). The FDM inits to
about 50 feet AGL and the model falls to the ground. It does stay
upright, however, and seems to be fine once it settles out, FWIW.
To do:
--implement set_Model on the bus
--bring Christian's weather data into JSBSim
-- add default method to bus for updating things like the sin and cos of
latitude (for Balloon, MagicCarpet)
-- lots of cleanup
The files:
src/FDM/flight.cxx
src/FDM/flight.hxx
-- all data members now declared protected instead of private.
-- eliminated all but a small set of 'setters', no change to getters.
-- that small set is declared virtual, the default implementation
provided preserves the old behavior
-- all of the vector data members are now initialized.
-- added busdump() method -- FG_LOG's all the bus data when called,
useful for diagnostics.
src/FDM/ADA.cxx
-- bus data members now directly assigned to
src/FDM/Balloon.cxx
-- bus data members now directly assigned to
-- changed V_equiv_kts to V_calibrated_kts
src/FDM/JSBSim.cxx
src/FDM/JSBSim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with JSBSim specific
logic
-- changed the static FDMExec to a dynamic fdmex (needed so that the
JSBSim object can be deleted when a model change is called for)
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- added logic to bring up FGEngInterface objects and set the RPM and
throttle values.
src/FDM/LaRCsim.cxx
src/FDM/LaRCsim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with LaRCsim specific
logic, uses LaRCsimIC
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- moved default inertias to here from fg_init.cxx
-- eliminated the climb rate calculation. The equivalent, climb_rate =
-1*vdown, is now in copy_from_LaRCsim().
src/FDM/LaRCsimIC.cxx
src/FDM/LaRCsimIC.hxx
-- similar to FGInitialCondition, this class has all the logic needed to
turn data like Vc and Mach into the more fundamental quantities LaRCsim
needs to initialize.
-- put it in src/FDM since it is a class
src/FDM/MagicCarpet.cxx
-- bus data members now directly assigned to
src/FDM/Makefile.am
-- adds LaRCsimIC.hxx and cxx
src/FDM/JSBSim/FGAtmosphere.h
src/FDM/JSBSim/FGDefs.h
src/FDM/JSBSim/FGInitialCondition.cpp
src/FDM/JSBSim/FGInitialCondition.h
src/FDM/JSBSim/JSBSim.cpp
-- changes to accomodate the new bus
src/FDM/LaRCsim/atmos_62.h
src/FDM/LaRCsim/ls_geodesy.h
-- surrounded prototypes with #ifdef __cplusplus ... #endif , functions
here are needed in LaRCsimIC
src/FDM/LaRCsim/c172_main.c
src/FDM/LaRCsim/cherokee_aero.c
src/FDM/LaRCsim/ls_aux.c
src/FDM/LaRCsim/ls_constants.h
src/FDM/LaRCsim/ls_geodesy.c
src/FDM/LaRCsim/ls_geodesy.h
src/FDM/LaRCsim/ls_step.c
src/FDM/UIUCModel/uiuc_betaprobe.cpp
-- changed PI to LS_PI, eliminates preprocessor naming conflict with
weather module
src/FDM/LaRCsim/ls_interface.c
src/FDM/LaRCsim/ls_interface.h
-- added function ls_set_model_dt()
src/Main/bfi.cxx
-- eliminated calls that set the NED speeds to body components. They
are no longer needed and confuse the new bus.
src/Main/fg_init.cxx
-- eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). or set default values. The bus now handles the
defaults and updates itself when the setters are called (for LaRCsim and
JSBSim). A default method for doing this needs to be added to the bus.
-- added fgVelocityInit() to set the speed the user asked for. Both
JSBSim and LaRCsim can now be initialized using any of:
vc,mach, NED components, UVW components.
src/Main/main.cxx
--eliminated call to fgFDMSetGroundElevation, this data is now 'pulled'
onto the bus every update()
src/Main/options.cxx
src/Main/options.hxx
-- added enum to keep track of the speed requested by the user
-- eliminated calls to set NED velocity properties to body speeds, they
are no longer needed.
-- added options for the NED components.
src/Network/garmin.cxx
src/Network/nmea.cxx
--eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). The bus now updates itself when the setters are
called (for LaRCsim and JSBSim). A default method for doing this needs
to be added to the bus.
-- changed set_V_equiv_kts to set_V_calibrated_kts. set_V_equiv_kts no
longer exists ( get_V_equiv_kts still does, though)
src/WeatherCM/FGLocalWeatherDatabase.cpp
-- commented out the code to put the weather data on the bus, a
different scheme for this is needed.
2000-10-24 00:34:50 +00:00
|
|
|
speedset = FG_VTUVW;
|
1999-07-31 04:58:26 +00:00
|
|
|
if ( units == FG_UNITS_FEET ) {
|
|
|
|
wBody = atof( arg.substr(8) );
|
1999-12-30 17:42:24 +00:00
|
|
|
} else {
|
|
|
|
wBody = atof( arg.substr(8) ) * FEET_TO_METER;
|
1999-07-31 04:58:26 +00:00
|
|
|
}
|
I tested:
LaRCsim c172 on-ground and in-air starts, reset: all work
UIUC Cessna172 on-ground and in-air starts work as expected, reset
results in an aircraft that is upside down but does not crash FG. I
don't know what it was like before, so it may well be no change.
JSBSim c172 and X15 in-air starts work fine, resets now work (and are
trimmed), on-ground starts do not -- the c172 ends up on its back. I
suspect this is no worse than before.
I did not test:
Balloon (the weather code returns nan's for the atmosphere data --this
is in the weather module and apparently is a linux only bug)
ADA (don't know how)
MagicCarpet (needs work yet)
External (don't know how)
known to be broken:
LaRCsim c172 on-ground starts with a negative terrain altitude (this
happens at KPAO when the scenery is not present). The FDM inits to
about 50 feet AGL and the model falls to the ground. It does stay
upright, however, and seems to be fine once it settles out, FWIW.
To do:
--implement set_Model on the bus
--bring Christian's weather data into JSBSim
-- add default method to bus for updating things like the sin and cos of
latitude (for Balloon, MagicCarpet)
-- lots of cleanup
The files:
src/FDM/flight.cxx
src/FDM/flight.hxx
-- all data members now declared protected instead of private.
-- eliminated all but a small set of 'setters', no change to getters.
-- that small set is declared virtual, the default implementation
provided preserves the old behavior
-- all of the vector data members are now initialized.
-- added busdump() method -- FG_LOG's all the bus data when called,
useful for diagnostics.
src/FDM/ADA.cxx
-- bus data members now directly assigned to
src/FDM/Balloon.cxx
-- bus data members now directly assigned to
-- changed V_equiv_kts to V_calibrated_kts
src/FDM/JSBSim.cxx
src/FDM/JSBSim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with JSBSim specific
logic
-- changed the static FDMExec to a dynamic fdmex (needed so that the
JSBSim object can be deleted when a model change is called for)
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- added logic to bring up FGEngInterface objects and set the RPM and
throttle values.
src/FDM/LaRCsim.cxx
src/FDM/LaRCsim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with LaRCsim specific
logic, uses LaRCsimIC
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- moved default inertias to here from fg_init.cxx
-- eliminated the climb rate calculation. The equivalent, climb_rate =
-1*vdown, is now in copy_from_LaRCsim().
src/FDM/LaRCsimIC.cxx
src/FDM/LaRCsimIC.hxx
-- similar to FGInitialCondition, this class has all the logic needed to
turn data like Vc and Mach into the more fundamental quantities LaRCsim
needs to initialize.
-- put it in src/FDM since it is a class
src/FDM/MagicCarpet.cxx
-- bus data members now directly assigned to
src/FDM/Makefile.am
-- adds LaRCsimIC.hxx and cxx
src/FDM/JSBSim/FGAtmosphere.h
src/FDM/JSBSim/FGDefs.h
src/FDM/JSBSim/FGInitialCondition.cpp
src/FDM/JSBSim/FGInitialCondition.h
src/FDM/JSBSim/JSBSim.cpp
-- changes to accomodate the new bus
src/FDM/LaRCsim/atmos_62.h
src/FDM/LaRCsim/ls_geodesy.h
-- surrounded prototypes with #ifdef __cplusplus ... #endif , functions
here are needed in LaRCsimIC
src/FDM/LaRCsim/c172_main.c
src/FDM/LaRCsim/cherokee_aero.c
src/FDM/LaRCsim/ls_aux.c
src/FDM/LaRCsim/ls_constants.h
src/FDM/LaRCsim/ls_geodesy.c
src/FDM/LaRCsim/ls_geodesy.h
src/FDM/LaRCsim/ls_step.c
src/FDM/UIUCModel/uiuc_betaprobe.cpp
-- changed PI to LS_PI, eliminates preprocessor naming conflict with
weather module
src/FDM/LaRCsim/ls_interface.c
src/FDM/LaRCsim/ls_interface.h
-- added function ls_set_model_dt()
src/Main/bfi.cxx
-- eliminated calls that set the NED speeds to body components. They
are no longer needed and confuse the new bus.
src/Main/fg_init.cxx
-- eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). or set default values. The bus now handles the
defaults and updates itself when the setters are called (for LaRCsim and
JSBSim). A default method for doing this needs to be added to the bus.
-- added fgVelocityInit() to set the speed the user asked for. Both
JSBSim and LaRCsim can now be initialized using any of:
vc,mach, NED components, UVW components.
src/Main/main.cxx
--eliminated call to fgFDMSetGroundElevation, this data is now 'pulled'
onto the bus every update()
src/Main/options.cxx
src/Main/options.hxx
-- added enum to keep track of the speed requested by the user
-- eliminated calls to set NED velocity properties to body speeds, they
are no longer needed.
-- added options for the NED components.
src/Network/garmin.cxx
src/Network/nmea.cxx
--eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). The bus now updates itself when the setters are
called (for LaRCsim and JSBSim). A default method for doing this needs
to be added to the bus.
-- changed set_V_equiv_kts to set_V_calibrated_kts. set_V_equiv_kts no
longer exists ( get_V_equiv_kts still does, though)
src/WeatherCM/FGLocalWeatherDatabase.cpp
-- commented out the code to put the weather data on the bus, a
different scheme for this is needed.
2000-10-24 00:34:50 +00:00
|
|
|
} else if ( arg.find( "--vNorth=" ) != string::npos ) {
|
|
|
|
speedset = FG_VTNED;
|
|
|
|
if ( units == FG_UNITS_FEET ) {
|
|
|
|
vNorth = atof( arg.substr(9) );
|
|
|
|
} else {
|
|
|
|
vNorth = atof( arg.substr(9) ) * FEET_TO_METER;
|
|
|
|
}
|
2000-12-19 23:29:16 +00:00
|
|
|
globals->get_props()->setDoubleValue("/velocities/speed-north", vNorth);
|
I tested:
LaRCsim c172 on-ground and in-air starts, reset: all work
UIUC Cessna172 on-ground and in-air starts work as expected, reset
results in an aircraft that is upside down but does not crash FG. I
don't know what it was like before, so it may well be no change.
JSBSim c172 and X15 in-air starts work fine, resets now work (and are
trimmed), on-ground starts do not -- the c172 ends up on its back. I
suspect this is no worse than before.
I did not test:
Balloon (the weather code returns nan's for the atmosphere data --this
is in the weather module and apparently is a linux only bug)
ADA (don't know how)
MagicCarpet (needs work yet)
External (don't know how)
known to be broken:
LaRCsim c172 on-ground starts with a negative terrain altitude (this
happens at KPAO when the scenery is not present). The FDM inits to
about 50 feet AGL and the model falls to the ground. It does stay
upright, however, and seems to be fine once it settles out, FWIW.
To do:
--implement set_Model on the bus
--bring Christian's weather data into JSBSim
-- add default method to bus for updating things like the sin and cos of
latitude (for Balloon, MagicCarpet)
-- lots of cleanup
The files:
src/FDM/flight.cxx
src/FDM/flight.hxx
-- all data members now declared protected instead of private.
-- eliminated all but a small set of 'setters', no change to getters.
-- that small set is declared virtual, the default implementation
provided preserves the old behavior
-- all of the vector data members are now initialized.
-- added busdump() method -- FG_LOG's all the bus data when called,
useful for diagnostics.
src/FDM/ADA.cxx
-- bus data members now directly assigned to
src/FDM/Balloon.cxx
-- bus data members now directly assigned to
-- changed V_equiv_kts to V_calibrated_kts
src/FDM/JSBSim.cxx
src/FDM/JSBSim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with JSBSim specific
logic
-- changed the static FDMExec to a dynamic fdmex (needed so that the
JSBSim object can be deleted when a model change is called for)
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- added logic to bring up FGEngInterface objects and set the RPM and
throttle values.
src/FDM/LaRCsim.cxx
src/FDM/LaRCsim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with LaRCsim specific
logic, uses LaRCsimIC
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- moved default inertias to here from fg_init.cxx
-- eliminated the climb rate calculation. The equivalent, climb_rate =
-1*vdown, is now in copy_from_LaRCsim().
src/FDM/LaRCsimIC.cxx
src/FDM/LaRCsimIC.hxx
-- similar to FGInitialCondition, this class has all the logic needed to
turn data like Vc and Mach into the more fundamental quantities LaRCsim
needs to initialize.
-- put it in src/FDM since it is a class
src/FDM/MagicCarpet.cxx
-- bus data members now directly assigned to
src/FDM/Makefile.am
-- adds LaRCsimIC.hxx and cxx
src/FDM/JSBSim/FGAtmosphere.h
src/FDM/JSBSim/FGDefs.h
src/FDM/JSBSim/FGInitialCondition.cpp
src/FDM/JSBSim/FGInitialCondition.h
src/FDM/JSBSim/JSBSim.cpp
-- changes to accomodate the new bus
src/FDM/LaRCsim/atmos_62.h
src/FDM/LaRCsim/ls_geodesy.h
-- surrounded prototypes with #ifdef __cplusplus ... #endif , functions
here are needed in LaRCsimIC
src/FDM/LaRCsim/c172_main.c
src/FDM/LaRCsim/cherokee_aero.c
src/FDM/LaRCsim/ls_aux.c
src/FDM/LaRCsim/ls_constants.h
src/FDM/LaRCsim/ls_geodesy.c
src/FDM/LaRCsim/ls_geodesy.h
src/FDM/LaRCsim/ls_step.c
src/FDM/UIUCModel/uiuc_betaprobe.cpp
-- changed PI to LS_PI, eliminates preprocessor naming conflict with
weather module
src/FDM/LaRCsim/ls_interface.c
src/FDM/LaRCsim/ls_interface.h
-- added function ls_set_model_dt()
src/Main/bfi.cxx
-- eliminated calls that set the NED speeds to body components. They
are no longer needed and confuse the new bus.
src/Main/fg_init.cxx
-- eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). or set default values. The bus now handles the
defaults and updates itself when the setters are called (for LaRCsim and
JSBSim). A default method for doing this needs to be added to the bus.
-- added fgVelocityInit() to set the speed the user asked for. Both
JSBSim and LaRCsim can now be initialized using any of:
vc,mach, NED components, UVW components.
src/Main/main.cxx
--eliminated call to fgFDMSetGroundElevation, this data is now 'pulled'
onto the bus every update()
src/Main/options.cxx
src/Main/options.hxx
-- added enum to keep track of the speed requested by the user
-- eliminated calls to set NED velocity properties to body speeds, they
are no longer needed.
-- added options for the NED components.
src/Network/garmin.cxx
src/Network/nmea.cxx
--eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). The bus now updates itself when the setters are
called (for LaRCsim and JSBSim). A default method for doing this needs
to be added to the bus.
-- changed set_V_equiv_kts to set_V_calibrated_kts. set_V_equiv_kts no
longer exists ( get_V_equiv_kts still does, though)
src/WeatherCM/FGLocalWeatherDatabase.cpp
-- commented out the code to put the weather data on the bus, a
different scheme for this is needed.
2000-10-24 00:34:50 +00:00
|
|
|
} else if ( arg.find( "--vEast=" ) != string::npos ) {
|
|
|
|
speedset = FG_VTNED;
|
|
|
|
if ( units == FG_UNITS_FEET ) {
|
|
|
|
vEast = atof( arg.substr(8) );
|
|
|
|
} else {
|
|
|
|
vEast = atof( arg.substr(8) ) * FEET_TO_METER;
|
|
|
|
}
|
2000-12-19 23:29:16 +00:00
|
|
|
globals->get_props()->setDoubleValue("/velocities/speed-east", vEast);
|
I tested:
LaRCsim c172 on-ground and in-air starts, reset: all work
UIUC Cessna172 on-ground and in-air starts work as expected, reset
results in an aircraft that is upside down but does not crash FG. I
don't know what it was like before, so it may well be no change.
JSBSim c172 and X15 in-air starts work fine, resets now work (and are
trimmed), on-ground starts do not -- the c172 ends up on its back. I
suspect this is no worse than before.
I did not test:
Balloon (the weather code returns nan's for the atmosphere data --this
is in the weather module and apparently is a linux only bug)
ADA (don't know how)
MagicCarpet (needs work yet)
External (don't know how)
known to be broken:
LaRCsim c172 on-ground starts with a negative terrain altitude (this
happens at KPAO when the scenery is not present). The FDM inits to
about 50 feet AGL and the model falls to the ground. It does stay
upright, however, and seems to be fine once it settles out, FWIW.
To do:
--implement set_Model on the bus
--bring Christian's weather data into JSBSim
-- add default method to bus for updating things like the sin and cos of
latitude (for Balloon, MagicCarpet)
-- lots of cleanup
The files:
src/FDM/flight.cxx
src/FDM/flight.hxx
-- all data members now declared protected instead of private.
-- eliminated all but a small set of 'setters', no change to getters.
-- that small set is declared virtual, the default implementation
provided preserves the old behavior
-- all of the vector data members are now initialized.
-- added busdump() method -- FG_LOG's all the bus data when called,
useful for diagnostics.
src/FDM/ADA.cxx
-- bus data members now directly assigned to
src/FDM/Balloon.cxx
-- bus data members now directly assigned to
-- changed V_equiv_kts to V_calibrated_kts
src/FDM/JSBSim.cxx
src/FDM/JSBSim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with JSBSim specific
logic
-- changed the static FDMExec to a dynamic fdmex (needed so that the
JSBSim object can be deleted when a model change is called for)
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- added logic to bring up FGEngInterface objects and set the RPM and
throttle values.
src/FDM/LaRCsim.cxx
src/FDM/LaRCsim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with LaRCsim specific
logic, uses LaRCsimIC
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- moved default inertias to here from fg_init.cxx
-- eliminated the climb rate calculation. The equivalent, climb_rate =
-1*vdown, is now in copy_from_LaRCsim().
src/FDM/LaRCsimIC.cxx
src/FDM/LaRCsimIC.hxx
-- similar to FGInitialCondition, this class has all the logic needed to
turn data like Vc and Mach into the more fundamental quantities LaRCsim
needs to initialize.
-- put it in src/FDM since it is a class
src/FDM/MagicCarpet.cxx
-- bus data members now directly assigned to
src/FDM/Makefile.am
-- adds LaRCsimIC.hxx and cxx
src/FDM/JSBSim/FGAtmosphere.h
src/FDM/JSBSim/FGDefs.h
src/FDM/JSBSim/FGInitialCondition.cpp
src/FDM/JSBSim/FGInitialCondition.h
src/FDM/JSBSim/JSBSim.cpp
-- changes to accomodate the new bus
src/FDM/LaRCsim/atmos_62.h
src/FDM/LaRCsim/ls_geodesy.h
-- surrounded prototypes with #ifdef __cplusplus ... #endif , functions
here are needed in LaRCsimIC
src/FDM/LaRCsim/c172_main.c
src/FDM/LaRCsim/cherokee_aero.c
src/FDM/LaRCsim/ls_aux.c
src/FDM/LaRCsim/ls_constants.h
src/FDM/LaRCsim/ls_geodesy.c
src/FDM/LaRCsim/ls_geodesy.h
src/FDM/LaRCsim/ls_step.c
src/FDM/UIUCModel/uiuc_betaprobe.cpp
-- changed PI to LS_PI, eliminates preprocessor naming conflict with
weather module
src/FDM/LaRCsim/ls_interface.c
src/FDM/LaRCsim/ls_interface.h
-- added function ls_set_model_dt()
src/Main/bfi.cxx
-- eliminated calls that set the NED speeds to body components. They
are no longer needed and confuse the new bus.
src/Main/fg_init.cxx
-- eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). or set default values. The bus now handles the
defaults and updates itself when the setters are called (for LaRCsim and
JSBSim). A default method for doing this needs to be added to the bus.
-- added fgVelocityInit() to set the speed the user asked for. Both
JSBSim and LaRCsim can now be initialized using any of:
vc,mach, NED components, UVW components.
src/Main/main.cxx
--eliminated call to fgFDMSetGroundElevation, this data is now 'pulled'
onto the bus every update()
src/Main/options.cxx
src/Main/options.hxx
-- added enum to keep track of the speed requested by the user
-- eliminated calls to set NED velocity properties to body speeds, they
are no longer needed.
-- added options for the NED components.
src/Network/garmin.cxx
src/Network/nmea.cxx
--eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). The bus now updates itself when the setters are
called (for LaRCsim and JSBSim). A default method for doing this needs
to be added to the bus.
-- changed set_V_equiv_kts to set_V_calibrated_kts. set_V_equiv_kts no
longer exists ( get_V_equiv_kts still does, though)
src/WeatherCM/FGLocalWeatherDatabase.cpp
-- commented out the code to put the weather data on the bus, a
different scheme for this is needed.
2000-10-24 00:34:50 +00:00
|
|
|
} else if ( arg.find( "--vDown=" ) != string::npos ) {
|
|
|
|
speedset = FG_VTNED;
|
|
|
|
if ( units == FG_UNITS_FEET ) {
|
|
|
|
vDown = atof( arg.substr(8) );
|
|
|
|
} else {
|
|
|
|
vDown = atof( arg.substr(8) ) * FEET_TO_METER;
|
|
|
|
}
|
2000-12-19 23:29:16 +00:00
|
|
|
globals->get_props()->setDoubleValue("/velocities/speed-down", vDown);
|
Updates from the Jon and Tony show.
Tony submitted:
JSBsim:
Added trimming routine, it is longitudinal & in-air only at this point
Added support for taking wind & weather data from external source
Added support for flaps.
Added independently settable pitch trim
Added alphamin and max to config file, stall modeling and warning to
follow
c172.cfg:
Flaps!
Adjusted Cmo, model should be speed stable now
FG:
Hooked up Christian's weather code, should be using it soon.
Hooked up the trimming routine. Note that the X-15 will not trim.
This is not a model or trimming routine deficiency, just the
nature of the X-15
The trimming routine sets the pitch trim and and throttle at startup.
The throttle is set using Norman's code for the autothrottle so the
autothrottle is on by default. --notrim will turn it off.
Added --vc, --mach, and --notrim switches
(vc is airspeed in knots)
uBody, vBody, and wBody are still supported, last one entered
on the command line counts, i.e. you can set vc or mach or u,v,
and w but any combination will be ignored.
2000-05-16 21:35:11 +00:00
|
|
|
} else if ( arg.find( "--vc=" ) != string::npos) {
|
I tested:
LaRCsim c172 on-ground and in-air starts, reset: all work
UIUC Cessna172 on-ground and in-air starts work as expected, reset
results in an aircraft that is upside down but does not crash FG. I
don't know what it was like before, so it may well be no change.
JSBSim c172 and X15 in-air starts work fine, resets now work (and are
trimmed), on-ground starts do not -- the c172 ends up on its back. I
suspect this is no worse than before.
I did not test:
Balloon (the weather code returns nan's for the atmosphere data --this
is in the weather module and apparently is a linux only bug)
ADA (don't know how)
MagicCarpet (needs work yet)
External (don't know how)
known to be broken:
LaRCsim c172 on-ground starts with a negative terrain altitude (this
happens at KPAO when the scenery is not present). The FDM inits to
about 50 feet AGL and the model falls to the ground. It does stay
upright, however, and seems to be fine once it settles out, FWIW.
To do:
--implement set_Model on the bus
--bring Christian's weather data into JSBSim
-- add default method to bus for updating things like the sin and cos of
latitude (for Balloon, MagicCarpet)
-- lots of cleanup
The files:
src/FDM/flight.cxx
src/FDM/flight.hxx
-- all data members now declared protected instead of private.
-- eliminated all but a small set of 'setters', no change to getters.
-- that small set is declared virtual, the default implementation
provided preserves the old behavior
-- all of the vector data members are now initialized.
-- added busdump() method -- FG_LOG's all the bus data when called,
useful for diagnostics.
src/FDM/ADA.cxx
-- bus data members now directly assigned to
src/FDM/Balloon.cxx
-- bus data members now directly assigned to
-- changed V_equiv_kts to V_calibrated_kts
src/FDM/JSBSim.cxx
src/FDM/JSBSim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with JSBSim specific
logic
-- changed the static FDMExec to a dynamic fdmex (needed so that the
JSBSim object can be deleted when a model change is called for)
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- added logic to bring up FGEngInterface objects and set the RPM and
throttle values.
src/FDM/LaRCsim.cxx
src/FDM/LaRCsim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with LaRCsim specific
logic, uses LaRCsimIC
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- moved default inertias to here from fg_init.cxx
-- eliminated the climb rate calculation. The equivalent, climb_rate =
-1*vdown, is now in copy_from_LaRCsim().
src/FDM/LaRCsimIC.cxx
src/FDM/LaRCsimIC.hxx
-- similar to FGInitialCondition, this class has all the logic needed to
turn data like Vc and Mach into the more fundamental quantities LaRCsim
needs to initialize.
-- put it in src/FDM since it is a class
src/FDM/MagicCarpet.cxx
-- bus data members now directly assigned to
src/FDM/Makefile.am
-- adds LaRCsimIC.hxx and cxx
src/FDM/JSBSim/FGAtmosphere.h
src/FDM/JSBSim/FGDefs.h
src/FDM/JSBSim/FGInitialCondition.cpp
src/FDM/JSBSim/FGInitialCondition.h
src/FDM/JSBSim/JSBSim.cpp
-- changes to accomodate the new bus
src/FDM/LaRCsim/atmos_62.h
src/FDM/LaRCsim/ls_geodesy.h
-- surrounded prototypes with #ifdef __cplusplus ... #endif , functions
here are needed in LaRCsimIC
src/FDM/LaRCsim/c172_main.c
src/FDM/LaRCsim/cherokee_aero.c
src/FDM/LaRCsim/ls_aux.c
src/FDM/LaRCsim/ls_constants.h
src/FDM/LaRCsim/ls_geodesy.c
src/FDM/LaRCsim/ls_geodesy.h
src/FDM/LaRCsim/ls_step.c
src/FDM/UIUCModel/uiuc_betaprobe.cpp
-- changed PI to LS_PI, eliminates preprocessor naming conflict with
weather module
src/FDM/LaRCsim/ls_interface.c
src/FDM/LaRCsim/ls_interface.h
-- added function ls_set_model_dt()
src/Main/bfi.cxx
-- eliminated calls that set the NED speeds to body components. They
are no longer needed and confuse the new bus.
src/Main/fg_init.cxx
-- eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). or set default values. The bus now handles the
defaults and updates itself when the setters are called (for LaRCsim and
JSBSim). A default method for doing this needs to be added to the bus.
-- added fgVelocityInit() to set the speed the user asked for. Both
JSBSim and LaRCsim can now be initialized using any of:
vc,mach, NED components, UVW components.
src/Main/main.cxx
--eliminated call to fgFDMSetGroundElevation, this data is now 'pulled'
onto the bus every update()
src/Main/options.cxx
src/Main/options.hxx
-- added enum to keep track of the speed requested by the user
-- eliminated calls to set NED velocity properties to body speeds, they
are no longer needed.
-- added options for the NED components.
src/Network/garmin.cxx
src/Network/nmea.cxx
--eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). The bus now updates itself when the setters are
called (for LaRCsim and JSBSim). A default method for doing this needs
to be added to the bus.
-- changed set_V_equiv_kts to set_V_calibrated_kts. set_V_equiv_kts no
longer exists ( get_V_equiv_kts still does, though)
src/WeatherCM/FGLocalWeatherDatabase.cpp
-- commented out the code to put the weather data on the bus, a
different scheme for this is needed.
2000-10-24 00:34:50 +00:00
|
|
|
speedset = FG_VC;
|
Updates from the Jon and Tony show.
Tony submitted:
JSBsim:
Added trimming routine, it is longitudinal & in-air only at this point
Added support for taking wind & weather data from external source
Added support for flaps.
Added independently settable pitch trim
Added alphamin and max to config file, stall modeling and warning to
follow
c172.cfg:
Flaps!
Adjusted Cmo, model should be speed stable now
FG:
Hooked up Christian's weather code, should be using it soon.
Hooked up the trimming routine. Note that the X-15 will not trim.
This is not a model or trimming routine deficiency, just the
nature of the X-15
The trimming routine sets the pitch trim and and throttle at startup.
The throttle is set using Norman's code for the autothrottle so the
autothrottle is on by default. --notrim will turn it off.
Added --vc, --mach, and --notrim switches
(vc is airspeed in knots)
uBody, vBody, and wBody are still supported, last one entered
on the command line counts, i.e. you can set vc or mach or u,v,
and w but any combination will be ignored.
2000-05-16 21:35:11 +00:00
|
|
|
vkcas=atof( arg.substr(5) );
|
|
|
|
cout << "Got vc: " << vkcas << endl;
|
|
|
|
} else if ( arg.find( "--mach=" ) != string::npos) {
|
I tested:
LaRCsim c172 on-ground and in-air starts, reset: all work
UIUC Cessna172 on-ground and in-air starts work as expected, reset
results in an aircraft that is upside down but does not crash FG. I
don't know what it was like before, so it may well be no change.
JSBSim c172 and X15 in-air starts work fine, resets now work (and are
trimmed), on-ground starts do not -- the c172 ends up on its back. I
suspect this is no worse than before.
I did not test:
Balloon (the weather code returns nan's for the atmosphere data --this
is in the weather module and apparently is a linux only bug)
ADA (don't know how)
MagicCarpet (needs work yet)
External (don't know how)
known to be broken:
LaRCsim c172 on-ground starts with a negative terrain altitude (this
happens at KPAO when the scenery is not present). The FDM inits to
about 50 feet AGL and the model falls to the ground. It does stay
upright, however, and seems to be fine once it settles out, FWIW.
To do:
--implement set_Model on the bus
--bring Christian's weather data into JSBSim
-- add default method to bus for updating things like the sin and cos of
latitude (for Balloon, MagicCarpet)
-- lots of cleanup
The files:
src/FDM/flight.cxx
src/FDM/flight.hxx
-- all data members now declared protected instead of private.
-- eliminated all but a small set of 'setters', no change to getters.
-- that small set is declared virtual, the default implementation
provided preserves the old behavior
-- all of the vector data members are now initialized.
-- added busdump() method -- FG_LOG's all the bus data when called,
useful for diagnostics.
src/FDM/ADA.cxx
-- bus data members now directly assigned to
src/FDM/Balloon.cxx
-- bus data members now directly assigned to
-- changed V_equiv_kts to V_calibrated_kts
src/FDM/JSBSim.cxx
src/FDM/JSBSim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with JSBSim specific
logic
-- changed the static FDMExec to a dynamic fdmex (needed so that the
JSBSim object can be deleted when a model change is called for)
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- added logic to bring up FGEngInterface objects and set the RPM and
throttle values.
src/FDM/LaRCsim.cxx
src/FDM/LaRCsim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with LaRCsim specific
logic, uses LaRCsimIC
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- moved default inertias to here from fg_init.cxx
-- eliminated the climb rate calculation. The equivalent, climb_rate =
-1*vdown, is now in copy_from_LaRCsim().
src/FDM/LaRCsimIC.cxx
src/FDM/LaRCsimIC.hxx
-- similar to FGInitialCondition, this class has all the logic needed to
turn data like Vc and Mach into the more fundamental quantities LaRCsim
needs to initialize.
-- put it in src/FDM since it is a class
src/FDM/MagicCarpet.cxx
-- bus data members now directly assigned to
src/FDM/Makefile.am
-- adds LaRCsimIC.hxx and cxx
src/FDM/JSBSim/FGAtmosphere.h
src/FDM/JSBSim/FGDefs.h
src/FDM/JSBSim/FGInitialCondition.cpp
src/FDM/JSBSim/FGInitialCondition.h
src/FDM/JSBSim/JSBSim.cpp
-- changes to accomodate the new bus
src/FDM/LaRCsim/atmos_62.h
src/FDM/LaRCsim/ls_geodesy.h
-- surrounded prototypes with #ifdef __cplusplus ... #endif , functions
here are needed in LaRCsimIC
src/FDM/LaRCsim/c172_main.c
src/FDM/LaRCsim/cherokee_aero.c
src/FDM/LaRCsim/ls_aux.c
src/FDM/LaRCsim/ls_constants.h
src/FDM/LaRCsim/ls_geodesy.c
src/FDM/LaRCsim/ls_geodesy.h
src/FDM/LaRCsim/ls_step.c
src/FDM/UIUCModel/uiuc_betaprobe.cpp
-- changed PI to LS_PI, eliminates preprocessor naming conflict with
weather module
src/FDM/LaRCsim/ls_interface.c
src/FDM/LaRCsim/ls_interface.h
-- added function ls_set_model_dt()
src/Main/bfi.cxx
-- eliminated calls that set the NED speeds to body components. They
are no longer needed and confuse the new bus.
src/Main/fg_init.cxx
-- eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). or set default values. The bus now handles the
defaults and updates itself when the setters are called (for LaRCsim and
JSBSim). A default method for doing this needs to be added to the bus.
-- added fgVelocityInit() to set the speed the user asked for. Both
JSBSim and LaRCsim can now be initialized using any of:
vc,mach, NED components, UVW components.
src/Main/main.cxx
--eliminated call to fgFDMSetGroundElevation, this data is now 'pulled'
onto the bus every update()
src/Main/options.cxx
src/Main/options.hxx
-- added enum to keep track of the speed requested by the user
-- eliminated calls to set NED velocity properties to body speeds, they
are no longer needed.
-- added options for the NED components.
src/Network/garmin.cxx
src/Network/nmea.cxx
--eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). The bus now updates itself when the setters are
called (for LaRCsim and JSBSim). A default method for doing this needs
to be added to the bus.
-- changed set_V_equiv_kts to set_V_calibrated_kts. set_V_equiv_kts no
longer exists ( get_V_equiv_kts still does, though)
src/WeatherCM/FGLocalWeatherDatabase.cpp
-- commented out the code to put the weather data on the bus, a
different scheme for this is needed.
2000-10-24 00:34:50 +00:00
|
|
|
speedset = FG_MACH;
|
Updates from the Jon and Tony show.
Tony submitted:
JSBsim:
Added trimming routine, it is longitudinal & in-air only at this point
Added support for taking wind & weather data from external source
Added support for flaps.
Added independently settable pitch trim
Added alphamin and max to config file, stall modeling and warning to
follow
c172.cfg:
Flaps!
Adjusted Cmo, model should be speed stable now
FG:
Hooked up Christian's weather code, should be using it soon.
Hooked up the trimming routine. Note that the X-15 will not trim.
This is not a model or trimming routine deficiency, just the
nature of the X-15
The trimming routine sets the pitch trim and and throttle at startup.
The throttle is set using Norman's code for the autothrottle so the
autothrottle is on by default. --notrim will turn it off.
Added --vc, --mach, and --notrim switches
(vc is airspeed in knots)
uBody, vBody, and wBody are still supported, last one entered
on the command line counts, i.e. you can set vc or mach or u,v,
and w but any combination will be ignored.
2000-05-16 21:35:11 +00:00
|
|
|
mach=atof( arg.substr(7) );
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg.find( "--heading=" ) != string::npos ) {
|
|
|
|
heading = atof( arg.substr(10) );
|
2000-12-19 23:29:16 +00:00
|
|
|
globals->get_props()->setDoubleValue("/orientation/heading", heading);
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg.find( "--roll=" ) != string::npos ) {
|
|
|
|
roll = atof( arg.substr(7) );
|
2000-12-19 23:29:16 +00:00
|
|
|
globals->get_props()->setDoubleValue("/orientation/roll", roll);
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg.find( "--pitch=" ) != string::npos ) {
|
|
|
|
pitch = atof( arg.substr(8) );
|
2000-12-19 23:29:16 +00:00
|
|
|
globals->get_props()->setDoubleValue("/orientation/pitch", pitch);
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg.find( "--fg-root=" ) != string::npos ) {
|
|
|
|
fg_root = arg.substr( 10 );
|
2000-07-14 16:57:55 +00:00
|
|
|
} else if ( arg.find( "--fg-scenery=" ) != string::npos ) {
|
|
|
|
fg_scenery = arg.substr( 13 );
|
1999-02-05 21:28:09 +00:00
|
|
|
} else if ( arg.find( "--fdm=" ) != string::npos ) {
|
|
|
|
flight_model = parse_fdm( arg.substr(6) );
|
2000-12-19 23:29:16 +00:00
|
|
|
globals->get_props()->setIntValue("/sim/flight-model", flight_model);
|
2000-05-19 16:29:23 +00:00
|
|
|
if((flight_model == FGInterface::FG_JSBSIM) && (get_trim_mode() == 0)) {
|
|
|
|
set_trim_mode(1);
|
|
|
|
} else {
|
|
|
|
set_trim_mode(0);
|
|
|
|
}
|
1999-12-20 20:26:18 +00:00
|
|
|
} else if ( arg.find( "--aircraft=" ) != string::npos ) {
|
|
|
|
aircraft = arg.substr(11);
|
2000-12-19 23:29:16 +00:00
|
|
|
globals->get_props()->setStringValue("/sim/aircraft", aircraft);
|
2000-03-22 22:01:33 +00:00
|
|
|
} else if ( arg.find( "--aircraft-dir=" ) != string::npos ) {
|
|
|
|
aircraft_dir = arg.substr(15); // (UIUC)
|
1999-09-01 20:24:54 +00:00
|
|
|
} else if ( arg.find( "--model-hz=" ) != string::npos ) {
|
|
|
|
model_hz = atoi( arg.substr(11) );
|
1999-08-10 03:44:47 +00:00
|
|
|
} else if ( arg.find( "--speed=" ) != string::npos ) {
|
|
|
|
speed_up = atoi( arg.substr(8) );
|
Updates from the Jon and Tony show.
Tony submitted:
JSBsim:
Added trimming routine, it is longitudinal & in-air only at this point
Added support for taking wind & weather data from external source
Added support for flaps.
Added independently settable pitch trim
Added alphamin and max to config file, stall modeling and warning to
follow
c172.cfg:
Flaps!
Adjusted Cmo, model should be speed stable now
FG:
Hooked up Christian's weather code, should be using it soon.
Hooked up the trimming routine. Note that the X-15 will not trim.
This is not a model or trimming routine deficiency, just the
nature of the X-15
The trimming routine sets the pitch trim and and throttle at startup.
The throttle is set using Norman's code for the autothrottle so the
autothrottle is on by default. --notrim will turn it off.
Added --vc, --mach, and --notrim switches
(vc is airspeed in knots)
uBody, vBody, and wBody are still supported, last one entered
on the command line counts, i.e. you can set vc or mach or u,v,
and w but any combination will be ignored.
2000-05-16 21:35:11 +00:00
|
|
|
} else if ( arg.find( "--notrim") != string::npos) {
|
2000-05-19 16:29:23 +00:00
|
|
|
trim=-1;
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg == "--fog-disable" ) {
|
|
|
|
fog = FG_FOG_DISABLED;
|
|
|
|
} else if ( arg == "--fog-fastest" ) {
|
|
|
|
fog = FG_FOG_FASTEST;
|
|
|
|
} else if ( arg == "--fog-nicest" ) {
|
|
|
|
fog = FG_FOG_NICEST;
|
1999-10-22 00:27:49 +00:00
|
|
|
} else if ( arg == "--disable-clouds" ) {
|
|
|
|
clouds = false;
|
|
|
|
} else if ( arg == "--enable-clouds" ) {
|
|
|
|
clouds = true;
|
|
|
|
} else if ( arg.find( "--clouds-asl=" ) != string::npos ) {
|
|
|
|
if ( units == FG_UNITS_FEET ) {
|
|
|
|
clouds_asl = atof( arg.substr(13) ) * FEET_TO_METER;
|
|
|
|
} else {
|
|
|
|
clouds_asl = atof( arg.substr(13) );
|
|
|
|
}
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg.find( "--fov=" ) != string::npos ) {
|
2000-11-01 23:27:32 +00:00
|
|
|
parse_fov( arg.substr(6) );
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg == "--disable-fullscreen" ) {
|
|
|
|
fullscreen = false;
|
|
|
|
} else if ( arg== "--enable-fullscreen") {
|
|
|
|
fullscreen = true;
|
|
|
|
} else if ( arg == "--shading-flat") {
|
1998-05-13 18:29:56 +00:00
|
|
|
shading = 0;
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg == "--shading-smooth") {
|
1998-05-13 18:29:56 +00:00
|
|
|
shading = 1;
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg == "--disable-skyblend") {
|
|
|
|
skyblend = false;
|
|
|
|
} else if ( arg== "--enable-skyblend" ) {
|
|
|
|
skyblend = true;
|
|
|
|
} else if ( arg == "--disable-textures" ) {
|
|
|
|
textures = false;
|
|
|
|
} else if ( arg == "--enable-textures" ) {
|
1998-11-16 13:59:58 +00:00
|
|
|
textures = true;
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg == "--disable-wireframe" ) {
|
|
|
|
wireframe = false;
|
|
|
|
} else if ( arg == "--enable-wireframe" ) {
|
1998-11-16 13:59:58 +00:00
|
|
|
wireframe = true;
|
|
|
|
} else if ( arg.find( "--geometry=" ) != string::npos ) {
|
1999-08-31 23:22:05 +00:00
|
|
|
bool geometry_ok = true;
|
1998-11-16 13:59:58 +00:00
|
|
|
string geometry = arg.substr( 11 );
|
1999-08-31 23:22:05 +00:00
|
|
|
string::size_type i = geometry.find('x');
|
|
|
|
|
|
|
|
if (i != string::npos) {
|
|
|
|
xsize = atoi(geometry.substr(0, i));
|
|
|
|
ysize = atoi(geometry.substr(i+1));
|
|
|
|
// cout << "Geometry is " << xsize << 'x' << ysize << '\n';
|
|
|
|
} else {
|
|
|
|
geometry_ok = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( xsize <= 0 || ysize <= 0 ) {
|
1998-11-16 13:59:58 +00:00
|
|
|
xsize = 640;
|
|
|
|
ysize = 480;
|
1999-08-31 23:22:05 +00:00
|
|
|
geometry_ok = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( !geometry_ok ) {
|
|
|
|
FG_LOG( FG_GENERAL, FG_ALERT, "Unknown geometry: " << geometry );
|
|
|
|
FG_LOG( FG_GENERAL, FG_ALERT,
|
|
|
|
"Setting geometry to " << xsize << 'x' << ysize << '\n');
|
|
|
|
}
|
2000-05-13 00:02:43 +00:00
|
|
|
} else if ( arg.find( "--bpp=" ) != string::npos ) {
|
|
|
|
string bits_per_pix = arg.substr( 6 );
|
|
|
|
if ( bits_per_pix == "16" ) {
|
|
|
|
bpp = 16;
|
|
|
|
} else if ( bits_per_pix == "24" ) {
|
|
|
|
bpp = 24;
|
|
|
|
} else if ( bits_per_pix == "32" ) {
|
|
|
|
bpp = 32;
|
|
|
|
}
|
1998-11-02 23:04:02 +00:00
|
|
|
} else if ( arg == "--units-feet" ) {
|
|
|
|
units = FG_UNITS_FEET;
|
|
|
|
} else if ( arg == "--units-meters" ) {
|
|
|
|
units = FG_UNITS_METERS;
|
1999-10-22 00:27:49 +00:00
|
|
|
} else if ( arg.find( "--time-offset" ) != string::npos ) {
|
|
|
|
time_offset = parse_time_offset( (arg.substr(14)) );
|
2000-07-07 21:52:45 +00:00
|
|
|
//time_offset_type = FG_TIME_SYS_OFFSET;
|
1999-10-22 00:27:49 +00:00
|
|
|
} else if ( arg.find( "--time-match-real") != string::npos ) {
|
|
|
|
//time_offset = parse_time_offset(arg.substr(18));
|
2000-07-07 21:52:45 +00:00
|
|
|
time_offset_type = FG_TIME_SYS_OFFSET;
|
1999-10-22 00:27:49 +00:00
|
|
|
} else if ( arg.find( "--time-match-local") != string::npos ) {
|
|
|
|
//time_offset = parse_time_offset(arg.substr(18));
|
2000-07-07 21:52:45 +00:00
|
|
|
time_offset_type = FG_TIME_LAT_OFFSET;
|
1999-09-07 23:09:43 +00:00
|
|
|
} else if ( arg.find( "--start-date-sys=") != string::npos ) {
|
|
|
|
time_offset = parse_date( (arg.substr(17)) );
|
2000-07-07 21:52:45 +00:00
|
|
|
time_offset_type = FG_TIME_SYS_ABSOLUTE;
|
1999-09-07 23:09:43 +00:00
|
|
|
} else if ( arg.find( "--start-date-lat=") != string::npos ) {
|
|
|
|
time_offset = parse_date( (arg.substr(17)) );
|
2000-07-07 21:52:45 +00:00
|
|
|
time_offset_type = FG_TIME_LAT_ABSOLUTE;
|
1999-09-07 23:09:43 +00:00
|
|
|
} else if ( arg.find( "--start-date-gmt=") != string::npos ) {
|
|
|
|
time_offset = parse_date( (arg.substr(17)) );
|
2000-07-07 21:52:45 +00:00
|
|
|
time_offset_type = FG_TIME_GMT_ABSOLUTE;
|
1999-09-07 23:09:43 +00:00
|
|
|
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg == "--hud-tris" ) {
|
1998-08-24 20:11:12 +00:00
|
|
|
tris_or_culled = 0;
|
1998-08-27 17:01:55 +00:00
|
|
|
} else if ( arg == "--hud-culled" ) {
|
1998-11-16 13:59:58 +00:00
|
|
|
tris_or_culled = 1;
|
1999-11-23 05:51:14 +00:00
|
|
|
} else if ( arg.find( "--native=" ) != string::npos ) {
|
|
|
|
parse_channel( "native", arg.substr(9) );
|
1999-11-19 02:10:24 +00:00
|
|
|
} else if ( arg.find( "--garmin=" ) != string::npos ) {
|
|
|
|
parse_channel( "garmin", arg.substr(9) );
|
|
|
|
} else if ( arg.find( "--nmea=" ) != string::npos ) {
|
|
|
|
parse_channel( "nmea", arg.substr(7) );
|
2000-09-27 20:16:22 +00:00
|
|
|
} else if ( arg.find( "--props=" ) != string::npos ) {
|
|
|
|
parse_channel( "props", arg.substr(8) );
|
1999-11-19 03:03:11 +00:00
|
|
|
} else if ( arg.find( "--pve=" ) != string::npos ) {
|
|
|
|
parse_channel( "pve", arg.substr(6) );
|
2000-05-30 17:01:09 +00:00
|
|
|
} else if ( arg.find( "--ray=" ) != string::npos ) {
|
|
|
|
parse_channel( "ray", arg.substr(6) );
|
1999-11-19 03:03:11 +00:00
|
|
|
} else if ( arg.find( "--rul=" ) != string::npos ) {
|
|
|
|
parse_channel( "rul", arg.substr(6) );
|
2000-04-19 21:22:16 +00:00
|
|
|
} else if ( arg.find( "--joyclient=" ) != string::npos ) {
|
|
|
|
parse_channel( "joyclient", arg.substr(12) );
|
1999-06-30 20:21:04 +00:00
|
|
|
#ifdef FG_NETWORK_OLK
|
2000-02-28 04:16:12 +00:00
|
|
|
} else if ( arg == "--disable-network-olk" ) {
|
|
|
|
network_olk = false;
|
|
|
|
} else if ( arg== "--enable-network-olk") {
|
|
|
|
network_olk = true;
|
1999-06-30 20:21:04 +00:00
|
|
|
} else if ( arg == "--net-hud" ) {
|
|
|
|
net_hud_display = 1;
|
|
|
|
} else if ( arg.find( "--net-id=") != string::npos ) {
|
|
|
|
net_id = arg.substr( 9 );
|
|
|
|
#endif
|
2000-07-03 20:09:56 +00:00
|
|
|
} else if ( arg.find( "--prop:" ) == 0 ) {
|
|
|
|
string assign = arg.substr(7);
|
|
|
|
int pos = assign.find('=');
|
|
|
|
if (pos == arg.npos || pos == 0) {
|
|
|
|
FG_LOG(FG_GENERAL, FG_ALERT, "Bad property assignment: " << arg);
|
|
|
|
return FG_OPTIONS_ERROR;
|
|
|
|
}
|
|
|
|
string name = assign.substr(0, pos);
|
|
|
|
string value = assign.substr(pos + 1);
|
2000-12-19 23:29:16 +00:00
|
|
|
globals->get_props()->setStringValue(name.c_str(), value);
|
2000-07-03 20:09:56 +00:00
|
|
|
FG_LOG(FG_GENERAL, FG_INFO, "Setting default value of property "
|
|
|
|
<< name << " to \"" << value << '"');
|
The following changes were made to flightgear-0.7.5 code to implement the follow
ing features:
a) ADA Flight model - ADA.cxx, ADA.hxx, flight.hxx
b) Fighter a/c HUD - flight.hxx, hud.hxx, hud.cxx, cockpit.cxx, hud_ladr.c
xx, hud_card.cxx
c) 3-window display - options.hxx, options.cxx, viewer.cxx
d) Moving objects (ship) - main.cxx
e) Patches - main.cxx
ADA.cxx, ADA.hxx
--------------------------
Interface to the external ADA flight dynamics package.
flight.hxx
----------
Included prototypes for accepting additional data fron the External flight
model for fighter aircraft HUD
Hud.hxx
-------
Included prototypes for accepting additional data for fighter HUD from Exernal F
light model.
Defined FIGHTER_HUD pre-processor directive to enable compilation of fighter hud
code.
hud.cxx, cockpit.cxx, hud_ladr.cxx, hud_card.cxx
---------------------------------------
Included code to initialise additional reticles/text for fighter HUD which is co
nditionally
compiled if FIGHTER_HUD is defined.
options.hxx
-----------
Added window_offset, and function to retrieve its value for 3 windows
options.cxx
-----------
Changed few options to suit ADA/CEF projection system/screens and checks for win
dow offset.
views.cxx
---------
Added code to retrieve view offset for window.
Main.cxx
--------
Added code to load and move an aircraft carrier.
Patch to enable clouds from command line until Curtis fixes it. By default cloud
s are disabled.
2000-10-19 19:46:13 +00:00
|
|
|
// $$$ begin - added VS Renganathan, 14 Oct 2K
|
|
|
|
// for multi-window outside window imagery
|
|
|
|
} else if ( arg.find( "--view-offset=" ) != string::npos ) {
|
|
|
|
string woffset = arg.substr( 14 );
|
|
|
|
if ( woffset == "LEFT" ) {
|
|
|
|
default_view_offset = M_PI * 0.25;
|
|
|
|
} else if ( woffset == "RIGHT" ) {
|
|
|
|
default_view_offset = M_PI * 1.75;
|
|
|
|
} else if ( woffset == "CENTER" ) {
|
|
|
|
default_view_offset = 0.00;
|
|
|
|
} else {
|
|
|
|
default_view_offset = atof( woffset.c_str() ) * DEG_TO_RAD;
|
|
|
|
}
|
2000-10-26 21:51:09 +00:00
|
|
|
FGViewerRPH *pilot_view =
|
|
|
|
(FGViewerRPH *)globals->get_viewmgr()->get_view( 0 );
|
|
|
|
pilot_view->set_view_offset( default_view_offset );
|
|
|
|
pilot_view->set_goal_view_offset( default_view_offset );
|
The following changes were made to flightgear-0.7.5 code to implement the follow
ing features:
a) ADA Flight model - ADA.cxx, ADA.hxx, flight.hxx
b) Fighter a/c HUD - flight.hxx, hud.hxx, hud.cxx, cockpit.cxx, hud_ladr.c
xx, hud_card.cxx
c) 3-window display - options.hxx, options.cxx, viewer.cxx
d) Moving objects (ship) - main.cxx
e) Patches - main.cxx
ADA.cxx, ADA.hxx
--------------------------
Interface to the external ADA flight dynamics package.
flight.hxx
----------
Included prototypes for accepting additional data fron the External flight
model for fighter aircraft HUD
Hud.hxx
-------
Included prototypes for accepting additional data for fighter HUD from Exernal F
light model.
Defined FIGHTER_HUD pre-processor directive to enable compilation of fighter hud
code.
hud.cxx, cockpit.cxx, hud_ladr.cxx, hud_card.cxx
---------------------------------------
Included code to initialise additional reticles/text for fighter HUD which is co
nditionally
compiled if FIGHTER_HUD is defined.
options.hxx
-----------
Added window_offset, and function to retrieve its value for 3 windows
options.cxx
-----------
Changed few options to suit ADA/CEF projection system/screens and checks for win
dow offset.
views.cxx
---------
Added code to retrieve view offset for window.
Main.cxx
--------
Added code to load and move an aircraft carrier.
Patch to enable clouds from command line until Curtis fixes it. By default cloud
s are disabled.
2000-10-19 19:46:13 +00:00
|
|
|
// $$$ end - added VS Renganathan, 14 Oct 2K
|
2000-12-06 04:13:16 +00:00
|
|
|
} else if ( arg.find( "--visibility=" ) != string::npos ) {
|
|
|
|
visibility = atof( arg.substr( 13 ) );
|
2001-01-06 05:09:40 +00:00
|
|
|
globals->get_props()->setDoubleValue("/environment/visibility",
|
|
|
|
visibility);
|
2000-12-06 04:13:16 +00:00
|
|
|
} else if ( arg.find( "--visibility-miles=" ) != string::npos ) {
|
|
|
|
visibility = atof( arg.substr( 19 ) ) * 5280.0 * FEET_TO_METER;
|
2001-01-06 05:09:40 +00:00
|
|
|
globals->get_props()->setDoubleValue("/environment/visibility",
|
|
|
|
visibility);
|
2000-10-12 01:08:09 +00:00
|
|
|
} else if ( arg.find( "--wp=" ) != string::npos ) {
|
|
|
|
parse_wp( arg.substr( 5 ) );
|
2000-11-28 23:38:24 +00:00
|
|
|
} else if ( arg.find( "--flight-plan=") != string::npos) {
|
|
|
|
parse_flightplan ( arg.substr (14) );
|
1998-05-13 18:29:56 +00:00
|
|
|
} else {
|
1998-11-06 21:17:31 +00:00
|
|
|
FG_LOG( FG_GENERAL, FG_ALERT, "Unknown option '" << arg << "'" );
|
|
|
|
return FG_OPTIONS_ERROR;
|
1998-05-13 18:29:56 +00:00
|
|
|
}
|
|
|
|
|
1998-11-06 21:17:31 +00:00
|
|
|
return FG_OPTIONS_OK;
|
1998-04-24 00:49:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-10-04 22:52:34 +00:00
|
|
|
// Scan the command line options for an fg_root definition and set
|
|
|
|
// just that.
|
2000-10-19 21:24:43 +00:00
|
|
|
int FGOptions::scan_command_line_for_root( int argc, char **argv ) {
|
2000-10-04 22:52:34 +00:00
|
|
|
int i = 1;
|
|
|
|
|
|
|
|
FG_LOG(FG_GENERAL, FG_INFO, "Processing command line arguments");
|
|
|
|
|
|
|
|
while ( i < argc ) {
|
|
|
|
FG_LOG( FG_GENERAL, FG_DEBUG, "argv[" << i << "] = " << argv[i] );
|
|
|
|
|
|
|
|
string arg = argv[i];
|
|
|
|
if ( arg.find( "--fg-root=" ) != string::npos ) {
|
|
|
|
fg_root = arg.substr( 10 );
|
|
|
|
}
|
|
|
|
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return FG_OPTIONS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Scan the config file for an fg_root definition and set just that.
|
2000-10-19 21:24:43 +00:00
|
|
|
int FGOptions::scan_config_file_for_root( const string& path ) {
|
2000-10-04 22:52:34 +00:00
|
|
|
fg_gzifstream in( path );
|
|
|
|
if ( !in.is_open() )
|
|
|
|
return(FG_OPTIONS_ERROR);
|
|
|
|
|
|
|
|
FG_LOG( FG_GENERAL, FG_INFO, "Processing config file: " << path );
|
|
|
|
|
|
|
|
in >> skipcomment;
|
|
|
|
#ifndef __MWERKS__
|
|
|
|
while ( ! in.eof() ) {
|
|
|
|
#else
|
|
|
|
char c = '\0';
|
|
|
|
while ( in.get(c) && c != '\0' ) {
|
|
|
|
in.putback(c);
|
|
|
|
#endif
|
|
|
|
string line;
|
|
|
|
|
|
|
|
#ifdef GETLINE_NEEDS_TERMINATOR
|
|
|
|
getline( in, line, '\n' );
|
|
|
|
#elif defined( macintosh )
|
|
|
|
getline( in, line, '\r' );
|
|
|
|
#else
|
|
|
|
getline( in, line );
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if ( line.find( "--fg-root=" ) != string::npos ) {
|
|
|
|
fg_root = line.substr( 10 );
|
|
|
|
}
|
|
|
|
|
|
|
|
in >> skipcomment;
|
|
|
|
}
|
|
|
|
|
|
|
|
return FG_OPTIONS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-04-24 00:49:17 +00:00
|
|
|
// Parse the command line options
|
2000-10-19 21:24:43 +00:00
|
|
|
int FGOptions::parse_command_line( int argc, char **argv ) {
|
1998-04-24 00:49:17 +00:00
|
|
|
int i = 1;
|
1998-05-13 18:29:56 +00:00
|
|
|
int result;
|
1998-04-24 00:49:17 +00:00
|
|
|
|
1998-11-06 21:17:31 +00:00
|
|
|
FG_LOG(FG_GENERAL, FG_INFO, "Processing command line arguments");
|
1998-04-24 00:49:17 +00:00
|
|
|
|
|
|
|
while ( i < argc ) {
|
1998-11-06 21:17:31 +00:00
|
|
|
FG_LOG( FG_GENERAL, FG_DEBUG, "argv[" << i << "] = " << argv[i] );
|
1998-04-24 00:49:17 +00:00
|
|
|
|
1998-05-13 18:29:56 +00:00
|
|
|
result = parse_option(argv[i]);
|
|
|
|
if ( (result == FG_OPTIONS_HELP) || (result == FG_OPTIONS_ERROR) ) {
|
|
|
|
return(result);
|
1998-04-24 00:49:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
|
2000-10-04 22:52:34 +00:00
|
|
|
return FG_OPTIONS_OK;
|
1998-04-24 00:49:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-08-27 17:01:55 +00:00
|
|
|
// Parse config file options
|
2000-10-19 21:24:43 +00:00
|
|
|
int FGOptions::parse_config_file( const string& path ) {
|
1998-09-15 02:09:24 +00:00
|
|
|
fg_gzifstream in( path );
|
1999-08-07 18:24:23 +00:00
|
|
|
if ( !in.is_open() )
|
1998-09-15 02:09:24 +00:00
|
|
|
return(FG_OPTIONS_ERROR);
|
1998-05-13 18:29:56 +00:00
|
|
|
|
1998-11-06 21:17:31 +00:00
|
|
|
FG_LOG( FG_GENERAL, FG_INFO, "Processing config file: " << path );
|
1998-05-13 18:29:56 +00:00
|
|
|
|
1998-11-06 14:46:59 +00:00
|
|
|
in >> skipcomment;
|
1999-08-07 18:24:23 +00:00
|
|
|
#ifndef __MWERKS__
|
|
|
|
while ( ! in.eof() ) {
|
|
|
|
#else
|
|
|
|
char c = '\0';
|
|
|
|
while ( in.get(c) && c != '\0' ) {
|
|
|
|
in.putback(c);
|
|
|
|
#endif
|
1998-09-15 02:09:24 +00:00
|
|
|
string line;
|
1999-05-06 19:38:28 +00:00
|
|
|
|
|
|
|
#ifdef GETLINE_NEEDS_TERMINATOR
|
2000-02-10 23:37:56 +00:00
|
|
|
getline( in, line, '\n' );
|
2000-09-10 00:04:50 +00:00
|
|
|
#elif defined( macintosh )
|
2000-02-10 23:37:56 +00:00
|
|
|
getline( in, line, '\r' );
|
1999-05-06 19:38:28 +00:00
|
|
|
#else
|
2000-02-10 23:37:56 +00:00
|
|
|
getline( in, line );
|
1999-05-06 19:38:28 +00:00
|
|
|
#endif
|
1998-07-22 01:27:03 +00:00
|
|
|
|
1998-09-15 02:09:24 +00:00
|
|
|
if ( parse_option( line ) == FG_OPTIONS_ERROR ) {
|
1998-11-06 21:17:31 +00:00
|
|
|
FG_LOG( FG_GENERAL, FG_ALERT,
|
|
|
|
"Config file parse error: " << path << " '"
|
|
|
|
<< line << "'" );
|
|
|
|
exit(-1);
|
1998-05-13 18:29:56 +00:00
|
|
|
}
|
1998-11-06 14:46:59 +00:00
|
|
|
in >> skipcomment;
|
1998-05-13 18:29:56 +00:00
|
|
|
}
|
|
|
|
|
1998-08-27 17:01:55 +00:00
|
|
|
return FG_OPTIONS_OK;
|
1998-05-13 18:29:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-04-24 00:49:17 +00:00
|
|
|
// Print usage message
|
2000-10-19 21:24:43 +00:00
|
|
|
void FGOptions::usage ( void ) {
|
1999-09-07 23:09:43 +00:00
|
|
|
cout << "Usage: fg [ options ... ]" << endl;
|
|
|
|
cout << endl;
|
|
|
|
|
|
|
|
cout << "General Options:" << endl;
|
|
|
|
cout << "\t--help -h: print usage" << endl;
|
|
|
|
cout << "\t--fg-root=path: specify the root path for all the data files"
|
|
|
|
<< endl;
|
2000-07-14 16:57:55 +00:00
|
|
|
cout << "\t--fg-scenery=path: specify the base path for all the scenery"
|
|
|
|
<< " data." << endl
|
|
|
|
<< "\t\tdefaults to $FG_ROOT/Scenery" << endl;
|
1999-09-07 23:09:43 +00:00
|
|
|
cout << "\t--disable-game-mode: disable full-screen game mode" << endl;
|
|
|
|
cout << "\t--enable-game-mode: enable full-screen game mode" << endl;
|
|
|
|
cout << "\t--disable-splash-screen: disable splash screen" << endl;
|
|
|
|
cout << "\t--enable-splash-screen: enable splash screen" << endl;
|
|
|
|
cout << "\t--disable-intro-music: disable introduction music" << endl;
|
|
|
|
cout << "\t--enable-intro-music: enable introduction music" << endl;
|
|
|
|
cout << "\t--disable-mouse-pointer: disable extra mouse pointer" << endl;
|
|
|
|
cout << "\t--enable-mouse-pointer: enable extra mouse pointer (i.e. for"
|
|
|
|
<< endl;
|
|
|
|
cout << "\t\tfull screen voodoo/voodoo-II based cards.)" << endl;
|
2000-07-08 06:29:19 +00:00
|
|
|
cout << "\t--disable-freeze: start out in an running state" << endl;
|
|
|
|
cout << "\t--enable-freeze: start out in a frozen state" << endl;
|
1999-09-07 23:09:43 +00:00
|
|
|
cout << "\t--control=mode: primary control mode "
|
|
|
|
<< "(joystick, keyboard, mouse)" << endl;
|
|
|
|
cout << endl;
|
|
|
|
|
|
|
|
cout << "Features:" << endl;
|
|
|
|
cout << "\t--disable-hud: disable heads up display" << endl;
|
|
|
|
cout << "\t--enable-hud: enable heads up display" << endl;
|
|
|
|
cout << "\t--disable-panel: disable instrument panel" << endl;
|
|
|
|
cout << "\t--enable-panel: enable instrumetn panel" << endl;
|
|
|
|
cout << "\t--disable-sound: disable sound effects" << endl;
|
|
|
|
cout << "\t--enable-sound: enable sound effects" << endl;
|
2000-05-13 00:02:43 +00:00
|
|
|
cout << "\t--disable-anti-alias-hud: disable anti aliased hud" << endl;
|
|
|
|
cout << "\t--enable-anti-alias-hud: enable anti aliased hud" << endl;
|
1999-09-07 23:09:43 +00:00
|
|
|
cout << endl;
|
1998-04-28 01:20:20 +00:00
|
|
|
|
1999-09-07 23:09:43 +00:00
|
|
|
cout << "Flight Model:" << endl;
|
1999-12-20 20:26:18 +00:00
|
|
|
cout << "\t--fdm=abcd: selects the core flight model code." << endl;
|
The following changes were made to flightgear-0.7.5 code to implement the follow
ing features:
a) ADA Flight model - ADA.cxx, ADA.hxx, flight.hxx
b) Fighter a/c HUD - flight.hxx, hud.hxx, hud.cxx, cockpit.cxx, hud_ladr.c
xx, hud_card.cxx
c) 3-window display - options.hxx, options.cxx, viewer.cxx
d) Moving objects (ship) - main.cxx
e) Patches - main.cxx
ADA.cxx, ADA.hxx
--------------------------
Interface to the external ADA flight dynamics package.
flight.hxx
----------
Included prototypes for accepting additional data fron the External flight
model for fighter aircraft HUD
Hud.hxx
-------
Included prototypes for accepting additional data for fighter HUD from Exernal F
light model.
Defined FIGHTER_HUD pre-processor directive to enable compilation of fighter hud
code.
hud.cxx, cockpit.cxx, hud_ladr.cxx, hud_card.cxx
---------------------------------------
Included code to initialise additional reticles/text for fighter HUD which is co
nditionally
compiled if FIGHTER_HUD is defined.
options.hxx
-----------
Added window_offset, and function to retrieve its value for 3 windows
options.cxx
-----------
Changed few options to suit ADA/CEF projection system/screens and checks for win
dow offset.
views.cxx
---------
Added code to retrieve view offset for window.
Main.cxx
--------
Added code to load and move an aircraft carrier.
Patch to enable clouds from command line until Curtis fixes it. By default cloud
s are disabled.
2000-10-19 19:46:13 +00:00
|
|
|
cout << "\t\tcan be one of jsb, larcsim, magic, external, balloon, or ada"
|
|
|
|
<< endl;
|
1999-12-20 20:26:18 +00:00
|
|
|
cout << "\t--aircraft=abcd: aircraft model to load" << endl;
|
1999-09-07 23:09:43 +00:00
|
|
|
cout << "\t--model-hz=n: run the FDM this rate (iterations per second)"
|
|
|
|
<< endl;
|
|
|
|
cout << "\t--speed=n: run the FDM this much faster than real time" << endl;
|
Updates from the Jon and Tony show.
Tony submitted:
JSBsim:
Added trimming routine, it is longitudinal & in-air only at this point
Added support for taking wind & weather data from external source
Added support for flaps.
Added independently settable pitch trim
Added alphamin and max to config file, stall modeling and warning to
follow
c172.cfg:
Flaps!
Adjusted Cmo, model should be speed stable now
FG:
Hooked up Christian's weather code, should be using it soon.
Hooked up the trimming routine. Note that the X-15 will not trim.
This is not a model or trimming routine deficiency, just the
nature of the X-15
The trimming routine sets the pitch trim and and throttle at startup.
The throttle is set using Norman's code for the autothrottle so the
autothrottle is on by default. --notrim will turn it off.
Added --vc, --mach, and --notrim switches
(vc is airspeed in knots)
uBody, vBody, and wBody are still supported, last one entered
on the command line counts, i.e. you can set vc or mach or u,v,
and w but any combination will be ignored.
2000-05-16 21:35:11 +00:00
|
|
|
cout << "\t--notrim: Do NOT attempt to trim the model when initializing JSBsim" << endl;
|
1999-09-07 23:09:43 +00:00
|
|
|
cout << endl;
|
2000-03-22 22:01:33 +00:00
|
|
|
//(UIUC)
|
2000-10-12 01:08:09 +00:00
|
|
|
cout <<"Aircraft model directory:" << endl;
|
2000-03-22 22:01:33 +00:00
|
|
|
cout <<"\t--aircraft-dir=<path> path is relative to the path of the executable" << endl;
|
|
|
|
cout << endl;
|
1999-09-07 23:09:43 +00:00
|
|
|
|
|
|
|
cout << "Initial Position and Orientation:" << endl;
|
|
|
|
cout << "\t--airport-id=ABCD: specify starting postion by airport id"
|
|
|
|
<< endl;
|
|
|
|
cout << "\t--lon=degrees: starting longitude in degrees (west = -)"
|
|
|
|
<< endl;
|
|
|
|
cout << "\t--lat=degrees: starting latitude in degrees (south = -)"
|
|
|
|
<< endl;
|
|
|
|
cout << "\t--altitude=feet: starting altitude in feet" << endl;
|
|
|
|
cout << "\t\t(unless --units-meters specified" << endl;
|
|
|
|
cout << "\t--heading=degrees: heading (yaw) angle in degress (Psi)"
|
|
|
|
<< endl;
|
|
|
|
cout << "\t--roll=degrees: roll angle in degrees (Phi)" << endl;
|
|
|
|
cout << "\t--pitch=degrees: pitch angle in degrees (Theta)" << endl;
|
|
|
|
cout << "\t--uBody=feet per second: velocity along the body X axis"
|
|
|
|
<< endl;
|
|
|
|
cout << "\t--vBody=feet per second: velocity along the body Y axis"
|
|
|
|
<< endl;
|
|
|
|
cout << "\t--wBody=feet per second: velocity along the body Z axis"
|
|
|
|
<< endl;
|
|
|
|
cout << "\t\t(unless --units-meters specified" << endl;
|
Updates from the Jon and Tony show.
Tony submitted:
JSBsim:
Added trimming routine, it is longitudinal & in-air only at this point
Added support for taking wind & weather data from external source
Added support for flaps.
Added independently settable pitch trim
Added alphamin and max to config file, stall modeling and warning to
follow
c172.cfg:
Flaps!
Adjusted Cmo, model should be speed stable now
FG:
Hooked up Christian's weather code, should be using it soon.
Hooked up the trimming routine. Note that the X-15 will not trim.
This is not a model or trimming routine deficiency, just the
nature of the X-15
The trimming routine sets the pitch trim and and throttle at startup.
The throttle is set using Norman's code for the autothrottle so the
autothrottle is on by default. --notrim will turn it off.
Added --vc, --mach, and --notrim switches
(vc is airspeed in knots)
uBody, vBody, and wBody are still supported, last one entered
on the command line counts, i.e. you can set vc or mach or u,v,
and w but any combination will be ignored.
2000-05-16 21:35:11 +00:00
|
|
|
cout << "\t--vc= initial airspeed in knots (--fdm=jsb only)" << endl;
|
|
|
|
cout << "\t--mach= initial mach number (--fdm=jsb only)" << endl;
|
1999-09-07 23:09:43 +00:00
|
|
|
cout << endl;
|
|
|
|
|
|
|
|
cout << "Rendering Options:" << endl;
|
|
|
|
cout << "\t--fog-disable: disable fog/haze" << endl;
|
|
|
|
cout << "\t--fog-fastest: enable fastest fog/haze" << endl;
|
|
|
|
cout << "\t--fog-nicest: enable nicest fog/haze" << endl;
|
1999-10-22 00:27:49 +00:00
|
|
|
cout << "\t--enable-clouds: enable demo cloud layer" << endl;
|
|
|
|
cout << "\t--disable-clouds: disable demo cloud layer" << endl;
|
|
|
|
cout << "\t--clouds-asl=xxx: specify altitude of cloud layer above sea level" << endl;
|
1999-09-07 23:09:43 +00:00
|
|
|
cout << "\t--fov=xx.x: specify initial field of view angle in degrees"
|
|
|
|
<< endl;
|
|
|
|
cout << "\t--disable-fullscreen: disable fullscreen mode" << endl;
|
|
|
|
cout << "\t--enable-fullscreen: enable fullscreen mode" << endl;
|
|
|
|
cout << "\t--shading-flat: enable flat shading" << endl;
|
|
|
|
cout << "\t--shading-smooth: enable smooth shading" << endl;
|
|
|
|
cout << "\t--disable-skyblend: disable sky blending" << endl;
|
|
|
|
cout << "\t--enable-skyblend: enable sky blending" << endl;
|
|
|
|
cout << "\t--disable-textures: disable textures" << endl;
|
|
|
|
cout << "\t--enable-textures: enable textures" << endl;
|
|
|
|
cout << "\t--disable-wireframe: disable wireframe drawing mode" << endl;
|
|
|
|
cout << "\t--enable-wireframe: enable wireframe drawing mode" << endl;
|
|
|
|
cout << "\t--geometry=WWWxHHH: window geometry: 640x480, 800x600, etc."
|
|
|
|
<< endl;
|
The following changes were made to flightgear-0.7.5 code to implement the follow
ing features:
a) ADA Flight model - ADA.cxx, ADA.hxx, flight.hxx
b) Fighter a/c HUD - flight.hxx, hud.hxx, hud.cxx, cockpit.cxx, hud_ladr.c
xx, hud_card.cxx
c) 3-window display - options.hxx, options.cxx, viewer.cxx
d) Moving objects (ship) - main.cxx
e) Patches - main.cxx
ADA.cxx, ADA.hxx
--------------------------
Interface to the external ADA flight dynamics package.
flight.hxx
----------
Included prototypes for accepting additional data fron the External flight
model for fighter aircraft HUD
Hud.hxx
-------
Included prototypes for accepting additional data for fighter HUD from Exernal F
light model.
Defined FIGHTER_HUD pre-processor directive to enable compilation of fighter hud
code.
hud.cxx, cockpit.cxx, hud_ladr.cxx, hud_card.cxx
---------------------------------------
Included code to initialise additional reticles/text for fighter HUD which is co
nditionally
compiled if FIGHTER_HUD is defined.
options.hxx
-----------
Added window_offset, and function to retrieve its value for 3 windows
options.cxx
-----------
Changed few options to suit ADA/CEF projection system/screens and checks for win
dow offset.
views.cxx
---------
Added code to retrieve view offset for window.
Main.cxx
--------
Added code to load and move an aircraft carrier.
Patch to enable clouds from command line until Curtis fixes it. By default cloud
s are disabled.
2000-10-19 19:46:13 +00:00
|
|
|
cout << "\t--view-offset=xxx: set the default forward view direction"
|
|
|
|
<< endl;
|
|
|
|
cout << "\t\tas an offset from straight ahead. Allowable values are"
|
|
|
|
<< endl;
|
|
|
|
cout << "\t\tLEFT, RIGHT, CENTER, or a specific number of degrees" << endl;
|
2000-12-06 04:13:16 +00:00
|
|
|
cout << "\t--visibility=xxx: specify initial visibility in meters" << endl;
|
|
|
|
cout << "\t--visibility-miles=xxx: specify initial visibility in miles"
|
|
|
|
<< endl;
|
1999-09-07 23:09:43 +00:00
|
|
|
cout << endl;
|
|
|
|
|
|
|
|
cout << "Scenery Options:" << endl;
|
|
|
|
cout << "\t--tile-radius=n: specify tile radius, must be 1 - 4" << endl;
|
|
|
|
cout << endl;
|
|
|
|
|
|
|
|
cout << "Hud Options:" << endl;
|
|
|
|
cout << "\t--units-feet: Hud displays units in feet" << endl;
|
|
|
|
cout << "\t--units-meters: Hud displays units in meters" << endl;
|
|
|
|
cout << "\t--hud-tris: Hud displays number of triangles rendered" << endl;
|
|
|
|
cout << "\t--hud-culled: Hud displays percentage of triangles culled"
|
|
|
|
<< endl;
|
|
|
|
cout << endl;
|
1998-08-24 20:11:12 +00:00
|
|
|
|
1999-09-07 23:09:43 +00:00
|
|
|
cout << "Time Options:" << endl;
|
1999-10-22 00:27:49 +00:00
|
|
|
cout << "\t--time-offset=[+-]hh:mm:ss: add this time offset" << endl;
|
|
|
|
cout << "\t--time-match-real: Synchronize real-world and FlightGear" << endl
|
|
|
|
<< "\t\ttime. Can be used in combination with --time-offset." << endl;
|
|
|
|
cout << "\t--time-match-local:Synchronize local real-world and " << endl
|
|
|
|
<< "\t\tFlightGear time" << endl;
|
1999-09-07 23:09:43 +00:00
|
|
|
cout << "\t--start-date-sys=yyyy:mm:dd:hh:mm:ss: specify a starting" << endl
|
|
|
|
<< "\t\tdate/time. Uses your system time " << endl;
|
|
|
|
cout << "\t--start-date-gmt=yyyy:mm:dd:hh:mm:ss: specify a starting" << endl
|
|
|
|
<< "\t\tdate/time. Uses Greenwich Mean Time" << endl;
|
|
|
|
cout << "\t--start-date-lat=yyyy:mm:dd:hh:mm:ss: specify a starting" << endl
|
|
|
|
<< "\t\tdate/time. Uses Local Aircraft Time" << endl;
|
1999-06-30 20:21:04 +00:00
|
|
|
#ifdef FG_NETWORK_OLK
|
2000-10-12 01:08:09 +00:00
|
|
|
cout << endl;
|
1999-06-30 20:21:04 +00:00
|
|
|
|
1999-09-07 23:09:43 +00:00
|
|
|
cout << "Network Options:" << endl;
|
2000-08-14 20:12:17 +00:00
|
|
|
cout << "\t--enable-network-olk: enable Multipilot mode" << endl;
|
|
|
|
cout << "\t--disable-network-olk: disable Multipilot mode (default)" << endl;
|
1999-09-07 23:09:43 +00:00
|
|
|
cout << "\t--net-hud: Hud displays network info" << endl;
|
|
|
|
cout << "\t--net-id=name: specify your own callsign" << endl;
|
1999-06-30 20:21:04 +00:00
|
|
|
#endif
|
2000-10-12 01:08:09 +00:00
|
|
|
|
|
|
|
cout << endl;
|
|
|
|
cout << "Route/Way Point Options:" << endl;
|
2000-10-13 23:34:54 +00:00
|
|
|
cout << "\t--wp=ID[@alt]: specify a waypoint for the GC autopilot" << endl;
|
2000-10-12 01:08:09 +00:00
|
|
|
cout << "\t\tYou can specify multiple waypoints (a route) with multiple"
|
|
|
|
<< endl;
|
|
|
|
cout << "\t\tinstances of --wp=" << endl;
|
2000-11-28 23:38:24 +00:00
|
|
|
cout << "\t--flight-plan=[file]: Read all waypoints from [file]" <<endl;
|
1998-04-24 00:49:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Destructor
|
2000-10-19 21:24:43 +00:00
|
|
|
FGOptions::~FGOptions( void ) {
|
1998-04-24 00:49:17 +00:00
|
|
|
}
|