#endif
#include <simgear/compiler.h>
+#include <simgear/misc/exception.hxx>
+
+/* normans fix */
+#if defined(FX) && defined(XMESA)
+bool global_fullscreen = true;
+#endif
#include <math.h> // rint()
#include <stdio.h>
#include STL_STRING
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
// #include <Include/general.hxx>
// #include <Airports/simple.hxx>
# include <NetworkOLK/network.h>
#endif
+#include <GUI/gui.h>
+
#include "globals.hxx"
#include "fg_init.hxx"
#include "fg_props.hxx"
#include "options.hxx"
+#include "viewmgr.hxx"
-FG_USING_STD(string);
-FG_USING_NAMESPACE(std);
+SG_USING_STD(string);
+SG_USING_NAMESPACE(std);
#define NEW_DEFAULT_MODEL_HZ 120
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
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);
-
+#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/hud/antialiased", false);
// Flight Model options
- fgSetString("/sim/flight-model", "larcsim");
+ fgSetString("/sim/flight-model", "jsb");
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
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);
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");
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];
}
+// parse a date string (yyyy:mm:dd:hh:mm:ss) into a time_t (seconds)
static long int
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 );
}
-// parse time offset command line option
+// parse time offset string into seconds
static int
parse_time_offset( const string& time_str) {
int result;
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]
+// Parse --wp=ID[@alt]
static bool
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;
static bool
parse_flightplan(const string& arg)
{
- fg_gzifstream infile(arg.c_str());
- if (!infile) {
+ 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);
} else if ( arg == "--enable-mouse-pointer" ) {
fgSetString("/sim/startup/mouse-pointer", "enabled");
} else if ( arg == "--disable-freeze" ) {
- fgSetBool("/sim/freeze", false);
+ fgSetBool("/sim/freeze", false);
} else if ( arg == "--enable-freeze" ) {
- fgSetBool("/sim/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" ) {
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);
} 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" ) {
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 ) {
- fgSetDouble("/position/longitude",
+ } 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-deg",
parse_degree(arg.substr(6)));
- fgSetString("/position/airport-id", "");
- } else if ( arg.find( "--lat=" ) != string::npos ) {
- fgSetDouble("/position/latitude",
+ fgSetString("/sim/startup/airport-id", "");
+ } else if ( arg.find( "--lat=" ) == 0 ) {
+ fgSetDouble("/position/latitude-deg",
parse_degree(arg.substr(6)));
- fgSetString("/position/airport-id", "");
- } else if ( arg.find( "--altitude=" ) != string::npos ) {
+ 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);
- } else if ( arg.find( "--uBody=" ) != string::npos ) {
+ fgSetDouble("/position/altitude-ft",
+ 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)));
+ fgSetDouble("/velocities/uBody-fps", atof(arg.substr(8)));
else
- fgSetDouble("/velocities/uBody",
- atof(arg.substr(8)) * FEET_TO_METER);
- } else if ( arg.find( "--vBody=" ) != string::npos ) {
+ fgSetDouble("/velocities/uBody-fps",
+ 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)));
+ fgSetDouble("/velocities/vBody-fps", atof(arg.substr(8)));
else
- fgSetDouble("/velocities/vBody",
- atof(arg.substr(8)) * FEET_TO_METER);
- } else if ( arg.find( "--wBody=" ) != string::npos ) {
+ fgSetDouble("/velocities/vBody-fps",
+ 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)));
+ fgSetDouble("/velocities/wBody-fps", atof(arg.substr(8)));
else
- fgSetDouble("/velocities/wBody",
- atof(arg.substr(8)) * FEET_TO_METER);
- } else if ( arg.find( "--vNorth=" ) != string::npos ) {
+ fgSetDouble("/velocities/wBody-fps",
+ 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-fps", atof(arg.substr(9)));
else
- fgSetDouble("/velocities/speed-north",
- atof(arg.substr(8)) * FEET_TO_METER);
- } else if ( arg.find( "--vEast=" ) != string::npos ) {
+ 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");
- // FIXME: the units are totally confused here
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)) * FEET_TO_METER);
- } else if ( arg.find( "--vDown=" ) != string::npos ) {
+ 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");
- // FIXME: the units are totally confused here
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)) * FEET_TO_METER);
- } else if ( arg.find( "--vc=" ) != string::npos) {
+ 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)));
- } else if ( arg.find( "--mach=" ) != string::npos) {
+ 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=" ) != string::npos ) {
- fgSetDouble("/orientation/heading", atof(arg.substr(10)));
- } else if ( arg.find( "--roll=" ) != string::npos ) {
- fgSetDouble("/orientation/roll", atof(arg.substr(7)));
- } else if ( arg.find( "--pitch=" ) != string::npos ) {
- fgSetDouble("/orientation/pitch", atof(arg.substr(8)));
- } else if ( arg.find( "--fg-root=" ) != string::npos ) {
+ } else if ( arg.find( "--heading=" ) == 0 ) {
+ fgSetDouble("/orientation/heading-deg", atof(arg.substr(10)));
+ } else if ( arg.find( "--roll=" ) == 0 ) {
+ fgSetDouble("/orientation/roll-deg", atof(arg.substr(7)));
+ } else if ( arg.find( "--pitch=" ) == 0 ) {
+ 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=" ) != 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) {
- fgSetInt("/sim/startup/trim", true);
- } else if ( arg.find( "--notrim") != string::npos) {
- fgSetInt("/sim/startup/trim", false);
+ } else if ( arg.find( "--trim") == 0) {
+ fgSetBool("/sim/startup/trim", true);
+ } else if ( arg.find( "--notrim") == 0) {
+ fgSetBool("/sim/startup/trim", false);
+ } else if ( arg.find( "--on-ground") == 0) {
+ fgSetBool("/sim/startup/onground", true);
+ } else if ( arg.find( "--in-air") == 0) {
+ fgSetBool("/sim/startup/onground", false);
} else if ( arg == "--fog-disable" ) {
fgSetString("/sim/rendering/fog", "disabled");
} else if ( arg == "--fog-fastest" ) {
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);
+ 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=" ) != string::npos ) {
+ } else if ( arg.find( "--fov=" ) == 0 ) {
parse_fov( arg.substr(6) );
} else if ( arg == "--disable-fullscreen" ) {
fgSetBool("/sim/startup/fullscreen", false);
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 );
}
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);
}
- } 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);
} 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");
} 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");
fgSetString("/sim/hud/frame-stat-type", "tris");
} else if ( arg == "--hud-culled" ) {
fgSetString("/sim/hud/frame-stat-type", "culled");
- } else if ( arg.find( "--native=" ) != string::npos ) {
+ } else if ( arg.find( "--atlas=" ) == 0 ) {
+ parse_channel( "atlas", arg.substr(8) );
+ } else if ( arg.find( "--native=" ) == 0 ) {
parse_channel( "native", arg.substr(9) );
- } else if ( arg.find( "--garmin=" ) != string::npos ) {
+ } else if ( arg.find( "--native-ctrls=" ) == 0 ) {
+ parse_channel( "native_ctrls", arg.substr(15) );
+ } 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" ) {
} 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 ) {
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 "
- << name << " to \"" << value << '"');
+ // 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( "--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 );
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=" ) != string::npos ) {
- 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;
- fgSetDouble("/environment/visibility", visibility);
+ } else if ( arg.find( "--visibility=" ) == 0 ) {
+ fgSetDouble("/environment/visibility-m", atof(arg.substr(13)));
+ } else if ( arg.find( "--visibility-miles=" ) == 0 ) {
+ double visibility = atof(arg.substr(19)) * 5280.0 * SG_FEET_TO_METER;
+ fgSetDouble("/environment/visibility-m", visibility);
} else if ( arg.find( "--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=" ) != 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);
+ 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 {
- FG_LOG( FG_GENERAL, FG_ALERT, "Unknown option '" << arg << "'" );
+ SG_LOG( SG_GENERAL, SG_ALERT, "Unknown option '" << arg << "'" );
return FG_OPTIONS_ERROR;
}
{
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=" ) != string::npos ) {
+ if ( arg.find( "--fg-root=" ) == 0 ) {
return arg.substr( 10 );
}
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__
#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
- if ( line.find( "--fg-root=" ) != string::npos ) {
+ // 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 );
}
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) ) {
// 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__
#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();
void
fgUsage ()
{
- cout << "Usage: fg [ options ... ]" << endl;
+ cout << "Usage: fgfs [ options ... ]" << endl;
cout << endl;
cout << "General Options:" << 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--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 <name> to <value>" << endl;
+ cout << "\t--config=path: load additional properties from path" << endl;
cout << endl;
cout << "Features:" << endl;
<< 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;
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 = -)"
projects / flightgear.git / blobdiff