X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Foptions.cxx;h=8ec77dfad1b64cb725406625886d4b597ea277c8;hb=5ea9c04c644a7e115f651132a6179d4e9d1ef8ce;hp=01c0dfbf159ca3116fa25053c83d7219b81a54ad;hpb=d1a50b5667447ca98828856761fdaa694cd5f886;p=flightgear.git diff --git a/src/Main/options.cxx b/src/Main/options.cxx index 01c0dfbf1..8ec77dfad 100644 --- a/src/Main/options.cxx +++ b/src/Main/options.cxx @@ -55,8 +55,8 @@ bool global_fullscreen = true; #include "fg_props.hxx" #include "options.hxx" -FG_USING_STD(string); -FG_USING_NAMESPACE(std); +SG_USING_STD(string); +SG_USING_NAMESPACE(std); #define NEW_DEFAULT_MODEL_HZ 120 @@ -138,7 +138,9 @@ fgSetDefaults () fgSetBool("/sim/startup/game-mode", false); fgSetBool("/sim/startup/splash-screen", true); fgSetBool("/sim/startup/intro-music", true); - fgSetString("/sim/startup/mouse-pointer", "disabled"); + // 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); @@ -184,6 +186,8 @@ fgSetDefaults () fgSetString("/sim/networking/call-sign", "Johnny"); } + +// parse a time string ([+/-]%f[:%f[:%f]]) into hours static double parse_time(const string& time_in) { char *time_str, num[256]; @@ -263,6 +267,7 @@ parse_time(const string& time_in) { } +// parse a date string (yyyy:mm:dd:hh:mm:ss) into a time_t (seconds) static long int parse_date( const string& date) { @@ -371,7 +376,7 @@ parse_date( const string& date) } -/// parse degree in the form of [+/-]hhh:mm:ss +// 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 ); @@ -382,7 +387,7 @@ parse_degree( const string& degree_str) { } -// parse time offset command line option +// parse time offset string into seconds static int parse_time_offset( const string& time_str) { int result; @@ -452,7 +457,7 @@ parse_channel( const string& type, const string& channel_str ) { } -// Parse --wp=ID[,alt] +// Parse --wp=ID[@alt] static bool parse_wp( const string& arg ) { string id, alt_str; @@ -465,7 +470,7 @@ parse_wp( const string& arg ) { // cout << "id str = " << id << " alt str = " << alt_str << endl; alt = atof( alt_str.c_str() ); if ( fgGetString("/sim/startup/units") == "feet" ) { - alt *= FEET_TO_METER; + alt *= SG_FEET_TO_METER; } } else { id = arg; @@ -488,7 +493,7 @@ static bool parse_flightplan(const string& arg) { fg_gzifstream infile(arg.c_str()); - if (!infile) { + if ( !infile.is_open() ) { return false; } while ( true ) { @@ -542,7 +547,7 @@ parse_option (const string& arg) fgSetBool("/sim/hud/antialiased", false); } else if ( arg == "--enable-anti-alias-hud" ) { fgSetBool("/sim/hud/antialiased", true); - } else if ( arg.find( "--control=") != string::npos ) { + } else if ( arg.find( "--control=") == 0 ) { fgSetString("/sim/control-mode", arg.substr(10)); } else if ( arg == "--disable-auto-coordination" ) { fgSetBool("/sim/auto-coordination", false); @@ -560,105 +565,103 @@ parse_option (const string& arg) fgSetBool("/sim/sound", false); } else if ( arg == "--enable-sound" ) { fgSetBool("/sim/sound", true); - } else if ( arg.find( "--airport-id=") != string::npos ) { + } else if ( arg.find( "--airport-id=") == 0 ) { // NB: changed property name!!! fgSetString("/sim/startup/airport-id", arg.substr(13)); - } else if ( arg.find( "--lon=" ) != string::npos ) { + } 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", parse_degree(arg.substr(6))); fgSetString("/sim/startup/airport-id", ""); - } else if ( arg.find( "--lat=" ) != string::npos ) { + } else if ( arg.find( "--lat=" ) == 0 ) { fgSetDouble("/position/latitude", parse_degree(arg.substr(6))); fgSetString("/sim/startup/airport-id", ""); - } else if ( arg.find( "--altitude=" ) != string::npos ) { + } else if ( arg.find( "--altitude=" ) == 0 ) { fgSetBool("/sim/startup/onground", false); if ( fgGetString("/sim/startup/units") == "feet" ) fgSetDouble("/position/altitude", atof(arg.substr(11))); else fgSetDouble("/position/altitude", - atof(arg.substr(11)) * METER_TO_FEET); - } else if ( arg.find( "--uBody=" ) != string::npos ) { + atof(arg.substr(11)) * SG_METER_TO_FEET); + } else if ( arg.find( "--uBody=" ) == 0 ) { fgSetString("/sim/startup/speed-set", "UVW"); - // FIXME: the units are totally confused here if ( fgGetString("/sim/startup/units") == "feet" ) fgSetDouble("/velocities/uBody", atof(arg.substr(8))); else fgSetDouble("/velocities/uBody", - atof(arg.substr(8)) * FEET_TO_METER); - } else if ( arg.find( "--vBody=" ) != string::npos ) { + atof(arg.substr(8)) * SG_METER_TO_FEET); + } else if ( arg.find( "--vBody=" ) == 0 ) { fgSetString("/sim/startup/speed-set", "UVW"); - // FIXME: the units are totally confused here if ( fgGetString("/sim/startup/units") == "feet" ) fgSetDouble("/velocities/vBody", atof(arg.substr(8))); else fgSetDouble("/velocities/vBody", - atof(arg.substr(8)) * FEET_TO_METER); - } else if ( arg.find( "--wBody=" ) != string::npos ) { + atof(arg.substr(8)) * SG_METER_TO_FEET); + } else if ( arg.find( "--wBody=" ) == 0 ) { fgSetString("/sim/startup/speed-set", "UVW"); - // FIXME: the units are totally confused here if ( fgGetString("/sim/startup/units") == "feet" ) fgSetDouble("/velocities/wBody", atof(arg.substr(8))); else fgSetDouble("/velocities/wBody", - atof(arg.substr(8)) * FEET_TO_METER); - } else if ( arg.find( "--vNorth=" ) != string::npos ) { + atof(arg.substr(8)) * SG_METER_TO_FEET); + } else if ( arg.find( "--vNorth=" ) == 0 ) { fgSetString("/sim/startup/speed-set", "NED"); - // FIXME: the units are totally confused here if ( fgGetString("/sim/startup/units") == "feet" ) - fgSetDouble("/velocities/speed-north", atof(arg.substr(8))); + fgSetDouble("/velocities/speed-north", atof(arg.substr(9))); else fgSetDouble("/velocities/speed-north", - atof(arg.substr(8)) * FEET_TO_METER); - } else if ( arg.find( "--vEast=" ) != string::npos ) { + atof(arg.substr(9)) * SG_METER_TO_FEET); + } else if ( arg.find( "--vEast=" ) == 0 ) { fgSetString("/sim/startup/speed-set", "NED"); - // FIXME: the units are totally confused here if ( fgGetString("/sim/startup/units") == "feet" ) fgSetDouble("/velocities/speed-east", atof(arg.substr(8))); else fgSetDouble("/velocities/speed-east", - atof(arg.substr(8)) * FEET_TO_METER); - } else if ( arg.find( "--vDown=" ) != string::npos ) { + atof(arg.substr(8)) * SG_METER_TO_FEET); + } else if ( arg.find( "--vDown=" ) == 0 ) { fgSetString("/sim/startup/speed-set", "NED"); - // FIXME: the units are totally confused here if ( fgGetString("/sim/startup/units") == "feet" ) fgSetDouble("/velocities/speed-down", atof(arg.substr(8))); else fgSetDouble("/velocities/speed-down", - atof(arg.substr(8)) * FEET_TO_METER); - } else if ( arg.find( "--vc=" ) != string::npos) { + 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))); - } else if ( arg.find( "--mach=" ) != string::npos) { + } else if ( arg.find( "--mach=" ) == 0) { fgSetString("/sim/startup/speed-set", "mach"); fgSetDouble("/velocities/mach", atof(arg.substr(7))); - } else if ( arg.find( "--heading=" ) != string::npos ) { + } else if ( arg.find( "--heading=" ) == 0 ) { fgSetDouble("/orientation/heading", atof(arg.substr(10))); - } else if ( arg.find( "--roll=" ) != string::npos ) { + } else if ( arg.find( "--roll=" ) == 0 ) { fgSetDouble("/orientation/roll", atof(arg.substr(7))); - } else if ( arg.find( "--pitch=" ) != string::npos ) { + } else if ( arg.find( "--pitch=" ) == 0 ) { fgSetDouble("/orientation/pitch", atof(arg.substr(8))); - } else if ( arg.find( "--fg-root=" ) != string::npos ) { + } 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 ) { + } else if ( arg.find( "--fdm=" ) == 0 ) { fgSetString("/sim/flight-model", arg.substr(6)); - } else if ( arg.find( "--aircraft=" ) != string::npos ) { + } else if ( arg.find( "--aircraft=" ) == 0 ) { fgSetString("/sim/aircraft", arg.substr(11)); - } else if ( arg.find( "--aircraft-dir=" ) != string::npos ) { + } else if ( arg.find( "--aircraft-dir=" ) == 0 ) { fgSetString("/sim/aircraft-dir", arg.substr(15)); - } else if ( arg.find( "--model-hz=" ) != string::npos ) { + } else if ( arg.find( "--model-hz=" ) == 0 ) { fgSetInt("/sim/model-hz", atoi(arg.substr(11))); - } else if ( arg.find( "--speed=" ) != string::npos ) { + } else if ( arg.find( "--speed=" ) == 0 ) { fgSetInt("/sim/speed-up", atoi(arg.substr(8))); - } else if ( arg.find( "--trim") != string::npos) { + } else if ( arg.find( "--trim") == 0) { fgSetBool("/sim/startup/trim", true); - } else if ( arg.find( "--notrim") != string::npos) { + } else if ( arg.find( "--notrim") == 0) { fgSetBool("/sim/startup/trim", false); - } else if ( arg.find( "--on-ground") != string::npos) { + } else if ( arg.find( "--on-ground") == 0) { fgSetBool("/sim/startup/onground", true); - } else if ( arg.find( "--in-air") != string::npos) { + } else if ( arg.find( "--in-air") == 0) { fgSetBool("/sim/startup/onground", false); } else if ( arg == "--fog-disable" ) { fgSetString("/sim/rendering/fog", "disabled"); @@ -670,15 +673,15 @@ 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=" ) != string::npos ) { + } else if ( arg.find( "--clouds-asl=" ) == 0 ) { // FIXME: check units if ( fgGetString("/sim/startup/units") == "feet" ) fgSetDouble("/environment/clouds/altitude", - atof(arg.substr(13)) * FEET_TO_METER); + atof(arg.substr(13)) * SG_FEET_TO_METER); else fgSetDouble("/environment/clouds/altitude", atof(arg.substr(13))); - } else if ( arg.find( "--fov=" ) != string::npos ) { + } else if ( arg.find( "--fov=" ) == 0 ) { parse_fov( arg.substr(6) ); } else if ( arg == "--disable-fullscreen" ) { fgSetBool("/sim/startup/fullscreen", false); @@ -700,7 +703,7 @@ parse_option (const string& arg) fgSetBool("/sim/rendering/wireframe", false); } else if ( arg == "--enable-wireframe" ) { fgSetBool("/sim/rendering/wireframe", true); - } else if ( arg.find( "--geometry=" ) != string::npos ) { + } else if ( arg.find( "--geometry=" ) == 0 ) { bool geometry_ok = true; int xsize = 0, ysize = 0; string geometry = arg.substr( 11 ); @@ -729,7 +732,7 @@ parse_option (const string& arg) 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" ) { fgSetInt("/sim/rendering/bits-per-pixel", 16); @@ -744,25 +747,25 @@ parse_option (const string& arg) fgSetString("/sim/startup/units", "feet"); } else if ( arg == "--units-meters" ) { fgSetString("/sim/startup/units", "meters"); - } else if ( arg.find( "--time-offset" ) != string::npos ) { + } else if ( arg.find( "--time-offset" ) == 0 ) { fgSetInt("/sim/startup/time-offset", parse_time_offset( (arg.substr(14)) )); - } else if ( arg.find( "--time-match-real") != string::npos ) { - fgSetString("/sim/startup/time-offset_type", + } else if ( arg.find( "--time-match-real") == 0 ) { + fgSetString("/sim/startup/time-offset-type", "system-offset"); - } else if ( arg.find( "--time-match-local") != string::npos ) { - fgSetString("/sim/startup/time-offset_type", + } else if ( arg.find( "--time-match-local") == 0 ) { + fgSetString("/sim/startup/time-offset-type", "latitude-offset"); - } else if ( arg.find( "--start-date-sys=") != string::npos ) { + } 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=") != string::npos ) { + } 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=") != string::npos ) { + } 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"); @@ -770,23 +773,23 @@ parse_option (const string& arg) fgSetString("/sim/hud/frame-stat-type", "tris"); } else if ( arg == "--hud-culled" ) { fgSetString("/sim/hud/frame-stat-type", "culled"); - } else if ( arg.find( "--atlas=" ) != string::npos ) { + } else if ( arg.find( "--atlas=" ) == 0 ) { parse_channel( "atlas", arg.substr(8) ); - } else if ( arg.find( "--native=" ) != string::npos ) { + } else if ( arg.find( "--native=" ) == 0 ) { parse_channel( "native", arg.substr(9) ); - } else if ( arg.find( "--garmin=" ) != string::npos ) { + } else if ( arg.find( "--garmin=" ) == 0 ) { parse_channel( "garmin", arg.substr(9) ); - } else if ( arg.find( "--nmea=" ) != string::npos ) { + } else if ( arg.find( "--nmea=" ) == 0 ) { parse_channel( "nmea", arg.substr(7) ); - } else if ( arg.find( "--props=" ) != string::npos ) { + } else if ( arg.find( "--props=" ) == 0 ) { parse_channel( "props", arg.substr(8) ); - } else if ( arg.find( "--pve=" ) != string::npos ) { + } else if ( arg.find( "--pve=" ) == 0 ) { parse_channel( "pve", arg.substr(6) ); - } else if ( arg.find( "--ray=" ) != string::npos ) { + } else if ( arg.find( "--ray=" ) == 0 ) { parse_channel( "ray", arg.substr(6) ); - } else if ( arg.find( "--rul=" ) != string::npos ) { + } else if ( arg.find( "--rul=" ) == 0 ) { parse_channel( "rul", arg.substr(6) ); - } else if ( arg.find( "--joyclient=" ) != string::npos ) { + } else if ( arg.find( "--joyclient=" ) == 0 ) { parse_channel( "joyclient", arg.substr(12) ); #ifdef FG_NETWORK_OLK } else if ( arg == "--disable-network-olk" ) { @@ -796,7 +799,7 @@ parse_option (const string& arg) } else if ( arg == "--net-hud" ) { fgSetBool("/sim/hud/net-display", true); net_hud_display = 1; // FIXME - } else if ( arg.find( "--net-id=") != string::npos ) { + } else if ( arg.find( "--net-id=") == 0 ) { fgSetString("sim/networking/call-sign", arg.substr(9)); #endif } else if ( arg.find( "--prop:" ) == 0 ) { @@ -813,17 +816,17 @@ parse_option (const string& arg) // << name << " to \"" << value << '"'); // $$$ begin - added VS Renganathan, 14 Oct 2K // for multi-window outside window imagery - } else if ( arg.find( "--view-offset=" ) != string::npos ) { + } else if ( arg.find( "--view-offset=" ) == 0 ) { 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 ); @@ -831,10 +834,10 @@ parse_option (const string& arg) pilot_view->set_goal_view_offset( default_view_offset ); fgSetDouble("/sim/startup/view-offset", default_view_offset); // $$$ end - added VS Renganathan, 14 Oct 2K - } else if ( arg.find( "--visibility=" ) != string::npos ) { + } else if ( arg.find( "--visibility=" ) == 0 ) { fgSetDouble("/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; + } else if ( arg.find( "--visibility-miles=" ) == 0 ) { + double visibility = atof(arg.substr(19)) * 5280.0 * SG_FEET_TO_METER; fgSetDouble("/environment/visibility", visibility); } else if ( arg.find( "--wind=" ) == 0 ) { string val = arg.substr(7); @@ -848,19 +851,26 @@ parse_option (const string& arg) FG_LOG(FG_GENERAL, FG_INFO, "WIND: " << dir << '@' << speed << " knots" << endl); // convert to fps - speed *= NM_TO_METER * METER_TO_FEET * (1.0/3600); + speed *= SG_NM_TO_METER * SG_METER_TO_FEET * (1.0/3600); dir += 180; if (dir >= 360) dir -= 360; - dir *= DEG_TO_RAD; + dir *= SGD_DEGREES_TO_RADIANS; fgSetDouble("/environment/wind-north", speed * cos(dir)); fgSetDouble("/environment/wind-east", speed * sin(dir)); - } else if ( arg.find( "--wp=" ) != string::npos ) { + } 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); + if (!readProperties(file, globals->get_props())) { + FG_LOG(FG_IO, FG_ALERT, + "--config: failed to read properties from " << file); + return FG_OPTIONS_ERROR; + } } else { FG_LOG( FG_GENERAL, FG_ALERT, "Unknown option '" << arg << "'" ); return FG_OPTIONS_ERROR; @@ -883,7 +893,7 @@ fgScanForRoot (int argc, char **argv) FG_LOG( FG_GENERAL, FG_DEBUG, "argv[" << i << "] = " << argv[i] ); string arg = argv[i]; - if ( arg.find( "--fg-root=" ) != string::npos ) { + if ( arg.find( "--fg-root=" ) == 0 ) { return arg.substr( 10 ); } @@ -922,7 +932,7 @@ fgScanForRoot (const string& path) getline( in, line ); #endif - if ( line.find( "--fg-root=" ) != string::npos ) { + if ( line.find( "--fg-root=" ) == 0 ) { return line.substr( 10 ); } @@ -1022,6 +1032,8 @@ fgUsage () 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--file=path: load additional properties from path" << endl; cout << endl; cout << "Features:" << endl; @@ -1058,6 +1070,10 @@ fgUsage () 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 = -)"