X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Foptions.cxx;h=93fff76a3692489e65ebfa0721933f0004819b43;hb=e2dd3ac3e5682a47200f668343f91a617382f3fb;hp=636db9029bc51100c98d780a729f3014a269b6e7;hpb=4cf4edcfb40d384de6010c5588796a76a20ad57b;p=flightgear.git diff --git a/src/Main/options.cxx b/src/Main/options.cxx index 636db9029..93fff76a3 100644 --- a/src/Main/options.cxx +++ b/src/Main/options.cxx @@ -39,7 +39,7 @@ bool global_fullscreen = true; #include STL_STRING -#include +#include // #include // #include @@ -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 @@ -114,24 +114,24 @@ fgSetDefaults () globals->set_fg_scenery(""); } // Position (Globe, AZ) - fgSetDouble("/position/longitude", -110.6642444); - fgSetDouble("/position/latitude", 33.3528917); - fgSetDouble("/position/altitude", -9999.0); + fgSetDouble("/position/longitude-deg", -110.6642444); + fgSetDouble("/position/latitude-deg", 33.3528917); + 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,7 +143,11 @@ 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); @@ -161,7 +165,7 @@ fgSetDefaults () // Rendering options fgSetString("/sim/rendering/fog", "nicest"); fgSetBool("/environment/clouds/status", true); - fgSetDouble("/environment/clouds/altitude", 5000); + fgSetDouble("/environment/clouds/altitude-ft", 5000); fgSetBool("/sim/startup/fullscreen", false); fgSetBool("/sim/rendering/shading", true); fgSetBool("/sim/rendering/skyblend", true); @@ -171,8 +175,8 @@ fgSetDefaults () fgSetInt("/sim/startup/ysize", 600); fgSetInt("/sim/rendering/bits-per-pixel", 16); fgSetString("/sim/view-mode", "pilot"); - fgSetDouble("/sim/startup/view-offset", 0); - fgSetDouble("/environment/visibility", 20000); + fgSetDouble("/sim/view/offset-deg", 0); + fgSetDouble("/environment/visibility-m", 20000); // HUD options fgSetString("/sim/startup/units", "feet"); @@ -463,14 +467,14 @@ parse_wp( const string& arg ) { string id, alt_str; double alt = 0.0; - int pos = arg.find( "@" ); + unsigned int pos = arg.find( "@" ); if ( pos != string::npos ) { id = arg.substr( 0, pos ); alt_str = arg.substr( pos + 1 ); // cout << "id str = " << id << " alt str = " << alt_str << endl; alt = atof( alt_str.c_str() ); if ( fgGetString("/sim/startup/units") == "feet" ) { - alt *= FEET_TO_METER; + alt *= SG_FEET_TO_METER; } } else { id = arg; @@ -492,20 +496,25 @@ parse_wp( const string& arg ) { static bool parse_flightplan(const string& arg) { - fg_gzifstream infile(arg.c_str()); - if ( !infile.is_open() ) { + sg_gzifstream in(arg.c_str()); + if ( !in.is_open() ) { return false; } while ( true ) { string line; -#ifdef GETLINE_NEEDS_TERMINATOR - getline( infile, line, '\n' ); -#elif defined( macintosh ) - getline( infile, line, '\r' ); + +#if defined( macintosh ) + getline( in, line, '\r' ); #else - getline( infile, line ); + getline( in, line, '\n' ); #endif - if ( infile.eof() ) { + + // catch extraneous (DOS) line ending character + if ( line[line.length() - 1] < 32 ) { + line = line.substr( 0, line.length()-1 ); + } + + if ( in.eof() ) { break; } parse_wp(line); @@ -540,9 +549,9 @@ parse_option (const string& arg) } else if ( arg == "--enable-mouse-pointer" ) { fgSetString("/sim/startup/mouse-pointer", "enabled"); } else if ( arg == "--disable-freeze" ) { - globals->set_freeze(false); + fgSetBool("/sim/freeze", false); } else if ( arg == "--enable-freeze" ) { - globals->set_freeze(true); + fgSetBool("/sim/freeze", true); } else if ( arg == "--disable-anti-alias-hud" ) { fgSetBool("/sim/hud/antialiased", false); } else if ( arg == "--enable-anti-alias-hud" ) { @@ -553,6 +562,8 @@ parse_option (const string& arg) 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)); } else if ( arg == "--disable-hud" ) { fgSetBool("/sim/hud/visibility", false); } else if ( arg == "--enable-hud" ) { @@ -573,74 +584,74 @@ parse_option (const string& arg) } 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))); + fgSetDouble("/position/altitude-ft", atof(arg.substr(11))); else - fgSetDouble("/position/altitude", - atof(arg.substr(11)) * METER_TO_FEET); + 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))); + fgSetDouble("/velocities/uBody-fps", atof(arg.substr(8))); else - fgSetDouble("/velocities/uBody", - atof(arg.substr(8)) * METER_TO_FEET); + 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))); + fgSetDouble("/velocities/vBody-fps", atof(arg.substr(8))); else - fgSetDouble("/velocities/vBody", - atof(arg.substr(8)) * METER_TO_FEET); + 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))); + fgSetDouble("/velocities/wBody-fps", atof(arg.substr(8))); else - fgSetDouble("/velocities/wBody", - atof(arg.substr(8)) * METER_TO_FEET); + 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))); + fgSetDouble("/velocities/speed-north-fps", atof(arg.substr(9))); else - fgSetDouble("/velocities/speed-north", - atof(arg.substr(9)) * METER_TO_FEET); + 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))); + fgSetDouble("/velocities/speed-east-fps", atof(arg.substr(8))); else - fgSetDouble("/velocities/speed-east", - atof(arg.substr(8)) * 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))); + fgSetDouble("/velocities/speed-down-fps", atof(arg.substr(8))); else - fgSetDouble("/velocities/speed-down", - atof(arg.substr(8)) * METER_TO_FEET); + 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( "--fg-root=" ) == 0 ) { globals->set_fg_root(arg.substr( 10 )); } else if ( arg.find( "--fg-scenery=" ) == 0 ) { @@ -676,10 +687,10 @@ parse_option (const string& arg) } 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); + fgSetDouble("/environment/clouds/altitude-ft", + atof(arg.substr(13)) * SG_FEET_TO_METER); else - fgSetDouble("/environment/clouds/altitude", + fgSetDouble("/environment/clouds/altitude-ft", atof(arg.substr(13))); } else if ( arg.find( "--fov=" ) == 0 ) { parse_fov( arg.substr(6) ); @@ -723,11 +734,11 @@ parse_option (const string& arg) } if ( !geometry_ok ) { - FG_LOG( FG_GENERAL, FG_ALERT, "Unknown geometry: " << geometry ); - FG_LOG( FG_GENERAL, FG_ALERT, + SG_LOG( SG_GENERAL, SG_ALERT, "Unknown geometry: " << geometry ); + SG_LOG( SG_GENERAL, SG_ALERT, "Setting geometry to " << xsize << 'x' << ysize << '\n'); } else { - FG_LOG( FG_GENERAL, FG_INFO, + SG_LOG( SG_GENERAL, SG_INFO, "Setting geometry to " << xsize << 'x' << ysize << '\n'); fgSetInt("/sim/startup/xsize", xsize); fgSetInt("/sim/startup/ysize", ysize); @@ -741,7 +752,7 @@ parse_option (const string& arg) } else if ( bits_per_pix == "32" ) { fgSetInt("/sim/rendering/bits-per-pixel", 32); } else { - FG_LOG(FG_GENERAL, FG_ALERT, "Unsupported bpp " << bits_per_pix); + SG_LOG(SG_GENERAL, SG_ALERT, "Unsupported bpp " << bits_per_pix); } } else if ( arg == "--units-feet" ) { fgSetString("/sim/startup/units", "feet"); @@ -804,15 +815,15 @@ parse_option (const string& arg) #endif } else if ( arg.find( "--prop:" ) == 0 ) { string assign = arg.substr(7); - int pos = assign.find('='); - if (pos == arg.npos || pos == 0) { - FG_LOG(FG_GENERAL, FG_ALERT, "Bad property assignment: " << arg); + unsigned int pos = assign.find('='); + if ( pos == arg.npos || pos == 0 ) { + SG_LOG( SG_GENERAL, SG_ALERT, "Bad property assignment: " << arg ); return FG_OPTIONS_ERROR; } string name = assign.substr(0, pos); string value = assign.substr(pos + 1); fgSetString(name.c_str(), value); - // FG_LOG(FG_GENERAL, FG_INFO, "Setting default value of property " + // 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 @@ -820,45 +831,45 @@ parse_option (const string& arg) string woffset = arg.substr( 14 ); double default_view_offset = 0.0; if ( woffset == "LEFT" ) { - default_view_offset = FG_PI * 0.25; + default_view_offset = SGD_PI * 0.25; } else if ( woffset == "RIGHT" ) { - default_view_offset = FG_PI * 1.75; + default_view_offset = SGD_PI * 1.75; } else if ( woffset == "CENTER" ) { default_view_offset = 0.00; } else { - default_view_offset = atof( woffset.c_str() ) * DEG_TO_RAD; + default_view_offset = atof( woffset.c_str() ) * SGD_DEGREES_TO_RADIANS; } FGViewerRPH *pilot_view = (FGViewerRPH *)globals->get_viewmgr()->get_view( 0 ); pilot_view->set_view_offset( default_view_offset ); pilot_view->set_goal_view_offset( default_view_offset ); - fgSetDouble("/sim/startup/view-offset", default_view_offset); + fgSetDouble("/sim/view/offset-deg", default_view_offset); // $$$ 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 * FEET_TO_METER; - fgSetDouble("/environment/visibility", visibility); + double visibility = atof(arg.substr(19)) * 5280.0 * SG_FEET_TO_METER; + fgSetDouble("/environment/visibility-m", visibility); } else if ( arg.find( "--wind=" ) == 0 ) { string val = arg.substr(7); - int pos = val.find('@'); - if (pos == string::npos) { - FG_LOG(FG_GENERAL, FG_ALERT, "bad wind value " << val); + unsigned int pos = val.find('@'); + if ( pos == string::npos ) { + SG_LOG( SG_GENERAL, SG_ALERT, "bad wind value " << val ); return FG_OPTIONS_ERROR; } double dir = atof(val.substr(0,pos).c_str()); double speed = atof(val.substr(pos+1).c_str()); - FG_LOG(FG_GENERAL, FG_INFO, "WIND: " << dir << '@' << + SG_LOG(SG_GENERAL, SG_INFO, "WIND: " << 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; - fgSetDouble("/environment/wind-north", + dir *= SGD_DEGREES_TO_RADIANS; + fgSetDouble("/environment/wind-north-fps", speed * cos(dir)); - fgSetDouble("/environment/wind-east", + fgSetDouble("/environment/wind-east-fps", speed * sin(dir)); } else if ( arg.find( "--wp=" ) == 0 ) { parse_wp( arg.substr( 5 ) ); @@ -867,12 +878,12 @@ parse_option (const string& arg) } else if ( arg.find( "--config=" ) == 0 ) { string file = arg.substr(9); if (!readProperties(file, globals->get_props())) { - FG_LOG(FG_IO, FG_ALERT, + SG_LOG(SG_IO, SG_ALERT, "--config: failed to read properties from " << file); return FG_OPTIONS_ERROR; } } else { - FG_LOG( FG_GENERAL, FG_ALERT, "Unknown option '" << arg << "'" ); + SG_LOG( SG_GENERAL, SG_ALERT, "Unknown option '" << arg << "'" ); return FG_OPTIONS_ERROR; } @@ -887,10 +898,10 @@ fgScanForRoot (int argc, char **argv) { int i = 1; - FG_LOG(FG_GENERAL, FG_INFO, "Scanning for root: command line"); + SG_LOG(SG_GENERAL, SG_INFO, "Scanning for root: command line"); while ( i < argc ) { - FG_LOG( FG_GENERAL, FG_DEBUG, "argv[" << i << "] = " << argv[i] ); + SG_LOG( SG_GENERAL, SG_DEBUG, "argv[" << i << "] = " << argv[i] ); string arg = argv[i]; if ( arg.find( "--fg-root=" ) == 0 ) { @@ -908,11 +919,11 @@ fgScanForRoot (int argc, char **argv) string fgScanForRoot (const string& path) { - fg_gzifstream in( path ); + sg_gzifstream in( path ); if ( !in.is_open() ) return ""; - FG_LOG( FG_GENERAL, FG_INFO, "Scanning for root: " << path ); + SG_LOG( SG_GENERAL, SG_INFO, "Scanning for root: " << path ); in >> skipcomment; #ifndef __MWERKS__ @@ -924,14 +935,17 @@ fgScanForRoot (const string& path) #endif string line; -#ifdef GETLINE_NEEDS_TERMINATOR - getline( in, line, '\n' ); -#elif defined( macintosh ) - getline( in, line, '\r' ); +#if defined( macintosh ) + getline( in, line, '\r' ); #else - getline( in, line ); + getline( in, line, '\n' ); #endif + // catch extraneous (DOS) line ending character + if ( line[line.length() - 1] < 32 ) { + line = line.substr( 0, line.length()-1 ); + } + if ( line.find( "--fg-root=" ) == 0 ) { return line.substr( 10 ); } @@ -949,10 +963,10 @@ fgParseOptions (int argc, char **argv) { int i = 1; int result; - FG_LOG(FG_GENERAL, FG_INFO, "Processing command line arguments"); + SG_LOG(SG_GENERAL, SG_INFO, "Processing command line arguments"); while ( i < argc ) { - FG_LOG( FG_GENERAL, FG_DEBUG, "argv[" << i << "] = " << argv[i] ); + SG_LOG( SG_GENERAL, SG_DEBUG, "argv[" << i << "] = " << argv[i] ); result = parse_option(argv[i]); if ( (result == FG_OPTIONS_HELP) || (result == FG_OPTIONS_ERROR) ) { @@ -968,11 +982,12 @@ fgParseOptions (int argc, char **argv) { // Parse config file options void fgParseOptions (const string& path) { - fg_gzifstream in( path ); - if ( !in.is_open() ) - return; + sg_gzifstream in( path ); + if ( !in.is_open() ) { + return; + } - FG_LOG( FG_GENERAL, FG_INFO, "Processing config file: " << path ); + SG_LOG( SG_GENERAL, SG_INFO, "Processing config file: " << path ); in >> skipcomment; #ifndef __MWERKS__ @@ -984,16 +999,19 @@ fgParseOptions (const string& path) { #endif string line; -#ifdef GETLINE_NEEDS_TERMINATOR - getline( in, line, '\n' ); -#elif defined( macintosh ) - getline( in, line, '\r' ); +#if defined( macintosh ) + getline( in, line, '\r' ); #else - getline( in, line ); + getline( in, line, '\n' ); #endif + // catch extraneous (DOS) line ending character + if ( line[line.length() - 1] < 32 ) { + line = line.substr( 0, line.length()-1 ); + } + if ( parse_option( line ) == FG_OPTIONS_ERROR ) { - FG_LOG( FG_GENERAL, FG_ALERT, + SG_LOG( SG_GENERAL, SG_ALERT, "Config file parse error: " << path << " '" << line << "'" ); fgUsage(); @@ -1032,8 +1050,11 @@ 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--enable-auto-coordination: enable auto coordination" << endl; + cout << "\t--disable-auto-coordination: disable auto coordination" << endl; + cout << "\t--browser-app=/path/to/app: specify location of your web browser" << endl; cout << "\t--prop:name=value: set property to " << endl; - cout << "\t--file=path: load additional properties from path" << endl; + cout << "\t--config=path: load additional properties from path" << endl; cout << endl; cout << "Features:" << endl;