X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Foptions.cxx;h=6cb98fc5adb464704f089c1220e489e3b0f54893;hb=a4e81f4ff075e6a3c0c2ea1b5a29c0bcdfdbc671;hp=7b89e72a99968706b937ed870b9ab0493354ce39;hpb=7a723244a0c170bff00b42bd84f0a5785d691420;p=flightgear.git diff --git a/src/Main/options.cxx b/src/Main/options.cxx index 7b89e72a9..6cb98fc5a 100644 --- a/src/Main/options.cxx +++ b/src/Main/options.cxx @@ -26,20 +26,19 @@ #endif #include +#include -/* normans fix */ -#if defined(FX) && defined(XMESA) -bool global_fullscreen = true; -#endif - -#include // rint() +#include // rint() #include -#include // atof(), atoi() -#include +#include // atof(), atoi() +#include // strcmp() #include STL_STRING #include +#include +#include +#include // #include // #include @@ -50,10 +49,13 @@ bool global_fullscreen = true; # include #endif +#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); @@ -113,25 +115,25 @@ fgSetDefaults () // Otherwise, default to Scenery being in $FG_ROOT/Scenery globals->set_fg_scenery(""); } - // Position (Globe, AZ) - fgSetDouble("/position/longitude", -110.6642444); - fgSetDouble("/position/latitude", 33.3528917); - fgSetDouble("/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 - fgSetDouble("/orientation/heading", 270); - fgSetDouble("/orientation/roll", 0); - fgSetDouble("/orientation/pitch", 0.424); + fgSetDouble("/orientation/heading-deg", 270); + fgSetDouble("/orientation/roll-deg", 0); + fgSetDouble("/orientation/pitch-deg", 0.424); // Velocities fgSetString("/sim/startup/speed-set", "knots"); - fgSetDouble("/velocities/uBody", 0.0); - fgSetDouble("/velocities/vBody", 0.0); - fgSetDouble("/velocities/wBody", 0.0); - fgSetDouble("/velocities/speed-north", 0.0); - fgSetDouble("/velocities/speed-east", 0.0); - fgSetDouble("/velocities/speed-down", 0.0); - fgSetDouble("/velocities/airspeed", 0.0); + fgSetDouble("/velocities/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 @@ -143,16 +145,20 @@ fgSetDefaults () // 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 fgSetBool("/sim/hud/visibility", false); fgSetBool("/sim/panel/visibility", true); - fgSetBool("/sim/sound", true); + fgSetBool("/sim/sound/audible", true); fgSetBool("/sim/hud/antialiased", false); // Flight Model options - fgSetString("/sim/flight-model", "larcsim"); - fgSetString("/sim/aircraft", "c172"); + 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); @@ -161,7 +167,6 @@ fgSetDefaults () // Rendering options fgSetString("/sim/rendering/fog", "nicest"); fgSetBool("/environment/clouds/status", true); - fgSetDouble("/environment/clouds/altitude", 5000); fgSetBool("/sim/startup/fullscreen", false); fgSetBool("/sim/rendering/shading", true); fgSetBool("/sim/rendering/skyblend", true); @@ -171,8 +176,8 @@ fgSetDefaults () fgSetInt("/sim/startup/ysize", 600); fgSetInt("/sim/rendering/bits-per-pixel", 16); fgSetString("/sim/view-mode", "pilot"); - fgSetDouble("/sim/view/offset", 0); - fgSetDouble("/environment/visibility", 20000); + fgSetDouble("/sim/current-view/heading-offset-deg", 0); + fgSetDouble("/environment/visibility-m", 20000); // HUD options fgSetString("/sim/startup/units", "feet"); @@ -181,12 +186,45 @@ fgSetDefaults () // Time options 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); } +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; +} + // parse a time string ([+/-]%f[:%f[:%f]]) into hours static double parse_time(const string& time_in) { @@ -414,7 +452,7 @@ parse_fov( const string& arg ) { if ( fov < FG_FOV_MIN ) { fov = FG_FOV_MIN; } if ( fov > FG_FOV_MAX ) { fov = FG_FOV_MAX; } - fgSetDouble("/sim/field-of-view", fov); + fgSetDouble("/sim/current-view/field-of-view", fov); // printf("parse_fov(): result = %.4f\n", fov); @@ -448,7 +486,7 @@ parse_fov( const string& arg ) { // filename = file system file name static bool -parse_channel( const string& type, const string& channel_str ) { +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 ); @@ -469,7 +507,7 @@ parse_wp( const string& arg ) { alt_str = arg.substr( pos + 1 ); // cout << "id str = " << id << " alt str = " << alt_str << endl; alt = atof( alt_str.c_str() ); - if ( fgGetString("/sim/startup/units") == "feet" ) { + if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) { alt *= SG_FEET_TO_METER; } } else { @@ -545,19 +583,29 @@ parse_option (const string& arg) } else if ( arg == "--enable-mouse-pointer" ) { fgSetString("/sim/startup/mouse-pointer", "enabled"); } else if ( arg == "--disable-freeze" ) { - fgSetBool("/sim/freeze", false); + fgSetBool("/sim/freeze/master", false); } else if ( arg == "--enable-freeze" ) { - fgSetBool("/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" ) { 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)); + 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" ) { @@ -567,95 +615,100 @@ parse_option (const string& arg) } else if ( arg == "--enable-panel" ) { fgSetBool("/sim/panel/visibility", true); } else if ( arg == "--disable-sound" ) { - fgSetBool("/sim/sound", false); + fgSetBool("/sim/sound/audible", false); } else if ( arg == "--enable-sound" ) { - fgSetBool("/sim/sound", true); + fgSetBool("/sim/sound/audible", true); } else if ( arg.find( "--airport-id=") == 0 ) { // NB: changed property name!!! - fgSetString("/sim/startup/airport-id", arg.substr(13)); + 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", + fgSetDouble("/position/longitude-deg", parse_degree(arg.substr(6))); fgSetString("/sim/startup/airport-id", ""); } else if ( arg.find( "--lat=" ) == 0 ) { - fgSetDouble("/position/latitude", + fgSetDouble("/position/latitude-deg", parse_degree(arg.substr(6))); fgSetString("/sim/startup/airport-id", ""); } else if ( arg.find( "--altitude=" ) == 0 ) { fgSetBool("/sim/startup/onground", false); - if ( fgGetString("/sim/startup/units") == "feet" ) - fgSetDouble("/position/altitude", atof(arg.substr(11))); + if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) + fgSetDouble("/position/altitude-ft", atof(arg.substr(11))); else - fgSetDouble("/position/altitude", + 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 ( fgGetString("/sim/startup/units") == "feet" ) - fgSetDouble("/velocities/uBody", atof(arg.substr(8))); + if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) + fgSetDouble("/velocities/uBody-fps", atof(arg.substr(8))); else - fgSetDouble("/velocities/uBody", + 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 ( fgGetString("/sim/startup/units") == "feet" ) - fgSetDouble("/velocities/vBody", atof(arg.substr(8))); + if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) + fgSetDouble("/velocities/vBody-fps", atof(arg.substr(8))); else - fgSetDouble("/velocities/vBody", + 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 ( fgGetString("/sim/startup/units") == "feet" ) - fgSetDouble("/velocities/wBody", atof(arg.substr(8))); + if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) + fgSetDouble("/velocities/wBody-fps", atof(arg.substr(8))); else - fgSetDouble("/velocities/wBody", + 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 ( fgGetString("/sim/startup/units") == "feet" ) - fgSetDouble("/velocities/speed-north", atof(arg.substr(9))); + if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) + fgSetDouble("/velocities/speed-north-fps", atof(arg.substr(9))); else - fgSetDouble("/velocities/speed-north", + 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 ( fgGetString("/sim/startup/units") == "feet" ) - fgSetDouble("/velocities/speed-east", atof(arg.substr(8))); + if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) + fgSetDouble("/velocities/speed-east-fps", atof(arg.substr(8))); else - fgSetDouble("/velocities/speed-east", - atof(arg.substr(8)) * SG_METER_TO_FEET); + 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 ( fgGetString("/sim/startup/units") == "feet" ) - fgSetDouble("/velocities/speed-down", atof(arg.substr(8))); + if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) + fgSetDouble("/velocities/speed-down-fps", atof(arg.substr(8))); else - fgSetDouble("/velocities/speed-down", + 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", atof(arg.substr(5))); + 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", atof(arg.substr(10))); + fgSetDouble("/orientation/heading-deg", atof(arg.substr(10))); } else if ( arg.find( "--roll=" ) == 0 ) { - fgSetDouble("/orientation/roll", atof(arg.substr(7))); + fgSetDouble("/orientation/roll-deg", atof(arg.substr(7))); } else if ( arg.find( "--pitch=" ) == 0 ) { - fgSetDouble("/orientation/pitch", atof(arg.substr(8))); + 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=" ) == 0 ) { globals->set_fg_scenery(arg.substr( 13 )); } else if ( arg.find( "--fdm=" ) == 0 ) { - fgSetString("/sim/flight-model", arg.substr(6)); - } else if ( arg.find( "--aircraft=" ) == 0 ) { - fgSetString("/sim/aircraft", arg.substr(11)); + 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)); + 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 ) { @@ -678,14 +731,6 @@ parse_option (const string& arg) fgSetBool("/environment/clouds/status", false); } else if ( arg == "--enable-clouds" ) { fgSetBool("/environment/clouds/status", true); - } else if ( arg.find( "--clouds-asl=" ) == 0 ) { - // FIXME: check units - if ( fgGetString("/sim/startup/units") == "feet" ) - fgSetDouble("/environment/clouds/altitude", - atof(arg.substr(13)) * SG_FEET_TO_METER); - else - fgSetDouble("/environment/clouds/altitude", - atof(arg.substr(13))); } else if ( arg.find( "--fov=" ) == 0 ) { parse_fov( arg.substr(6) ); } else if ( arg == "--disable-fullscreen" ) { @@ -754,48 +799,61 @@ parse_option (const string& arg) fgSetString("/sim/startup/units", "meters"); } else if ( arg.find( "--time-offset" ) == 0 ) { fgSetInt("/sim/startup/time-offset", - parse_time_offset( (arg.substr(14)) )); + 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"); + fgSetString("/sim/startup/time-offset-type", "system-offset"); } else if ( arg.find( "--time-match-local") == 0 ) { - fgSetString("/sim/startup/time-offset-type", - "latitude-offset"); + 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)))); + 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"); + 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)))); + 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 ) { - parse_channel( "atlas", arg.substr(8) ); + 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 ) { - parse_channel( "native", arg.substr(9) ); + 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 ) { - parse_channel( "garmin", arg.substr(9) ); + add_channel( "garmin", arg.substr(9) ); } else if ( arg.find( "--nmea=" ) == 0 ) { - parse_channel( "nmea", arg.substr(7) ); + add_channel( "nmea", arg.substr(7) ); } else if ( arg.find( "--props=" ) == 0 ) { - parse_channel( "props", arg.substr(8) ); + add_channel( "props", arg.substr(8) ); + } else if ( arg.find( "--telnet=" ) == 0 ) { + add_channel( "telnet", arg.substr(9) ); } else if ( arg.find( "--pve=" ) == 0 ) { - parse_channel( "pve", arg.substr(6) ); + add_channel( "pve", arg.substr(6) ); } else if ( arg.find( "--ray=" ) == 0 ) { - parse_channel( "ray", arg.substr(6) ); + add_channel( "ray", arg.substr(6) ); } else if ( arg.find( "--rul=" ) == 0 ) { - parse_channel( "rul", arg.substr(6) ); + add_channel( "rul", arg.substr(6) ); } else if ( arg.find( "--joyclient=" ) == 0 ) { - parse_channel( "joyclient", arg.substr(12) ); + add_channel( "joyclient", arg.substr(12) ); #ifdef FG_NETWORK_OLK } else if ( arg == "--disable-network-olk" ) { fgSetBool("/sim/networking/olk", false); @@ -805,7 +863,7 @@ parse_option (const string& arg) 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)); + fgSetString("sim/networking/call-sign", arg.substr(9).c_str()); #endif } else if ( arg.find( "--prop:" ) == 0 ) { string assign = arg.substr(7); @@ -816,12 +874,22 @@ parse_option (const string& arg) } string name = assign.substr(0, pos); string value = assign.substr(pos + 1); - fgSetString(name.c_str(), value); + fgSetString(name.c_str(), value.c_str()); // SG_LOG(SG_GENERAL, SG_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("--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" ) { @@ -833,49 +901,74 @@ parse_option (const string& arg) } else { 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 ); - fgSetDouble("/sim/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=" ) == 0 ) { - fgSetDouble("/environment/visibility", atof(arg.substr(13))); + 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", visibility); + 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); 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()); - SG_LOG(SG_GENERAL, SG_INFO, "WIND: " << dir << '@' << + SG_LOG(SG_GENERAL, SG_INFO, "WIND: " << min_hdg << '@' << speed << " knots" << endl); - // convert to fps + +#ifdef FG_WEATHERCM + // convert to fps speed *= SG_NM_TO_METER * SG_METER_TO_FEET * (1.0/3600); - dir += 180; - if (dir >= 360) - dir -= 360; - dir *= SGD_DEGREES_TO_RADIANS; - fgSetDouble("/environment/wind-north", - speed * cos(dir)); - fgSetDouble("/environment/wind-east", - speed * sin(dir)); + 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=") == 0) { parse_flightplan ( arg.substr (14) ); } else if ( arg.find( "--config=" ) == 0 ) { string file = arg.substr(9); - if (!readProperties(file, globals->get_props())) { - SG_LOG(SG_IO, SG_ALERT, - "--config: failed to read properties from " << file); - return FG_OPTIONS_ERROR; + 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 { SG_LOG( SG_GENERAL, SG_ALERT, "Unknown option '" << arg << "'" ); return FG_OPTIONS_ERROR; @@ -953,23 +1046,35 @@ fgScanForRoot (const string& path) // Parse the command line options void -fgParseOptions (int argc, char **argv) { - int i = 1; - int result; +fgParseArgs (int argc, char **argv) +{ + bool in_options = true; SG_LOG(SG_GENERAL, SG_INFO, "Processing command line arguments"); - while ( i < argc ) { - SG_LOG( SG_GENERAL, SG_DEBUG, "argv[" << i << "] = " << argv[i] ); - - result = parse_option(argv[i]); - if ( (result == FG_OPTIONS_HELP) || (result == FG_OPTIONS_ERROR) ) { - fgUsage(); - exit(-1); + 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++; } + + SG_LOG(SG_GENERAL, SG_INFO, "Finished command line arguments"); } @@ -1020,163 +1125,83 @@ fgParseOptions (const string& path) { void fgUsage () { - cout << "Usage: fgfs [ 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 << "\t--prop:name=value: set property to " << endl; - cout << "\t--config=path: load additional properties from path" << 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--on-ground: Start up at ground level (default)" << endl; - cout << "\t--in-air: Start up in air (implied by specifying an initial" - << " altitude above ground level." << endl; - cout << "\t--wind=DIR@SPEED: specify wind coming from DIR (degrees) at SPEED (knots)" << endl; - cout << endl; - - //(UIUC) - cout <<"Aircraft model directory:" << endl; - cout <<"\t--aircraft-dir= path is relative to the path of the executable" << endl; - cout << endl; - - cout << "Initial Position and Orientation:" << endl; - cout << "\t--airport-id=ABCD: specify starting postion by airport id" - << endl; - cout << "\t--offset-distance: specify distance to threshhold" - << " (NM)" << endl; - cout << "\t--offset-azimuth: specify heading to threshhold (deg) " - << 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; + // *** 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); + } - 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 + SGPropertyNode *options = options_root.getNode("options"); + if (!options) { + SG_LOG( SG_GENERAL, SG_ALERT, + "Error reading options.xml: directive not found." ); + exit(-1); + } + + 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() + << ":" ); + } - 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]" <option = 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, "" ); + } + } + } + } }