X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Foptions.cxx;h=8571b1ca0f82457951b9b164a8447a77d2043dbe;hb=a9ab25ddd15af9d2ddc0b5dfed6548c51c7e5ed9;hp=15f4851c28207e791eafbc8a65b9a38b1a90d1ff;hpb=c65cd3254b4f21639aa5290fd781d5220f922e4d;p=flightgear.git

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 15f4851c2..8571b1ca0 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -156,13 +156,12 @@ fgOPTIONS::fgOPTIONS() :
     splash_screen(1),
     intro_music(1),
     mouse_pointer(0),
-    pause(0),
     control_mode(FG_JOYSTICK),
     auto_coordination(FG_AUTO_COORD_NOT_SPECIFIED),
 
     // Features
-    hud_status(1),
-    panel_status(0),
+    hud_status(0),
+    panel_status(1),
     sound(1),
     anti_alias_hud(0),
 
@@ -183,8 +182,8 @@ fgOPTIONS::fgOPTIONS() :
     skyblend(1),
     textures(1),
     wireframe(0),
-    xsize(640),
-    ysize(480),
+    xsize(800),
+    ysize(600),
     bpp(16),
     view_mode(FG_VIEW_PILOT),
 
@@ -209,20 +208,32 @@ fgOPTIONS::fgOPTIONS() :
 	// variable $FG_ROOT if it is set.
 	fg_root = envp;
     } else {
-	// Otherwise, default to a random compiled in location if
+	// 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 )
 	fg_root = "\\FlightGear";
-#elif defined( MACOS )
+#elif defined( macintosh )
 	fg_root = "";
 #else
 	fg_root = PKGLIBDIR;
 #endif
     }
 
-    airport_id = "";		// default airport id
+    // set a possibly independent location for scenery data
+    envp = ::getenv( "FG_SCENERY" );
+
+    if ( envp != NULL ) {
+	// fg_root could be anywhere, so default to environmental
+	// variable $FG_ROOT if it is set.
+	fg_scenery = envp;
+    } else {
+	// Otherwise, default to Scenery being in $FG_ROOT/Scenery
+	fg_scenery = "";
+    }
+
+    airport_id = "P13";		// default airport id
     net_id = "Johnney";		// default pilot's name
 
     // initialize port config string list
@@ -232,8 +243,10 @@ fgOPTIONS::fgOPTIONS() :
 void 
 fgOPTIONS::toggle_panel() {
     
-    if( !pause )
-        toggle_pause();
+    bool freeze = globals->get_freeze();
+
+    if( !freeze )
+        globals->set_freeze(true);
     
     if( panel_status ) {
 	panel_status = false;
@@ -244,16 +257,19 @@ fgOPTIONS::toggle_panel() {
 	if ( current_panel != NULL )
 	  current_panel->setVisibility(true);
     }
-    if ( panel_status ) {
+
+    // new rule .. "fov" shouldn't get messed with like this.
+    /* if ( panel_status ) {
 	fov *= 0.4232;
     } else {
 	fov *= (1.0 / 0.4232);
-    }
+    } */
+
     // fgReshape( xsize, ysize);
     fgReshape( current_view.get_winWidth(), current_view.get_winHeight() );
 
-    if( !pause )
-        toggle_pause();
+    if( !freeze )
+        globals->set_freeze( false );
 }
 
 double
@@ -553,10 +569,11 @@ fgOPTIONS::parse_fov( const string& arg ) {
 //  device = OS device name of serial line to be open()'ed
 //  baud = {300, 1200, 2400, ..., 230400}
 //
-// Socket exacmple "--native=socket,dir,hz,machine,port" where
+// Socket exacmple "--native=socket,dir,hz,machine,port,style" where
 // 
 //  machine = machine name or ip address if client (leave empty if server)
 //  port = port, leave empty to let system choose
+//  style = tcp or udp
 //
 // File example "--garmin=file,dir,hz,filename" where
 // 
@@ -594,10 +611,10 @@ int fgOPTIONS::parse_option( const string& arg ) {
 	mouse_pointer = 1;
     } else if ( arg == "--enable-mouse-pointer" ) {
 	mouse_pointer = 2;
-    } else if ( arg == "--disable-pause" ) {
-	pause = false;	
-    } else if ( arg == "--enable-pause" ) {
-	pause = true;	
+    } else if ( arg == "--disable-freeze" ) {
+	globals->set_freeze( false );
+    } else if ( arg == "--enable-freeze" ) {
+	globals->set_freeze( true );
     } else if ( arg == "--disable-anti-alias-hud" ) {
 	anti_alias_hud = false;	
     } else if ( arg == "--enable-anti-alias-hud" ) {
@@ -619,8 +636,8 @@ int fgOPTIONS::parse_option( const string& arg ) {
     } else if ( arg == "--enable-panel" ) {
 	panel_status = true;
 	if ( current_panel != NULL )
-	  current_panel->setVisibility(true);
-	fov *= 0.4232;
+	    current_panel->setVisibility(true);
+	// fov *= 0.4232; /* NO!!! */
     } else if ( arg == "--disable-sound" ) {
 	sound = false;
     } else if ( arg == "--enable-sound" ) {
@@ -629,14 +646,19 @@ int fgOPTIONS::parse_option( const string& arg ) {
 	airport_id = arg.substr( 13 );
     } else if ( arg.find( "--lon=" ) != string::npos ) {
 	lon = parse_degree( arg.substr(6) );
+	airport_id = "";
+	current_properties.setDoubleValue("/position/longitude", lon);
     } else if ( arg.find( "--lat=" ) != string::npos ) {
 	lat = parse_degree( arg.substr(6) );
+	airport_id = "";
+	current_properties.setDoubleValue("/position/latitude", lat);
     } else if ( arg.find( "--altitude=" ) != string::npos ) {
 	if ( units == FG_UNITS_FEET ) {
 	    altitude = atof( arg.substr(11) ) * FEET_TO_METER;
 	} else {
 	    altitude = atof( arg.substr(11) );
 	}
+	current_properties.setDoubleValue("/position/altitude", altitude);
     } else if ( arg.find( "--uBody=" ) != string::npos ) {
 	vkcas=mach=-1;
 	if ( units == FG_UNITS_FEET ) {
@@ -644,6 +666,7 @@ int fgOPTIONS::parse_option( const string& arg ) {
 	} else {
 	    uBody = atof( arg.substr(8) ) * FEET_TO_METER;
 	}
+	current_properties.setDoubleValue("/velocities/speed-north", uBody);
     } else if ( arg.find( "--vBody=" ) != string::npos ) {
 	vkcas=mach=-1;
 	if ( units == FG_UNITS_FEET ) {
@@ -651,6 +674,7 @@ int fgOPTIONS::parse_option( const string& arg ) {
 	} else {
 	    vBody = atof( arg.substr(8) ) * FEET_TO_METER;
 	}
+	current_properties.setDoubleValue("/velocities/speed-east", vBody);
     } else if ( arg.find( "--wBody=" ) != string::npos ) {
 	vkcas=mach=-1;
 	if ( units == FG_UNITS_FEET ) {
@@ -658,6 +682,7 @@ int fgOPTIONS::parse_option( const string& arg ) {
 	} else {
 	    wBody = atof( arg.substr(8) ) * FEET_TO_METER;
 	}
+	current_properties.setDoubleValue("/velocities/speed-down", wBody);
     } else if ( arg.find( "--vc=" ) != string::npos) {
 	mach=-1;
 	vkcas=atof( arg.substr(5) );
@@ -667,14 +692,20 @@ int fgOPTIONS::parse_option( const string& arg ) {
 	mach=atof( arg.substr(7) );
     } else if ( arg.find( "--heading=" ) != string::npos ) {
 	heading = atof( arg.substr(10) );
+	current_properties.setDoubleValue("/orientation/heading", heading);
     } else if ( arg.find( "--roll=" ) != string::npos ) {
 	roll = atof( arg.substr(7) );
+	current_properties.setDoubleValue("/orientation/roll", roll);
     } else if ( arg.find( "--pitch=" ) != string::npos ) {
 	pitch = atof( arg.substr(8) );
+	current_properties.setDoubleValue("/orientation/pitch", pitch);
     } else if ( arg.find( "--fg-root=" ) != string::npos ) {
 	fg_root = arg.substr( 10 );
+    } else if ( arg.find( "--fg-scenery=" ) != string::npos ) {
+	fg_scenery = arg.substr( 13 );
     } else if ( arg.find( "--fdm=" ) != string::npos ) {
 	flight_model = parse_fdm( arg.substr(6) );
+	current_properties.setIntValue("/sim/flight-model", flight_model);
     if((flight_model == FGInterface::FG_JSBSIM) && (get_trim_mode() == 0)) {
 	set_trim_mode(1);
     } else {
@@ -682,6 +713,7 @@ int fgOPTIONS::parse_option( const string& arg ) {
     }        
     } else if ( arg.find( "--aircraft=" ) != string::npos ) {
 	aircraft = arg.substr(11);
+	current_properties.setStringValue("/sim/aircraft", aircraft);
     } else if ( arg.find( "--aircraft-dir=" ) != string::npos ) {
 	aircraft_dir =  arg.substr(15); //  (UIUC)
     } else if ( arg.find( "--model-hz=" ) != string::npos ) {
@@ -878,7 +910,7 @@ int fgOPTIONS::parse_config_file( const string& path ) {
 
 #ifdef GETLINE_NEEDS_TERMINATOR
         getline( in, line, '\n' );
-#elif defined (MACOS)
+#elif defined( macintosh )
 	getline( in, line, '\r' );
 #else
         getline( in, line );
@@ -906,6 +938,9 @@ void fgOPTIONS::usage ( void ) {
     cout << "\t--help -h:  print usage" << endl;
     cout << "\t--fg-root=path:  specify the root path for all the data files"
 	 << endl;
+    cout << "\t--fg-scenery=path:  specify the base path for all the scenery"
+	 << " data." << endl
+	 << "\t\tdefaults to $FG_ROOT/Scenery" << endl;
     cout << "\t--disable-game-mode:  disable full-screen game mode" << endl;
     cout << "\t--enable-game-mode:  enable full-screen game mode" << endl;
     cout << "\t--disable-splash-screen:  disable splash screen" << endl;
@@ -916,8 +951,8 @@ void fgOPTIONS::usage ( void ) {
     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-pause:  start out in an active state" << endl;
-    cout << "\t--enable-pause:  start out in a paused state" << endl;
+    cout << "\t--disable-freeze:  start out in an 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 << endl;
@@ -1022,6 +1057,8 @@ void fgOPTIONS::usage ( void ) {
     cout << "" << endl;
 
     cout << "Network Options:" << 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;
     cout << "\t--net-id=name:  specify your own callsign" << endl;
 #endif