X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Foptions.cxx;h=1073c5635472bf8ffa5ede6c2b1f25ffdbe52eb9;hb=2cd7473384ec231e2a013b280e83919b98ed2a15;hp=ff379206ac0ef4a100560e2436ac067e28a13345;hpb=31b9c763dfc38d1905352defaa05d65055cf0689;p=flightgear.git diff --git a/src/Main/options.cxx b/src/Main/options.cxx index ff379206a..1073c5635 100644 --- a/src/Main/options.cxx +++ b/src/Main/options.cxx @@ -25,10 +25,6 @@ # include #endif -#if defined(FX) && defined(XMESA) -bool global_fullscreen = true; -#endif - #include #include // rint() @@ -38,32 +34,36 @@ bool global_fullscreen = true; #include STL_STRING -#include -#include #include -#include -#include - -#include -#include -#include -#include -#include + +// #include +// #include +// #include +// #include +// #include #ifdef FG_NETWORK_OLK # include #endif -#include "fg_init.hxx" #include "globals.hxx" +#include "fg_init.hxx" +#include "fg_props.hxx" #include "options.hxx" FG_USING_STD(string); FG_USING_NAMESPACE(std); -// from main.cxx -extern void fgReshape( int width, int height ); -inline double +#define NEW_DEFAULT_MODEL_HZ 120 + +enum +{ + FG_OPTIONS_OK = 0, + FG_OPTIONS_HELP = 1, + FG_OPTIONS_ERROR = 2 +}; + +static double atof( const string& str ) { @@ -75,7 +75,7 @@ atof( const string& str ) #endif } -inline int +static int atoi( const string& str ) { #ifdef __MWERKS__ @@ -87,187 +87,100 @@ atoi( const string& str ) } -// Defined the shared options class here -// FGOptions current_options; - - -// Constructor -FGOptions::FGOptions() : - // starting longitude in degrees (west = -) - // starting latitude in degrees (south = -) - - // Default initial position is Globe, AZ (P13) - lon(-110.6642444), - lat( 33.3528917), - - // North of the city of Globe - // lon(-110.7), - // lat( 33.4), - - // North of the city of Globe - // lon(-110.742578), - // lat( 33.507122), - - // Near where I used to live in Globe, AZ - // lon(-110.766000), - // lat( 33.377778), - - // 10125 Jewell St. NE - // lon(-93.15), - // lat( 45.15), - - // Near KHSP (Hot Springs, VA) - // lon(-79.8338964 + 0.01), - // lat( 37.9514564 + 0.008), - - // (SEZ) SEDONA airport - // lon(-111.7884614 + 0.01), - // lat( 34.8486289 - 0.015), - - // Jim Brennon's Kingmont Observatory - // lon(-121.1131667), - // lat( 38.8293917), - - // Huaras, Peru (S09d 31.871' W077d 31.498') - // lon(-77.5249667), - // lat( -9.5311833), - - // Eclipse Watching w73.5 n10 (approx) 18:00 UT - // lon(-73.5), - // lat( 10.0), - - // Timms Hill (WI) - // lon(-90.1953055556), - // lat( 45.4511388889), - - // starting altitude in meters (this will be reset to ground level - // if it is lower than the terrain - altitude(-9999.0), - - // Initial Orientation - 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) - - // Initialize current options velocities to 0.0 - 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), - - // Miscellaneous - game_mode(0), - splash_screen(1), - intro_music(1), - mouse_pointer(0), - control_mode(FG_JOYSTICK), - auto_coordination(FG_AUTO_COORD_NOT_SPECIFIED), - - // Features - hud_status(0), - panel_status(1), - sound(1), - anti_alias_hud(0), - - // Flight Model options - flight_model( FGInterface::FG_LARCSIM ), - aircraft( "c172" ), - model_hz( NEW_DEFAULT_MODEL_HZ ), - speed_up( 1 ), - trim(0), - - // Rendering options - fog(FG_FOG_NICEST), // nicest - clouds(true), - clouds_asl(5000*FEET_TO_METER), - fullscreen(0), - shading(1), - skyblend(1), - textures(1), - wireframe(0), - xsize(800), - ysize(600), - bpp(16), - view_mode(FG_VIEW_PILOT), - default_view_offset(0), - visibility(-1.0), - - // HUD options - units(FG_UNITS_FEET), - tris_or_culled(0), - - // Time options - time_offset(0), - - network_olk(false) +/** + * Set a few fail-safe default property values. + * + * These should all be set in $FG_ROOT/preferences.xml, but just + * in case, we provide some initial sane values here. This method + * should be invoked *before* reading any init files. + */ +void +fgSetDefaults () { - // set initial values/defaults - time_offset_type = FG_TIME_SYS_OFFSET; - char* envp = ::getenv( "FG_ROOT" ); - - if ( envp != NULL ) { - // fg_root could be anywhere, so default to environmental - // variable $FG_ROOT if it is set. - fg_root = envp; - } else { - // Otherwise, default to a random compiled-in location if - // $FG_ROOT is not set. This can still be overridden from the - // command line or a config file. - -#if defined( WIN32 ) - fg_root = "\\FlightGear"; -#elif defined( macintosh ) - fg_root = ""; -#else - fg_root = PKGLIBDIR; -#endif - } - // set a possibly independent location for scenery data - envp = ::getenv( "FG_SCENERY" ); + char *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; + globals->set_fg_scenery(envp); } else { // Otherwise, default to Scenery being in $FG_ROOT/Scenery - fg_scenery = ""; + globals->set_fg_scenery(""); } + // Position (Globe, AZ) + fgSetDouble("/position/longitude", -110.6642444); + fgSetDouble("/position/latitude", 33.3528917); + fgSetDouble("/position/altitude", -9999.0); + + // Orientation + fgSetDouble("/orientation/heading", 270); + fgSetDouble("/orientation/roll", 0); + fgSetDouble("/orientation/pitch", 0.424); + + // Velocities + fgSetString("/sim/startup/speed-set", "knots"); + fgSetDouble("/velocities/uBody", 0.0); + fgSetDouble("/velocities/vBody", 0.0); + fgSetDouble("/velocities/wBody", 0.0); + fgSetDouble("/velocities/speed-north", 0.0); + fgSetDouble("/velocities/speed-east", 0.0); + fgSetDouble("/velocities/speed-down", 0.0); + fgSetDouble("/velocities/airspeed", 0.0); + fgSetDouble("/velocities/mach", 0.0); + + // Miscellaneous + fgSetBool("/sim/startup/game-mode", false); + fgSetBool("/sim/startup/splash-screen", true); + fgSetBool("/sim/startup/intro-music", true); + fgSetString("/sim/startup/mouse-pointer", "disabled"); + fgSetString("/sim/control-mode", "joystick"); + fgSetBool("/sim/auto-coordination", false); + + // Features + fgSetBool("/sim/hud/visibility", false); + fgSetBool("/sim/panel/visibility", true); + fgSetBool("/sim/sound", true); + fgSetBool("/sim/hud/antialiased", false); + + // Flight Model options + fgSetString("/sim/flight-model", "larcsim"); + fgSetString("/sim/aircraft", "c172"); + fgSetInt("/sim/model-hz", NEW_DEFAULT_MODEL_HZ); + fgSetInt("/sim/speed-up", 1); + fgSetBool("/sim/startup/trim", false); + fgSetBool("/sim/startup/onground", true); + + // Rendering options + fgSetString("/sim/rendering/fog", "nicest"); + fgSetBool("/environment/clouds/status", true); + fgSetDouble("/environment/clouds/altitude", 5000); + fgSetBool("/sim/startup/fullscreen", false); + fgSetBool("/sim/rendering/shading", true); + fgSetBool("/sim/rendering/skyblend", true); + fgSetBool("/sim/rendering/textures", true); + fgSetBool("/sim/rendering/wireframe", false); + fgSetInt("/sim/startup/xsize", 800); + fgSetInt("/sim/startup/ysize", 600); + fgSetInt("/sim/rendering/bits-per-pixel", 16); + fgSetString("/sim/view-mode", "pilot"); + fgSetDouble("/sim/startup/view-offset", 0); + fgSetDouble("/environment/visibility", 20000); + + // HUD options + fgSetString("/sim/startup/units", "feet"); + fgSetString("/sim/hud/frame-stat-type", "tris"); + + // Time options + fgSetInt("/sim/startup/time-offset", 0); + fgSetString("/sim/startup/time-offset-type", "system-offset"); - airport_id = "KPAO"; // default airport id - net_id = "Johnney"; // default pilot's name - - // initialize port config string list - channel_options_list.clear(); -} - -void -FGOptions::toggle_panel() { - - bool freeze = globals->get_freeze(); - - if( !freeze ) - globals->set_freeze(true); - - if( panel_status ) { - panel_status = false; - if ( current_panel != NULL ) - current_panel->setVisibility(false); - } else { - panel_status = true; - if ( current_panel != NULL ) - current_panel->setVisibility(true); - } - - fgReshape( xsize, ysize); - - if( !freeze ) - globals->set_freeze( false ); + fgSetBool("/sim/networking/network-olk", false); + fgSetString("/sim/networking/call-sign", "Johnny"); } -double -FGOptions::parse_time(const string& time_in) { +static double +parse_time(const string& time_in) { char *time_str, num[256]; double hours, minutes, seconds; double result = 0.0; @@ -345,7 +258,8 @@ FGOptions::parse_time(const string& time_in) { } -long int FGOptions::parse_date( const string& date) +static long int +parse_date( const string& date) { struct tm gmt; char * date_str, num[256]; @@ -452,21 +366,9 @@ long int FGOptions::parse_date( const string& date) } -// parse degree in the form of [+/-]hhh:mm:ss -void FGOptions::parse_control( const string& mode ) { - 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 -double -FGOptions::parse_degree( const string& degree_str) { +static double +parse_degree( const string& degree_str) { double result = parse_time( degree_str ); // printf("Degree = %.4f\n", result); @@ -476,8 +378,8 @@ FGOptions::parse_degree( const string& degree_str) { // parse time offset command line option -int -FGOptions::parse_time_offset( const string& time_str) { +static int +parse_time_offset( const string& time_str) { int result; // printf("time offset = %s\n", time_str); @@ -494,42 +396,15 @@ FGOptions::parse_time_offset( const string& time_str) { } -// Parse --fdm=abcdefg type option -int -FGOptions::parse_fdm( const string& fm ) { - // cout << "fdm = " << fm << endl; - - if ( fm == "ada" ) { - return FGInterface::FG_ADA; - } else if ( fm == "balloon" ) { - return FGInterface::FG_BALLOONSIM; - } else if ( fm == "external" ) { - return FGInterface::FG_EXTERNAL; - } else if ( fm == "jsb" ) { - return FGInterface::FG_JSBSIM; - } else if ( (fm == "larcsim") || (fm == "LaRCsim") ) { - return FGInterface::FG_LARCSIM; - } else if ( fm == "magic" ) { - return FGInterface::FG_MAGICCARPET; - } else { - FG_LOG( FG_GENERAL, FG_ALERT, "Unknown fdm = " << fm ); - exit(-1); - } - - // we'll never get here, but it makes the compiler happy. - return -1; -} - - // Parse --fov=x.xx type option -double -FGOptions::parse_fov( const string& arg ) { +static double +parse_fov( const string& arg ) { double fov = atof(arg); if ( fov < FG_FOV_MIN ) { fov = FG_FOV_MIN; } if ( fov > FG_FOV_MAX ) { fov = FG_FOV_MAX; } - globals->get_current_view()->set_fov( fov ); + fgSetDouble("/sim/field-of-view", fov); // printf("parse_fov(): result = %.4f\n", fov); @@ -562,18 +437,19 @@ FGOptions::parse_fov( const string& arg ) { // // filename = file system file name -bool -FGOptions::parse_channel( const string& type, const string& channel_str ) { +static bool +parse_channel( const string& type, const string& channel_str ) { // cout << "Channel string = " << channel_str << endl; - channel_options_list.push_back( type + "," + channel_str ); + globals->get_channel_options_list()->push_back( type + "," + channel_str ); return true; } // Parse --wp=ID[,alt] -bool FGOptions::parse_wp( const string& arg ) { +static bool +parse_wp( const string& arg ) { string id, alt_str; double alt = 0.0; @@ -583,7 +459,7 @@ bool FGOptions::parse_wp( const string& arg ) { 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 ) { + if ( fgGetString("/sim/startup/units") == "feet" ) { alt *= FEET_TO_METER; } } else { @@ -603,7 +479,8 @@ bool FGOptions::parse_wp( const string& arg ) { // Parse --flight-plan=[file] -bool FGOptions::parse_flightplan(const string& arg) +static bool +parse_flightplan(const string& arg) { fg_gzifstream infile(arg.c_str()); if (!infile) { @@ -629,214 +506,204 @@ bool FGOptions::parse_flightplan(const string& arg) // Parse a single option -int FGOptions::parse_option( const string& arg ) { +static int +parse_option (const string& arg) +{ // General Options if ( (arg == "--help") || (arg == "-h") ) { // help/usage request return(FG_OPTIONS_HELP); } else if ( arg == "--disable-game-mode") { - game_mode = false; + fgSetBool("/sim/startup/game-mode", false); } else if ( arg == "--enable-game-mode" ) { - game_mode = true; + fgSetBool("/sim/startup/game-mode", true); } else if ( arg == "--disable-splash-screen" ) { - splash_screen = false; + fgSetBool("/sim/startup/splash-screen", false); } else if ( arg == "--enable-splash-screen" ) { - splash_screen = true; + fgSetBool("/sim/startup/splash-screen", true); } else if ( arg == "--disable-intro-music" ) { - intro_music = false; + fgSetBool("/sim/startup/intro-music", false); } else if ( arg == "--enable-intro-music" ) { - intro_music = true; + fgSetBool("/sim/startup/intro-music", true); } else if ( arg == "--disable-mouse-pointer" ) { - mouse_pointer = 1; + fgSetString("/sim/startup/mouse-pointer", "disabled"); } else if ( arg == "--enable-mouse-pointer" ) { - mouse_pointer = 2; + fgSetString("/sim/startup/mouse-pointer", "enabled"); } else if ( arg == "--disable-freeze" ) { - globals->set_freeze( false ); + globals->set_freeze(false); } else if ( arg == "--enable-freeze" ) { - globals->set_freeze( true ); + globals->set_freeze(true); } else if ( arg == "--disable-anti-alias-hud" ) { - anti_alias_hud = false; + fgSetBool("/sim/hud/antialiased", false); } else if ( arg == "--enable-anti-alias-hud" ) { - anti_alias_hud = true; + fgSetBool("/sim/hud/antialiased", true); } else if ( arg.find( "--control=") != string::npos ) { - parse_control( arg.substr(10) ); + fgSetString("/sim/control-mode", arg.substr(10)); } else if ( arg == "--disable-auto-coordination" ) { - auto_coordination = FG_AUTO_COORD_DISABLED; + fgSetBool("/sim/auto-coordination", false); } else if ( arg == "--enable-auto-coordination" ) { - auto_coordination = FG_AUTO_COORD_ENABLED; + fgSetBool("/sim/auto-coordination", true); } else if ( arg == "--disable-hud" ) { - hud_status = false; - current_properties.setBoolValue("/sim/hud/visibility", false); + fgSetBool("/sim/hud/visibility", false); } else if ( arg == "--enable-hud" ) { - hud_status = true; - current_properties.setBoolValue("/sim/hud/visibility", true); + fgSetBool("/sim/hud/visibility", true); } else if ( arg == "--disable-panel" ) { - panel_status = false; - current_properties.setBoolValue("/sim/panel/visibility", false); - if ( current_panel != NULL ) - current_panel->setVisibility(false); + fgSetBool("/sim/panel/visibility", false); } else if ( arg == "--enable-panel" ) { - panel_status = true; - current_properties.setBoolValue("/sim/panel/visibility", true); - if ( current_panel != NULL ) - current_panel->setVisibility(true); + fgSetBool("/sim/panel/visibility", true); } else if ( arg == "--disable-sound" ) { - sound = false; + fgSetBool("/sim/sound", false); } else if ( arg == "--enable-sound" ) { - sound = true; + fgSetBool("/sim/sound", true); } else if ( arg.find( "--airport-id=") != string::npos ) { - airport_id = arg.substr( 13 ); - current_properties.setStringValue("/position/airport-id", airport_id); + // NB: changed property name!!! + fgSetString("/sim/startup/airport-id", arg.substr(13)); } else if ( arg.find( "--lon=" ) != string::npos ) { - lon = parse_degree( arg.substr(6) ); - airport_id = ""; - current_properties.setDoubleValue("/position/longitude", lon); - current_properties.setStringValue("/position/airport-id", airport_id); + fgSetDouble("/position/longitude", + parse_degree(arg.substr(6))); + fgSetString("/sim/startup/airport-id", ""); } else if ( arg.find( "--lat=" ) != string::npos ) { - lat = parse_degree( arg.substr(6) ); - airport_id = ""; - current_properties.setDoubleValue("/position/latitude", lat); - current_properties.setStringValue("/position/airport-id", airport_id); + fgSetDouble("/position/latitude", + parse_degree(arg.substr(6))); + fgSetString("/sim/startup/airport-id", ""); } else if ( arg.find( "--altitude=" ) != string::npos ) { - if ( units == FG_UNITS_FEET ) { - altitude = atof( arg.substr(11) ) * FEET_TO_METER; - } else { - altitude = atof( arg.substr(11) ); - } - current_properties.setDoubleValue("/position/altitude", altitude); + fgSetBool("/sim/startup/onground", false); + if ( fgGetString("/sim/startup/units") == "feet" ) + fgSetDouble("/position/altitude", atof(arg.substr(11))); + else + fgSetDouble("/position/altitude", + atof(arg.substr(11)) * METER_TO_FEET); } else if ( arg.find( "--uBody=" ) != string::npos ) { - speedset = FG_VTUVW; - if ( units == FG_UNITS_FEET ) { - uBody = atof( arg.substr(8) ); - } else { - uBody = atof( arg.substr(8) ) * FEET_TO_METER; - } - //current_properties.setDoubleValue("/velocities/speed-north", uBody); + fgSetString("/sim/startup/speed-set", "UVW"); + // FIXME: the units are totally confused here + if ( fgGetString("/sim/startup/units") == "feet" ) + fgSetDouble("/velocities/uBody", atof(arg.substr(8))); + else + fgSetDouble("/velocities/uBody", + atof(arg.substr(8)) * FEET_TO_METER); } else if ( arg.find( "--vBody=" ) != string::npos ) { - speedset = FG_VTUVW; - if ( units == FG_UNITS_FEET ) { - vBody = atof( arg.substr(8) ); - } else { - vBody = atof( arg.substr(8) ) * FEET_TO_METER; - } - //current_properties.setDoubleValue("/velocities/speed-east", vBody); + fgSetString("/sim/startup/speed-set", "UVW"); + // FIXME: the units are totally confused here + if ( fgGetString("/sim/startup/units") == "feet" ) + fgSetDouble("/velocities/vBody", atof(arg.substr(8))); + else + fgSetDouble("/velocities/vBody", + atof(arg.substr(8)) * FEET_TO_METER); } else if ( arg.find( "--wBody=" ) != string::npos ) { - speedset = FG_VTUVW; - if ( units == FG_UNITS_FEET ) { - wBody = atof( arg.substr(8) ); - } else { - wBody = atof( arg.substr(8) ) * FEET_TO_METER; - } + fgSetString("/sim/startup/speed-set", "UVW"); + // FIXME: the units are totally confused here + if ( fgGetString("/sim/startup/units") == "feet" ) + fgSetDouble("/velocities/wBody", atof(arg.substr(8))); + else + fgSetDouble("/velocities/wBody", + atof(arg.substr(8)) * FEET_TO_METER); } 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; - } - current_properties.setDoubleValue("/velocities/speed-north", vNorth); + fgSetString("/sim/startup/speed-set", "NED"); + // FIXME: the units are totally confused here + if ( fgGetString("/sim/startup/units") == "feet" ) + fgSetDouble("/velocities/speed-north", atof(arg.substr(8))); + else + fgSetDouble("/velocities/speed-north", + atof(arg.substr(8)) * FEET_TO_METER); } 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; - } - current_properties.setDoubleValue("/velocities/speed-east", vEast); + fgSetString("/sim/startup/speed-set", "NED"); + // FIXME: the units are totally confused here + if ( fgGetString("/sim/startup/units") == "feet" ) + fgSetDouble("/velocities/speed-east", atof(arg.substr(8))); + else + fgSetDouble("/velocities/speed-east", + atof(arg.substr(8)) * FEET_TO_METER); } 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; - } - current_properties.setDoubleValue("/velocities/speed-down", vDown); + fgSetString("/sim/startup/speed-set", "NED"); + // FIXME: the units are totally confused here + if ( fgGetString("/sim/startup/units") == "feet" ) + fgSetDouble("/velocities/speed-down", atof(arg.substr(8))); + else + fgSetDouble("/velocities/speed-down", + atof(arg.substr(8)) * FEET_TO_METER); } else if ( arg.find( "--vc=" ) != string::npos) { - speedset = FG_VC; - vkcas=atof( arg.substr(5) ); - cout << "Got vc: " << vkcas << endl; + fgSetString("/sim/startup/speed-set", "knots"); + fgSetDouble("/velocities/airspeed", atof(arg.substr(5))); } else if ( arg.find( "--mach=" ) != string::npos) { - speedset = FG_MACH; - mach=atof( arg.substr(7) ); + fgSetString("/sim/startup/speed-set", "mach"); + fgSetDouble("/velocities/mach", atof(arg.substr(7))); } else if ( arg.find( "--heading=" ) != string::npos ) { - heading = atof( arg.substr(10) ); - current_properties.setDoubleValue("/orientation/heading", heading); + fgSetDouble("/orientation/heading", atof(arg.substr(10))); } else if ( arg.find( "--roll=" ) != string::npos ) { - roll = atof( arg.substr(7) ); - current_properties.setDoubleValue("/orientation/roll", roll); + fgSetDouble("/orientation/roll", atof(arg.substr(7))); } else if ( arg.find( "--pitch=" ) != string::npos ) { - pitch = atof( arg.substr(8) ); - current_properties.setDoubleValue("/orientation/pitch", pitch); + fgSetDouble("/orientation/pitch", atof(arg.substr(8))); } else if ( arg.find( "--fg-root=" ) != string::npos ) { - fg_root = arg.substr( 10 ); + globals->set_fg_root(arg.substr( 10 )); } else if ( arg.find( "--fg-scenery=" ) != string::npos ) { - fg_scenery = arg.substr( 13 ); + globals->set_fg_scenery(arg.substr( 13 )); } else if ( arg.find( "--fdm=" ) != string::npos ) { - flight_model = parse_fdm( arg.substr(6) ); - current_properties.setIntValue("/sim/flight-model", flight_model); - if((flight_model == FGInterface::FG_JSBSIM) && (get_trim_mode() == 0)) { - set_trim_mode(1); - } else { - set_trim_mode(0); - } + fgSetString("/sim/flight-model", arg.substr(6)); } else if ( arg.find( "--aircraft=" ) != string::npos ) { - aircraft = arg.substr(11); - current_properties.setStringValue("/sim/aircraft", aircraft); + fgSetString("/sim/aircraft", arg.substr(11)); } else if ( arg.find( "--aircraft-dir=" ) != string::npos ) { - aircraft_dir = arg.substr(15); // (UIUC) + fgSetString("/sim/aircraft-dir", arg.substr(15)); } else if ( arg.find( "--model-hz=" ) != string::npos ) { - model_hz = atoi( arg.substr(11) ); + fgSetInt("/sim/model-hz", atoi(arg.substr(11))); } else if ( arg.find( "--speed=" ) != string::npos ) { - speed_up = atoi( arg.substr(8) ); + fgSetInt("/sim/speed-up", atoi(arg.substr(8))); + } else if ( arg.find( "--trim") != string::npos) { + fgSetBool("/sim/startup/trim", true); } else if ( arg.find( "--notrim") != string::npos) { - trim=-1; + fgSetBool("/sim/startup/trim", false); + } else if ( arg.find( "--on-ground") != string::npos) { + fgSetBool("/sim/startup/onground", true); + } else if ( arg.find( "--in-air") != string::npos) { + fgSetBool("/sim/startup/onground", false); } else if ( arg == "--fog-disable" ) { - fog = FG_FOG_DISABLED; + fgSetString("/sim/rendering/fog", "disabled"); } else if ( arg == "--fog-fastest" ) { - fog = FG_FOG_FASTEST; + fgSetString("/sim/rendering/fog", "fastest"); } else if ( arg == "--fog-nicest" ) { - fog = FG_FOG_NICEST; + fgSetString("/sim/fog", "nicest"); } else if ( arg == "--disable-clouds" ) { - clouds = false; + fgSetBool("/environment/clouds/status", false); } else if ( arg == "--enable-clouds" ) { - clouds = true; + fgSetBool("/environment/clouds/status", 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) ); - } + // FIXME: check units + if ( fgGetString("/sim/startup/units") == "feet" ) + fgSetDouble("/environment/clouds/altitude", + atof(arg.substr(13)) * FEET_TO_METER); + else + fgSetDouble("/environment/clouds/altitude", + atof(arg.substr(13))); } else if ( arg.find( "--fov=" ) != string::npos ) { parse_fov( arg.substr(6) ); } else if ( arg == "--disable-fullscreen" ) { - fullscreen = false; + fgSetBool("/sim/startup/fullscreen", false); } else if ( arg== "--enable-fullscreen") { - fullscreen = true; + fgSetBool("/sim/startup/fullscreen", true); } else if ( arg == "--shading-flat") { - shading = 0; + fgSetBool("/sim/rendering/shading", false); } else if ( arg == "--shading-smooth") { - shading = 1; + fgSetBool("/sim/rendering/shading", true); } else if ( arg == "--disable-skyblend") { - skyblend = false; + fgSetBool("/sim/rendering/skyblend", false); } else if ( arg== "--enable-skyblend" ) { - skyblend = true; + fgSetBool("/sim/rendering/skyblend", true); } else if ( arg == "--disable-textures" ) { - textures = false; + fgSetBool("/sim/rendering/textures", false); } else if ( arg == "--enable-textures" ) { - textures = true; + fgSetBool("/sim/rendering/textures", true); } else if ( arg == "--disable-wireframe" ) { - wireframe = false; + fgSetBool("/sim/rendering/wireframe", false); } else if ( arg == "--enable-wireframe" ) { - wireframe = true; + fgSetBool("/sim/rendering/wireframe", true); } else if ( arg.find( "--geometry=" ) != string::npos ) { bool geometry_ok = true; + int xsize = 0, ysize = 0; string geometry = arg.substr( 11 ); 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; } @@ -851,43 +718,53 @@ int FGOptions::parse_option( const string& arg ) { FG_LOG( FG_GENERAL, FG_ALERT, "Unknown geometry: " << geometry ); FG_LOG( FG_GENERAL, FG_ALERT, "Setting geometry to " << xsize << 'x' << ysize << '\n'); - } + } else { + FG_LOG( FG_GENERAL, FG_INFO, + "Setting geometry to " << xsize << 'x' << ysize << '\n'); + fgSetInt("/sim/startup/xsize", xsize); + fgSetInt("/sim/startup/ysize", ysize); + } } else if ( arg.find( "--bpp=" ) != string::npos ) { string bits_per_pix = arg.substr( 6 ); if ( bits_per_pix == "16" ) { - bpp = 16; + fgSetInt("/sim/rendering/bits-per-pixel", 16); } else if ( bits_per_pix == "24" ) { - bpp = 24; + fgSetInt("/sim/rendering/bits-per-pixel", 24); } else if ( bits_per_pix == "32" ) { - bpp = 32; + fgSetInt("/sim/rendering/bits-per-pixel", 32); + } else { + FG_LOG(FG_GENERAL, FG_ALERT, "Unsupported bpp " << bits_per_pix); } } else if ( arg == "--units-feet" ) { - units = FG_UNITS_FEET; + fgSetString("/sim/startup/units", "feet"); } else if ( arg == "--units-meters" ) { - units = FG_UNITS_METERS; + fgSetString("/sim/startup/units", "meters"); } else if ( arg.find( "--time-offset" ) != string::npos ) { - time_offset = parse_time_offset( (arg.substr(14)) ); - //time_offset_type = FG_TIME_SYS_OFFSET; + fgSetInt("/sim/startup/time-offset", + parse_time_offset( (arg.substr(14)) )); } else if ( arg.find( "--time-match-real") != string::npos ) { - //time_offset = parse_time_offset(arg.substr(18)); - time_offset_type = FG_TIME_SYS_OFFSET; + fgSetString("/sim/startup/time-offset_type", + "system-offset"); } else if ( arg.find( "--time-match-local") != string::npos ) { - //time_offset = parse_time_offset(arg.substr(18)); - time_offset_type = FG_TIME_LAT_OFFSET; + fgSetString("/sim/startup/time-offset_type", + "latitude-offset"); } else if ( arg.find( "--start-date-sys=") != string::npos ) { - time_offset = parse_date( (arg.substr(17)) ); - time_offset_type = FG_TIME_SYS_ABSOLUTE; + fgSetInt("/sim/startup/time-offset", + parse_date((arg.substr(17)))); + fgSetString("/sim/startup/time-offset-type", "system"); } else if ( arg.find( "--start-date-lat=") != string::npos ) { - time_offset = parse_date( (arg.substr(17)) ); - time_offset_type = FG_TIME_LAT_ABSOLUTE; + fgSetInt("/sim/startup/time-offset", + parse_date((arg.substr(17)))); + fgSetString("/sim/startup/time-offset-type", + "latitude"); } else if ( arg.find( "--start-date-gmt=") != string::npos ) { - time_offset = parse_date( (arg.substr(17)) ); - time_offset_type = FG_TIME_GMT_ABSOLUTE; - + fgSetInt("/sim/startup/time-offset", + parse_date((arg.substr(17)))); + fgSetString("/sim/startup/time-offset-type", "gmt"); } else if ( arg == "--hud-tris" ) { - tris_or_culled = 0; + fgSetString("/sim/hud/frame-stat-type", "tris"); } else if ( arg == "--hud-culled" ) { - tris_or_culled = 1; + fgSetString("/sim/hud/frame-stat-type", "culled"); } else if ( arg.find( "--native=" ) != string::npos ) { parse_channel( "native", arg.substr(9) ); } else if ( arg.find( "--garmin=" ) != string::npos ) { @@ -906,13 +783,14 @@ int FGOptions::parse_option( const string& arg ) { parse_channel( "joyclient", arg.substr(12) ); #ifdef FG_NETWORK_OLK } else if ( arg == "--disable-network-olk" ) { - network_olk = false; + fgSetBool("/sim/networking/olk", false); } else if ( arg== "--enable-network-olk") { - network_olk = true; + fgSetBool("/sim/networking/olk", true); } else if ( arg == "--net-hud" ) { - net_hud_display = 1; + fgSetBool("/sim/hud/net-display", true); + net_hud_display = 1; // FIXME } else if ( arg.find( "--net-id=") != string::npos ) { - net_id = arg.substr( 9 ); + fgSetString("sim/networking/call-sign", arg.substr(9)); #endif } else if ( arg.find( "--prop:" ) == 0 ) { string assign = arg.substr(7); @@ -923,17 +801,18 @@ int FGOptions::parse_option( const string& arg ) { } string name = assign.substr(0, pos); string value = assign.substr(pos + 1); - current_properties.setStringValue(name.c_str(), value); - FG_LOG(FG_GENERAL, FG_INFO, "Setting default value of property " - << name << " to \"" << value << '"'); + fgSetString(name.c_str(), value); + // FG_LOG(FG_GENERAL, FG_INFO, "Setting default value of property " + // << name << " to \"" << value << '"'); // $$$ 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 ); + double default_view_offset = 0.0; if ( woffset == "LEFT" ) { - default_view_offset = M_PI * 0.25; + default_view_offset = FG_PI * 0.25; } else if ( woffset == "RIGHT" ) { - default_view_offset = M_PI * 1.75; + default_view_offset = FG_PI * 1.75; } else if ( woffset == "CENTER" ) { default_view_offset = 0.00; } else { @@ -943,11 +822,34 @@ int FGOptions::parse_option( const string& arg ) { (FGViewerRPH *)globals->get_viewmgr()->get_view( 0 ); pilot_view->set_view_offset( default_view_offset ); pilot_view->set_goal_view_offset( default_view_offset ); + fgSetDouble("/sim/startup/view-offset", default_view_offset); // $$$ end - added VS Renganathan, 14 Oct 2K } else if ( arg.find( "--visibility=" ) != string::npos ) { - visibility = atof( arg.substr( 13 ) ); + fgSetDouble("/environment/visibility", atof(arg.substr(13))); } else if ( arg.find( "--visibility-miles=" ) != string::npos ) { - visibility = atof( arg.substr( 19 ) ) * 5280.0 * FEET_TO_METER; + double visibility = atof(arg.substr(19)) * 5280.0 * FEET_TO_METER; + fgSetDouble("/environment/visibility", visibility); + } else if ( arg.find( "--wind=" ) == 0 ) { + string val = arg.substr(7); + int pos = val.find('@'); + if (pos == string::npos) { + FG_LOG(FG_GENERAL, FG_ALERT, "bad wind value " << val); + return FG_OPTIONS_ERROR; + } + double dir = atof(val.substr(0,pos).c_str()); + double speed = atof(val.substr(pos+1).c_str()); + FG_LOG(FG_GENERAL, FG_INFO, "WIND: " << dir << '@' << + speed << " knots" << endl); + // convert to fps + speed *= NM_TO_METER * METER_TO_FEET * (1.0/3600); + dir += 180; + if (dir >= 360) + dir -= 360; + dir *= DEG_TO_RAD; + fgSetDouble("/environment/wind-north", + speed * cos(dir)); + fgSetDouble("/environment/wind-east", + speed * sin(dir)); } else if ( arg.find( "--wp=" ) != string::npos ) { parse_wp( arg.substr( 5 ) ); } else if ( arg.find( "--flight-plan=") != string::npos) { @@ -963,33 +865,37 @@ int FGOptions::parse_option( const string& arg ) { // Scan the command line options for an fg_root definition and set // just that. -int FGOptions::scan_command_line_for_root( int argc, char **argv ) { +string +fgScanForRoot (int argc, char **argv) +{ int i = 1; - FG_LOG(FG_GENERAL, FG_INFO, "Processing command line arguments"); + FG_LOG(FG_GENERAL, FG_INFO, "Scanning for root: command line"); 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 ); + return arg.substr( 10 ); } i++; } - - return FG_OPTIONS_OK; + + return ""; } // Scan the config file for an fg_root definition and set just that. -int FGOptions::scan_config_file_for_root( const string& path ) { +string +fgScanForRoot (const string& path) +{ fg_gzifstream in( path ); if ( !in.is_open() ) - return(FG_OPTIONS_ERROR); + return ""; - FG_LOG( FG_GENERAL, FG_INFO, "Processing config file: " << path ); + FG_LOG( FG_GENERAL, FG_INFO, "Scanning for root: " << path ); in >> skipcomment; #ifndef __MWERKS__ @@ -1010,18 +916,19 @@ int FGOptions::scan_config_file_for_root( const string& path ) { #endif if ( line.find( "--fg-root=" ) != string::npos ) { - fg_root = line.substr( 10 ); + return line.substr( 10 ); } in >> skipcomment; } - return FG_OPTIONS_OK; + return ""; } // Parse the command line options -int FGOptions::parse_command_line( int argc, char **argv ) { +void +fgParseOptions (int argc, char **argv) { int i = 1; int result; @@ -1032,21 +939,21 @@ int FGOptions::parse_command_line( int argc, char **argv ) { result = parse_option(argv[i]); if ( (result == FG_OPTIONS_HELP) || (result == FG_OPTIONS_ERROR) ) { - return(result); + fgUsage(); + exit(-1); } i++; } - - return FG_OPTIONS_OK; } // Parse config file options -int FGOptions::parse_config_file( const string& path ) { +void +fgParseOptions (const string& path) { fg_gzifstream in( path ); if ( !in.is_open() ) - return(FG_OPTIONS_ERROR); + return; FG_LOG( FG_GENERAL, FG_INFO, "Processing config file: " << path ); @@ -1072,17 +979,18 @@ int FGOptions::parse_config_file( const string& path ) { FG_LOG( FG_GENERAL, FG_ALERT, "Config file parse error: " << path << " '" << line << "'" ); + fgUsage(); exit(-1); } in >> skipcomment; } - - return FG_OPTIONS_OK; } // Print usage message -void FGOptions::usage ( void ) { +void +fgUsage () +{ cout << "Usage: fg [ options ... ]" << endl; cout << endl; @@ -1129,7 +1037,12 @@ void FGOptions::usage ( void ) { << endl; cout << "\t--speed=n: run the FDM this much faster than real time" << endl; cout << "\t--notrim: Do NOT attempt to trim the model when initializing JSBsim" << endl; + cout << "\t--on-ground: Start up at ground level (default)" << endl; + cout << "\t--in-air: Start up in air (implied by specifying an initial" + << " altitude above ground level." << endl; + cout << "\t--wind=DIR@SPEED: specify wind coming from DIR (degrees) at SPEED (knots)" << endl; cout << endl; + //(UIUC) cout <<"Aircraft model directory:" << endl; cout <<"\t--aircraft-dir= path is relative to the path of the executable" << endl; @@ -1232,8 +1145,3 @@ void FGOptions::usage ( void ) { cout << "\t\tinstances of --wp=" << endl; cout << "\t--flight-plan=[file]: Read all waypoints from [file]" <