]> git.mxchange.org Git - flightgear.git/blobdiff - src/Main/options.cxx
Sync with latest JSBSim CVS
[flightgear.git] / src / Main / options.cxx
index 4b0c430231b1d3530582f78f3b14c93b253eb792..1796c8cc0854c0070462c62bffd0252d67a43e4d 100644 (file)
@@ -26,6 +26,7 @@
 #endif
 
 #include <simgear/compiler.h>
+#include <simgear/misc/exception.hxx>
 
 /* normans fix */
 #if defined(FX) && defined(XMESA)
@@ -50,10 +51,13 @@ bool global_fullscreen = true;
 #  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"
 
 SG_USING_STD(string);
 SG_USING_NAMESPACE(std);
@@ -114,24 +118,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 +147,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);
@@ -151,7 +159,7 @@ fgSetDefaults ()
     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);
@@ -161,7 +169,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 +179,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");
@@ -448,7 +456,7 @@ parse_fov( const string& arg ) {
 //  filename = file system file name
 
 static bool 
-parse_channel( const string& type, const string& channel_str ) {
+add_channel( const string& type, const string& channel_str ) {
     // cout << "Channel string = " << channel_str << endl;
 
     globals->get_channel_options_list()->push_back( type + "," + channel_str );
@@ -545,9 +553,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" ) {
@@ -558,6 +566,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" ) {
@@ -578,74 +588,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",
+           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",
+         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",
+         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",
+         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",
+         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)) * SG_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",
+         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 ) {
@@ -681,10 +691,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",
+         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) );
@@ -779,23 +789,29 @@ parse_option (const string& arg)
     } else if ( arg == "--hud-culled" ) {
         fgSetString("/sim/hud/frame-stat-type", "culled");
     } else if ( arg.find( "--atlas=" ) == 0 ) {
-       parse_channel( "atlas", arg.substr(8) );
+       add_channel( "atlas", arg.substr(8) );
+    } else if ( arg.find( "--httpd=" ) == 0 ) {
+       add_channel( "httpd", arg.substr(8) );
     } else if ( arg.find( "--native=" ) == 0 ) {
-       parse_channel( "native", arg.substr(9) );
+       add_channel( "native", arg.substr(9) );
+    } else if ( arg.find( "--native-ctrls=" ) == 0 ) {
+       add_channel( "native_ctrls", arg.substr(15) );
+    } else if ( arg.find( "--native-fdm=" ) == 0 ) {
+       add_channel( "native_fdm", arg.substr(13) );
     } else if ( arg.find( "--garmin=" ) == 0 ) {
-       parse_channel( "garmin", arg.substr(9) );
+       add_channel( "garmin", arg.substr(9) );
     } else if ( arg.find( "--nmea=" ) == 0 ) {
-       parse_channel( "nmea", arg.substr(7) );
+       add_channel( "nmea", arg.substr(7) );
     } else if ( arg.find( "--props=" ) == 0 ) {
-       parse_channel( "props", arg.substr(8) );
+       add_channel( "props", arg.substr(8) );
     } else if ( arg.find( "--pve=" ) == 0 ) {
-       parse_channel( "pve", arg.substr(6) );
+       add_channel( "pve", arg.substr(6) );
     } else if ( arg.find( "--ray=" ) == 0 ) {
-       parse_channel( "ray", arg.substr(6) );
+       add_channel( "ray", arg.substr(6) );
     } else if ( arg.find( "--rul=" ) == 0 ) {
-       parse_channel( "rul", arg.substr(6) );
+       add_channel( "rul", arg.substr(6) );
     } else if ( arg.find( "--joyclient=" ) == 0 ) {
-       parse_channel( "joyclient", arg.substr(12) );
+       add_channel( "joyclient", arg.substr(12) );
 #ifdef FG_NETWORK_OLK
     } else if ( arg == "--disable-network-olk" ) {
         fgSetBool("/sim/networking/olk", false);
@@ -837,13 +853,13 @@ 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 );
-       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 * SG_FEET_TO_METER;
-       fgSetDouble("/environment/visibility", visibility);
+       fgSetDouble("/environment/visibility-m", visibility);
     } else if ( arg.find( "--wind=" ) == 0 ) {
         string val = arg.substr(7);
        unsigned int pos = val.find('@');
@@ -855,15 +871,18 @@ parse_option (const string& arg)
        double speed = atof(val.substr(pos+1).c_str());
        SG_LOG(SG_GENERAL, SG_INFO, "WIND: " << dir << '@' << 
               speed << " knots" << endl);
-                               // convert to fps
+       fgSetDouble("/environment/wind-from-heading-deg", dir);
+       fgSetDouble("/environment/wind-speed-knots", speed);
+
+        // convert to fps
        speed *= SG_NM_TO_METER * SG_METER_TO_FEET * (1.0/3600);
-       dir += 180;
+       // dir += 180;
        if (dir >= 360)
          dir -= 360;
        dir *= SGD_DEGREES_TO_RADIANS;
-       fgSetDouble("/environment/wind-north",
+       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 ) );
@@ -871,10 +890,13 @@ parse_option (const string& arg)
        parse_flightplan ( arg.substr (14) );
     } else if ( arg.find( "--config=" ) == 0 ) {
         string file = arg.substr(9);
-        if (!readProperties(file, globals->get_props())) {
-         SG_LOG(SG_IO, SG_ALERT,
-                "--config: failed to read properties from " << file);
-         return FG_OPTIONS_ERROR;
+       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 {
        SG_LOG( SG_GENERAL, SG_ALERT, "Unknown option '" << arg << "'" );
@@ -1040,19 +1062,22 @@ fgUsage ()
     cout << "\t--enable-mouse-pointer:  enable extra mouse pointer (i.e. for"
         << endl;
     cout << "\t\tfull screen voodoo/voodoo-II based cards.)" << endl;
-    cout << "\t--disable-freeze:  start out in an running state" << endl;
+    cout << "\t--disable-freeze:  start out in a running state" << 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--file=path:  load additional properties from path" << endl;
+    cout << "\t--config=path:  load additional properties from path" << endl;
     cout << endl;
 
     cout << "Features:" << endl;
     cout << "\t--disable-hud:  disable heads up display" << endl;
     cout << "\t--enable-hud:  enable heads up display" << endl;
     cout << "\t--disable-panel:  disable instrument panel" << endl;
-    cout << "\t--enable-panel:  enable instrumetn panel" << endl;
+    cout << "\t--enable-panel:  enable instrument panel" << endl;
     cout << "\t--disable-sound:  disable sound effects" << endl;
     cout << "\t--enable-sound:  enable sound effects" << endl;
     cout << "\t--disable-anti-alias-hud:  disable anti aliased hud" << endl;
@@ -1061,7 +1086,7 @@ fgUsage ()
  
     cout << "Flight Model:" << endl;
     cout << "\t--fdm=abcd:  selects the core flight model code." << endl;
-    cout << "\t\tcan be one of jsb, larcsim, magic, external, balloon, or ada"
+    cout << "\t\tcan be one of jsb, larcsim, magic, null, external, balloon, or ada"
         << endl;
     cout << "\t--aircraft=abcd:  aircraft model to load" << endl;
     cout << "\t--model-hz=n:  run the FDM this rate (iterations per second)" 
@@ -1082,17 +1107,17 @@ fgUsage ()
     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"
+    cout << "\t--offset-distance:  specify distance to threshold"
          << " (NM)" << endl; 
-    cout << "\t--offset-azimuth:  specify heading to threshhold (deg) " 
+    cout << "\t--offset-azimuth:  specify heading to threshold (deg) " 
          << endl;    
     cout << "\t--lon=degrees:  starting longitude in degrees (west = -)" 
         << endl;
     cout << "\t--lat=degrees:  starting latitude in degrees (south = -)"
         << endl;
     cout << "\t--altitude=feet:  starting altitude in feet" << endl;
-    cout << "\t\t(unless --units-meters specified" << endl;
-    cout << "\t--heading=degrees:  heading (yaw) angle in degress (Psi)"
+    cout << "\t\t(unless --units-meters specified)" << endl;
+    cout << "\t--heading=degrees:  heading (yaw) angle in degrees (Psi)"
         << endl;
     cout << "\t--roll=degrees:  roll angle in degrees (Phi)" << endl;
     cout << "\t--pitch=degrees:  pitch angle in degrees (Theta)" << endl;
@@ -1102,9 +1127,9 @@ fgUsage ()
         << endl;
     cout << "\t--wBody=feet per second:  velocity along the body Z axis"
         << endl;
-    cout << "\t\t(unless --units-meters specified" << endl;
-    cout << "\t--vc= initial airspeed in knots (--fdm=jsb only)" << endl;
-    cout << "\t--mach= initial mach number (--fdm=jsb only)" << endl;
+    cout << "\t\t(unless --units-meters specified)" << endl;
+    cout << "\t--vc= initial airspeed in knots" << endl;
+    cout << "\t--mach= initial mach number" << endl;
     cout << endl;
 
     cout << "Rendering Options:" << endl;
@@ -1166,6 +1191,7 @@ fgUsage ()
     cout << endl;
 
     cout << "Network Options:" << endl;
+    cout << "\t--httpd=port:  enable http server on the specified port" << endl;
     cout << "\t--enable-network-olk:  enable Multipilot mode" << endl;
     cout << "\t--disable-network-olk:  disable Multipilot mode (default)" << endl;
     cout << "\t--net-hud:  Hud displays network info" << endl;