X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FMain%2Foptions.cxx;h=e7bf6d0c7076cc04802ace52ca7f3e060f6a8365;hb=b3e969726249e772da4c9d1aa6eb212e6472aed3;hp=0cf352f385fd2a7f72368b3fe03c6bfe3c331ac6;hpb=86bf012f50819ed7ab8866d2fce307b47fcd964f;p=flightgear.git diff --git a/src/Main/options.cxx b/src/Main/options.cxx index 0cf352f38..e7bf6d0c7 100644 --- a/src/Main/options.cxx +++ b/src/Main/options.cxx @@ -26,7 +26,8 @@ #endif #include -#include +#include +#include #include // rint() #include @@ -41,24 +42,21 @@ #include #include #include -#include -#include // #include // #include // #include // #include // #include -#ifdef FG_NETWORK_OLK -# include -#endif +#include #include #include "globals.hxx" #include "fg_init.hxx" #include "fg_props.hxx" #include "options.hxx" +#include "util.hxx" #include "viewmgr.hxx" @@ -82,7 +80,7 @@ static double atof( const string& str ) { -#ifdef __MWERKS__ +#ifdef __MWERKS__ // -dw- if ::atof is called, then we get an infinite loop return std::atof( str.c_str() ); #else @@ -93,7 +91,7 @@ atof( const string& str ) static int atoi( const string& str ) { -#ifdef __MWERKS__ +#ifdef __MWERKS__ // -dw- if ::atoi is called, then we get an infinite loop return std::atoi( str.c_str() ); #else @@ -106,7 +104,7 @@ atoi( const string& str ) * 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 + * in case, we provide some initial sane values here. This method * should be invoked *before* reading any init files. */ void @@ -179,11 +177,14 @@ fgSetDefaults () #else fgSetString("/sim/startup/browser-app", "webrun.bat"); #endif + fgSetString("/sim/logging/priority", "alert"); + // Features + fgSetBool("/sim/hud/antialiased", false); + fgSetBool("/sim/hud/enable3d", true); fgSetBool("/sim/hud/visibility", false); fgSetBool("/sim/panel/visibility", true); - fgSetBool("/sim/sound/audible", true); - fgSetBool("/sim/hud/antialiased", false); + fgSetBool("/sim/sound/pause", false); // Flight Model options fgSetString("/sim/flight-model", "jsb"); @@ -199,13 +200,15 @@ fgSetDefaults () fgSetBool("/sim/rendering/skyblend", true); fgSetBool("/sim/rendering/textures", true); fgSetBool("/sim/rendering/wireframe", false); + fgSetBool("/sim/rendering/horizon-effect", false); + fgSetBool("/sim/rendering/enhanced-lighting", false); fgSetBool("/sim/rendering/distance-attenuation", false); + fgSetBool("/sim/rendering/specular-highlight", true); 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 fgSetString("/sim/startup/units", "feet"); @@ -216,16 +219,21 @@ fgSetDefaults () 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); -} +#ifdef FG_MPLAYER_AS + fgSetString("/sim/multiplay/callsign", "callsign"); + fgSetString("/sim/multiplay/rxhost", "0"); + fgSetString("/sim/multiplay/txhost", "0"); + fgSetInt("/sim/multiplay/rxport", 0); + fgSetInt("/sim/multiplay/txport", 0); +#endif + +} static bool parse_wind (const string &wind, double * min_hdg, double * max_hdg, @@ -329,7 +337,7 @@ parse_time(const string& time_in) { result += seconds / 3600.0; } - cout << " parse_time() = " << sign * result << endl; + SG_LOG( SG_GENERAL, SG_INFO, " parse_time() = " << sign * result ); return(sign * result); } @@ -506,80 +514,39 @@ parse_fov( const string& arg ) { // baud = {300, 1200, 2400, ..., 230400} // // Socket exacmple "--native=socket,dir,hz,machine,port,style" where -// +// // machine = machine name or ip address if client (leave empty if server) // port = port, leave empty to let system choose // style = tcp or udp // // File example "--garmin=file,dir,hz,filename" where -// +// // filename = file system file name -static bool +static bool add_channel( const string& type, const string& channel_str ) { - // cout << "Channel string = " << channel_str << endl; + SG_LOG(SG_GENERAL, SG_INFO, "Channel string = " << channel_str ); globals->get_channel_options_list()->push_back( type + "," + channel_str ); + + // cout << "here" << endl; return true; } - -static void -setup_wind (double min_hdg, double max_hdg, double speed, double gust) -{ - 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); - - SG_LOG(SG_GENERAL, SG_INFO, "WIND: " << min_hdg << '@' << - speed << " knots" << endl); - -#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 -} - +// The parse wp and parse flight-plan options don't work anymore, because +// the route manager and the airport subsystems have not yet been initialized +// at this stage. // Parse --wp=ID[@alt] -static bool +static void parse_wp( const string& arg ) { - string id, alt_str; - double alt = 0.0; - - string::size_type 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 ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) { - alt *= SG_FEET_TO_METER; - } - } else { - id = arg; - } - - FGAirport a; - if ( fgFindAirportID( id, &a ) ) { - SGWayPoint wp( a.longitude, a.latitude, alt, SGWayPoint::WGS84, id ); - globals->get_route()->add_waypoint( wp ); - - return true; - } else { - return false; + string_list *waypoints = globals->get_initial_waypoints(); + if (!waypoints) { + waypoints = new string_list; } + waypoints->push_back(arg); + globals->set_initial_waypoints(waypoints); } @@ -587,35 +554,36 @@ parse_wp( const string& arg ) { static bool parse_flightplan(const string& arg) { - sg_gzifstream in(arg.c_str()); - if ( !in.is_open() ) { - return false; - } - while ( true ) { - string line; - + string_list *waypoints = globals->get_initial_waypoints(); + if (!waypoints) + waypoints = new string_list; + sg_gzifstream in(arg.c_str()); + if ( !in.is_open() ) { + return false; + } + while ( true ) { + string line; + #if defined( macintosh ) - getline( in, line, '\r' ); + getline( in, line, '\r' ); #else - getline( in, line, '\n' ); + 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 ( in.eof() ) { - break; - } - parse_wp(line); + + // catch extraneous (DOS) line ending character + if ( line[line.length() - 1] < 32 ) { + line = line.substr( 0, line.length()-1 ); } - - return true; + + if ( in.eof() ) { + break; + } + waypoints->push_back(line); + } + globals->set_initial_waypoints(waypoints); + return true; } -#define NEW_OPTION_PARSING 1 -#ifdef NEW_OPTION_PARSING static int fgOptLanguage( const char *arg ) { @@ -623,21 +591,54 @@ fgOptLanguage( const char *arg ) return FG_OPTIONS_OK; } +static void +clearLocation () +{ + fgSetString("/sim/presets/airport-id", ""); + fgSetString("/sim/presets/vor-id", ""); + fgSetString("/sim/presets/ndb-id", ""); + fgSetString("/sim/presets/fix", ""); +} + +static int +fgOptVOR( const char * arg ) +{ + clearLocation(); + fgSetString("/sim/presets/vor-id", arg); + return FG_OPTIONS_OK; +} + +static int +fgOptNDB( const char * arg ) +{ + clearLocation(); + fgSetString("/sim/presets/ndb-id", arg); + return FG_OPTIONS_OK; +} + +static int +fgOptFIX( const char * arg ) +{ + clearLocation(); + fgSetString("/sim/presets/fix", arg); + return FG_OPTIONS_OK; +} + static int fgOptLon( const char *arg ) { + clearLocation(); fgSetDouble("/sim/presets/longitude-deg", parse_degree( arg )); fgSetDouble("/position/longitude-deg", parse_degree( arg )); - fgSetString("/sim/presets/airport-id", ""); return FG_OPTIONS_OK; } static int fgOptLat( const char *arg ) { + clearLocation(); fgSetDouble("/sim/presets/latitude-deg", parse_degree( arg )); fgSetDouble("/position/latitude-deg", parse_degree( arg )); - fgSetString("/sim/presets/airport-id", ""); return FG_OPTIONS_OK; } @@ -854,15 +855,31 @@ fgOptStartDateGmt( const char *arg ) return FG_OPTIONS_OK; } -#ifdef FG_NETWORK_OLK static int -fgOptNetHud( const char *arg ) +fgSetupProxy( const char *arg ) { - fgSetBool("/sim/hud/net-display", true); - net_hud_display = 1; // FIXME + string options = arg; + string host, port, auth; + unsigned int pos; + + host = port = auth = ""; + if ((pos = options.find("@")) != string::npos) + auth = options.substr(0, pos++); + else + pos = 0; + + host = options.substr(pos, options.size()); + if ((pos = host.find(":")) != string::npos) { + port = host.substr(++pos, host.size()); + host.erase(--pos, host.size()); + } + + fgSetString("/sim/presets/proxy/host", host.c_str()); + fgSetString("/sim/presets/proxy/port", port.c_str()); + fgSetString("/sim/presets/proxy/authentication", auth.c_str()); + return FG_OPTIONS_OK; } -#endif static int fgOptTraceRead( const char *arg ) @@ -874,6 +891,33 @@ fgOptTraceRead( const char *arg ) return FG_OPTIONS_OK; } +static int +fgOptLogLevel( const char *arg ) +{ + fgSetString("/sim/logging/classes", "all"); + fgSetString("/sim/logging/priority", arg); + + string priority = arg; + logbuf::set_log_classes(SG_ALL); + if (priority == "bulk") { + logbuf::set_log_priority(SG_BULK); + } else if (priority == "debug") { + logbuf::set_log_priority(SG_DEBUG); + } else if (priority == "info") { + logbuf::set_log_priority(SG_INFO); + } else if (priority == "warn") { + logbuf::set_log_priority(SG_WARN); + } else if (priority == "alert") { + logbuf::set_log_priority(SG_ALERT); + } else { + SG_LOG(SG_GENERAL, SG_WARN, "Unknown logging priority " << priority); + } + SG_LOG(SG_GENERAL, SG_DEBUG, "Logging priority is " << priority); + + return FG_OPTIONS_OK; +} + + static int fgOptTraceWrite( const char *arg ) { @@ -910,11 +954,19 @@ fgOptViewOffset( const char *arg ) return FG_OPTIONS_OK; } +static int +fgOptVisibilityMeters( const char *arg ) +{ + double visibility = atof( arg ); + fgDefaultWeatherValue("visibility-m", visibility); + return FG_OPTIONS_OK; +} + static int fgOptVisibilityMiles( const char *arg ) { double visibility = atof( arg ) * 5280.0 * SG_FEET_TO_METER; - fgSetDouble("/environment/visibility-m", visibility); + fgDefaultWeatherValue("visibility-m", visibility); return FG_OPTIONS_OK; } @@ -923,9 +975,9 @@ fgOptRandomWind( const char *arg ) { double min_hdg = sg_random() * 360.0; double max_hdg = min_hdg + (20 - sqrt(sg_random() * 400)); - double speed = 40 - sqrt(sg_random() * 1600.0); + double speed = sg_random() * sg_random() * 40; double gust = speed + (10 - sqrt(sg_random() * 100)); - setup_wind(min_hdg, max_hdg, speed, gust); + fgSetupWind(min_hdg, max_hdg, speed, gust); return FG_OPTIONS_OK; } @@ -937,7 +989,33 @@ fgOptWind( const char *arg ) SG_LOG( SG_GENERAL, SG_ALERT, "bad wind value " << arg ); return FG_OPTIONS_ERROR; } - setup_wind(min_hdg, max_hdg, speed, gust); + fgSetupWind(min_hdg, max_hdg, speed, gust); + return FG_OPTIONS_OK; +} + +static int +fgOptTurbulence( const char *arg ) +{ + fgDefaultWeatherValue("turbulence/magnitude-norm", atof(arg)); + return FG_OPTIONS_OK; +} + +static int +fgOptCeiling( const char *arg ) +{ + double elevation, thickness; + string spec = arg; + string::size_type pos = spec.find(':'); + if (pos == string::npos) { + elevation = atof(spec.c_str()); + thickness = 2000; + } else { + elevation = atof(spec.substr(0, pos).c_str()); + thickness = atof(spec.substr(pos + 1).c_str()); + } + fgSetDouble("/environment/clouds/layer[0]/elevation-ft", elevation); + fgSetDouble("/environment/clouds/layer[0]/thickness-ft", thickness); + fgSetString("/environment/clouds/layer[0]/coverage", "overcast"); return FG_OPTIONS_OK; } @@ -970,8 +1048,122 @@ fgOptConfig( const char *arg ) return FG_OPTIONS_OK; } +static bool +parse_colon (const string &s, double * val1, double * val2) +{ + string::size_type pos = s.find(':'); + if (pos == string::npos) { + *val2 = atof(s); + return false; + } else { + *val1 = atof(s.substr(0, pos).c_str()); + *val2 = atof(s.substr(pos+1).c_str()); + return true; + } +} + + +static int +fgOptFailure( const char * arg ) +{ + string a = arg; + if (a == "pitot") { + fgSetBool("/systems/pitot/serviceable", false); + } else if (a == "static") { + fgSetBool("/systems/static/serviceable", false); + } else if (a == "vacuum") { + fgSetBool("/systems/vacuum/serviceable", false); + } else if (a == "electrical") { + fgSetBool("/systems/electrical/serviceable", false); + } else { + SG_LOG(SG_INPUT, SG_ALERT, "Unknown failure mode: " << a); + return FG_OPTIONS_ERROR; + } + + return FG_OPTIONS_OK; +} + + +static int +fgOptNAV1( const char * arg ) +{ + double radial, freq; + if (parse_colon(arg, &radial, &freq)) + fgSetDouble("/radios/nav[0]/radials/selected-deg", radial); + fgSetDouble("/radios/nav[0]/frequencies/selected-mhz", freq); + return FG_OPTIONS_OK; +} + +static int +fgOptNAV2( const char * arg ) +{ + double radial, freq; + if (parse_colon(arg, &radial, &freq)) + fgSetDouble("/radios/nav[1]/radials/selected-deg", radial); + fgSetDouble("/radios/nav[1]/frequencies/selected-mhz", freq); + return FG_OPTIONS_OK; +} + +static int +fgOptADF( const char * arg ) +{ + double rot, freq; + if (parse_colon(arg, &rot, &freq)) + fgSetDouble("/instrumentation/adf/rotation-deg", rot); + fgSetDouble("/instrumentation/adf/frequencies/selected-khz", freq); + return FG_OPTIONS_OK; +} + +static int +fgOptDME( const char *arg ) +{ + string opt = arg; + if (opt == "nav1") { + fgSetInt("/instrumentation/dme/switch-position", 1); + fgSetString("/instrumentation/dme/frequencies/source", + "/radios/nav[0]/frequencies/selected-mhz"); + } else if (opt == "nav2") { + fgSetInt("/instrumentation/dme/switch-position", 3); + fgSetString("/instrumentation/dme/frequencies/source", + "/radios/nav[1]/frequencies/selected-mhz"); + } else { + fgSetInt("/instrumentation/dme/switch-position", 2); + fgSetString("/instrumentation/dme/frequencies/source", + "/instrumentation/dme/frequencies/selected-mhz"); + fgSetString("/instrumentation/dme/frequencies/selected-mhz", arg); + } + return FG_OPTIONS_OK; +} + static map fgOptionMap; +/* + option has_param type property b_param s_param func + +where: + option : name of the option + has_param : option is --name=value if true or --name if false + type : OPTION_BOOL - property is a boolean + OPTION_STRING - property is a string + OPTION_DOUBLE - property is a double + OPTION_INT - property is an integer + OPTION_CHANNEL - name of option is the name of a channel + OPTION_FUNC - the option trigger a function + b_param : if type==OPTION_BOOL, + value set to the property (has_param is false for boolean) + s_param : if type==OPTION_STRING, + value set to the property if has_param is false + func : function called if type==OPTION_FUNC. if has_param is true, + the value is passed to the function as a string, otherwise, + 0 is passed. + + For OPTION_DOUBLE and OPTION_INT, the parameter value is converted into a + double or an integer and set to the property. + + For OPTION_CHANNEL, add_channel is called with the parameter value as the + argument. +*/ + enum OptionType { OPTION_BOOL, OPTION_STRING, OPTION_DOUBLE, OPTION_INT, OPTION_CHANNEL, OPTION_FUNC }; struct OptionDesc { char *option; @@ -994,12 +1186,16 @@ struct OptionDesc { {"enable-mouse-pointer", false, OPTION_STRING, "/sim/startup/mouse-pointer", false, "enabled", 0 }, {"disable-random-objects", false, OPTION_BOOL, "/sim/rendering/random-objects", false, "", 0 }, {"enable-random-objects", false, OPTION_BOOL, "/sim/rendering/random-objects", true, "", 0 }, + {"disable-ai-models", false, OPTION_BOOL, "/sim/ai/enabled", false, "", 0 }, + {"enable-ai-models", false, OPTION_BOOL, "/sim/ai/enabled", true, "", 0 }, {"disable-freeze", false, OPTION_BOOL, "/sim/freeze/master", false, "", 0 }, {"enable-freeze", false, OPTION_BOOL, "/sim/freeze/master", true, "", 0 }, {"disable-fuel-freeze", false, OPTION_BOOL, "/sim/freeze/fuel", false, "", 0 }, {"enable-fuel-freeze", false, OPTION_BOOL, "/sim/freeze/fuel", true, "", 0 }, {"disable-clock-freeze", false, OPTION_BOOL, "/sim/freeze/clock", false, "", 0 }, {"enable-clock-freeze", false, OPTION_BOOL, "/sim/freeze/clock", true, "", 0 }, + {"disable-hud-3d", false, OPTION_BOOL, "/sim/hud/enable3d", false, "", 0 }, + {"enable-hud-3d", false, OPTION_BOOL, "/sim/hud/enable3d", true, "", 0 }, {"disable-anti-alias-hud", false, OPTION_BOOL, "/sim/hud/antialiased", false, "", 0 }, {"enable-anti-alias-hud", false, OPTION_BOOL, "/sim/hud/antialiased", true, "", 0 }, {"control", true, OPTION_STRING, "/sim/control-mode", false, "", 0 }, @@ -1010,11 +1206,14 @@ struct OptionDesc { {"enable-hud", false, OPTION_BOOL, "/sim/hud/visibility", true, "", 0 }, {"disable-panel", false, OPTION_BOOL, "/sim/panel/visibility", false, "", 0 }, {"enable-panel", false, OPTION_BOOL, "/sim/panel/visibility", true, "", 0 }, - {"disable-sound", false, OPTION_BOOL, "/sim/sound/audible", false, "", 0 }, - {"enable-sound", false, OPTION_BOOL, "/sim/sound/audible", true, "", 0 }, + {"disable-sound", false, OPTION_BOOL, "/sim/sound/pause", true, "", 0 }, + {"enable-sound", false, OPTION_BOOL, "/sim/sound/pause", false, "", 0 }, {"airport", true, OPTION_STRING, "/sim/presets/airport-id", false, "", 0 }, {"airport-id", true, OPTION_STRING, "/sim/presets/airport-id", false, "", 0 }, {"runway", true, OPTION_STRING, "/sim/presets/runway", false, "", 0 }, + {"vor", true, OPTION_FUNC, "", false, "", fgOptVOR }, + {"ndb", true, OPTION_FUNC, "", false, "", fgOptNDB }, + {"fix", true, OPTION_FUNC, "", false, "", fgOptFIX }, {"offset-distance", true, OPTION_DOUBLE, "/sim/presets/offset-distance", false, "", 0 }, {"offset-azimuth", true, OPTION_DOUBLE, "/sim/presets/offset-azimuth", false, "", 0 }, {"lon", true, OPTION_FUNC, "", false, "", fgOptLon }, @@ -1046,9 +1245,15 @@ struct OptionDesc { {"in-air", false, OPTION_BOOL, "/sim/presets/onground", false, "", 0 }, {"fog-disable", false, OPTION_STRING, "/sim/rendering/fog", false, "disabled", 0 }, {"fog-fastest", false, OPTION_STRING, "/sim/rendering/fog", false, "fastest", 0 }, - {"fog-nicest", false, OPTION_STRING, "/sim/fog", false, "nicest", 0 }, - {"disable-distance-attenuation", false, OPTION_BOOL, "/environment/distance-attenuation", false, "", 0 }, - {"enable-distance-attenuation", false, OPTION_BOOL, "/environment/distance-attenuation", true, "", 0 }, + {"fog-nicest", false, OPTION_STRING, "/sim/rendering/fog", false, "nicest", 0 }, + {"disable-horizon-effect", false, OPTION_BOOL, "/sim/rendering/horizon-effect", false, "", 0 }, + {"enable-horizon-effect", false, OPTION_BOOL, "/sim/rendering/horizon-effect", true, "", 0 }, + {"disable-enhanced-lighting", false, OPTION_BOOL, "/sim/rendering/enhanced-lighting", false, "", 0 }, + {"enable-enhanced-lighting", false, OPTION_BOOL, "/sim/rendering/enhanced-lighting", true, "", 0 }, + {"disable-distance-attenuation", false, OPTION_BOOL, "/sim/rendering/distance-attenuation", false, "", 0 }, + {"enable-distance-attenuation", false, OPTION_BOOL, "/sim/rendering/distance-attenuation", true, "", 0 }, + {"disable-specular-highlight", false, OPTION_BOOL, "/sim/rendering/specular-highlight", false, "", 0 }, + {"enable-specular-highlight", false, OPTION_BOOL, "/sim/rendering/specular-highlight", true, "", 0 }, {"disable-clouds", false, OPTION_BOOL, "/environment/clouds/status", false, "", 0 }, {"enable-clouds", false, OPTION_BOOL, "/environment/clouds/status", true, "", 0 }, #ifdef FG_USE_CLOUDS_3D @@ -1070,6 +1275,7 @@ struct OptionDesc { {"bpp", true, OPTION_FUNC, "", false, "", fgOptBpp }, {"units-feet", false, OPTION_STRING, "/sim/startup/units", false, "feet", 0 }, {"units-meters", false, OPTION_STRING, "/sim/startup/units", false, "meters", 0 }, + {"timeofday", true, OPTION_STRING, "/sim/startup/time-offset-type", false, "noon", 0 }, {"time-offset", true, OPTION_FUNC, "", false, "", fgOptTimeOffset }, {"time-match-real", false, OPTION_STRING, "/sim/startup/time-offset-type", false, "system-offset", 0 }, {"time-match-local", false, OPTION_STRING, "/sim/startup/time-offset-type", false, "latitude-offset", 0 }, @@ -1078,7 +1284,7 @@ struct OptionDesc { {"start-date-gmt", true, OPTION_FUNC, "", false, "", fgOptStartDateGmt }, {"hud-tris", false, OPTION_STRING, "/sim/hud/frame-stat-type", false, "tris", 0 }, {"hud-culled", false, OPTION_STRING, "/sim/hud/frame-stat-type", false, "culled", 0 }, - {"atc610x", false, OPTION_CHANNEL, "", false, "dummy", 0 }, + {"atc610x", true, OPTION_CHANNEL, "", false, "dummy", 0 }, {"atlas", true, OPTION_CHANNEL, "", false, "", 0 }, {"httpd", true, OPTION_CHANNEL, "", false, "", 0 }, #ifdef FG_JPEG_SERVER @@ -1091,38 +1297,48 @@ struct OptionDesc { {"opengc", true, OPTION_CHANNEL, "", false, "", 0 }, {"garmin", true, OPTION_CHANNEL, "", false, "", 0 }, {"nmea", true, OPTION_CHANNEL, "", false, "", 0 }, + {"generic", true, OPTION_CHANNEL, "", false, "", 0 }, {"props", true, OPTION_CHANNEL, "", false, "", 0 }, {"telnet", true, OPTION_CHANNEL, "", false, "", 0 }, {"pve", true, OPTION_CHANNEL, "", false, "", 0 }, {"ray", true, OPTION_CHANNEL, "", false, "", 0 }, {"rul", true, OPTION_CHANNEL, "", false, "", 0 }, {"joyclient", true, OPTION_CHANNEL, "", false, "", 0 }, -#ifdef FG_NETWORK_OLK - {"disable-network-olk", false, OPTION_BOOL, "/sim/networking/olk", false, "", 0 }, - {"enable-network-olk", false, OPTION_BOOL, "/sim/networking/olk", true, "", 0 }, - {"net-hud", false, OPTION_FUNC, "", false, "", fgOptNetHud }, - {"net-id", true, OPTION_STRING, "sim/networking/call-sign", false, "", 0 }, + {"jsclient", true, OPTION_CHANNEL, "", false, "", 0 }, + {"proxy", true, OPTION_FUNC, "", false, "", fgSetupProxy }, +#ifdef FG_MPLAYER_AS + {"callsign", true, OPTION_STRING, "sim/multiplay/callsign", false, "", 0 }, + {"multiplay", true, OPTION_CHANNEL, "", false, "", 0 }, #endif {"trace-read", true, OPTION_FUNC, "", false, "", fgOptTraceRead }, {"trace-write", true, OPTION_FUNC, "", false, "", fgOptTraceWrite }, + {"log-level", true, OPTION_FUNC, "", false, "", fgOptLogLevel }, {"view-offset", true, OPTION_FUNC, "", false, "", fgOptViewOffset }, - {"visibility", true, OPTION_DOUBLE, "/environment/visibility-m", false, "", 0 }, + {"visibility", true, OPTION_FUNC, "", false, "", fgOptVisibilityMeters }, {"visibility-miles", true, OPTION_FUNC, "", false, "", fgOptVisibilityMiles }, {"random-wind", false, OPTION_FUNC, "", false, "", fgOptRandomWind }, {"wind", true, OPTION_FUNC, "", false, "", fgOptWind }, + {"turbulence", true, OPTION_FUNC, "", false, "", fgOptTurbulence }, + {"ceiling", true, OPTION_FUNC, "", false, "", fgOptCeiling }, {"wp", true, OPTION_FUNC, "", false, "", fgOptWp }, {"flight-plan", true, OPTION_FUNC, "", false, "", fgOptFlightPlan }, {"config", true, OPTION_FUNC, "", false, "", fgOptConfig }, {"aircraft", true, OPTION_STRING, "/sim/aircraft", false, "", 0 }, + {"failure", true, OPTION_FUNC, "", false, "", fgOptFailure }, + {"com1", true, OPTION_DOUBLE, "/radios/comm[0]/frequencies/selected-mhz", false, "", 0 }, + {"com2", true, OPTION_DOUBLE, "/radios/comm[1]/frequencies/selected-mhz", false, "", 0 }, + {"nav1", true, OPTION_FUNC, "", false, "", fgOptNAV1 }, + {"nav2", true, OPTION_FUNC, "", false, "", fgOptNAV2 }, + {"adf", true, OPTION_FUNC, "", false, "", fgOptADF }, + {"dme", true, OPTION_FUNC, "", false, "", fgOptDME }, {0} }; -#endif + // Parse a single option -static int -parse_option (const string& arg) +static int +parse_option (const string& arg) { -#ifdef NEW_OPTION_PARSING if ( fgOptionMap.size() == 0 ) { size_t i = 0; OptionDesc *pt = &fgOptionArray[ 0 ]; @@ -1213,9 +1429,9 @@ parse_option (const string& arg) break; case OPTION_FUNC: if ( pt->has_param && pos != string::npos ) { - pt->func( arg.substr( pos + 1 ).c_str() ); + return pt->func( arg.substr( pos + 1 ).c_str() ); } else if ( !pt->has_param && pos == string::npos ) { - pt->func( 0 ); + return pt->func( 0 ); } else if ( pt->has_param ) { SG_LOG( SG_GENERAL, SG_ALERT, "Option '" << arg << "' needs a parameter" ); return FG_OPTIONS_ERROR; @@ -1234,422 +1450,6 @@ parse_option (const string& arg) return FG_OPTIONS_ERROR; } -#else - - // General Options - if ( (arg == "--help") || (arg == "-h") ) { - // help/usage request - return(FG_OPTIONS_HELP); - } else if ( (arg == "--verbose") || (arg == "-v") ) { - // verbose help/usage request - return(FG_OPTIONS_VERBOSE_HELP); - } else if ( arg.find( "--language=") == 0 ) { - globals->set_locale( fgInitLocale( arg.substr( 11 ).c_str() ) ); - } else if ( arg == "--disable-game-mode") { - fgSetBool("/sim/startup/game-mode", false); - } else if ( arg == "--enable-game-mode" ) { - fgSetBool("/sim/startup/game-mode", true); - } else if ( arg == "--disable-splash-screen" ) { - fgSetBool("/sim/startup/splash-screen", false); - } else if ( arg == "--enable-splash-screen" ) { - fgSetBool("/sim/startup/splash-screen", true); - } else if ( arg == "--disable-intro-music" ) { - fgSetBool("/sim/startup/intro-music", false); - } else if ( arg == "--enable-intro-music" ) { - fgSetBool("/sim/startup/intro-music", true); - } else if ( arg == "--disable-mouse-pointer" ) { - fgSetString("/sim/startup/mouse-pointer", "disabled"); - } else if ( arg == "--enable-mouse-pointer" ) { - fgSetString("/sim/startup/mouse-pointer", "enabled"); - } else if ( arg == "--disable-random-objects" ) { - fgSetBool("/sim/rendering/random-objects", false); - } else if ( arg == "--enable-random-objects" ) { - fgSetBool("/sim/rendering/random-objects", true); - } else if ( arg == "--disable-freeze" ) { - fgSetBool("/sim/freeze/master", false); - } else if ( arg == "--enable-freeze" ) { - 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" ) { - fgSetBool("/sim/hud/antialiased", false); - } else if ( arg == "--enable-anti-alias-hud" ) { - 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" ) { - fgSetBool("/sim/auto-coordination", false); - } else if ( arg == "--enable-auto-coordination" ) { - 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" ) { - fgSetBool("/sim/hud/visibility", false); - } else if ( arg == "--enable-hud" ) { - fgSetBool("/sim/hud/visibility", true); - } else if ( arg == "--disable-panel" ) { - fgSetBool("/sim/panel/visibility", false); - } else if ( arg == "--enable-panel" ) { - fgSetBool("/sim/panel/visibility", true); - } else if ( arg == "--disable-sound" ) { - fgSetBool("/sim/sound/audible", false); - } else if ( arg == "--enable-sound" ) { - fgSetBool("/sim/sound/audible", true); - } else if ( arg.find( "--airport=") == 0 ) { - fgSetString("/sim/presets/airport-id", arg.substr(10).c_str()); - } else if ( arg.find( "--airport-id=") == 0 ) { - fgSetString("/sim/presets/airport-id", arg.substr(13).c_str()); - } else if ( arg.find( "--runway=") == 0 ) { - fgSetString("/sim/presets/runway", arg.substr(9).c_str()); - } else if ( arg.find( "--offset-distance=") == 0 ) { - fgSetDouble("/sim/presets/offset-distance", atof(arg.substr(18))); - } else if ( arg.find( "--offset-azimuth=") == 0 ) { - fgSetDouble("/sim/presets/offset-azimuth", atof(arg.substr(17))); - } else if ( arg.find( "--lon=" ) == 0 ) { - fgSetDouble("/sim/presets/longitude-deg", parse_degree(arg.substr(6))); - fgSetDouble("/position/longitude-deg", parse_degree(arg.substr(6))); - fgSetString("/sim/presets/airport-id", ""); - } else if ( arg.find( "--lat=" ) == 0 ) { - fgSetDouble("/sim/presets/latitude-deg", parse_degree(arg.substr(6))); - fgSetDouble("/position/latitude-deg", parse_degree(arg.substr(6))); - fgSetString("/sim/presets/airport-id", ""); - } else if ( arg.find( "--altitude=" ) == 0 ) { - fgSetBool("/sim/presets/onground", false); - if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) - fgSetDouble("/sim/presets/altitude-ft", atof(arg.substr(11))); - else - fgSetDouble("/sim/presets/altitude-ft", - atof(arg.substr(11)) * SG_METER_TO_FEET); - } else if ( arg.find( "--uBody=" ) == 0 ) { - fgSetString("/sim/presets/speed-set", "UVW"); - if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) - fgSetDouble("/sim/presets/uBody-fps", atof(arg.substr(8))); - else - fgSetDouble("/sim/presets/uBody-fps", - atof(arg.substr(8)) * SG_METER_TO_FEET); - } else if ( arg.find( "--vBody=" ) == 0 ) { - fgSetString("/sim/presets/speed-set", "UVW"); - if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) - fgSetDouble("/sim/presets/vBody-fps", atof(arg.substr(8))); - else - fgSetDouble("/sim/presets/vBody-fps", - atof(arg.substr(8)) * SG_METER_TO_FEET); - } else if ( arg.find( "--wBody=" ) == 0 ) { - fgSetString("/sim/presets/speed-set", "UVW"); - if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) - fgSetDouble("/sim/presets/wBody-fps", atof(arg.substr(8))); - else - fgSetDouble("/sim/presets/wBody-fps", - atof(arg.substr(8)) * SG_METER_TO_FEET); - } else if ( arg.find( "--vNorth=" ) == 0 ) { - fgSetString("/sim/presets/speed-set", "NED"); - if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) - fgSetDouble("/sim/presets/speed-north-fps", atof(arg.substr(9))); - else - fgSetDouble("/sim/presets/speed-north-fps", - atof(arg.substr(9)) * SG_METER_TO_FEET); - } else if ( arg.find( "--vEast=" ) == 0 ) { - fgSetString("/sim/presets/speed-set", "NED"); - if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) - fgSetDouble("/sim/presets/speed-east-fps", atof(arg.substr(8))); - else - fgSetDouble("/sim/presets/speed-east-fps", - atof(arg.substr(8)) * SG_METER_TO_FEET); - } else if ( arg.find( "--vDown=" ) == 0 ) { - fgSetString("/sim/presets/speed-set", "NED"); - if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) - fgSetDouble("/sim/presets/speed-down-fps", atof(arg.substr(8))); - else - fgSetDouble("/sim/presets/speed-down-fps", - atof(arg.substr(8)) * SG_METER_TO_FEET); - } else if ( arg.find( "--vc=" ) == 0) { - // fgSetString("/sim/presets/speed-set", "knots"); - // fgSetDouble("/velocities/airspeed-kt", atof(arg.substr(5))); - fgSetString("/sim/presets/speed-set", "knots"); - fgSetDouble("/sim/presets/airspeed-kt", atof(arg.substr(5))); - } else if ( arg.find( "--mach=" ) == 0) { - fgSetString("/sim/presets/speed-set", "mach"); - fgSetDouble("/sim/presets/mach", atof(arg.substr(7))); - } else if ( arg.find( "--heading=" ) == 0 ) { - fgSetDouble("/sim/presets/heading-deg", atof(arg.substr(10))); - } else if ( arg.find( "--roll=" ) == 0 ) { - fgSetDouble("/sim/presets/roll-deg", atof(arg.substr(7))); - } else if ( arg.find( "--pitch=" ) == 0 ) { - fgSetDouble("/sim/presets/pitch-deg", atof(arg.substr(8))); - } else if ( arg.find( "--glideslope=" ) == 0 ) { - fgSetDouble("/sim/presets/glideslope-deg", - atof(arg.substr(13))); - } 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=" ) == 0 ) { - globals->set_fg_scenery(arg.substr( 13 )); - } 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( "--show-aircraft") == 0) { - return(FG_OPTIONS_SHOW_AIRCRAFT); - } 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/presets/trim", true); - } else if ( arg.find( "--notrim") == 0) { - fgSetBool("/sim/presets/trim", false); - } else if ( arg.find( "--on-ground") == 0) { - fgSetBool("/sim/presets/onground", true); - } else if ( arg.find( "--in-air") == 0) { - fgSetBool("/sim/presets/onground", false); - } else if ( arg == "--fog-disable" ) { - fgSetString("/sim/rendering/fog", "disabled"); - } else if ( arg == "--fog-fastest" ) { - fgSetString("/sim/rendering/fog", "fastest"); - } else if ( arg == "--fog-nicest" ) { - fgSetString("/sim/fog", "nicest"); - } else if ( arg == "--disable-distance-attenuation" ) { - fgSetBool("/environment/distance-attenuation", false); - } else if ( arg == "--enable-distance-attenuation" ) { - fgSetBool("/environment/distance-attenuation", true); - } else if ( arg == "--disable-clouds" ) { - fgSetBool("/environment/clouds/status", false); - } else if ( arg == "--enable-clouds" ) { - fgSetBool("/environment/clouds/status", true); -#ifdef FG_USE_CLOUDS_3D - } else if ( arg == "--disable-clouds3d" ) { - fgSetBool("/sim/rendering/clouds3d", false); - } else if ( arg == "--enable-clouds3d" ) { - fgSetBool("/sim/rendering/clouds3d", true); -#endif - } else if ( arg.find( "--fov=" ) == 0 ) { - parse_fov( arg.substr(6) ); - } else if ( arg == "--disable-fullscreen" ) { - fgSetBool("/sim/startup/fullscreen", false); - } else if ( arg== "--enable-fullscreen") { - fgSetBool("/sim/startup/fullscreen", true); - } else if ( arg == "--shading-flat") { - fgSetBool("/sim/rendering/shading", false); - } else if ( arg == "--shading-smooth") { - fgSetBool("/sim/rendering/shading", true); - } else if ( arg == "--disable-skyblend") { - fgSetBool("/sim/rendering/skyblend", false); - } else if ( arg== "--enable-skyblend" ) { - fgSetBool("/sim/rendering/skyblend", true); - } else if ( arg == "--disable-textures" ) { - fgSetBool("/sim/rendering/textures", false); - } else if ( arg == "--enable-textures" ) { - fgSetBool("/sim/rendering/textures", true); - } else if ( arg == "--disable-wireframe" ) { - fgSetBool("/sim/rendering/wireframe", false); - } else if ( arg == "--enable-wireframe" ) { - 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 ); - string::size_type i = geometry.find('x'); - - if (i != string::npos) { - xsize = atoi(geometry.substr(0, i)); - ysize = atoi(geometry.substr(i+1)); - } else { - geometry_ok = false; - } - - if ( xsize <= 0 || ysize <= 0 ) { - xsize = 640; - ysize = 480; - geometry_ok = false; - } - - if ( !geometry_ok ) { - SG_LOG( SG_GENERAL, SG_ALERT, "Unknown geometry: " << geometry ); - SG_LOG( SG_GENERAL, SG_ALERT, - "Setting geometry to " << xsize << 'x' << ysize << '\n'); - } else { - SG_LOG( SG_GENERAL, SG_INFO, - "Setting geometry to " << xsize << 'x' << ysize << '\n'); - fgSetInt("/sim/startup/xsize", xsize); - fgSetInt("/sim/startup/ysize", ysize); - } - } else if ( arg.find( "--bpp=" ) == 0 ) { - string bits_per_pix = arg.substr( 6 ); - if ( bits_per_pix == "16" ) { - fgSetInt("/sim/rendering/bits-per-pixel", 16); - } else if ( bits_per_pix == "24" ) { - fgSetInt("/sim/rendering/bits-per-pixel", 24); - } else if ( bits_per_pix == "32" ) { - fgSetInt("/sim/rendering/bits-per-pixel", 32); - } else { - SG_LOG(SG_GENERAL, SG_ALERT, "Unsupported bpp " << bits_per_pix); - } - } else if ( arg == "--units-feet" ) { - fgSetString("/sim/startup/units", "feet"); - } else if ( arg == "--units-meters" ) { - 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" ) { - fgSetString("/sim/hud/frame-stat-type", "tris"); - } else if ( arg == "--hud-culled" ) { - 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( "--native-gui=" ) == 0 ) { - add_channel( "native_gui", 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" ) { - fgSetBool("/sim/networking/olk", false); - } else if ( arg== "--enable-network-olk") { - fgSetBool("/sim/networking/olk", true); - } else if ( arg == "--net-hud" ) { - fgSetBool("/sim/hud/net-display", true); - net_hud_display = 1; // FIXME - } 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); - string::size_type 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); - 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 = SGD_PI * 0.25; - } else if ( woffset == "RIGHT" ) { - default_view_offset = SGD_PI * 1.75; - } else if ( woffset == "CENTER" ) { - default_view_offset = 0.00; - } else { - default_view_offset = atof( woffset.c_str() ) * SGD_DEGREES_TO_RADIANS; - } - /* apparently not used (CLO, 11 Jun 2002) - 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=" ) == 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( "--random-wind" ) == 0 ) { - double min_hdg = sg_random() * 360.0; - double max_hdg = min_hdg + (20 - sqrt(sg_random() * 400)); - double speed = 40 - sqrt(sg_random() * 1600.0); - double gust = speed + (10 - sqrt(sg_random() * 100)); - setup_wind(min_hdg, max_hdg, speed, gust); - } 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; - } - setup_wind(min_hdg, max_hdg, speed, gust); - } else if ( arg.find( "--wp=" ) == 0 ) { - parse_wp( arg.substr( 5 ) ); - } 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 ) { - fgSetString("/sim/aircraft", arg.substr(11).c_str()); - } else { - SG_LOG( SG_GENERAL, SG_ALERT, "Unknown option '" << arg << "'" ); - return FG_OPTIONS_ERROR; - } -#endif - return FG_OPTIONS_OK; } @@ -1679,7 +1479,10 @@ fgParseArgs (int argc, char **argv) verbose = true; else if (result == FG_OPTIONS_SHOW_AIRCRAFT) { - fgShowAircraft(); + fgOptLogLevel( "alert" ); + SGPath path( globals->get_fg_root() ); + path.append("Aircraft"); + fgShowAircraft(path, true); exit(0); } } @@ -1692,6 +1495,7 @@ fgParseArgs (int argc, char **argv) } if (help) { + fgOptLogLevel( "alert" ); fgUsage(verbose); exit(0); } @@ -1750,7 +1554,8 @@ fgUsage (bool verbose) SGPropertyNode options_root; - cout << "" << endl; + SG_LOG( SG_GENERAL, SG_ALERT, "" ); // To popup the console on Windows + cout << endl; try { fgLoadProps("options.xml", &options_root); @@ -1870,19 +1675,17 @@ fgUsage (bool verbose) cout << endl; cout << "For a complete list of options use --help --verbose" << endl; } +#ifdef _MSC_VER + cout << "Hit a key to continue..." << endl; + cin.get(); +#endif } -// Show available aircraft types -void fgShowAircraft(void) { - vector aircraft; - - SGPath path( globals->get_fg_root() ); - path.append("Aircraft"); - +static void fgSearchAircraft(const SGPath &path, string_list &aircraft, + bool recursive) +{ ulDirEnt* dire; - ulDir *dirp; - - dirp = ulOpenDir(path.c_str()); + ulDir *dirp = ulOpenDir(path.str().c_str()); if (dirp == NULL) { cerr << "Unable to open aircraft directory." << endl; exit(-1); @@ -1891,7 +1694,17 @@ void fgShowAircraft(void) { while ((dire = ulReadDir(dirp)) != NULL) { char *ptr; - if ((ptr = strstr(dire->d_name, "-set.xml")) && ptr[8] == '\0' ) { + if (dire->d_isdir) { + if (recursive && strcmp("CVS", dire->d_name) + && strcmp(".", dire->d_name) && strcmp("..", dire->d_name)) + { + SGPath next = path; + next.append(dire->d_name); + + fgSearchAircraft(next, aircraft, true); + } + } else if ((ptr = strstr(dire->d_name, "-set.xml")) && (ptr[8] == '\0')) { + SGPath afile = path; afile.append(dire->d_name); @@ -1911,23 +1724,44 @@ void fgShowAircraft(void) { } char cstr[96]; - if (strlen(dire->d_name) <= 27) + if (strlen(dire->d_name) <= 27) { snprintf(cstr, 96, " %-27s %s", dire->d_name, (desc) ? desc->getStringValue() : "" ); - else + } else { snprintf(cstr, 96, " %-27s\n%32c%s", dire->d_name, ' ', (desc) ? desc->getStringValue() : "" ); + } aircraft.push_back(cstr); } } - sort(aircraft.begin(), aircraft.end()); - cout << "Available aircraft:" << endl; - for (int i = 0; i < aircraft.size(); i++) - cout << aircraft[i] << endl; - - aircraft.clear(); ulCloseDir(dirp); } + + +/* + * Search in the current directory, and in on directory deeper + * for -set.xml configuration files and show the aircaft name + * and the contents of the tag in a sorted manner. + * + * @parampath the directory to search for configuration files + * @param recursive defines whether the directory should be searched recursively + */ +void fgShowAircraft(const SGPath &path, bool recursive) { + string_list aircraft; + + fgSearchAircraft( path, aircraft, recursive ); + + sort(aircraft.begin(), aircraft.end()); + SG_LOG( SG_GENERAL, SG_ALERT, "" ); // To popup the console on Windows + cout << "Available aircraft:" << endl; + for ( unsigned int i = 0; i < aircraft.size(); i++ ) { + cout << aircraft[i] << endl; + } +#ifdef _MSC_VER + cout << "Hit a key to continue..." << endl; + cin.get(); +#endif +}