X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Foptions.cxx;h=6cb98fc5adb464704f089c1220e489e3b0f54893;hb=a4e81f4ff075e6a3c0c2ea1b5a29c0bcdfdbc671;hp=0bc64b50b4dfb65c2ce9757b3385d4cc7fb3614a;hpb=bc99033c96b7f8c3c30904cf94248d924450348e;p=flightgear.git diff --git a/src/Main/options.cxx b/src/Main/options.cxx index 0bc64b50b..6cb98fc5a 100644 --- a/src/Main/options.cxx +++ b/src/Main/options.cxx @@ -25,45 +25,52 @@ # include #endif -#if defined(FX) && defined(XMESA) -bool global_fullscreen = true; -#endif - #include +#include -#include // rint() +#include // rint() #include -#include // atof(), atoi() -#include +#include // atof(), atoi() +#include // strcmp() #include STL_STRING -#include -#include -#include -#include -#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 + #include "globals.hxx" +#include "fg_init.hxx" +#include "fg_props.hxx" #include "options.hxx" +#include "viewmgr.hxx" + +SG_USING_STD(string); +SG_USING_NAMESPACE(std); + -FG_USING_STD(string); -FG_USING_NAMESPACE(std); +#define NEW_DEFAULT_MODEL_HZ 120 -// from main.cxx -extern void fgReshape( int width, int height ); +enum +{ + FG_OPTIONS_OK = 0, + FG_OPTIONS_HELP = 1, + FG_OPTIONS_ERROR = 2 +}; -inline double +static double atof( const string& str ) { @@ -75,7 +82,7 @@ atof( const string& str ) #endif } -inline int +static int atoi( const string& str ) { #ifdef __MWERKS__ @@ -87,37 +94,18 @@ atoi( const string& str ) } -// Defined the shared options class here -// FGOptions current_options; - -#define PROP(name) (globals->get_props()->getValue(name, true)) - - -// Constructor -FGOptions::FGOptions() +/** + * 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 () { - char* envp = ::getenv( "FG_ROOT" ); - - if ( envp != NULL ) { - // fg_root could be anywhere, so default to environmental - // variable $FG_ROOT if it is set. - globals->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 ) - globals->set_fg_root("\\FlightGear"); -#elif defined( macintosh ) - globals->set_fg_root(""); -#else - globals->set_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 @@ -127,170 +115,119 @@ FGOptions::FGOptions() // Otherwise, default to Scenery being in $FG_ROOT/Scenery globals->set_fg_scenery(""); } -} - -void -FGOptions::init () -{ - // These are all deprecated, and will - // be removed gradually. - airport_id = PROP("/sim/startup/airport-id"); - lon = PROP("/position/longitude"); - lat = PROP("/position/latitude"); - altitude = PROP("/position/altitude"); - heading = PROP("/orientation/heading"); - roll = PROP("/orientation/roll"); - pitch = PROP("/orientation/pitch"); - speedset = PROP("/sim/startup/speed-set"); - uBody = PROP("/velocities/uBody"); - vBody = PROP("/velocities/vBody"); - wBody = PROP("/velocities/wBody"); - vNorth = PROP("/velocities/speed-north"); - vEast = PROP("/velocities/speed-east"); - vDown = PROP("/velocities/speed-down"); - vkcas = PROP("/velocities/knots"); - mach = PROP("/velocities/mach"); - game_mode = PROP("/sim/startup/game-mode"); - splash_screen = PROP("/sim/startup/splash-screen"); - intro_music = PROP("/sim/startup/intro-music"); - mouse_pointer = PROP("/sim/startup/mouse-pointer"); - control_mode = PROP("/sim/control-mode"); - auto_coordination = PROP("/sim/auto-coordination"); - hud_status = PROP("/sim/hud/visibility"); - panel_status = PROP("/sim/panel/visibility"); - sound = PROP("/sim/sound"); - anti_alias_hud = PROP("/sim/hud/antialiased"); - flight_model = PROP("/sim/flight-model"); - aircraft = PROP("/sim/aircraft"); - model_hz = PROP("/sim/model-hz"); - speed_up = PROP("/sim/speed-up"); - trim = PROP("/sim/startup/trim"); - fog = PROP("/sim/rendering/fog"); - clouds = PROP("/environment/clouds/enabled"); - clouds_asl = PROP("/environments/clouds/altitude"); - fullscreen = PROP("/sim/startup/fullscreen"); - shading = PROP("/sim/rendering/shading"); - skyblend = PROP("/sim/rendering/skyblend"); - textures = PROP("/sim/rendering/textures"); - wireframe = PROP("/sim/rendering/wireframe"); - xsize = PROP("/sim/startup/xsize"); - ysize = PROP("/sim/startup/ysize"); - bpp = PROP("/sim/rendering/bits-per-pixel"); - view_mode = PROP("/sim/view-mode"); - default_view_offset = PROP("/sim/startup/view-offset"); - visibility = PROP("/environment/visibility"); - units = PROP("/sim/startup/units"); - tris_or_culled = PROP("/sim/hud/frame-stat-type"); - time_offset = PROP("/sim/startup/time-offset"); - time_offset_type = PROP("/sim/startup/time-offset-type"); - network_olk = PROP("/sim/networking/network-olk"); - net_id = PROP("/sim/networking/call-sign"); -} - - -/** - * 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 -FGOptions::set_default_props () -{ - SGPropertyNode * props = globals->get_props(); - - // Position (Globe, AZ) - props->setDoubleValue("/position/longitude", -110.6642444); - props->setDoubleValue("/position/latitude", 33.3528917); - props->setDoubleValue("/position/altitude", -9999.0); + // Position (deliberately out of range) + fgSetDouble("/position/longitude-deg", 9999.0); + fgSetDouble("/position/latitude-deg", 9999.0); + fgSetDouble("/position/altitude-ft", -9999.0); // Orientation - props->setDoubleValue("/orientation/heading", 270); - props->setDoubleValue("/orientation/roll", 0); - props->setDoubleValue("/orientation/pitch", 0.424); + fgSetDouble("/orientation/heading-deg", 270); + fgSetDouble("/orientation/roll-deg", 0); + fgSetDouble("/orientation/pitch-deg", 0.424); // Velocities - props->setStringValue("/sim/startup/speed-set", "knots"); - props->setDoubleValue("/velocities/uBody", 0.0); - props->setDoubleValue("/velocities/vBody", 0.0); - props->setDoubleValue("/velocities/wBody", 0.0); - props->setDoubleValue("/velocities/speed-north", 0.0); - props->setDoubleValue("/velocities/speed-east", 0.0); - props->setDoubleValue("/velocities/speed-down", 0.0); - props->setDoubleValue("/velocities/airspeed", 0.0); - props->setDoubleValue("/velocities/mach", 0.0); + fgSetString("/sim/startup/speed-set", "knots"); + fgSetDouble("/velocities/uBody-fps", 0.0); + fgSetDouble("/velocities/vBody-fps", 0.0); + fgSetDouble("/velocities/wBody-fps", 0.0); + fgSetDouble("/velocities/speed-north-fps", 0.0); + fgSetDouble("/velocities/speed-east-fps", 0.0); + fgSetDouble("/velocities/speed-down-fps", 0.0); + fgSetDouble("/velocities/airspeed-kt", 0.0); + fgSetDouble("/velocities/mach", 0.0); // Miscellaneous - props->setBoolValue("/sim/startup/game-mode", false); - props->setBoolValue("/sim/startup/splash-screen", true); - props->setBoolValue("/sim/startup/intro-music", true); - props->setStringValue("/sim/startup/mouse-pointer", "disabled"); - props->setStringValue("/sim/control-mode", "joystick"); - props->setBoolValue("/sim/auto-coordination", false); - + fgSetBool("/sim/startup/game-mode", false); + fgSetBool("/sim/startup/splash-screen", true); + fgSetBool("/sim/startup/intro-music", true); + // we want mouse-pointer to have an undefined value if nothing is + // specified so we can do the right thing for voodoo-1/2 cards. + // fgSetString("/sim/startup/mouse-pointer", "disabled"); + fgSetString("/sim/control-mode", "joystick"); + fgSetBool("/sim/auto-coordination", false); +#if !defined(WIN32) + fgSetString("/sim/startup/browser-app", "netscape"); +#else + fgSetString("/sim/startup/browser-app", "webrun.bat"); +#endif // Features - props->setBoolValue("/sim/hud/visibility", false); - props->setBoolValue("/sim/panel/visibility", true); - props->setBoolValue("/sim/sound", true); - props->setBoolValue("/sim/hud/antialiased", false); + fgSetBool("/sim/hud/visibility", false); + fgSetBool("/sim/panel/visibility", true); + fgSetBool("/sim/sound/audible", true); + fgSetBool("/sim/hud/antialiased", false); // Flight Model options - props->setStringValue("/sim/flight-model", "larcsim"); - props->setStringValue("/sim/aircraft", "c172"); - props->setIntValue("/sim/model-hz", NEW_DEFAULT_MODEL_HZ); - props->setIntValue("/sim/speed-up", 1); - props->setBoolValue("/sim/startup/trim", false); + fgSetString("/sim/flight-model", "jsb"); + fgSetString("/sim/aero", "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 - props->setStringValue("/sim/rendering/fog", "nicest"); - props->setBoolValue("/environment/clouds/enabled", true); - props->setDoubleValue("/environment/clouds/altitude", 5000); - props->setBoolValue("/sim/startup/fullscreen", false); - props->setBoolValue("/sim/rendering/shading", true); - props->setBoolValue("/sim/rendering/skyblend", true); - props->setBoolValue("/sim/rendering/textures", true); - props->setBoolValue("/sim/rendering/wireframe", false); - props->setIntValue("/sim/startup/xsize", 800); - props->setIntValue("/sim/startup/ysize", 600); - props->setIntValue("/sim/rendering/bits-per-pixel", 16); - props->setIntValue("/sim/view-mode", (int)FG_VIEW_PILOT); - props->setDoubleValue("/sim/startup/view-offset", 0); - props->setDoubleValue("/environment/visibility", 20000); + fgSetString("/sim/rendering/fog", "nicest"); + fgSetBool("/environment/clouds/status", true); + 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/current-view/heading-offset-deg", 0); + fgSetDouble("/environment/visibility-m", 20000); // HUD options - props->setStringValue("/sim/startup/units", "feet"); - props->setStringValue("/sim/hud/frame-stat-type", "tris"); + fgSetString("/sim/startup/units", "feet"); + fgSetString("/sim/hud/frame-stat-type", "tris"); // Time options - props->setIntValue("/sim/startup/time-offset", 0); - - props->setBoolValue("/sim/networking/network-olk", false); - props->setStringValue("/sim/networking/call-sign", "Johnny"); + fgSetInt("/sim/startup/time-offset", 0); + fgSetString("/sim/startup/time-offset-type", "system-offset"); + fgSetLong("/sim/time/cur-time-override", 0); + + fgSetBool("/sim/networking/network-olk", false); + fgSetString("/sim/networking/call-sign", "Johnny"); + + // Freeze options + fgSetBool("/sim/freeze/master", false); + fgSetBool("/sim/freeze/position", false); + fgSetBool("/sim/freeze/clock", false); + fgSetBool("/sim/freeze/fuel", false); } -void -FGOptions::toggle_panel() { - SGPropertyNode * props = globals->get_props(); - bool freeze = globals->get_freeze(); - - if( !freeze ) - globals->set_freeze(true); - - if(props->getBoolValue("/sim/panel/visibility")) - props->setBoolValue("/sim/panel/visibility", false); - else - props->setBoolValue("/sim/panel/visibility", true); - - fgReshape(props->getIntValue("/sim/startup/xsize"), - props->getIntValue("/sim/startup/ysize")); - if( !freeze ) - globals->set_freeze( false ); +static bool +parse_wind (const string &wind, double * min_hdg, double * max_hdg, + double * speed, double * gust) +{ + unsigned int pos = wind.find('@'); + if (pos == string::npos) + return false; + string dir = wind.substr(0, pos); + string spd = wind.substr(pos+1); + pos = dir.find(':'); + if (pos == string::npos) { + *min_hdg = *max_hdg = atof(dir.c_str()); + } else { + *min_hdg = atof(dir.substr(0,pos).c_str()); + *max_hdg = atof(dir.substr(pos+1).c_str()); + } + pos = spd.find(':'); + if (pos == string::npos) { + *speed = *gust = atof(spd.c_str()); + } else { + *speed = atof(spd.substr(0,pos).c_str()); + *gust = atof(spd.substr(pos+1).c_str()); + } + return true; } -double -FGOptions::parse_time(const string& time_in) { +// parse a time string ([+/-]%f[:%f[:%f]]) into hours +static double +parse_time(const string& time_in) { char *time_str, num[256]; double hours, minutes, seconds; double result = 0.0; @@ -368,7 +305,9 @@ FGOptions::parse_time(const string& time_in) { } -long int FGOptions::parse_date( const string& date) +// parse a date string (yyyy:mm:dd:hh:mm:ss) into a time_t (seconds) +static long int +parse_date( const string& date) { struct tm gmt; char * date_str, num[256]; @@ -475,9 +414,9 @@ long int FGOptions::parse_date( const string& date) } -/// parse degree in the form of [+/-]hhh:mm:ss -double -FGOptions::parse_degree( const string& degree_str) { +// parse angle in the form of [+/-]ddd:mm:ss into degrees +static double +parse_degree( const string& degree_str) { double result = parse_time( degree_str ); // printf("Degree = %.4f\n", result); @@ -486,9 +425,9 @@ FGOptions::parse_degree( const string& degree_str) { } -// parse time offset command line option -int -FGOptions::parse_time_offset( const string& time_str) { +// parse time offset string into seconds +static int +parse_time_offset( const string& time_str) { int result; // printf("time offset = %s\n", time_str); @@ -505,42 +444,15 @@ FGOptions::parse_time_offset( const string& time_str) { } -// Parse --fdm=abcdefg type option -int -FGOptions::parse_fdm( const string& fm ) const { - // 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_props()->setDoubleValue("/sim/field-of-view", fov); + fgSetDouble("/sim/current-view/field-of-view", fov); // printf("parse_fov(): result = %.4f\n", fov); @@ -573,30 +485,30 @@ FGOptions::parse_fov( const string& arg ) { // // filename = file system file name -bool -FGOptions::parse_channel( const string& type, const string& channel_str ) { +static bool +add_channel( const string& type, const string& channel_str ) { // cout << "Channel string = " << channel_str << endl; - globals->get_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 ) { +// Parse --wp=ID[@alt] +static bool +parse_wp( const string& arg ) { string id, alt_str; double alt = 0.0; - int pos = arg.find( "@" ); + unsigned int pos = arg.find( "@" ); 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 ( globals->get_props()->getStringValue("/sim/startup/units") - == "feet" ) { - alt *= FEET_TO_METER; + if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) { + alt *= SG_FEET_TO_METER; } } else { id = arg; @@ -615,22 +527,28 @@ 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) { + sg_gzifstream in(arg.c_str()); + if ( !in.is_open() ) { return false; } while ( true ) { string line; -#ifdef GETLINE_NEEDS_TERMINATOR - getline( infile, line, '\n' ); -#elif defined( macintosh ) - getline( infile, line, '\r' ); + +#if defined( macintosh ) + getline( in, line, '\r' ); #else - getline( infile, line ); + getline( in, line, '\n' ); #endif - if ( infile.eof() ) { + + // catch extraneous (DOS) line ending character + if ( line[line.length() - 1] < 32 ) { + line = line.substr( 0, line.length()-1 ); + } + + if ( in.eof() ) { break; } parse_wp(line); @@ -641,194 +559,201 @@ bool FGOptions::parse_flightplan(const string& arg) // Parse a single option -int FGOptions::parse_option( const string& arg ) { - SGPropertyNode * props = globals->get_props(); +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") { - props->setBoolValue("/sim/startup/game-mode", false); + fgSetBool("/sim/startup/game-mode", false); } else if ( arg == "--enable-game-mode" ) { - props->setBoolValue("/sim/startup/game-mode", true); + fgSetBool("/sim/startup/game-mode", true); } else if ( arg == "--disable-splash-screen" ) { - props->setBoolValue("/sim/startup/splash-screen", false); + fgSetBool("/sim/startup/splash-screen", false); } else if ( arg == "--enable-splash-screen" ) { - props->setBoolValue("/sim/startup/splash-screen", true); + fgSetBool("/sim/startup/splash-screen", true); } else if ( arg == "--disable-intro-music" ) { - props->setBoolValue("/sim/startup/intro-music", false); + fgSetBool("/sim/startup/intro-music", false); } else if ( arg == "--enable-intro-music" ) { - props->setBoolValue("/sim/startup/intro-music", true); + fgSetBool("/sim/startup/intro-music", true); } else if ( arg == "--disable-mouse-pointer" ) { - props->setStringValue("/sim/startup/mouse-pointer", "disabled"); + fgSetString("/sim/startup/mouse-pointer", "disabled"); } else if ( arg == "--enable-mouse-pointer" ) { - props->setStringValue("/sim/startup/mouse-pointer", "enabled"); + fgSetString("/sim/startup/mouse-pointer", "enabled"); } else if ( arg == "--disable-freeze" ) { - props->setBoolValue("/sim/freeze", false); + fgSetBool("/sim/freeze/master", false); } else if ( arg == "--enable-freeze" ) { - props->setBoolValue("/sim/freeze", true); + fgSetBool("/sim/freeze/master", true); + } else if ( arg == "--disable-fuel-freeze" ) { + fgSetBool("/sim/freeze/fuel", false); + } else if ( arg == "--enable-fuel-freeze" ) { + fgSetBool("/sim/freeze/fuel", true); + } else if ( arg == "--disable-clock-freeze" ) { + fgSetBool("/sim/freeze/clock", false); + } else if ( arg == "--enable-clock-freeze" ) { + fgSetBool("/sim/freeze/clock", true); } else if ( arg == "--disable-anti-alias-hud" ) { - props->setBoolValue("/sim/hud/antialiased", false); + fgSetBool("/sim/hud/antialiased", false); } else if ( arg == "--enable-anti-alias-hud" ) { - props->setBoolValue("/sim/hud/antialiased", true); - } else if ( arg.find( "--control=") != string::npos ) { - props->setStringValue("/sim/control-mode", arg.substr(10)); + fgSetBool("/sim/hud/antialiased", true); + } else if ( arg.find( "--control=") == 0 ) { + fgSetString("/sim/control-mode", arg.substr(10).c_str()); } else if ( arg == "--disable-auto-coordination" ) { - props->setBoolValue("/sim/auto-coordination", false); + fgSetBool("/sim/auto-coordination", false); } else if ( arg == "--enable-auto-coordination" ) { - props->setBoolValue("/sim/auto-coordination", true); + fgSetBool("/sim/auto-coordination", true); + } else if ( arg.find( "--browser-app=") == 0 ) { + fgSetString("/sim/startup/browser-app", arg.substr(14).c_str()); } else if ( arg == "--disable-hud" ) { - props->setBoolValue("/sim/hud/visibility", false); + fgSetBool("/sim/hud/visibility", false); } else if ( arg == "--enable-hud" ) { - props->setBoolValue("/sim/hud/visibility", true); + fgSetBool("/sim/hud/visibility", true); } else if ( arg == "--disable-panel" ) { - props->setBoolValue("/sim/panel/visibility", false); + fgSetBool("/sim/panel/visibility", false); } else if ( arg == "--enable-panel" ) { - props->setBoolValue("/sim/panel/visibility", true); + fgSetBool("/sim/panel/visibility", true); } else if ( arg == "--disable-sound" ) { - props->setBoolValue("/sim/sound", false); + fgSetBool("/sim/sound/audible", false); } else if ( arg == "--enable-sound" ) { - props->setBoolValue("/sim/sound", true); - } else if ( arg.find( "--airport-id=") != string::npos ) { + fgSetBool("/sim/sound/audible", true); + } else if ( arg.find( "--airport-id=") == 0 ) { // NB: changed property name!!! - props->setStringValue("/sim/startup/airport-id", arg.substr(13)); - } else if ( arg.find( "--lon=" ) != string::npos ) { - props->setDoubleValue("/position/longitude", + fgSetString("/sim/startup/airport-id", arg.substr(13).c_str()); + } else if ( arg.find( "--offset-distance=") == 0 ) { + fgSetDouble("/sim/startup/offset-distance", atof(arg.substr(18))); + } else if ( arg.find( "--offset-azimuth=") == 0 ) { + fgSetDouble("/sim/startup/offset-azimuth", atof(arg.substr(17))); + } else if ( arg.find( "--lon=" ) == 0 ) { + fgSetDouble("/position/longitude-deg", parse_degree(arg.substr(6))); - props->setStringValue("/position/airport-id", ""); - } else if ( arg.find( "--lat=" ) != string::npos ) { - props->setDoubleValue("/position/latitude", + fgSetString("/sim/startup/airport-id", ""); + } else if ( arg.find( "--lat=" ) == 0 ) { + fgSetDouble("/position/latitude-deg", parse_degree(arg.substr(6))); - props->setStringValue("/position/airport-id", ""); - } else if ( arg.find( "--altitude=" ) != string::npos ) { - if ( props->getStringValue("/sim/startup/units") == "feet" ) - props->setDoubleValue(atof(arg.substr(11))); + fgSetString("/sim/startup/airport-id", ""); + } else if ( arg.find( "--altitude=" ) == 0 ) { + fgSetBool("/sim/startup/onground", false); + if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) + fgSetDouble("/position/altitude-ft", atof(arg.substr(11))); else - props->setDoubleValue(atof(arg.substr(11)) * METER_TO_FEET); - } else if ( arg.find( "--uBody=" ) != string::npos ) { - props->setStringValue("/sim/startup/speed-set", "UVW"); - // FIXME: the units are totally confused here - if ( props->getStringValue("/sim/startup/units") == "feet" ) - props->setDoubleValue("/velocities/uBody", atof(arg.substr(8))); + fgSetDouble("/position/altitude-ft", + atof(arg.substr(11)) * SG_METER_TO_FEET); + } else if ( arg.find( "--uBody=" ) == 0 ) { + fgSetString("/sim/startup/speed-set", "UVW"); + if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) + fgSetDouble("/velocities/uBody-fps", atof(arg.substr(8))); else - props->setDoubleValue("/velocities/uBody", - atof(arg.substr(8)) * FEET_TO_METER); - } else if ( arg.find( "--vBody=" ) != string::npos ) { - props->setStringValue("/sim/startup/speed-set", "UVW"); - // FIXME: the units are totally confused here - if ( props->getStringValue("/sim/startup/units") == "feet" ) - props->setDoubleValue("/velocities/vBody", atof(arg.substr(8))); + fgSetDouble("/velocities/uBody-fps", + atof(arg.substr(8)) * SG_METER_TO_FEET); + } else if ( arg.find( "--vBody=" ) == 0 ) { + fgSetString("/sim/startup/speed-set", "UVW"); + if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) + fgSetDouble("/velocities/vBody-fps", atof(arg.substr(8))); else - props->setDoubleValue("/velocities/vBody", - atof(arg.substr(8)) * FEET_TO_METER); - } else if ( arg.find( "--wBody=" ) != string::npos ) { - props->setStringValue("/sim/startup/speed-set", "UVW"); - // FIXME: the units are totally confused here - if ( props->getStringValue("/sim/startup/units") == "feet" ) - props->setDoubleValue("/velocities/wBody", atof(arg.substr(8))); + fgSetDouble("/velocities/vBody-fps", + atof(arg.substr(8)) * SG_METER_TO_FEET); + } else if ( arg.find( "--wBody=" ) == 0 ) { + fgSetString("/sim/startup/speed-set", "UVW"); + if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) + fgSetDouble("/velocities/wBody-fps", atof(arg.substr(8))); else - props->setDoubleValue("/velocities/wBody", - atof(arg.substr(8)) * FEET_TO_METER); - } else if ( arg.find( "--vNorth=" ) != string::npos ) { - props->setStringValue("/sim/startup/speed-set", "NED"); - // FIXME: the units are totally confused here - if ( props->getStringValue("/sim/startup/units") == "feet" ) - props->setDoubleValue("/velocities/speed-north", atof(arg.substr(8))); + fgSetDouble("/velocities/wBody-fps", + atof(arg.substr(8)) * SG_METER_TO_FEET); + } else if ( arg.find( "--vNorth=" ) == 0 ) { + fgSetString("/sim/startup/speed-set", "NED"); + if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) + fgSetDouble("/velocities/speed-north-fps", atof(arg.substr(9))); else - props->setDoubleValue("/velocities/speed-north", - atof(arg.substr(8)) * FEET_TO_METER); - } else if ( arg.find( "--vEast=" ) != string::npos ) { - props->setStringValue("/sim/startup/speed-set", "NED"); - // FIXME: the units are totally confused here - if ( props->getStringValue("/sim/startup/units") == "feet" ) - props->setDoubleValue("/velocities/speed-east", atof(arg.substr(8))); + fgSetDouble("/velocities/speed-north-fps", + atof(arg.substr(9)) * SG_METER_TO_FEET); + } else if ( arg.find( "--vEast=" ) == 0 ) { + fgSetString("/sim/startup/speed-set", "NED"); + if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) + fgSetDouble("/velocities/speed-east-fps", atof(arg.substr(8))); else - props->setDoubleValue("/velocities/speed-east", - atof(arg.substr(8)) * FEET_TO_METER); - } else if ( arg.find( "--vDown=" ) != string::npos ) { - props->setStringValue("/sim/startup/speed-set", "NED"); - // FIXME: the units are totally confused here - if ( props->getStringValue("/sim/startup/units") == "feet" ) - props->setDoubleValue("/velocities/speed-down", atof(arg.substr(8))); + fgSetDouble("/velocities/speed-east-fps", + atof(arg.substr(8)) * SG_METER_TO_FEET); + } else if ( arg.find( "--vDown=" ) == 0 ) { + fgSetString("/sim/startup/speed-set", "NED"); + if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) + fgSetDouble("/velocities/speed-down-fps", atof(arg.substr(8))); else - props->setDoubleValue("/velocities/speed-down", - atof(arg.substr(8)) * FEET_TO_METER); - } else if ( arg.find( "--vc=" ) != string::npos) { - props->setStringValue("/sim/startup/speed-set", "knots"); - props->setDoubleValue("/velocities/airspeed", atof(arg.substr(5))); - } else if ( arg.find( "--mach=" ) != string::npos) { - props->setStringValue("/sim/startup/speed-set", "mach"); - props->setDoubleValue("/velocities/mach", atof(arg.substr(7))); - } else if ( arg.find( "--heading=" ) != string::npos ) { - props->setDoubleValue("/orientation/heading", atof(arg.substr(10))); - } else if ( arg.find( "--roll=" ) != string::npos ) { - props->setDoubleValue("/orientation/roll", atof(arg.substr(7))); - } else if ( arg.find( "--pitch=" ) != string::npos ) { - props->setDoubleValue("/orientation/pitch", atof(arg.substr(8))); - } else if ( arg.find( "--fg-root=" ) != string::npos ) { + fgSetDouble("/velocities/speed-down-fps", + atof(arg.substr(8)) * SG_METER_TO_FEET); + } else if ( arg.find( "--vc=" ) == 0) { + fgSetString("/sim/startup/speed-set", "knots"); + fgSetDouble("/velocities/airspeed-kt", atof(arg.substr(5))); + } else if ( arg.find( "--mach=" ) == 0) { + fgSetString("/sim/startup/speed-set", "mach"); + fgSetDouble("/velocities/mach", atof(arg.substr(7))); + } else if ( arg.find( "--heading=" ) == 0 ) { + fgSetDouble("/orientation/heading-deg", atof(arg.substr(10))); + } else if ( arg.find( "--roll=" ) == 0 ) { + fgSetDouble("/orientation/roll-deg", atof(arg.substr(7))); + } else if ( arg.find( "--pitch=" ) == 0 ) { + fgSetDouble("/orientation/pitch-deg", atof(arg.substr(8))); + } else if ( arg.find( "--glideslope=" ) == 0 ) { + fgSetDouble("/velocities/glideslope", atof(arg.substr(13)) + *SG_DEGREES_TO_RADIANS); + } else if ( arg.find( "--roc=" ) == 0 ) { + fgSetDouble("/velocities/vertical-speed-fps", atof(arg.substr(6))/60); + } else if ( arg.find( "--fg-root=" ) == 0 ) { globals->set_fg_root(arg.substr( 10 )); - } else if ( arg.find( "--fg-scenery=" ) != string::npos ) { + } else if ( arg.find( "--fg-scenery=" ) == 0 ) { globals->set_fg_scenery(arg.substr( 13 )); - } else if ( arg.find( "--fdm=" ) != string::npos ) { - props->setStringValue("/sim/flight-model", arg.substr(6)); - // FIXME: reimplement this logic, somehow -// if((flight_model == FGInterface::FG_JSBSIM) && (get_trim_mode() == 0)) { -// props-> -// set_trim_mode(1); -// } else { -// set_trim_mode(0); -// } - } else if ( arg.find( "--aircraft=" ) != string::npos ) { - props->setStringValue("/sim/aircraft", arg.substr(11)); - } else if ( arg.find( "--aircraft-dir=" ) != string::npos ) { - props->setStringValue("/sim/aircraft-dir", arg.substr(15)); - } else if ( arg.find( "--model-hz=" ) != string::npos ) { - props->setIntValue("/sim/model-hz", atoi(arg.substr(11))); - } else if ( arg.find( "--speed=" ) != string::npos ) { - props->setIntValue("/sim/speed-up", atoi(arg.substr(8))); - } else if ( arg.find( "--notrim") != string::npos) { - props->setIntValue("/sim/startup/trim", -1); + } else if ( arg.find( "--fdm=" ) == 0 ) { + fgSetString("/sim/flight-model", arg.substr(6).c_str()); + } else if ( arg.find( "--aero=" ) == 0 ) { + fgSetString("/sim/aero", arg.substr(7).c_str()); + } else if ( arg.find( "--aircraft-dir=" ) == 0 ) { + fgSetString("/sim/aircraft-dir", arg.substr(15).c_str()); + } else if ( arg.find( "--model-hz=" ) == 0 ) { + fgSetInt("/sim/model-hz", atoi(arg.substr(11))); + } else if ( arg.find( "--speed=" ) == 0 ) { + fgSetInt("/sim/speed-up", atoi(arg.substr(8))); + } else if ( arg.find( "--trim") == 0) { + fgSetBool("/sim/startup/trim", true); + } else if ( arg.find( "--notrim") == 0) { + fgSetBool("/sim/startup/trim", false); + } else if ( arg.find( "--on-ground") == 0) { + fgSetBool("/sim/startup/onground", true); + } else if ( arg.find( "--in-air") == 0) { + fgSetBool("/sim/startup/onground", false); } else if ( arg == "--fog-disable" ) { - props->setStringValue("/sim/rendering/fog", "disabled"); + fgSetString("/sim/rendering/fog", "disabled"); } else if ( arg == "--fog-fastest" ) { - props->setStringValue("/sim/rendering/fog", "fastest"); + fgSetString("/sim/rendering/fog", "fastest"); } else if ( arg == "--fog-nicest" ) { - props->setStringValue("/sim/fog", "nicest"); + fgSetString("/sim/fog", "nicest"); } else if ( arg == "--disable-clouds" ) { - props->setBoolValue("/environment/clouds/enabled", false); + fgSetBool("/environment/clouds/status", false); } else if ( arg == "--enable-clouds" ) { - props->setBoolValue("/environment/clouds/enabled", true); - } else if ( arg.find( "--clouds-asl=" ) != string::npos ) { - // FIXME: check units - if ( props->getStringValue("/sim/startup/units") == "feet" ) - props->setDoubleValue("/environment/clouds/altitude", - atof(arg.substr(13)) * FEET_TO_METER); - else - props->setDoubleValue("/environment/clouds/altitude", - atof(arg.substr(13))); - } else if ( arg.find( "--fov=" ) != string::npos ) { + fgSetBool("/environment/clouds/status", true); + } else if ( arg.find( "--fov=" ) == 0 ) { parse_fov( arg.substr(6) ); } else if ( arg == "--disable-fullscreen" ) { - props->setBoolValue("/sim/startup/fullscreen", false); + fgSetBool("/sim/startup/fullscreen", false); } else if ( arg== "--enable-fullscreen") { - props->setBoolValue("/sim/startup/fullscreen", true); + fgSetBool("/sim/startup/fullscreen", true); } else if ( arg == "--shading-flat") { - props->setBoolValue("/sim/rendering/shading", false); + fgSetBool("/sim/rendering/shading", false); } else if ( arg == "--shading-smooth") { - props->setBoolValue("/sim/rendering/shading", true); + fgSetBool("/sim/rendering/shading", true); } else if ( arg == "--disable-skyblend") { - props->setBoolValue("/sim/rendering/skyblend", false); + fgSetBool("/sim/rendering/skyblend", false); } else if ( arg== "--enable-skyblend" ) { - props->setBoolValue("/sim/rendering/skyblend", true); + fgSetBool("/sim/rendering/skyblend", true); } else if ( arg == "--disable-textures" ) { - props->setBoolValue("/sim/rendering/textures", false); + fgSetBool("/sim/rendering/textures", false); } else if ( arg == "--enable-textures" ) { - props->setBoolValue("/sim/rendering/textures", true); + fgSetBool("/sim/rendering/textures", true); } else if ( arg == "--disable-wireframe" ) { - props->setBoolValue("/sim/rendering/wireframe", false); + fgSetBool("/sim/rendering/wireframe", false); } else if ( arg == "--enable-wireframe" ) { - props->setBoolValue("/sim/rendering/wireframe", true); - } else if ( arg.find( "--geometry=" ) != string::npos ) { + fgSetBool("/sim/rendering/wireframe", true); + } else if ( arg.find( "--geometry=" ) == 0 ) { bool geometry_ok = true; int xsize = 0, ysize = 0; string geometry = arg.substr( 11 ); @@ -848,147 +773,204 @@ int FGOptions::parse_option( const string& arg ) { } if ( !geometry_ok ) { - FG_LOG( FG_GENERAL, FG_ALERT, "Unknown geometry: " << geometry ); - FG_LOG( FG_GENERAL, FG_ALERT, + SG_LOG( SG_GENERAL, SG_ALERT, "Unknown geometry: " << geometry ); + SG_LOG( SG_GENERAL, SG_ALERT, "Setting geometry to " << xsize << 'x' << ysize << '\n'); } else { - FG_LOG( FG_GENERAL, FG_INFO, + SG_LOG( SG_GENERAL, SG_INFO, "Setting geometry to " << xsize << 'x' << ysize << '\n'); - props->setIntValue("/sim/startup/xsize", xsize); - props->setIntValue("/sim/startup/ysize", ysize); + fgSetInt("/sim/startup/xsize", xsize); + fgSetInt("/sim/startup/ysize", ysize); } - } else if ( arg.find( "--bpp=" ) != string::npos ) { + } else if ( arg.find( "--bpp=" ) == 0 ) { string bits_per_pix = arg.substr( 6 ); if ( bits_per_pix == "16" ) { - props->setIntValue("/sim/rendering/bits-per-pixel", 16); + fgSetInt("/sim/rendering/bits-per-pixel", 16); } else if ( bits_per_pix == "24" ) { - props->setIntValue("/sim/rendering/bits-per-pixel", 24); + fgSetInt("/sim/rendering/bits-per-pixel", 24); } else if ( bits_per_pix == "32" ) { - props->setIntValue("/sim/rendering/bits-per-pixel", 32); + fgSetInt("/sim/rendering/bits-per-pixel", 32); } else { - FG_LOG(FG_GENERAL, FG_ALERT, "Unsupported bpp " << bits_per_pix); + SG_LOG(SG_GENERAL, SG_ALERT, "Unsupported bpp " << bits_per_pix); } } else if ( arg == "--units-feet" ) { - props->setStringValue("/sim/startup/units", "feet"); + fgSetString("/sim/startup/units", "feet"); } else if ( arg == "--units-meters" ) { - props->setStringValue("/sim/startup/units", "meters"); - } else if ( arg.find( "--time-offset" ) != string::npos ) { - props->setIntValue("/sim/startup/time-offset", - parse_time_offset( (arg.substr(14)) )); - } else if ( arg.find( "--time-match-real") != string::npos ) { - props->setStringValue("/sim/startup/time-offset_type", - "system-offset"); - } else if ( arg.find( "--time-match-local") != string::npos ) { - props->setStringValue("/sim/startup/time-offset_type", - "latitude-offset"); - } else if ( arg.find( "--start-date-sys=") != string::npos ) { - props->setIntValue("/sim/startup/time-offset", - parse_date((arg.substr(17)))); - props->setStringValue("/sim/startup/time-offset-type", "system"); - } else if ( arg.find( "--start-date-lat=") != string::npos ) { - props->setIntValue("/sim/startup/time-offset", - parse_date((arg.substr(17)))); - props->setStringValue("/sim/startup/time-offset-type", - "latitude"); - } else if ( arg.find( "--start-date-gmt=") != string::npos ) { - props->setIntValue("/sim/startup/time-offset", - parse_date((arg.substr(17)))); - props->setStringValue("/sim/startup/time-offset-type", "gmt"); + fgSetString("/sim/startup/units", "meters"); + } else if ( arg.find( "--time-offset" ) == 0 ) { + fgSetInt("/sim/startup/time-offset", + parse_time_offset( (arg.substr(14)) )); + fgSetString("/sim/startup/time-offset-type", "system-offset"); + } else if ( arg.find( "--time-match-real") == 0 ) { + fgSetString("/sim/startup/time-offset-type", "system-offset"); + } else if ( arg.find( "--time-match-local") == 0 ) { + fgSetString("/sim/startup/time-offset-type", "latitude-offset"); + } else if ( arg.find( "--start-date-sys=") == 0 ) { + fgSetInt("/sim/startup/time-offset", parse_date((arg.substr(17)))); + fgSetString("/sim/startup/time-offset-type", "system"); + } else if ( arg.find( "--start-date-lat=") == 0 ) { + fgSetInt("/sim/startup/time-offset", parse_date((arg.substr(17)))); + fgSetString("/sim/startup/time-offset-type", "latitude"); + } else if ( arg.find( "--start-date-gmt=") == 0 ) { + fgSetInt("/sim/startup/time-offset", parse_date((arg.substr(17)))); + fgSetString("/sim/startup/time-offset-type", "gmt"); } else if ( arg == "--hud-tris" ) { - props->setStringValue("/sim/hud/frame-stat-type", "tris"); + fgSetString("/sim/hud/frame-stat-type", "tris"); } else if ( arg == "--hud-culled" ) { - props->setStringValue("/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 ) { - parse_channel( "garmin", arg.substr(9) ); - } else if ( arg.find( "--nmea=" ) != string::npos ) { - parse_channel( "nmea", arg.substr(7) ); - } else if ( arg.find( "--props=" ) != string::npos ) { - parse_channel( "props", arg.substr(8) ); - } else if ( arg.find( "--pve=" ) != string::npos ) { - parse_channel( "pve", arg.substr(6) ); - } else if ( arg.find( "--ray=" ) != string::npos ) { - parse_channel( "ray", arg.substr(6) ); - } else if ( arg.find( "--rul=" ) != string::npos ) { - parse_channel( "rul", arg.substr(6) ); - } else if ( arg.find( "--joyclient=" ) != string::npos ) { - parse_channel( "joyclient", arg.substr(12) ); + fgSetString("/sim/hud/frame-stat-type", "culled"); + } else if ( arg.find( "--atc610x" ) == 0 ) { + add_channel( "atc610x", "dummy" ); + } else if ( arg.find( "--atlas=" ) == 0 ) { + add_channel( "atlas", arg.substr(8) ); + } else if ( arg.find( "--httpd=" ) == 0 ) { + add_channel( "httpd", arg.substr(8) ); +#ifdef FG_JPEG_SERVER + } else if ( arg.find( "--jpg-httpd=" ) == 0 ) { + add_channel( "jpg-httpd", arg.substr(12) ); +#endif + } else if ( arg.find( "--native=" ) == 0 ) { + add_channel( "native", arg.substr(9) ); + } else if ( arg.find( "--native-ctrls=" ) == 0 ) { + add_channel( "native_ctrls", arg.substr(15) ); + } else if ( arg.find( "--native-fdm=" ) == 0 ) { + add_channel( "native_fdm", arg.substr(13) ); + } else if ( arg.find( "--opengc=" ) == 0 ) { + // char stop; + // cout << "Adding channel for OpenGC Display" << endl; cin >> stop; + add_channel( "opengc", arg.substr(9) ); + } else if ( arg.find( "--garmin=" ) == 0 ) { + add_channel( "garmin", arg.substr(9) ); + } else if ( arg.find( "--nmea=" ) == 0 ) { + add_channel( "nmea", arg.substr(7) ); + } else if ( arg.find( "--props=" ) == 0 ) { + add_channel( "props", arg.substr(8) ); + } else if ( arg.find( "--telnet=" ) == 0 ) { + add_channel( "telnet", arg.substr(9) ); + } else if ( arg.find( "--pve=" ) == 0 ) { + add_channel( "pve", arg.substr(6) ); + } else if ( arg.find( "--ray=" ) == 0 ) { + add_channel( "ray", arg.substr(6) ); + } else if ( arg.find( "--rul=" ) == 0 ) { + add_channel( "rul", arg.substr(6) ); + } else if ( arg.find( "--joyclient=" ) == 0 ) { + add_channel( "joyclient", arg.substr(12) ); #ifdef FG_NETWORK_OLK } else if ( arg == "--disable-network-olk" ) { - props->setBoolValue("/sim/networking/olk", false); + fgSetBool("/sim/networking/olk", false); } else if ( arg== "--enable-network-olk") { - props->setBoolValue("/sim/networking/olk", true); + fgSetBool("/sim/networking/olk", true); } else if ( arg == "--net-hud" ) { - props->setBoolValue("/sim/hud/net-display", true); + fgSetBool("/sim/hud/net-display", true); net_hud_display = 1; // FIXME - } else if ( arg.find( "--net-id=") != string::npos ) { - props->setStringValue("sim/networking/call-sign", arg.substr(9)); + } else if ( arg.find( "--net-id=") == 0 ) { + fgSetString("sim/networking/call-sign", arg.substr(9).c_str()); #endif } 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); + unsigned int pos = assign.find('='); + if ( pos == arg.npos || pos == 0 ) { + SG_LOG( SG_GENERAL, SG_ALERT, "Bad property assignment: " << arg ); return FG_OPTIONS_ERROR; } string name = assign.substr(0, pos); string value = assign.substr(pos + 1); - props->setStringValue(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 ) { + fgSetString(name.c_str(), value.c_str()); + // SG_LOG(SG_GENERAL, SG_INFO, "Setting default value of property " + // << name << " to \"" << value << '"'); + } else if ( arg.find("--trace-read=") == 0) { + string name = arg.substr(13); + SG_LOG(SG_GENERAL, SG_INFO, "Tracing reads for property " << name); + fgGetNode(name.c_str(), true) + ->setAttribute(SGPropertyNode::TRACE_READ, true); + } else if ( arg.find("--trace-write=") == 0) { + string name = arg.substr(14); + SG_LOG(SG_GENERAL, SG_INFO, "Tracing writes for property " << name); + fgGetNode(name.c_str(), true) + ->setAttribute(SGPropertyNode::TRACE_WRITE, true); + } else if ( arg.find( "--view-offset=" ) == 0 ) { + // $$$ begin - added VS Renganathan, 14 Oct 2K + // for multi-window outside window imagery string woffset = arg.substr( 14 ); double default_view_offset = 0.0; if ( woffset == "LEFT" ) { - default_view_offset = FG_PI * 0.25; + default_view_offset = SGD_PI * 0.25; } else if ( woffset == "RIGHT" ) { - default_view_offset = FG_PI * 1.75; + default_view_offset = SGD_PI * 1.75; } else if ( woffset == "CENTER" ) { default_view_offset = 0.00; } else { - default_view_offset = atof( woffset.c_str() ) * DEG_TO_RAD; + default_view_offset = atof( woffset.c_str() ) * SGD_DEGREES_TO_RADIANS; } - 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 ); - props->setDoubleValue("/sim/startup/view-offset", default_view_offset); + FGViewer *pilot_view = + (FGViewer *)globals->get_viewmgr()->get_view( 0 ); + // this will work without calls to the viewer... + fgSetDouble( "/sim/current-view/heading-offset-deg", + default_view_offset * SGD_RADIANS_TO_DEGREES ); // $$$ end - added VS Renganathan, 14 Oct 2K - } else if ( arg.find( "--visibility=" ) != string::npos ) { - props->setDoubleValue("/environment/visibility", atof(arg.substr(13))); - } else if ( arg.find( "--visibility-miles=" ) != string::npos ) { - double visibility = atof(arg.substr(19)) * 5280.0 * FEET_TO_METER; - props->setDoubleValue("/environment/visibility", visibility); + } else if ( arg.find( "--visibility=" ) == 0 ) { + fgSetDouble("/environment/visibility-m", atof(arg.substr(13))); + } else if ( arg.find( "--visibility-miles=" ) == 0 ) { + double visibility = atof(arg.substr(19)) * 5280.0 * SG_FEET_TO_METER; + fgSetDouble("/environment/visibility-m", visibility); } else if ( arg.find( "--wind=" ) == 0 ) { + double min_hdg, max_hdg, speed, gust; + if (!parse_wind(arg.substr(7), &min_hdg, &max_hdg, &speed, &gust)) { + SG_LOG( SG_GENERAL, SG_ALERT, "bad wind value " << arg.substr(7) ); + return FG_OPTIONS_ERROR; + } + fgSetDouble("/environment/wind-from-heading-deg", min_hdg); + fgSetDouble("/environment/params/min-wind-from-heading-deg", min_hdg); + fgSetDouble("/environment/params/max-wind-from-heading-deg", max_hdg); + fgSetDouble("/environment/wind-speed-kt", speed); + fgSetDouble("/environment/params/base-wind-speed-kt", speed); + fgSetDouble("/environment/params/gust-wind-speed-kt", gust); + string val = arg.substr(7); - int pos = val.find('@'); - if (pos == string::npos) { - FG_LOG(FG_GENERAL, FG_ALERT, "bad wind value " << val); + unsigned int pos = val.find('@'); + if ( pos == string::npos ) { + SG_LOG( SG_GENERAL, SG_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 << '@' << + SG_LOG(SG_GENERAL, SG_INFO, "WIND: " << min_hdg << '@' << 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; - props->setDoubleValue("/environment/wind-north", - speed * cos(dir)); - props->setDoubleValue("/environment/wind-east", - speed * sin(dir)); - } else if ( arg.find( "--wp=" ) != string::npos ) { + +#ifdef FG_WEATHERCM + // convert to fps + speed *= SG_NM_TO_METER * SG_METER_TO_FEET * (1.0/3600); + while (min_hdg > 360) + min_hdg -= 360; + while (min_hdg <= 0) + min_hdg += 360; + min_hdg *= SGD_DEGREES_TO_RADIANS; + fgSetDouble("/environment/wind-from-north-fps", speed * cos(dir)); + fgSetDouble("/environment/wind-from-east-fps", speed * sin(dir)); +#endif // FG_WEATHERCM + + } else if ( arg.find( "--wp=" ) == 0 ) { parse_wp( arg.substr( 5 ) ); - } else if ( arg.find( "--flight-plan=") != string::npos) { + } else if ( arg.find( "--flight-plan=") == 0) { parse_flightplan ( arg.substr (14) ); + } else if ( arg.find( "--config=" ) == 0 ) { + string file = arg.substr(9); + try { + readProperties(file, globals->get_props()); + } catch (const sg_exception &e) { + string message = "Error loading config file: "; + message += e.getFormattedMessage(); + SG_LOG(SG_INPUT, SG_ALERT, message); + exit(2); + } + } else if ( arg.find( "--aircraft=" ) == 0 ) { + // read in the top level aircraft definition file + SGPath apath( globals->get_fg_root() ); + apath.append( "Aircraft" ); + apath.append( arg.substr(11) ); + apath.concat( "-set.xml" ); + SG_LOG(SG_INPUT, SG_INFO, "Reading aircraft: " << arg.substr(11) + << " from " << apath.str()); + readProperties( apath.str(), globals->get_props() ); } else { - FG_LOG( FG_GENERAL, FG_ALERT, "Unknown option '" << arg << "'" ); + SG_LOG( SG_GENERAL, SG_ALERT, "Unknown option '" << arg << "'" ); return FG_OPTIONS_ERROR; } @@ -998,33 +980,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"); + SG_LOG(SG_GENERAL, SG_INFO, "Scanning for root: command line"); while ( i < argc ) { - FG_LOG( FG_GENERAL, FG_DEBUG, "argv[" << i << "] = " << argv[i] ); + SG_LOG( SG_GENERAL, SG_DEBUG, "argv[" << i << "] = " << argv[i] ); string arg = argv[i]; - if ( arg.find( "--fg-root=" ) != string::npos ) { - globals->set_fg_root(arg.substr( 10 )); + if ( arg.find( "--fg-root=" ) == 0 ) { + 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 ) { - fg_gzifstream in( path ); +string +fgScanForRoot (const string& path) +{ + sg_gzifstream in( path ); if ( !in.is_open() ) - return(FG_OPTIONS_ERROR); + return ""; - FG_LOG( FG_GENERAL, FG_INFO, "Scanning for root: " << path ); + SG_LOG( SG_GENERAL, SG_INFO, "Scanning for root: " << path ); in >> skipcomment; #ifndef __MWERKS__ @@ -1036,54 +1022,71 @@ int FGOptions::scan_config_file_for_root( const string& path ) { #endif string line; -#ifdef GETLINE_NEEDS_TERMINATOR - getline( in, line, '\n' ); -#elif defined( macintosh ) - getline( in, line, '\r' ); +#if defined( macintosh ) + getline( in, line, '\r' ); #else - getline( in, line ); + getline( in, line, '\n' ); #endif - if ( line.find( "--fg-root=" ) != string::npos ) { - globals->set_fg_root(line.substr( 10 )); + // catch extraneous (DOS) line ending character + if ( line[line.length() - 1] < 32 ) { + line = line.substr( 0, line.length()-1 ); + } + + if ( line.find( "--fg-root=" ) == 0 ) { + 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 ) { - int i = 1; - int result; - - FG_LOG(FG_GENERAL, FG_INFO, "Processing command line arguments"); - - while ( i < argc ) { - FG_LOG( FG_GENERAL, FG_DEBUG, "argv[" << i << "] = " << argv[i] ); - - result = parse_option(argv[i]); - if ( (result == FG_OPTIONS_HELP) || (result == FG_OPTIONS_ERROR) ) { - return(result); +void +fgParseArgs (int argc, char **argv) +{ + bool in_options = true; + + SG_LOG(SG_GENERAL, SG_INFO, "Processing command line arguments"); + + for (int i = 1; i < argc; i++) { + string arg = argv[i]; + + if (in_options && (arg.find('-') == 0)) { + if (arg == "--") { + in_options = false; + } else { + int result = parse_option(arg); + if ( (result == FG_OPTIONS_HELP) || + (result == FG_OPTIONS_ERROR) ) { + fgUsage(); + exit(-1); + } + } + } else { + in_options = false; + SG_LOG(SG_GENERAL, SG_INFO, + "Reading command-line property file " << arg); + readProperties(arg, globals->get_props()); } - - i++; } - - return FG_OPTIONS_OK; + + SG_LOG(SG_GENERAL, SG_INFO, "Finished command line arguments"); } // Parse config file options -int FGOptions::parse_config_file( const string& path ) { - fg_gzifstream in( path ); - if ( !in.is_open() ) - return(FG_OPTIONS_ERROR); +void +fgParseOptions (const string& path) { + sg_gzifstream in( path ); + if ( !in.is_open() ) { + return; + } - FG_LOG( FG_GENERAL, FG_INFO, "Processing config file: " << path ); + SG_LOG( SG_GENERAL, SG_INFO, "Processing config file: " << path ); in >> skipcomment; #ifndef __MWERKS__ @@ -1095,205 +1098,110 @@ int FGOptions::parse_config_file( const string& path ) { #endif string line; -#ifdef GETLINE_NEEDS_TERMINATOR - getline( in, line, '\n' ); -#elif defined( macintosh ) - getline( in, line, '\r' ); +#if defined( macintosh ) + getline( in, line, '\r' ); #else - getline( in, line ); + getline( in, line, '\n' ); #endif + // catch extraneous (DOS) line ending character + if ( line[line.length() - 1] < 32 ) { + line = line.substr( 0, line.length()-1 ); + } + if ( parse_option( line ) == FG_OPTIONS_ERROR ) { - FG_LOG( FG_GENERAL, FG_ALERT, + SG_LOG( SG_GENERAL, SG_ALERT, "Config file parse error: " << path << " '" << line << "'" ); + fgUsage(); exit(-1); } in >> skipcomment; } - - return FG_OPTIONS_OK; } // Print usage message -void FGOptions::usage ( void ) { - 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; - cout << "\t--fg-scenery=path: specify the base path for all the scenery" - << " data." << endl - << "\t\tdefaults to $FG_ROOT/Scenery" << endl; - 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; - cout << "\t--disable-freeze: start out in an running state" << endl; - cout << "\t--enable-freeze: start out in a frozen state" << endl; - 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; - cout << "\t--disable-anti-alias-hud: disable anti aliased hud" << endl; - cout << "\t--enable-anti-alias-hud: enable anti aliased hud" << endl; - cout << endl; - - cout << "Flight Model:" << endl; - cout << "\t--fdm=abcd: selects the core flight model code." << endl; - cout << "\t\tcan be one of jsb, larcsim, magic, external, balloon, or ada" - << endl; - cout << "\t--aircraft=abcd: aircraft model to load" << endl; - 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; - cout << "\t--notrim: Do NOT attempt to trim the model when initializing JSBsim" << 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; - cout << endl; - - 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; - cout << "\t--vc= initial airspeed in knots (--fdm=jsb only)" << endl; - cout << "\t--mach= initial mach number (--fdm=jsb only)" << endl; - 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; - 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; - 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; - 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; - cout << "\t--visibility=xxx: specify initial visibility in meters" << endl; - cout << "\t--visibility-miles=xxx: specify initial visibility in miles" - << endl; - 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; - - cout << "Time Options:" << endl; - 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; - 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; -#ifdef FG_NETWORK_OLK - cout << endl; - - cout << "Network Options:" << endl; - cout << "\t--enable-network-olk: enable Multipilot mode" << endl; - cout << "\t--disable-network-olk: disable Multipilot mode (default)" << endl; - cout << "\t--net-hud: Hud displays network info" << endl; - cout << "\t--net-id=name: specify your own callsign" << endl; -#endif - - cout << endl; - cout << "Route/Way Point Options:" << endl; - cout << "\t--wp=ID[@alt]: specify a waypoint for the GC autopilot" << endl; - cout << "\t\tYou can specify multiple waypoints (a route) with multiple" - << endl; - cout << "\t\tinstances of --wp=" << endl; - cout << "\t--flight-plan=[file]: Read all waypoints from [file]" <get_fg_root(); -} + // *** FIXME *** + // Began the process of converting output from printf() to + // SG_LOG() but this needs to be finished. + + SGPropertyNode options_root; + SGPath opath( globals->get_fg_root() ); + opath.append( "options.xml" ); + + try { + readProperties(opath.c_str(), &options_root); + } catch (const sg_exception &ex) { + SG_LOG( SG_GENERAL, SG_ALERT, endl << "Unable to read the help file." ); + SG_LOG( SG_GENERAL, SG_ALERT, "Make sure the file options.xml is located in the FlightGear base directory." ); + exit(-1); + } -string -FGOptions::get_fg_scenery () const -{ - return globals->get_fg_scenery(); -} + SGPropertyNode *options = options_root.getNode("options"); + if (!options) { + SG_LOG( SG_GENERAL, SG_ALERT, + "Error reading options.xml: directive not found." ); + exit(-1); + } -string_list -FGOptions::get_channel_options_list () const -{ - return globals->get_channel_options_list(); + SGPropertyNode *usage = options->getNode("usage"); + if (usage) { + SG_LOG( SG_GENERAL, SG_ALERT, "Usage: " << usage->getStringValue() ); + } + + vectorsection = options->getChildren("section"); + for (unsigned int j = 0; j < section.size(); j++) { + + SGPropertyNode *name = section[j]->getNode("name"); + if (name) { + SG_LOG( SG_GENERAL, SG_ALERT, endl << name->getStringValue() + << ":" ); + } + + vectoroption = section[j]->getChildren("option"); + for (unsigned int k = 0; k < option.size(); k++) { + + SGPropertyNode *name = option[k]->getNode("name"); + SGPropertyNode *short_name = option[k]->getNode("short"); + SGPropertyNode *arg = option[k]->getNode("arg"); + + if (name) { + string str = name->getStringValue(); + if (short_name) { + str.append(", -"); + str.append(short_name->getStringValue()); + } + if (arg) { + str.append("="); + str.append(arg->getStringValue()); + } + + if (str.size() <= 25) { + fprintf(stderr, " --%-27s", str.c_str()); + } else { + fprintf(stderr, "\n --%s\n%32c", str.c_str(), ' '); + } + + str.erase(); + SGPropertyNode *desc = option[k]->getNode("description"); + if (desc) { + SG_LOG( SG_GENERAL, SG_ALERT, desc->getStringValue() ); + + for ( int l = 1; + (desc = option[k]->getNode("desc", l, false)); + l++ ) + { + fprintf(stderr, "%32c%s\n", ' ', + desc->getStringValue()); + } + } else { + SG_LOG( SG_GENERAL, SG_ALERT, "" ); + } + } + } + } }