#include STL_STRING
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
// #include <Include/general.hxx>
// #include <Airports/simple.hxx>
fgSetInt("/sim/startup/ysize", 600);
fgSetInt("/sim/rendering/bits-per-pixel", 16);
fgSetString("/sim/view-mode", "pilot");
- fgSetDouble("/sim/startup/view-offset", 0);
+ fgSetDouble("/sim/view/offset", 0);
fgSetDouble("/environment/visibility", 20000);
// HUD options
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.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);
fgSetDouble("/position/altitude", atof(arg.substr(11)));
else
fgSetDouble("/position/altitude",
- atof(arg.substr(11)) * METER_TO_FEET);
+ 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)));
else
fgSetDouble("/velocities/uBody",
- atof(arg.substr(8)) * METER_TO_FEET);
+ 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)));
else
fgSetDouble("/velocities/vBody",
- atof(arg.substr(8)) * METER_TO_FEET);
+ 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)));
else
fgSetDouble("/velocities/wBody",
- atof(arg.substr(8)) * METER_TO_FEET);
+ 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)));
else
fgSetDouble("/velocities/speed-north",
- atof(arg.substr(9)) * METER_TO_FEET);
+ 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)));
else
fgSetDouble("/velocities/speed-east",
- atof(arg.substr(8)) * METER_TO_FEET);
+ 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)));
else
fgSetDouble("/velocities/speed-down",
- atof(arg.substr(8)) * METER_TO_FEET);
+ 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)));
// 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)));
}
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 ( 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");
#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
} 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", default_view_offset);
// $$$ end - added VS Renganathan, 14 Oct 2K
} else if ( arg.find( "--visibility=" ) == 0 ) {
fgSetDouble("/environment/visibility", atof(arg.substr(13)));
} else if ( arg.find( "--visibility-miles=" ) == 0 ) {
- double visibility = atof(arg.substr(19)) * 5280.0 * FEET_TO_METER;
+ 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);
- 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;
+ dir *= SGD_DEGREES_TO_RADIANS;
fgSetDouble("/environment/wind-north",
speed * cos(dir));
fgSetDouble("/environment/wind-east",
} 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;
}
{
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 ) {
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
+ // 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();
cout << "\t--control=mode: primary control mode "
<< "(joystick, keyboard, mouse)" << endl;
cout << "\t--prop:name=value: set property <name> to <value>" << 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;
projects / flightgear.git / blobdiff