X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Foptions.cxx;h=1073c5635472bf8ffa5ede6c2b1f25ffdbe52eb9;hb=2cd7473384ec231e2a013b280e83919b98ed2a15;hp=0bc64b50b4dfb65c2ce9757b3385d4cc7fb3614a;hpb=bc99033c96b7f8c3c30904cf94248d924450348e;p=flightgear.git diff --git a/src/Main/options.cxx b/src/Main/options.cxx index 0bc64b50b..1073c5635 100644 --- a/src/Main/options.cxx +++ b/src/Main/options.cxx @@ -25,10 +25,6 @@ # include #endif -#if defined(FX) && defined(XMESA) -bool global_fullscreen = true; -#endif - #include #include // rint() @@ -38,32 +34,36 @@ bool global_fullscreen = true; #include STL_STRING -#include -#include #include -#include -#include - -#include -#include -#include -#include -#include + +// #include +// #include +// #include +// #include +// #include #ifdef FG_NETWORK_OLK # include #endif -#include "fg_init.hxx" #include "globals.hxx" +#include "fg_init.hxx" +#include "fg_props.hxx" #include "options.hxx" FG_USING_STD(string); FG_USING_NAMESPACE(std); -// from main.cxx -extern void fgReshape( int width, int height ); -inline double +#define NEW_DEFAULT_MODEL_HZ 120 + +enum +{ + FG_OPTIONS_OK = 0, + FG_OPTIONS_HELP = 1, + FG_OPTIONS_ERROR = 2 +}; + +static double atof( const string& str ) { @@ -75,7 +75,7 @@ atof( const string& str ) #endif } -inline int +static int atoi( const string& str ) { #ifdef __MWERKS__ @@ -87,37 +87,18 @@ atoi( const string& str ) } -// Defined the shared options class here -// FGOptions current_options; - -#define PROP(name) (globals->get_props()->getValue(name, true)) - - -// Constructor -FGOptions::FGOptions() +/** + * Set a few fail-safe default property values. + * + * These should all be set in $FG_ROOT/preferences.xml, but just + * in case, we provide some initial sane values here. This method + * should be invoked *before* reading any init files. + */ +void +fgSetDefaults () { - char* envp = ::getenv( "FG_ROOT" ); - - if ( envp != NULL ) { - // fg_root could be anywhere, so default to environmental - // variable $FG_ROOT if it is set. - globals->set_fg_root(envp); - } else { - // Otherwise, default to a random compiled-in location if - // $FG_ROOT is not set. This can still be overridden from the - // command line or a config file. - -#if defined( WIN32 ) - globals->set_fg_root("\\FlightGear"); -#elif defined( macintosh ) - globals->set_fg_root(""); -#else - globals->set_fg_root(PKGLIBDIR); -#endif - } - // set a possibly independent location for scenery data - envp = ::getenv( "FG_SCENERY" ); + char *envp = ::getenv( "FG_SCENERY" ); if ( envp != NULL ) { // fg_root could be anywhere, so default to environmental @@ -127,170 +108,79 @@ FGOptions::FGOptions() // Otherwise, default to Scenery being in $FG_ROOT/Scenery globals->set_fg_scenery(""); } -} - -void -FGOptions::init () -{ - // These are all deprecated, and will - // be removed gradually. - airport_id = PROP("/sim/startup/airport-id"); - lon = PROP("/position/longitude"); - lat = PROP("/position/latitude"); - altitude = PROP("/position/altitude"); - heading = PROP("/orientation/heading"); - roll = PROP("/orientation/roll"); - pitch = PROP("/orientation/pitch"); - speedset = PROP("/sim/startup/speed-set"); - uBody = PROP("/velocities/uBody"); - vBody = PROP("/velocities/vBody"); - wBody = PROP("/velocities/wBody"); - vNorth = PROP("/velocities/speed-north"); - vEast = PROP("/velocities/speed-east"); - vDown = PROP("/velocities/speed-down"); - vkcas = PROP("/velocities/knots"); - mach = PROP("/velocities/mach"); - game_mode = PROP("/sim/startup/game-mode"); - splash_screen = PROP("/sim/startup/splash-screen"); - intro_music = PROP("/sim/startup/intro-music"); - mouse_pointer = PROP("/sim/startup/mouse-pointer"); - control_mode = PROP("/sim/control-mode"); - auto_coordination = PROP("/sim/auto-coordination"); - hud_status = PROP("/sim/hud/visibility"); - panel_status = PROP("/sim/panel/visibility"); - sound = PROP("/sim/sound"); - anti_alias_hud = PROP("/sim/hud/antialiased"); - flight_model = PROP("/sim/flight-model"); - aircraft = PROP("/sim/aircraft"); - model_hz = PROP("/sim/model-hz"); - speed_up = PROP("/sim/speed-up"); - trim = PROP("/sim/startup/trim"); - fog = PROP("/sim/rendering/fog"); - clouds = PROP("/environment/clouds/enabled"); - clouds_asl = PROP("/environments/clouds/altitude"); - fullscreen = PROP("/sim/startup/fullscreen"); - shading = PROP("/sim/rendering/shading"); - skyblend = PROP("/sim/rendering/skyblend"); - textures = PROP("/sim/rendering/textures"); - wireframe = PROP("/sim/rendering/wireframe"); - xsize = PROP("/sim/startup/xsize"); - ysize = PROP("/sim/startup/ysize"); - bpp = PROP("/sim/rendering/bits-per-pixel"); - view_mode = PROP("/sim/view-mode"); - default_view_offset = PROP("/sim/startup/view-offset"); - visibility = PROP("/environment/visibility"); - units = PROP("/sim/startup/units"); - tris_or_culled = PROP("/sim/hud/frame-stat-type"); - time_offset = PROP("/sim/startup/time-offset"); - time_offset_type = PROP("/sim/startup/time-offset-type"); - network_olk = PROP("/sim/networking/network-olk"); - net_id = PROP("/sim/networking/call-sign"); -} - - -/** - * Set a few fail-safe default property values. - * - * These should all be set in $FG_ROOT/preferences.xml, but just - * in case, we provide some initial sane values here. This method - * should be invoked *before* reading any init files. - */ -void -FGOptions::set_default_props () -{ - SGPropertyNode * props = globals->get_props(); - // Position (Globe, AZ) - props->setDoubleValue("/position/longitude", -110.6642444); - props->setDoubleValue("/position/latitude", 33.3528917); - props->setDoubleValue("/position/altitude", -9999.0); + fgSetDouble("/position/longitude", -110.6642444); + fgSetDouble("/position/latitude", 33.3528917); + fgSetDouble("/position/altitude", -9999.0); // Orientation - props->setDoubleValue("/orientation/heading", 270); - props->setDoubleValue("/orientation/roll", 0); - props->setDoubleValue("/orientation/pitch", 0.424); + fgSetDouble("/orientation/heading", 270); + fgSetDouble("/orientation/roll", 0); + fgSetDouble("/orientation/pitch", 0.424); // Velocities - props->setStringValue("/sim/startup/speed-set", "knots"); - props->setDoubleValue("/velocities/uBody", 0.0); - props->setDoubleValue("/velocities/vBody", 0.0); - props->setDoubleValue("/velocities/wBody", 0.0); - props->setDoubleValue("/velocities/speed-north", 0.0); - props->setDoubleValue("/velocities/speed-east", 0.0); - props->setDoubleValue("/velocities/speed-down", 0.0); - props->setDoubleValue("/velocities/airspeed", 0.0); - props->setDoubleValue("/velocities/mach", 0.0); + fgSetString("/sim/startup/speed-set", "knots"); + fgSetDouble("/velocities/uBody", 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/mach", 0.0); // Miscellaneous - props->setBoolValue("/sim/startup/game-mode", false); - props->setBoolValue("/sim/startup/splash-screen", true); - props->setBoolValue("/sim/startup/intro-music", true); - props->setStringValue("/sim/startup/mouse-pointer", "disabled"); - props->setStringValue("/sim/control-mode", "joystick"); - props->setBoolValue("/sim/auto-coordination", false); + fgSetBool("/sim/startup/game-mode", false); + fgSetBool("/sim/startup/splash-screen", true); + fgSetBool("/sim/startup/intro-music", true); + fgSetString("/sim/startup/mouse-pointer", "disabled"); + fgSetString("/sim/control-mode", "joystick"); + fgSetBool("/sim/auto-coordination", false); // Features - props->setBoolValue("/sim/hud/visibility", false); - props->setBoolValue("/sim/panel/visibility", true); - props->setBoolValue("/sim/sound", true); - props->setBoolValue("/sim/hud/antialiased", false); + fgSetBool("/sim/hud/visibility", false); + fgSetBool("/sim/panel/visibility", true); + fgSetBool("/sim/sound", true); + fgSetBool("/sim/hud/antialiased", false); // Flight Model options - props->setStringValue("/sim/flight-model", "larcsim"); - props->setStringValue("/sim/aircraft", "c172"); - props->setIntValue("/sim/model-hz", NEW_DEFAULT_MODEL_HZ); - props->setIntValue("/sim/speed-up", 1); - props->setBoolValue("/sim/startup/trim", false); + fgSetString("/sim/flight-model", "larcsim"); + fgSetString("/sim/aircraft", "c172"); + fgSetInt("/sim/model-hz", NEW_DEFAULT_MODEL_HZ); + fgSetInt("/sim/speed-up", 1); + fgSetBool("/sim/startup/trim", false); + fgSetBool("/sim/startup/onground", true); // Rendering options - props->setStringValue("/sim/rendering/fog", "nicest"); - props->setBoolValue("/environment/clouds/enabled", true); - props->setDoubleValue("/environment/clouds/altitude", 5000); - props->setBoolValue("/sim/startup/fullscreen", false); - props->setBoolValue("/sim/rendering/shading", true); - props->setBoolValue("/sim/rendering/skyblend", true); - props->setBoolValue("/sim/rendering/textures", true); - props->setBoolValue("/sim/rendering/wireframe", false); - props->setIntValue("/sim/startup/xsize", 800); - props->setIntValue("/sim/startup/ysize", 600); - props->setIntValue("/sim/rendering/bits-per-pixel", 16); - props->setIntValue("/sim/view-mode", (int)FG_VIEW_PILOT); - props->setDoubleValue("/sim/startup/view-offset", 0); - props->setDoubleValue("/environment/visibility", 20000); + fgSetString("/sim/rendering/fog", "nicest"); + fgSetBool("/environment/clouds/status", true); + fgSetDouble("/environment/clouds/altitude", 5000); + fgSetBool("/sim/startup/fullscreen", false); + fgSetBool("/sim/rendering/shading", true); + fgSetBool("/sim/rendering/skyblend", true); + fgSetBool("/sim/rendering/textures", true); + fgSetBool("/sim/rendering/wireframe", false); + fgSetInt("/sim/startup/xsize", 800); + fgSetInt("/sim/startup/ysize", 600); + fgSetInt("/sim/rendering/bits-per-pixel", 16); + fgSetString("/sim/view-mode", "pilot"); + fgSetDouble("/sim/startup/view-offset", 0); + fgSetDouble("/environment/visibility", 20000); // HUD options - props->setStringValue("/sim/startup/units", "feet"); - props->setStringValue("/sim/hud/frame-stat-type", "tris"); + fgSetString("/sim/startup/units", "feet"); + fgSetString("/sim/hud/frame-stat-type", "tris"); // Time options - props->setIntValue("/sim/startup/time-offset", 0); + fgSetInt("/sim/startup/time-offset", 0); + fgSetString("/sim/startup/time-offset-type", "system-offset"); - props->setBoolValue("/sim/networking/network-olk", false); - props->setStringValue("/sim/networking/call-sign", "Johnny"); + fgSetBool("/sim/networking/network-olk", false); + fgSetString("/sim/networking/call-sign", "Johnny"); } -void -FGOptions::toggle_panel() { - SGPropertyNode * props = globals->get_props(); - bool freeze = globals->get_freeze(); - - if( !freeze ) - globals->set_freeze(true); - - if(props->getBoolValue("/sim/panel/visibility")) - props->setBoolValue("/sim/panel/visibility", false); - else - props->setBoolValue("/sim/panel/visibility", true); - - fgReshape(props->getIntValue("/sim/startup/xsize"), - props->getIntValue("/sim/startup/ysize")); - - if( !freeze ) - globals->set_freeze( false ); -} - -double -FGOptions::parse_time(const string& time_in) { +static double +parse_time(const string& time_in) { char *time_str, num[256]; double hours, minutes, seconds; double result = 0.0; @@ -368,7 +258,8 @@ FGOptions::parse_time(const string& time_in) { } -long int FGOptions::parse_date( const string& date) +static long int +parse_date( const string& date) { struct tm gmt; char * date_str, num[256]; @@ -476,8 +367,8 @@ long int FGOptions::parse_date( const string& date) /// parse degree in the form of [+/-]hhh:mm:ss -double -FGOptions::parse_degree( const string& degree_str) { +static double +parse_degree( const string& degree_str) { double result = parse_time( degree_str ); // printf("Degree = %.4f\n", result); @@ -487,8 +378,8 @@ FGOptions::parse_degree( const string& degree_str) { // parse time offset command line option -int -FGOptions::parse_time_offset( const string& time_str) { +static int +parse_time_offset( const string& time_str) { int result; // printf("time offset = %s\n", time_str); @@ -505,42 +396,15 @@ FGOptions::parse_time_offset( const string& time_str) { } -// Parse --fdm=abcdefg type option -int -FGOptions::parse_fdm( const string& fm ) const { - // cout << "fdm = " << fm << endl; - - if ( fm == "ada" ) { - return FGInterface::FG_ADA; - } else if ( fm == "balloon" ) { - return FGInterface::FG_BALLOONSIM; - } else if ( fm == "external" ) { - return FGInterface::FG_EXTERNAL; - } else if ( fm == "jsb" ) { - return FGInterface::FG_JSBSIM; - } else if ( (fm == "larcsim") || (fm == "LaRCsim") ) { - return FGInterface::FG_LARCSIM; - } else if ( fm == "magic" ) { - return FGInterface::FG_MAGICCARPET; - } else { - FG_LOG( FG_GENERAL, FG_ALERT, "Unknown fdm = " << fm ); - exit(-1); - } - - // we'll never get here, but it makes the compiler happy. - return -1; -} - - // Parse --fov=x.xx type option -double -FGOptions::parse_fov( const string& arg ) { +static double +parse_fov( const string& arg ) { double fov = atof(arg); if ( fov < FG_FOV_MIN ) { fov = FG_FOV_MIN; } if ( fov > FG_FOV_MAX ) { fov = FG_FOV_MAX; } - globals->get_props()->setDoubleValue("/sim/field-of-view", fov); + fgSetDouble("/sim/field-of-view", fov); // printf("parse_fov(): result = %.4f\n", fov); @@ -573,18 +437,19 @@ FGOptions::parse_fov( const string& arg ) { // // filename = file system file name -bool -FGOptions::parse_channel( const string& type, const string& channel_str ) { +static bool +parse_channel( const string& type, const string& channel_str ) { // cout << "Channel string = " << channel_str << endl; - globals->get_channel_options_list().push_back( type + "," + channel_str ); + globals->get_channel_options_list()->push_back( type + "," + channel_str ); return true; } // Parse --wp=ID[,alt] -bool FGOptions::parse_wp( const string& arg ) { +static bool +parse_wp( const string& arg ) { string id, alt_str; double alt = 0.0; @@ -594,8 +459,7 @@ bool FGOptions::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 ( globals->get_props()->getStringValue("/sim/startup/units") - == "feet" ) { + if ( fgGetString("/sim/startup/units") == "feet" ) { alt *= FEET_TO_METER; } } else { @@ -615,7 +479,8 @@ bool FGOptions::parse_wp( const string& arg ) { // Parse --flight-plan=[file] -bool FGOptions::parse_flightplan(const string& arg) +static bool +parse_flightplan(const string& arg) { fg_gzifstream infile(arg.c_str()); if (!infile) { @@ -641,193 +506,195 @@ bool FGOptions::parse_flightplan(const string& arg) // Parse a single option -int FGOptions::parse_option( const string& arg ) { - SGPropertyNode * props = globals->get_props(); +static int +parse_option (const string& arg) +{ // General Options if ( (arg == "--help") || (arg == "-h") ) { // help/usage request return(FG_OPTIONS_HELP); } else if ( arg == "--disable-game-mode") { - props->setBoolValue("/sim/startup/game-mode", false); + fgSetBool("/sim/startup/game-mode", false); } else if ( arg == "--enable-game-mode" ) { - props->setBoolValue("/sim/startup/game-mode", true); + fgSetBool("/sim/startup/game-mode", true); } else if ( arg == "--disable-splash-screen" ) { - props->setBoolValue("/sim/startup/splash-screen", false); + fgSetBool("/sim/startup/splash-screen", false); } else if ( arg == "--enable-splash-screen" ) { - props->setBoolValue("/sim/startup/splash-screen", true); + fgSetBool("/sim/startup/splash-screen", true); } else if ( arg == "--disable-intro-music" ) { - props->setBoolValue("/sim/startup/intro-music", false); + fgSetBool("/sim/startup/intro-music", false); } else if ( arg == "--enable-intro-music" ) { - props->setBoolValue("/sim/startup/intro-music", true); + fgSetBool("/sim/startup/intro-music", true); } else if ( arg == "--disable-mouse-pointer" ) { - props->setStringValue("/sim/startup/mouse-pointer", "disabled"); + fgSetString("/sim/startup/mouse-pointer", "disabled"); } else if ( arg == "--enable-mouse-pointer" ) { - props->setStringValue("/sim/startup/mouse-pointer", "enabled"); + fgSetString("/sim/startup/mouse-pointer", "enabled"); } else if ( arg == "--disable-freeze" ) { - props->setBoolValue("/sim/freeze", false); + globals->set_freeze(false); } else if ( arg == "--enable-freeze" ) { - props->setBoolValue("/sim/freeze", true); + globals->set_freeze(true); } else if ( arg == "--disable-anti-alias-hud" ) { - props->setBoolValue("/sim/hud/antialiased", false); + fgSetBool("/sim/hud/antialiased", false); } else if ( arg == "--enable-anti-alias-hud" ) { - props->setBoolValue("/sim/hud/antialiased", true); + fgSetBool("/sim/hud/antialiased", true); } else if ( arg.find( "--control=") != string::npos ) { - props->setStringValue("/sim/control-mode", arg.substr(10)); + fgSetString("/sim/control-mode", arg.substr(10)); } else if ( arg == "--disable-auto-coordination" ) { - props->setBoolValue("/sim/auto-coordination", false); + fgSetBool("/sim/auto-coordination", false); } else if ( arg == "--enable-auto-coordination" ) { - props->setBoolValue("/sim/auto-coordination", true); + fgSetBool("/sim/auto-coordination", true); } else if ( arg == "--disable-hud" ) { - props->setBoolValue("/sim/hud/visibility", false); + fgSetBool("/sim/hud/visibility", false); } else if ( arg == "--enable-hud" ) { - props->setBoolValue("/sim/hud/visibility", true); + fgSetBool("/sim/hud/visibility", true); } else if ( arg == "--disable-panel" ) { - props->setBoolValue("/sim/panel/visibility", false); + fgSetBool("/sim/panel/visibility", false); } else if ( arg == "--enable-panel" ) { - props->setBoolValue("/sim/panel/visibility", true); + fgSetBool("/sim/panel/visibility", true); } else if ( arg == "--disable-sound" ) { - props->setBoolValue("/sim/sound", false); + fgSetBool("/sim/sound", false); } else if ( arg == "--enable-sound" ) { - props->setBoolValue("/sim/sound", true); + fgSetBool("/sim/sound", true); } else if ( arg.find( "--airport-id=") != string::npos ) { // NB: changed property name!!! - props->setStringValue("/sim/startup/airport-id", arg.substr(13)); + fgSetString("/sim/startup/airport-id", arg.substr(13)); } else if ( arg.find( "--lon=" ) != string::npos ) { - props->setDoubleValue("/position/longitude", + fgSetDouble("/position/longitude", parse_degree(arg.substr(6))); - props->setStringValue("/position/airport-id", ""); + fgSetString("/sim/startup/airport-id", ""); } else if ( arg.find( "--lat=" ) != string::npos ) { - props->setDoubleValue("/position/latitude", + fgSetDouble("/position/latitude", parse_degree(arg.substr(6))); - props->setStringValue("/position/airport-id", ""); + fgSetString("/sim/startup/airport-id", ""); } else if ( arg.find( "--altitude=" ) != string::npos ) { - if ( props->getStringValue("/sim/startup/units") == "feet" ) - props->setDoubleValue(atof(arg.substr(11))); + fgSetBool("/sim/startup/onground", false); + if ( fgGetString("/sim/startup/units") == "feet" ) + fgSetDouble("/position/altitude", atof(arg.substr(11))); else - props->setDoubleValue(atof(arg.substr(11)) * METER_TO_FEET); + fgSetDouble("/position/altitude", + atof(arg.substr(11)) * METER_TO_FEET); } else if ( arg.find( "--uBody=" ) != string::npos ) { - props->setStringValue("/sim/startup/speed-set", "UVW"); + fgSetString("/sim/startup/speed-set", "UVW"); // FIXME: the units are totally confused here - if ( props->getStringValue("/sim/startup/units") == "feet" ) - props->setDoubleValue("/velocities/uBody", atof(arg.substr(8))); + if ( fgGetString("/sim/startup/units") == "feet" ) + fgSetDouble("/velocities/uBody", atof(arg.substr(8))); else - props->setDoubleValue("/velocities/uBody", + fgSetDouble("/velocities/uBody", atof(arg.substr(8)) * FEET_TO_METER); } else if ( arg.find( "--vBody=" ) != string::npos ) { - props->setStringValue("/sim/startup/speed-set", "UVW"); + fgSetString("/sim/startup/speed-set", "UVW"); // FIXME: the units are totally confused here - if ( props->getStringValue("/sim/startup/units") == "feet" ) - props->setDoubleValue("/velocities/vBody", atof(arg.substr(8))); + if ( fgGetString("/sim/startup/units") == "feet" ) + fgSetDouble("/velocities/vBody", atof(arg.substr(8))); else - props->setDoubleValue("/velocities/vBody", + fgSetDouble("/velocities/vBody", atof(arg.substr(8)) * FEET_TO_METER); } else if ( arg.find( "--wBody=" ) != string::npos ) { - props->setStringValue("/sim/startup/speed-set", "UVW"); + fgSetString("/sim/startup/speed-set", "UVW"); // FIXME: the units are totally confused here - if ( props->getStringValue("/sim/startup/units") == "feet" ) - props->setDoubleValue("/velocities/wBody", atof(arg.substr(8))); + if ( fgGetString("/sim/startup/units") == "feet" ) + fgSetDouble("/velocities/wBody", atof(arg.substr(8))); else - props->setDoubleValue("/velocities/wBody", + fgSetDouble("/velocities/wBody", atof(arg.substr(8)) * FEET_TO_METER); } else if ( arg.find( "--vNorth=" ) != string::npos ) { - props->setStringValue("/sim/startup/speed-set", "NED"); + fgSetString("/sim/startup/speed-set", "NED"); // FIXME: the units are totally confused here - if ( props->getStringValue("/sim/startup/units") == "feet" ) - props->setDoubleValue("/velocities/speed-north", atof(arg.substr(8))); + if ( fgGetString("/sim/startup/units") == "feet" ) + fgSetDouble("/velocities/speed-north", atof(arg.substr(8))); else - props->setDoubleValue("/velocities/speed-north", + fgSetDouble("/velocities/speed-north", atof(arg.substr(8)) * FEET_TO_METER); } else if ( arg.find( "--vEast=" ) != string::npos ) { - props->setStringValue("/sim/startup/speed-set", "NED"); + fgSetString("/sim/startup/speed-set", "NED"); // FIXME: the units are totally confused here - if ( props->getStringValue("/sim/startup/units") == "feet" ) - props->setDoubleValue("/velocities/speed-east", atof(arg.substr(8))); + if ( fgGetString("/sim/startup/units") == "feet" ) + fgSetDouble("/velocities/speed-east", atof(arg.substr(8))); else - props->setDoubleValue("/velocities/speed-east", + fgSetDouble("/velocities/speed-east", atof(arg.substr(8)) * FEET_TO_METER); } else if ( arg.find( "--vDown=" ) != string::npos ) { - props->setStringValue("/sim/startup/speed-set", "NED"); + fgSetString("/sim/startup/speed-set", "NED"); // FIXME: the units are totally confused here - if ( props->getStringValue("/sim/startup/units") == "feet" ) - props->setDoubleValue("/velocities/speed-down", atof(arg.substr(8))); + if ( fgGetString("/sim/startup/units") == "feet" ) + fgSetDouble("/velocities/speed-down", atof(arg.substr(8))); else - props->setDoubleValue("/velocities/speed-down", + fgSetDouble("/velocities/speed-down", atof(arg.substr(8)) * FEET_TO_METER); } else if ( arg.find( "--vc=" ) != string::npos) { - props->setStringValue("/sim/startup/speed-set", "knots"); - props->setDoubleValue("/velocities/airspeed", atof(arg.substr(5))); + fgSetString("/sim/startup/speed-set", "knots"); + fgSetDouble("/velocities/airspeed", atof(arg.substr(5))); } else if ( arg.find( "--mach=" ) != string::npos) { - props->setStringValue("/sim/startup/speed-set", "mach"); - props->setDoubleValue("/velocities/mach", atof(arg.substr(7))); + fgSetString("/sim/startup/speed-set", "mach"); + fgSetDouble("/velocities/mach", atof(arg.substr(7))); } else if ( arg.find( "--heading=" ) != string::npos ) { - props->setDoubleValue("/orientation/heading", atof(arg.substr(10))); + fgSetDouble("/orientation/heading", atof(arg.substr(10))); } else if ( arg.find( "--roll=" ) != string::npos ) { - props->setDoubleValue("/orientation/roll", atof(arg.substr(7))); + fgSetDouble("/orientation/roll", atof(arg.substr(7))); } else if ( arg.find( "--pitch=" ) != string::npos ) { - props->setDoubleValue("/orientation/pitch", atof(arg.substr(8))); + fgSetDouble("/orientation/pitch", atof(arg.substr(8))); } else if ( arg.find( "--fg-root=" ) != string::npos ) { globals->set_fg_root(arg.substr( 10 )); } else if ( arg.find( "--fg-scenery=" ) != string::npos ) { globals->set_fg_scenery(arg.substr( 13 )); } else if ( arg.find( "--fdm=" ) != string::npos ) { - props->setStringValue("/sim/flight-model", arg.substr(6)); - // FIXME: reimplement this logic, somehow -// if((flight_model == FGInterface::FG_JSBSIM) && (get_trim_mode() == 0)) { -// props-> -// set_trim_mode(1); -// } else { -// set_trim_mode(0); -// } + fgSetString("/sim/flight-model", arg.substr(6)); } else if ( arg.find( "--aircraft=" ) != string::npos ) { - props->setStringValue("/sim/aircraft", arg.substr(11)); + fgSetString("/sim/aircraft", arg.substr(11)); } else if ( arg.find( "--aircraft-dir=" ) != string::npos ) { - props->setStringValue("/sim/aircraft-dir", arg.substr(15)); + fgSetString("/sim/aircraft-dir", arg.substr(15)); } else if ( arg.find( "--model-hz=" ) != string::npos ) { - props->setIntValue("/sim/model-hz", atoi(arg.substr(11))); + fgSetInt("/sim/model-hz", atoi(arg.substr(11))); } else if ( arg.find( "--speed=" ) != string::npos ) { - props->setIntValue("/sim/speed-up", atoi(arg.substr(8))); + fgSetInt("/sim/speed-up", atoi(arg.substr(8))); + } else if ( arg.find( "--trim") != string::npos) { + fgSetBool("/sim/startup/trim", true); } else if ( arg.find( "--notrim") != string::npos) { - props->setIntValue("/sim/startup/trim", -1); + fgSetBool("/sim/startup/trim", false); + } else if ( arg.find( "--on-ground") != string::npos) { + fgSetBool("/sim/startup/onground", true); + } else if ( arg.find( "--in-air") != string::npos) { + fgSetBool("/sim/startup/onground", false); } else if ( arg == "--fog-disable" ) { - props->setStringValue("/sim/rendering/fog", "disabled"); + fgSetString("/sim/rendering/fog", "disabled"); } else if ( arg == "--fog-fastest" ) { - props->setStringValue("/sim/rendering/fog", "fastest"); + fgSetString("/sim/rendering/fog", "fastest"); } else if ( arg == "--fog-nicest" ) { - props->setStringValue("/sim/fog", "nicest"); + fgSetString("/sim/fog", "nicest"); } else if ( arg == "--disable-clouds" ) { - props->setBoolValue("/environment/clouds/enabled", false); + fgSetBool("/environment/clouds/status", false); } else if ( arg == "--enable-clouds" ) { - props->setBoolValue("/environment/clouds/enabled", true); + fgSetBool("/environment/clouds/status", true); } else if ( arg.find( "--clouds-asl=" ) != string::npos ) { // FIXME: check units - if ( props->getStringValue("/sim/startup/units") == "feet" ) - props->setDoubleValue("/environment/clouds/altitude", + if ( fgGetString("/sim/startup/units") == "feet" ) + fgSetDouble("/environment/clouds/altitude", atof(arg.substr(13)) * FEET_TO_METER); else - props->setDoubleValue("/environment/clouds/altitude", + fgSetDouble("/environment/clouds/altitude", atof(arg.substr(13))); } else if ( arg.find( "--fov=" ) != string::npos ) { parse_fov( arg.substr(6) ); } else if ( arg == "--disable-fullscreen" ) { - props->setBoolValue("/sim/startup/fullscreen", false); + fgSetBool("/sim/startup/fullscreen", false); } else if ( arg== "--enable-fullscreen") { - props->setBoolValue("/sim/startup/fullscreen", true); + fgSetBool("/sim/startup/fullscreen", true); } else if ( arg == "--shading-flat") { - props->setBoolValue("/sim/rendering/shading", false); + fgSetBool("/sim/rendering/shading", false); } else if ( arg == "--shading-smooth") { - props->setBoolValue("/sim/rendering/shading", true); + fgSetBool("/sim/rendering/shading", true); } else if ( arg == "--disable-skyblend") { - props->setBoolValue("/sim/rendering/skyblend", false); + fgSetBool("/sim/rendering/skyblend", false); } else if ( arg== "--enable-skyblend" ) { - props->setBoolValue("/sim/rendering/skyblend", true); + fgSetBool("/sim/rendering/skyblend", true); } else if ( arg == "--disable-textures" ) { - props->setBoolValue("/sim/rendering/textures", false); + fgSetBool("/sim/rendering/textures", false); } else if ( arg == "--enable-textures" ) { - props->setBoolValue("/sim/rendering/textures", true); + fgSetBool("/sim/rendering/textures", true); } else if ( arg == "--disable-wireframe" ) { - props->setBoolValue("/sim/rendering/wireframe", false); + fgSetBool("/sim/rendering/wireframe", false); } else if ( arg == "--enable-wireframe" ) { - props->setBoolValue("/sim/rendering/wireframe", true); + fgSetBool("/sim/rendering/wireframe", true); } else if ( arg.find( "--geometry=" ) != string::npos ) { bool geometry_ok = true; int xsize = 0, ysize = 0; @@ -854,50 +721,50 @@ int FGOptions::parse_option( const string& arg ) { } else { FG_LOG( FG_GENERAL, FG_INFO, "Setting geometry to " << xsize << 'x' << ysize << '\n'); - props->setIntValue("/sim/startup/xsize", xsize); - props->setIntValue("/sim/startup/ysize", ysize); + fgSetInt("/sim/startup/xsize", xsize); + fgSetInt("/sim/startup/ysize", ysize); } } else if ( arg.find( "--bpp=" ) != string::npos ) { string bits_per_pix = arg.substr( 6 ); if ( bits_per_pix == "16" ) { - props->setIntValue("/sim/rendering/bits-per-pixel", 16); + fgSetInt("/sim/rendering/bits-per-pixel", 16); } else if ( bits_per_pix == "24" ) { - props->setIntValue("/sim/rendering/bits-per-pixel", 24); + fgSetInt("/sim/rendering/bits-per-pixel", 24); } else if ( bits_per_pix == "32" ) { - props->setIntValue("/sim/rendering/bits-per-pixel", 32); + fgSetInt("/sim/rendering/bits-per-pixel", 32); } else { FG_LOG(FG_GENERAL, FG_ALERT, "Unsupported bpp " << bits_per_pix); } } else if ( arg == "--units-feet" ) { - props->setStringValue("/sim/startup/units", "feet"); + fgSetString("/sim/startup/units", "feet"); } else if ( arg == "--units-meters" ) { - props->setStringValue("/sim/startup/units", "meters"); + fgSetString("/sim/startup/units", "meters"); } else if ( arg.find( "--time-offset" ) != string::npos ) { - props->setIntValue("/sim/startup/time-offset", + fgSetInt("/sim/startup/time-offset", parse_time_offset( (arg.substr(14)) )); } else if ( arg.find( "--time-match-real") != string::npos ) { - props->setStringValue("/sim/startup/time-offset_type", + fgSetString("/sim/startup/time-offset_type", "system-offset"); } else if ( arg.find( "--time-match-local") != string::npos ) { - props->setStringValue("/sim/startup/time-offset_type", + fgSetString("/sim/startup/time-offset_type", "latitude-offset"); } else if ( arg.find( "--start-date-sys=") != string::npos ) { - props->setIntValue("/sim/startup/time-offset", + fgSetInt("/sim/startup/time-offset", parse_date((arg.substr(17)))); - props->setStringValue("/sim/startup/time-offset-type", "system"); + fgSetString("/sim/startup/time-offset-type", "system"); } else if ( arg.find( "--start-date-lat=") != string::npos ) { - props->setIntValue("/sim/startup/time-offset", + fgSetInt("/sim/startup/time-offset", parse_date((arg.substr(17)))); - props->setStringValue("/sim/startup/time-offset-type", + fgSetString("/sim/startup/time-offset-type", "latitude"); } else if ( arg.find( "--start-date-gmt=") != string::npos ) { - props->setIntValue("/sim/startup/time-offset", + fgSetInt("/sim/startup/time-offset", parse_date((arg.substr(17)))); - props->setStringValue("/sim/startup/time-offset-type", "gmt"); + fgSetString("/sim/startup/time-offset-type", "gmt"); } else if ( arg == "--hud-tris" ) { - props->setStringValue("/sim/hud/frame-stat-type", "tris"); + fgSetString("/sim/hud/frame-stat-type", "tris"); } else if ( arg == "--hud-culled" ) { - props->setStringValue("/sim/hud/frame-stat-type", "culled"); + fgSetString("/sim/hud/frame-stat-type", "culled"); } else if ( arg.find( "--native=" ) != string::npos ) { parse_channel( "native", arg.substr(9) ); } else if ( arg.find( "--garmin=" ) != string::npos ) { @@ -916,14 +783,14 @@ int FGOptions::parse_option( const string& arg ) { parse_channel( "joyclient", arg.substr(12) ); #ifdef FG_NETWORK_OLK } else if ( arg == "--disable-network-olk" ) { - props->setBoolValue("/sim/networking/olk", false); + fgSetBool("/sim/networking/olk", false); } else if ( arg== "--enable-network-olk") { - props->setBoolValue("/sim/networking/olk", true); + fgSetBool("/sim/networking/olk", true); } else if ( arg == "--net-hud" ) { - props->setBoolValue("/sim/hud/net-display", true); + fgSetBool("/sim/hud/net-display", true); net_hud_display = 1; // FIXME } else if ( arg.find( "--net-id=") != string::npos ) { - props->setStringValue("sim/networking/call-sign", arg.substr(9)); + fgSetString("sim/networking/call-sign", arg.substr(9)); #endif } else if ( arg.find( "--prop:" ) == 0 ) { string assign = arg.substr(7); @@ -934,9 +801,9 @@ int FGOptions::parse_option( const string& arg ) { } string name = assign.substr(0, pos); string value = assign.substr(pos + 1); - props->setStringValue(name.c_str(), value); - FG_LOG(FG_GENERAL, FG_INFO, "Setting default value of property " - << name << " to \"" << value << '"'); + fgSetString(name.c_str(), value); + // FG_LOG(FG_GENERAL, FG_INFO, "Setting default value of property " + // << name << " to \"" << value << '"'); // $$$ begin - added VS Renganathan, 14 Oct 2K // for multi-window outside window imagery } else if ( arg.find( "--view-offset=" ) != string::npos ) { @@ -955,13 +822,13 @@ int FGOptions::parse_option( const string& arg ) { (FGViewerRPH *)globals->get_viewmgr()->get_view( 0 ); pilot_view->set_view_offset( default_view_offset ); pilot_view->set_goal_view_offset( default_view_offset ); - props->setDoubleValue("/sim/startup/view-offset", default_view_offset); + fgSetDouble("/sim/startup/view-offset", default_view_offset); // $$$ end - added VS Renganathan, 14 Oct 2K } else if ( arg.find( "--visibility=" ) != string::npos ) { - props->setDoubleValue("/environment/visibility", atof(arg.substr(13))); + 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; - props->setDoubleValue("/environment/visibility", visibility); + fgSetDouble("/environment/visibility", visibility); } else if ( arg.find( "--wind=" ) == 0 ) { string val = arg.substr(7); int pos = val.find('@'); @@ -979,9 +846,9 @@ int FGOptions::parse_option( const string& arg ) { if (dir >= 360) dir -= 360; dir *= DEG_TO_RAD; - props->setDoubleValue("/environment/wind-north", + fgSetDouble("/environment/wind-north", speed * cos(dir)); - props->setDoubleValue("/environment/wind-east", + fgSetDouble("/environment/wind-east", speed * sin(dir)); } else if ( arg.find( "--wp=" ) != string::npos ) { parse_wp( arg.substr( 5 ) ); @@ -998,31 +865,35 @@ int FGOptions::parse_option( const string& arg ) { // Scan the command line options for an fg_root definition and set // just that. -int FGOptions::scan_command_line_for_root( int argc, char **argv ) { +string +fgScanForRoot (int argc, char **argv) +{ int i = 1; - FG_LOG(FG_GENERAL, FG_INFO, "Processing command line arguments"); + FG_LOG(FG_GENERAL, FG_INFO, "Scanning for root: command line"); while ( i < argc ) { FG_LOG( FG_GENERAL, FG_DEBUG, "argv[" << i << "] = " << argv[i] ); string arg = argv[i]; if ( arg.find( "--fg-root=" ) != string::npos ) { - globals->set_fg_root(arg.substr( 10 )); + return arg.substr( 10 ); } i++; } - - return FG_OPTIONS_OK; + + return ""; } // Scan the config file for an fg_root definition and set just that. -int FGOptions::scan_config_file_for_root( const string& path ) { +string +fgScanForRoot (const string& path) +{ fg_gzifstream in( path ); if ( !in.is_open() ) - return(FG_OPTIONS_ERROR); + return ""; FG_LOG( FG_GENERAL, FG_INFO, "Scanning for root: " << path ); @@ -1045,18 +916,19 @@ int FGOptions::scan_config_file_for_root( const string& path ) { #endif if ( line.find( "--fg-root=" ) != string::npos ) { - globals->set_fg_root(line.substr( 10 )); + return line.substr( 10 ); } in >> skipcomment; } - return FG_OPTIONS_OK; + return ""; } // Parse the command line options -int FGOptions::parse_command_line( int argc, char **argv ) { +void +fgParseOptions (int argc, char **argv) { int i = 1; int result; @@ -1067,21 +939,21 @@ int FGOptions::parse_command_line( int argc, char **argv ) { result = parse_option(argv[i]); if ( (result == FG_OPTIONS_HELP) || (result == FG_OPTIONS_ERROR) ) { - return(result); + fgUsage(); + exit(-1); } i++; } - - return FG_OPTIONS_OK; } // Parse config file options -int FGOptions::parse_config_file( const string& path ) { +void +fgParseOptions (const string& path) { fg_gzifstream in( path ); if ( !in.is_open() ) - return(FG_OPTIONS_ERROR); + return; FG_LOG( FG_GENERAL, FG_INFO, "Processing config file: " << path ); @@ -1107,17 +979,18 @@ int FGOptions::parse_config_file( const string& path ) { FG_LOG( FG_GENERAL, FG_ALERT, "Config file parse error: " << path << " '" << line << "'" ); + fgUsage(); exit(-1); } in >> skipcomment; } - - return FG_OPTIONS_OK; } // Print usage message -void FGOptions::usage ( void ) { +void +fgUsage () +{ cout << "Usage: fg [ options ... ]" << endl; cout << endl; @@ -1164,6 +1037,9 @@ void FGOptions::usage ( void ) { << 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; @@ -1269,31 +1145,3 @@ void FGOptions::usage ( void ) { cout << "\t\tinstances of --wp=" << endl; cout << "\t--flight-plan=[file]: Read all waypoints from [file]" <get_fg_root(); -} - -string -FGOptions::get_fg_scenery () const -{ - return globals->get_fg_scenery(); -} - -string_list -FGOptions::get_channel_options_list () const -{ - return globals->get_channel_options_list(); -}