]> git.mxchange.org Git - flightgear.git/blobdiff - src/Main/options.cxx
projects / flightgear.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
SG_ namespace.
[flightgear.git] / src / Main / options.cxx
diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 786749278d89929236b9cc50b5b77ca37ce2f833..8ec77dfad1b64cb725406625886d4b597ea277c8 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -55,8 +55,8 @@ bool global_fullscreen = true;
 #include "fg_props.hxx"
 #include "options.hxx"
 
-FG_USING_STD(string);
-FG_USING_NAMESPACE(std);
+SG_USING_STD(string);
+SG_USING_NAMESPACE(std);
 
 
 #define NEW_DEFAULT_MODEL_HZ 120
@@ -186,6 +186,8 @@ fgSetDefaults ()
     fgSetString("/sim/networking/call-sign", "Johnny");
 }
 
+
+// parse a time string ([+/-]%f[:%f[:%f]]) into hours
 static double
 parse_time(const string& time_in) {
     char *time_str, num[256];
@@ -265,6 +267,7 @@ parse_time(const string& time_in) {
 }
 
 
+// parse a date string (yyyy:mm:dd:hh:mm:ss) into a time_t (seconds)
 static long int 
 parse_date( const string& date)
 {
@@ -373,7 +376,7 @@ parse_date( const string& date)
 }
 
 
-/// parse degree in the form of [+/-]hhh:mm:ss
+// parse angle in the form of [+/-]ddd:mm:ss into degrees
 static double
 parse_degree( const string& degree_str) {
     double result = parse_time( degree_str );
@@ -384,7 +387,7 @@ parse_degree( const string& degree_str) {
 }
 
 
-// parse time offset command line option
+// parse time offset string into seconds
 static int
 parse_time_offset( const string& time_str) {
     int result;
@@ -454,7 +457,7 @@ parse_channel( const string& type, const string& channel_str ) {
 }
 
 
-// Parse --wp=ID[,alt]
+// Parse --wp=ID[@alt]
 static bool 
 parse_wp( const string& arg ) {
     string id, alt_str;
@@ -467,7 +470,7 @@ parse_wp( const string& arg ) {
        // cout << "id str = " << id << "  alt str = " << alt_str << endl;
        alt = atof( alt_str.c_str() );
        if ( fgGetString("/sim/startup/units") == "feet" ) {
-           alt *= FEET_TO_METER;
+           alt *= SG_FEET_TO_METER;
        }
     } else {
        id = arg;
@@ -490,7 +493,7 @@ static bool
 parse_flightplan(const string& arg)
 {
     fg_gzifstream infile(arg.c_str());
-    if (!infile) {
+    if ( !infile.is_open() ) {
        return false;
     }
     while ( true ) {
@@ -583,55 +586,49 @@ parse_option (const string& arg)
            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");
-                               // FIXME: the units are totally confused here
        if ( fgGetString("/sim/startup/units") == "feet" )
          fgSetDouble("/velocities/uBody", atof(arg.substr(8)));
        else
          fgSetDouble("/velocities/uBody",
-                              atof(arg.substr(8)) * FEET_TO_METER);
+                              atof(arg.substr(8)) * SG_METER_TO_FEET);
     } else if ( arg.find( "--vBody=" ) == 0 ) {
         fgSetString("/sim/startup/speed-set", "UVW");
-                               // FIXME: the units are totally confused here
        if ( fgGetString("/sim/startup/units") == "feet" )
          fgSetDouble("/velocities/vBody", atof(arg.substr(8)));
        else
          fgSetDouble("/velocities/vBody",
-                              atof(arg.substr(8)) * FEET_TO_METER);
+                              atof(arg.substr(8)) * SG_METER_TO_FEET);
     } else if ( arg.find( "--wBody=" ) == 0 ) {
         fgSetString("/sim/startup/speed-set", "UVW");
-                               // FIXME: the units are totally confused here
        if ( fgGetString("/sim/startup/units") == "feet" )
          fgSetDouble("/velocities/wBody", atof(arg.substr(8)));
        else
          fgSetDouble("/velocities/wBody",
-                              atof(arg.substr(8)) * FEET_TO_METER);
+                              atof(arg.substr(8)) * SG_METER_TO_FEET);
     } else if ( arg.find( "--vNorth=" ) == 0 ) {
         fgSetString("/sim/startup/speed-set", "NED");
-                               // FIXME: the units are totally confused here
        if ( fgGetString("/sim/startup/units") == "feet" )
-         fgSetDouble("/velocities/speed-north", atof(arg.substr(8)));
+         fgSetDouble("/velocities/speed-north", atof(arg.substr(9)));
        else
          fgSetDouble("/velocities/speed-north",
-                              atof(arg.substr(8)) * FEET_TO_METER);
+                              atof(arg.substr(9)) * SG_METER_TO_FEET);
     } else if ( arg.find( "--vEast=" ) == 0 ) {
         fgSetString("/sim/startup/speed-set", "NED");
-                               // FIXME: the units are totally confused here
        if ( fgGetString("/sim/startup/units") == "feet" )
          fgSetDouble("/velocities/speed-east", atof(arg.substr(8)));
        else
          fgSetDouble("/velocities/speed-east",
-                              atof(arg.substr(8)) * FEET_TO_METER);
+                              atof(arg.substr(8)) * SG_METER_TO_FEET);
     } else if ( arg.find( "--vDown=" ) == 0 ) {
         fgSetString("/sim/startup/speed-set", "NED");
-                               // FIXME: the units are totally confused here
        if ( fgGetString("/sim/startup/units") == "feet" )
          fgSetDouble("/velocities/speed-down", atof(arg.substr(8)));
        else
          fgSetDouble("/velocities/speed-down",
-                              atof(arg.substr(8)) * FEET_TO_METER);
+                              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)));
@@ -680,7 +677,7 @@ parse_option (const string& arg)
                                // 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)));
@@ -823,13 +820,13 @@ 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 );
@@ -840,7 +837,7 @@ parse_option (const string& arg)
     } 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);
@@ -854,11 +851,11 @@ parse_option (const string& arg)
        FG_LOG(FG_GENERAL, FG_INFO, "WIND: " << dir << '@' << 
               speed << " knots" << endl);
                                // convert to fps
-       speed *= NM_TO_METER * METER_TO_FEET * (1.0/3600);
+       speed *= SG_NM_TO_METER * SG_METER_TO_FEET * (1.0/3600);
        dir += 180;
        if (dir >= 360)
          dir -= 360;
-       dir *= DEG_TO_RAD;
+       dir *= SGD_DEGREES_TO_RADIANS;
        fgSetDouble("/environment/wind-north",
                                             speed * cos(dir));
        fgSetDouble("/environment/wind-east",
@@ -867,8 +864,8 @@ parse_option (const string& arg)
        parse_wp( arg.substr( 5 ) );
     } else if ( arg.find( "--flight-plan=") == 0) {
        parse_flightplan ( arg.substr (14) );
-    } else if ( arg.find( "--file=" ) == 0 ) {
-        string file = arg.substr(7);
+    } else if ( arg.find( "--config=" ) == 0 ) {
+        string file = arg.substr(9);
         if (!readProperties(file, globals->get_props())) {
          FG_LOG(FG_IO, FG_ALERT,
                 "--config: failed to read properties from " << file);
Personal clone of the FlightGear source code, the free-libre OpenSource flight simulator.