X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fmain.cxx;h=419614ed303a4fff1afd412bb1d99adbe61cdcf4;hb=a4d27fe7bc81a3c5acca18b76d4f10406b74f8a3;hp=69c89b42deb0dbd0cc346b82046acd73abe36848;hpb=5fecec2bba6465ac31101e8adc012db90c6d638d;p=flightgear.git

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 69c89b42d..419614ed3 100644
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -81,6 +81,7 @@
 
 #include <FDM/UIUCModel/uiuc_aircraftdir.h>
 #include <GUI/gui.h>
+#include <GUI/sgVec3Slider.hxx>
 #include <Joystick/joystick.hxx>
 #ifdef FG_NETWORK_OLK
 #include <NetworkOLK/network.h>
@@ -93,15 +94,20 @@
 #include <Time/sunpos.hxx>
 #include <Time/tmp.hxx>
 
-// $$$ begin - added VS Renganathan
+// begin - added Venky
+//    $$$ begin - added VS Renganathan
 #include <simgear/misc/fgstream.hxx>
 #include <FDM/flight.hxx>
+#include <FDM/ADA.hxx>
 void fgLoadDCS (void);
 void fgUpdateDCS (void);
-ssgSelector *ship_sel = NULL;
-ssgTransform *ship_pos = NULL;
-//int totalDCSobj = 0;
-// $$$ end - added VS Renganathan
+ssgSelector *ship_sel=NULL;
+// upto 32 instances of a same object can be loaded.
+ssgTransform *ship_pos[32];
+double obj_lat[32],obj_lon[32],obj_alt[32];
+int objc=0;
+//    $$$ end - added VS Renganathan
+// end - added Venky
 
 #ifndef FG_OLD_WEATHER
 #  include <WeatherCM/FGLocalWeatherDatabase.h>
@@ -118,12 +124,8 @@ ssgTransform *ship_pos = NULL;
 #include "keyboard.hxx"
 #include "splash.hxx"
 
-// -dw- use custom sioux settings so I can see output window
 #ifdef macintosh
-#  ifndef FG_NDEBUG
-#    include <sioux.h> // settings for output window
-#  endif
-#  include <console.h>
+#  include <console.h>		// -dw- for command line dialog
 #endif
 
 
@@ -134,14 +136,11 @@ FGGeneral general;
 // our initializations out of the glutIdleLoop() so that we can get a
 // splash screen up and running right away.
 static int idle_state = 0;
-static int global_multi_loop;
+static long global_multi_loop;
 
 // attempt to avoid a large bounce at startup
 static bool initial_freeze = true;
 
-// Another hack
-int use_signals = 0;
-
 // forward declaration
 void fgReshape( int width, int height );
 
@@ -159,8 +158,14 @@ slSample *s2;
 // ssg variables
 ssgRoot *scene = NULL;
 ssgBranch *terrain = NULL;
-ssgSelector *penguin_sel = NULL;
-ssgTransform *penguin_pos = NULL;
+
+// aircraft model stuff
+ssgSelector *acmodel_selector = NULL;
+ssgTransform *acmodel_pos = NULL;
+ssgSelector *prop_selector = NULL;
+ssgSelector *flaps_selector = NULL;
+int acmodel_npropsettings;
+int acmodel_proprpms[4][2];  // different propeller settings
 
 ssgRoot *lighting = NULL;
 ssgBranch *ground = NULL;
@@ -169,7 +174,6 @@ ssgBranch *airport = NULL;
 #ifdef FG_NETWORK_OLK
 ssgSelector *fgd_sel = NULL;
 ssgTransform *fgd_pos = NULL;
-//sgMat4 sgTUX;
 #endif
 
 // current fdm/position used for view
@@ -239,6 +243,23 @@ void fgBuildRenderStates( void ) {
     menus->enable( GL_BLEND );
 }
 
+// fgFindNode -- a function that finds a named node in an ssg graph
+ssgEntity *fgFindNode( ssgEntity *node, const char *name ) {
+  if ( node->getName() != NULL && strcmp( name, node->getName() ) == 0 ) {
+    return node;
+  } else if ( node->isAKindOf( ssgTypeBranch() ) ) {
+    ssgEntity *kid = ((ssgBranch*)node)->getKid(0);
+    while (kid != NULL) {
+      ssgEntity *n = fgFindNode(kid, name);
+      if (n != NULL)
+	return n;
+
+      kid = ((ssgBranch*)node)->getNextKid();
+    }
+  }
+
+  return NULL;
+}
 
 // fgInitVisuals() -- Initialize various GL/view parameters
 void fgInitVisuals( void ) {
@@ -248,7 +269,7 @@ void fgInitVisuals( void ) {
 
 #ifndef GLUT_WRONG_VERSION
     // Go full screen if requested ...
-    if ( globals->get_options()->get_fullscreen() ) {
+    if ( fgGetBool("/sim/startup/fullscreen") ) {
 	glutFullScreen();
     }
 #endif
@@ -267,14 +288,14 @@ void fgInitVisuals( void ) {
 
     // glFogi (GL_FOG_MODE, GL_LINEAR);
     glFogi (GL_FOG_MODE, GL_EXP2);
-    if ( (globals->get_options()->get_fog() == 1) || 
-	 (globals->get_options()->get_shading() == 0) ) {
+    if ( (fgGetString("/sim/rendering/fog") == "disabled") || 
+	 (!fgGetBool("/sim/rendering/shading"))) {
 	// if fastest fog requested, or if flat shading force fastest
 	glHint ( GL_FOG_HINT, GL_FASTEST );
-    } else if ( globals->get_options()->get_fog() == 2 ) {
+    } else if ( fgGetString("/sim/rendering/fog") == "nicest" ) {
 	glHint ( GL_FOG_HINT, GL_NICEST );
     }
-    if ( globals->get_options()->get_wireframe() ) {
+    if ( fgGetBool("/sim/rendering/wireframe") ) {
 	// draw wire frame
 	glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
     }
@@ -310,7 +331,7 @@ void fgRenderFrame( void ) {
     
     if ( idle_state != 1000 ) {
 	// still initializing, draw the splash screen
-	if ( globals->get_options()->get_splash_screen() == 1 ) {
+	if ( fgGetBool("/sim/startup/splash-screen") ) {
 	    fgSplashUpdate(0.0);
 	}
     } else {
@@ -357,7 +378,8 @@ void fgRenderFrame( void ) {
 		       cur_fdm_state->get_Psi() * RAD_TO_DEG,
 		       wup );
 	sgVec3 npo;		// new pilot offset after rotation
-	sgXformVec3( po, po, pilot_view->get_UP() );
+        sgVec3 *pPO = PilotOffsetGet();
+	sgXformVec3( po, *pPO, pilot_view->get_UP() );
 	sgXformVec3( npo, po, CXFM );
 
 	chase_view->set_geod_view_pos( cur_fdm_state->get_Longitude(), 
@@ -395,24 +417,24 @@ void fgRenderFrame( void ) {
 #endif
 
 	// update view port
-	fgReshape( globals->get_options()->get_xsize(),
-		   globals->get_options()->get_ysize() );
+	fgReshape( fgGetInt("/sim/startup/xsize"),
+		   fgGetInt("/sim/startup/ysize") );
 
 #if 0
 	// swing and a miss
 
 	if ( ! fgPanelVisible() ) {
 	    xglViewport( 0, 0 ,
-			 (GLint)(globals->get_options()->get_xsize()),
-			 (GLint)(globals->get_options()->get_ysize()) );
+			 (GLint)(fgGetInt("/sim/startup/xsize")),
+			 (GLint)(fgGetInt("/sim/startup/ysize")) );
 	} else {
 	    int view_h =
 		int( (current_panel->getViewHeight() -
 		      current_panel->getYOffset())
-		     * (globals->get_options()->get_ysize() / 768.0) );
+		     * (fgGetInt("/sim/startup/ysize") / 768.0) );
 	    glViewport( 0, 
-			(GLint)(globals->get_options()->get_ysize() - view_h),
-			(GLint)(globals->get_options()->get_xsize()),
+			(GLint)(fgGetInt("/sim/startup/ysize") - view_h),
+			(GLint)(fgGetInt("/sim/startup/xsize")),
 			(GLint)(view_h) );
 	}
 #endif
@@ -421,12 +443,12 @@ void fgRenderFrame( void ) {
 	glLightfv( GL_LIGHT0, GL_POSITION, l->sun_vec );
 
 	clear_mask = GL_DEPTH_BUFFER_BIT;
-	if ( globals->get_options()->get_wireframe() ) {
+	if ( fgGetBool("/sim/rendering/wireframe") ) {
 	    clear_mask |= GL_COLOR_BUFFER_BIT;
 	}
 
-	if ( globals->get_options()->get_skyblend() ) {
-	    if ( globals->get_options()->get_textures() ) {
+	if ( fgGetBool("/sim/rendering/skyblend") ) {
+	    if ( fgGetBool("/sim/rendering/textures") ) {
 		// glClearColor(black[0], black[1], black[2], black[3]);
 		glClearColor(l->adj_fog_color[0], l->adj_fog_color[1], 
 			     l->adj_fog_color[2], l->adj_fog_color[3]);
@@ -447,7 +469,7 @@ void fgRenderFrame( void ) {
 	// ssg does to set up the model view matrix
 	glMatrixMode(GL_MODELVIEW);
 	glLoadIdentity();
-	ssgSetCamera( (sgMat4)globals->get_current_view()->get_VIEW() );
+	ssgSetCamera( (sgVec4 *)globals->get_current_view()->get_VIEW() );
 
 	// set the opengl state to known default values
 	default_state->force();
@@ -460,10 +482,9 @@ void fgRenderFrame( void ) {
 #endif
 
 	thesky->modify_vis( cur_fdm_state->get_Altitude() * FEET_TO_METER,
-				
 			    ( global_multi_loop * 
-			      globals->get_options()->get_speed_up() ) /
-			    (double)globals->get_options()->get_model_hz() );
+			      fgGetInt("/sim/speed-up") ) /
+			    (double)fgGetInt("/sim/model-hz") );
 
 	double actual_visibility = thesky->get_visibility();
 	// cout << "actual visibility = " << actual_visibility << endl;
@@ -486,7 +507,7 @@ void fgRenderFrame( void ) {
 	glFogf (GL_FOG_DENSITY, fog_exp2_density);
 
 	// update the sky dome
-	if ( globals->get_options()->get_skyblend() ) {
+	if ( fgGetBool("/sim/rendering/skyblend") ) {
 	    /* cout << "thesky->repaint() sky_color = "
 		 << cur_light_params.sky_color[0] << " "
 		 << cur_light_params.sky_color[1] << " "
@@ -539,7 +560,7 @@ void fgRenderFrame( void ) {
 	}
 
 	glEnable( GL_DEPTH_TEST );
-	if ( globals->get_options()->get_fog() > 0 ) {
+	if ( fgGetString("/sim/rendering/fog") != "disabled" ) {
 	    glEnable( GL_FOG );
 	    glFogi( GL_FOG_MODE, GL_EXP2 );
 	    glFogfv( GL_FOG_COLOR, l->adj_fog_color );
@@ -584,11 +605,11 @@ void fgRenderFrame( void ) {
 	}
 
 	if ( globals->get_viewmgr()->get_current() == 0 ) {
-	    // disable TuX
-	    penguin_sel->select(0);
+	    // disable aircraft model
+	    acmodel_selector->select(0);
 	} else { 
-	    // enable TuX and set up his position and orientation
-	    penguin_sel->select(1);
+	    // enable aircraft model and set up its position and orientation
+	    acmodel_selector->select(1);
 
 	    FGViewerRPH *pilot_view =
 		(FGViewerRPH *)globals->get_viewmgr()->get_view( 0 );
@@ -615,7 +636,23 @@ void fgRenderFrame( void ) {
 	
 	    sgCoord tuxpos;
 	    sgSetCoord( &tuxpos, sgTUX );
-	    penguin_pos->setTransform( &tuxpos );
+	    acmodel_pos->setTransform( &tuxpos );
+
+	    // set up moving parts
+	    if (flaps_selector != NULL) {
+	      flaps_selector->select( (controls.get_flaps() > 0.5f) ? 1 : 2 );
+	    }
+
+	    if (prop_selector != NULL) {
+	      int propsel_mask = 0;
+	      for (int i = 0; i < acmodel_npropsettings; i++) {
+		if (FGBFI::getRPM() >= acmodel_proprpms[i][0] &&
+		    FGBFI::getRPM() <= acmodel_proprpms[i][1]) {
+		  propsel_mask |= 1 << i;
+		}
+	      }
+	      prop_selector->select(propsel_mask);
+	    }
 	}
 
 	// $$$ begin - added VS Renganthan 17 Oct 2K
@@ -623,7 +660,7 @@ void fgRenderFrame( void ) {
 	// $$$ end - added VS Renganthan 17 Oct 2K
 
 # ifdef FG_NETWORK_OLK
-	if ( globals->get_options()->get_network_olk() ) {
+	if ( fgGetBool("/sim/networking/network-olk") ) {
 	    sgCoord fgdpos;
 	    other = head->next;             /* put listpointer to start  */
 	    while ( other != tail) {        /* display all except myself */
@@ -646,8 +683,10 @@ void fgRenderFrame( void ) {
 	// position tile nodes and update range selectors
 	global_tile_mgr.prep_ssg_nodes();
 
-	// draw the sky backdrop
-	thesky->preDraw();
+	if ( fgGetBool("/sim/rendering/skyblend") ) {
+	    // draw the sky backdrop
+	    thesky->preDraw();
+	}
 
 	// draw the ssg scene
 	glEnable( GL_DEPTH_TEST );
@@ -661,17 +700,27 @@ void fgRenderFrame( void ) {
 
 	ssgCullAndDraw( lighting );
 
-	// draw the sky cloud layers
-	thesky->postDraw( cur_fdm_state->get_Altitude() * FEET_TO_METER );
+	if ( fgGetBool("/sim/rendering/skyblend") ) {
+	    // draw the sky cloud layers
+	    thesky->postDraw( cur_fdm_state->get_Altitude() * FEET_TO_METER );
+	}
 
 	// display HUD && Panel
 	glDisable( GL_FOG );
 	glDisable( GL_DEPTH_TEST );
 	// glDisable( GL_CULL_FACE );
 	// glDisable( GL_TEXTURE_2D );
+
+	// update the controls subsystem
+	controls.update();
+
 	hud_and_panel->apply();
 	fgCockpitUpdate();
 
+	// update the panel subsystem
+	if (current_panel != 0)
+	  current_panel->update();
+
 	// We can do translucent menus, so why not. :-)
 	menus->apply();
 	glBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ;
@@ -686,31 +735,54 @@ void fgRenderFrame( void ) {
 
 
 // Update internal time dependent calculations (i.e. flight model)
-void fgUpdateTimeDepCalcs(int multi_loop, int remainder) {
-    static fdm_state_list fdm_list;
+void fgUpdateTimeDepCalcs() {
+    static bool inited = false;
+
     fgLIGHT *l = &cur_light_params;
     int i;
 
-    // update the flight model
-    if ( multi_loop < 0 ) {
-	multi_loop = 1;
-    }
+    long multi_loop = 1;
 
     if ( !globals->get_freeze() && !initial_freeze ) {
-	// run Autopilot system
-	current_autopilot->run();
-
-	// printf("updating flight model x %d\n", multi_loop);
-	/* fgFDMUpdate( globals->get_options()->get_flight_model(), 
-		     fdm_state, 
-		     multi_loop * globals->get_options()->get_speed_up(),
-		     remainder ); */
-	cur_fdm_state->update( multi_loop *
-			       globals->get_options()->get_speed_up() );
-	FGSteam::update( multi_loop * globals->get_options()->get_speed_up() );
+	// conceptually, this could be done for each fdm instance ...
+
+	if ( !inited ) {
+	    cur_fdm_state->stamp();
+	    inited = true;
+	}
+
+	SGTimeStamp current;
+	current.stamp();
+	long elapsed = current - cur_fdm_state->get_time_stamp();
+	cur_fdm_state->set_time_stamp( current );
+	elapsed += cur_fdm_state->get_remainder();
+	// cout << "elapsed = " << elapsed << endl;
+	// cout << "dt = " << cur_fdm_state->get_delta_t() << endl;
+	multi_loop = (long)(((double)elapsed * 0.000001) /
+			       cur_fdm_state->get_delta_t() );
+	cur_fdm_state->set_multi_loop( multi_loop );
+	long remainder = elapsed - ( (multi_loop*1000000) *
+				     cur_fdm_state->get_delta_t() );
+	cur_fdm_state->set_remainder( remainder );
+	// cout << "remainder = " << remainder << endl;
+
+	// chop max interations to something reasonable if the sim was
+	// delayed for an excesive amount of time
+	if ( multi_loop > 2.0 / cur_fdm_state->get_delta_t() ) {
+	    multi_loop = (int)(2.0 / cur_fdm_state->get_delta_t());
+	    cur_fdm_state->set_remainder( 0 );
+	}
+
+	// cout << "multi_loop = " << multi_loop << endl;
+	for ( i = 0; i < multi_loop * fgGetInt("/sim/speed-up"); ++i ) {
+	    // run Autopilot system
+	    current_autopilot->run();
+
+	    // update autopilot
+	    cur_fdm_state->update( 1 );
+	}
+	FGSteam::update( multi_loop * fgGetInt("/sim/speed-up") );
     } else {
-	// fgFDMUpdate( globals->get_options()->get_flight_model(), 
-	//              fdm_state, 0, remainder );
 	cur_fdm_state->update( 0 );
 	FGSteam::update( 0 );
 
@@ -719,18 +791,9 @@ void fgUpdateTimeDepCalcs(int multi_loop, int remainder) {
 	}
     }
 
-    fdm_list.push_back( *cur_fdm_state );
-    while ( fdm_list.size() > 15 ) {
-	fdm_list.pop_front();
-    }
-
-    if ( globals->get_options()->get_view_mode() == FGOptions::FG_VIEW_PILOT ) {
+    if ( fgGetString("/sim/view-mode") == "pilot" ) {
 	cur_view_fdm = *cur_fdm_state;
 	// do nothing
-    } else if ( globals->get_options()->get_view_mode()
-		== FGOptions::FG_VIEW_FOLLOW )
-    {
-	cur_view_fdm = fdm_list.front();
     }
 
     // update the view angle
@@ -784,9 +847,7 @@ void fgUpdateTimeDepCalcs(int multi_loop, int remainder) {
 				  cur_fdm_state->get_Latitude() );
 
     // Update radio stack model
-    current_radiostack->update( cur_fdm_state->get_Longitude(),
-				cur_fdm_state->get_Latitude(),
-				cur_fdm_state->get_Altitude() * FEET_TO_METER );
+    current_radiostack->update();
 }
 
 
@@ -794,7 +855,7 @@ void fgInitTimeDepCalcs( void ) {
     // initialize timer
 
     // #ifdef HAVE_SETITIMER
-    //   fgTimerInit( 1.0 / globals->get_options()->get_model_hz(), 
+    //   fgTimerInit( 1.0 / fgGetInt("/sim/model-hz"), 
     //                fgUpdateTimeDepCalcs );
     // #endif HAVE_SETITIMER
 }
@@ -823,7 +884,7 @@ static void fgMainLoop( void ) {
     FG_LOG( FG_ALL, FG_DEBUG, "======= ==== ====");
 
 #ifdef FG_NETWORK_OLK
-    if ( globals->get_options()->get_network_olk() ) {
+    if ( fgGetBool("/sim/networking/network-olk") ) {
 	if ( net_is_registered == 0 ) {	     // We first have to reg. to fgd
 	    // printf("FGD: Netupdate\n");
 	    fgd_send_com( "A", FGFS_host);   // Send Mat4 data
@@ -834,7 +895,7 @@ static void fgMainLoop( void ) {
 
 #if defined( ENABLE_PLIB_JOYSTICK )
     // Read joystick and update control settings
-    if ( globals->get_options()->get_control_mode() == FGOptions::FG_JOYSTICK )
+    if ( fgGetString("/sim/control-mode") == "joystick" )
     {
 	fgJoystickRead();
     }
@@ -864,7 +925,7 @@ static void fgMainLoop( void ) {
 		   cur_fdm_state->get_Altitude() * FEET_TO_METER,
 		   scenery.cur_elev + alt_adjust_m - 3.0,
 		   scenery.cur_elev + alt_adjust_m );
-	    fgFDMForceAltitude( globals->get_options()->get_flight_model(), 
+	    fgFDMForceAltitude( fgGetString("/sim/flight-model"), 
 				scenery.cur_elev + alt_adjust_m );
 
 	    FG_LOG( FG_ALL, FG_DEBUG, 
@@ -872,8 +933,6 @@ static void fgMainLoop( void ) {
 		    << cur_fdm_state->get_Altitude() * FEET_TO_METER
 		    << " meters" );
 	}
-	//fgFDMSetGroundElevation( globals->get_options()->get_flight_model(),
-	//			 scenery.cur_elev );  // meters
     }
 
     /* printf("Adjustment - ground = %.2f  runway = %.2f  alt = %.2f\n",
@@ -937,25 +996,31 @@ static void fgMainLoop( void ) {
 #endif
 
     // Run flight model
-    if ( ! use_signals ) {
-	// Calculate model iterations needed for next frame
-	elapsed += remainder;
-
-	global_multi_loop = (int)(((double)elapsed * 0.000001) * 
-			   globals->get_options()->get_model_hz());
-	remainder = elapsed - ( (global_multi_loop*1000000) / 
-				globals->get_options()->get_model_hz() );
-	FG_LOG( FG_ALL, FG_DEBUG, 
-		"Model iterations needed = " << global_multi_loop
-		<< ", new remainder = " << remainder );
+
+    // Calculate model iterations needed for next frame
+    elapsed += remainder;
+
+    global_multi_loop = (long)(((double)elapsed * 0.000001) * 
+			      fgGetInt("/sim/model-hz"));
+    remainder = elapsed - ( (global_multi_loop*1000000) / 
+			    fgGetInt("/sim/model-hz") );
+    FG_LOG( FG_ALL, FG_DEBUG, 
+	    "Model iterations needed = " << global_multi_loop
+	    << ", new remainder = " << remainder );
 	
-	// flight model
-	if ( global_multi_loop > 0 ) {
-	    fgUpdateTimeDepCalcs(global_multi_loop, remainder);
-	} else {
-	    FG_LOG( FG_ALL, FG_DEBUG, 
-		    "Elapsed time is zero ... we're zinging" );
-	}
+    // chop max interations to something reasonable if the sim was
+    // delayed for an excesive amount of time
+    if ( global_multi_loop > 2.0 * fgGetInt("/sim/model-hz") ) {
+	global_multi_loop = (int)(2.0 * fgGetInt("/sim/model-hz") );
+	remainder = 0;
+    }
+
+    // flight model
+    if ( global_multi_loop > 0 ) {
+	fgUpdateTimeDepCalcs();
+    } else {
+	FG_LOG( FG_ALL, FG_DEBUG, 
+		"Elapsed time is zero ... we're zinging" );
     }
 
 #if ! defined( macintosh )
@@ -972,9 +1037,9 @@ static void fgMainLoop( void ) {
 
     // Run audio scheduler
 #ifdef ENABLE_AUDIO_SUPPORT
-    if ( globals->get_options()->get_sound() && !audio_sched->not_working() ) {
+    if ( fgGetBool("/sim/sound") && !audio_sched->not_working() ) {
 
-	if ( globals->get_options()->get_aircraft() == "c172" ) {
+	if ( fgGetString("/sim/aircraft") == "c172" ) {
 	    // pitch corresponds to rpm
 	    // volume corresponds to manifold pressure
 
@@ -998,18 +1063,18 @@ static void fgMainLoop( void ) {
 	    double mp_factor;
 	    if ( cur_fdm_state->get_engine(0) != NULL ) {
 		mp_factor = 
-		    cur_fdm_state->get_engine(0)->get_Manifold_Pressure() / 28;
+		    cur_fdm_state->get_engine(0)->get_Manifold_Pressure() / 100;
 	    } else {
-		mp_factor = 1.0;
+		mp_factor = 0.3;
 	    }
-	    // cout << "mp = " 
-	    //      << cur_fdm_state->get_engine(0)->get_Manifold_Pressure()
-	    //      << endl;
+	    /* cout << "mp = " 
+	         << cur_fdm_state->get_engine(0)->get_Manifold_Pressure()
+	         << endl; */
 
-	    double volume = mp_factor;
+	    double volume = 0.3 + mp_factor;
 
 	    if ( volume < 0.3 ) { volume = 0.3; }
-	    if ( volume > 2.0 ) { volume = 2.0; }
+	    if ( volume > 1.0 ) { volume = 1.0; }
 	    // cout << "volume = " << volume << endl;
 
 	    pitch_envelope.setStep  ( 0, 0.01, pitch );
@@ -1044,7 +1109,7 @@ static void fgIdleFunction ( void ) {
 
     if ( idle_state == 0 ) {
 	// Initialize the splash screen right away
-	if ( globals->get_options()->get_splash_screen() ) {
+	if ( fgGetBool("/sim/startup/splash-screen") ) {
 	    fgSplashInit();
 	}
 	
@@ -1052,9 +1117,9 @@ static void fgIdleFunction ( void ) {
     } else if ( idle_state == 1 ) {
 	// Start the intro music
 #if !defined(WIN32)
-	if ( globals->get_options()->get_intro_music() ) {
+	if ( fgGetBool("/sim/startup/intro-music") ) {
 	    string lockfile = "/tmp/mpg123.running";
-	    FGPath mp3file( globals->get_options()->get_fg_root() );
+	    FGPath mp3file( globals->get_fg_root() );
 	    mp3file.append( "Sounds/intro.mp3" );
 
 	    string command = "(touch " + lockfile + "; mpg123 "
@@ -1094,12 +1159,6 @@ static void fgIdleFunction ( void ) {
 	// setup OpenGL view parameters
 	fgInitVisuals();
 
-	if ( use_signals ) {
-	    // init timer routines, signals, etc.  Arrange for an alarm
-	    // signal to be generated, etc.
-	    fgInitTimeDepCalcs();
-	}
-
 	idle_state++;
     } else if ( idle_state == 5 ) {
 
@@ -1109,7 +1168,7 @@ static void fgIdleFunction ( void ) {
 #ifdef ENABLE_AUDIO_SUPPORT
 
 #if !defined(WIN32)
-	if ( globals->get_options()->get_intro_music() ) {
+	if ( fgGetBool("/sim/startup/intro-music") ) {
 	    // Let's wait for mpg123 to finish
 	    string lockfile = "/tmp/mpg123.running";
 	    struct stat stat_buf;
@@ -1125,13 +1184,13 @@ static void fgIdleFunction ( void ) {
 	}
 #endif // WIN32
 
-	if ( globals->get_options()->get_sound() ) {
+	if ( fgGetBool("/sim/sound") ) {
 	    audio_sched = new slScheduler ( 8000 );
 	    audio_mixer = new smMixer;
 	    audio_mixer -> setMasterVolume ( 80 ) ;  /* 80% of max volume. */
 	    audio_sched -> setSafetyMargin ( 1.0 ) ;
 
-	    FGPath slfile( globals->get_options()->get_fg_root() );
+	    FGPath slfile( globals->get_fg_root() );
 	    slfile.append( "Sounds/wasp.wav" );
 
 	    s1 = new slSample ( (char *)slfile.c_str() );
@@ -1167,8 +1226,8 @@ static void fgIdleFunction ( void ) {
 	idle_state = 1000;
 
 	cout << "Panel visible = " << fgPanelVisible() << endl;
-	fgReshape( globals->get_options()->get_xsize(),
-		   globals->get_options()->get_ysize() );
+	fgReshape( fgGetInt("/sim/startup/xsize"),
+		   fgGetInt("/sim/startup/ysize") );
     } 
 
     if ( idle_state == 1000 ) {
@@ -1177,7 +1236,7 @@ static void fgIdleFunction ( void ) {
 
 	fgMainLoop();
     } else {
-	if ( globals->get_options()->get_splash_screen() == 1 ) {
+	if ( fgGetBool("/sim/startup/splash-screen") ) {
 	    fgSplashUpdate(0.0);
 	}
     }
@@ -1211,8 +1270,8 @@ void fgReshape( int width, int height ) {
 		   (GLint)(width), (GLint)(view_h) );
     }
 
-    globals->get_options()->set_xsize( width );
-    globals->get_options()->set_ysize( height );
+    fgSetInt("/sim/startup/xsize", width);
+    fgSetInt("/sim/startup/ysize", height);
 
     float fov = globals->get_current_view()->get_fov();
     ssgSetFOV(fov, fov * globals->get_current_view()->get_win_ratio());
@@ -1234,15 +1293,15 @@ int fgGlutInit( int *argc, char **argv ) {
     glutInitDisplayMode( GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE );
 
     FG_LOG( FG_GENERAL, FG_INFO, "Opening a window: " <<
-	    globals->get_options()->get_xsize() << "x"
-	    << globals->get_options()->get_ysize() );
+	    fgGetInt("/sim/startup/xsize") << "x"
+	    << fgGetInt("/sim/startup/ysize") );
 
     // Define initial window size
-    glutInitWindowSize( globals->get_options()->get_xsize(),
-			 globals->get_options()->get_ysize() );
+    glutInitWindowSize( fgGetInt("/sim/startup/xsize"),
+			fgGetInt("/sim/startup/ysize") );
 
     // Initialize windows
-    if ( globals->get_options()->get_game_mode() == 0 ) {
+    if ( !fgGetBool("/sim/startup/game-mode")) {
 	// Open the regular window
 	glutCreateWindow("FlightGear");
 #ifndef GLUT_WRONG_VERSION
@@ -1250,9 +1309,9 @@ int fgGlutInit( int *argc, char **argv ) {
 	// Open the cool new 'game mode' window
 	char game_mode_str[256];
 	sprintf( game_mode_str, "width=%d height=%d bpp=%d",
-		 globals->get_options()->get_xsize(),
-		 globals->get_options()->get_ysize(),
-		 globals->get_options()->get_bpp());
+		 fgGetInt("/sim/startup/xsize"),
+		 fgGetInt("/sim/startup/ysize"),
+		 fgGetInt("/sim/rendering/bits-per-pixel"));
 
 	FG_LOG( FG_GENERAL, FG_INFO, 
 		"game mode params = " << game_mode_str );
@@ -1269,7 +1328,7 @@ int fgGlutInit( int *argc, char **argv ) {
     general.set_glVersion( (char *)glGetString ( GL_VERSION ) );
     FG_LOG( FG_GENERAL, FG_INFO, general.get_glRenderer() );
 
-    int tmp;
+    GLint tmp;
     glGetIntegerv( GL_MAX_TEXTURE_SIZE, &tmp );
     general.set_glMaxTexSize( tmp );
     FG_LOG ( FG_GENERAL, FG_INFO, "Max texture size = " << tmp );
@@ -1278,43 +1337,7 @@ int fgGlutInit( int *argc, char **argv ) {
     general.set_glDepthBits( tmp );
     FG_LOG ( FG_GENERAL, FG_INFO, "Depth buffer bits = " << tmp );
 
-#if 0
-    // try to determine if we should adjust the initial default
-    // display resolution.  The options class defaults (is
-    // initialized) to 640x480.
-    string renderer = general.glRenderer;
-
-    // currently we only know how to deal with Mesa/Glide/Voodoo cards
-    if ( renderer.find( "Glide" ) != string::npos ) {
-	FG_LOG( FG_GENERAL, FG_INFO, "Detected a Glide driver" );
-	if ( renderer.find( "FB/8" ) != string::npos ) {
-	    // probably a voodoo-2
-	    if ( renderer.find( "TMU/SLI" ) != string::npos ) {
-		// probably two SLI'd Voodoo-2's
-		globals->get_options()->set_xsize( 1024 );
-		globals->get_options()->set_ysize( 768 );
-		FG_LOG( FG_GENERAL, FG_INFO,
-			"It looks like you have two sli'd voodoo-2's." << endl
-			<< "upgrading your win resolution to 1024 x 768" );
-		glutReshapeWindow(1024, 768);
-	    } else {
-		// probably a single non-SLI'd Voodoo-2
-		globals->get_options()->set_xsize( 800 );
-		globals->get_options()->set_ysize( 600 );
-		FG_LOG( FG_GENERAL, FG_INFO,
-			"It looks like you have a voodoo-2." << endl
-			<< "upgrading your win resolution to 800 x 600" );
-		glutReshapeWindow(800, 600);
-	    }
-	} else if ( renderer.find( "FB/2" ) != string::npos ) {
-	    // probably a voodoo-1, stick with the default
-	}
-    } else {
-	// we have no special knowledge of this card, stick with the default
-    }
-#endif
-
-    return(1);
+    return 1;
 }
 
 
@@ -1359,22 +1382,28 @@ int main( int argc, char **argv ) {
     // set default log levels
     fglog().setLogLevels( FG_ALL, FG_INFO );
 
+    string version;
+#ifdef FLIGHTGEAR_VERSION
+    version = FLIGHTGEAR_VERSION;
+#else
+    version = "unknown version";
+#endif
     FG_LOG( FG_GENERAL, FG_INFO, "FlightGear:  Version "
-	    << FLIGHTGEAR_VERSION << endl );
-
-    // seed the random number generater
-    sg_srandom_time();
+	    << version << endl );
 
     // Allocate global data structures.  This needs to happen before
     // we parse command line options
+
+    SGPropertyNode *props = new SGPropertyNode;
     globals = new FGGlobals;
+    globals->set_props( props );
+
+    // seed the random number generater
+    sg_srandom_time();
 
     SGRoute *route = new SGRoute;
     globals->set_route( route );
 
-    FGOptions *options = new FGOptions;
-    globals->set_options( options );
-
     FGViewMgr *viewmgr = new FGViewMgr;
     globals->set_viewmgr( viewmgr );
 
@@ -1384,6 +1413,9 @@ int main( int argc, char **argv ) {
     FGViewerLookAt *chase = new FGViewerLookAt;
     globals->get_viewmgr()->add_view( chase );
 
+    string_list *col = new string_list;
+    globals->set_channel_options_list( col );
+
     // set current view to 0 (first) which is our main pilot view
     globals->set_current_view( globals->get_viewmgr()->get_view( 0 ) );
 
@@ -1391,21 +1423,6 @@ int main( int argc, char **argv ) {
     // fg_root was specified (ignore all other options for now)
     fgInitFGRoot(argc, argv);
 
-    // cout << "1. airport_id = " << globals->get_options()->get_airport_id() << endl;
-
-    // Read global preferences from $FG_ROOT/preferences.xml
-    FGPath props_path(globals->get_options()->get_fg_root());
-    props_path.append("preferences.xml");
-    FG_LOG(FG_INPUT, FG_INFO, "Reading global preferences");
-    if (!readPropertyList(props_path.str(), &current_properties)) {
-      FG_LOG(FG_INPUT, FG_ALERT, "Failed to read global preferences from "
-	     << props_path.str());
-    } else {
-      FG_LOG(FG_INPUT, FG_INFO, "Finished Reading global preferences");
-    }
-
-    // cout << "2. airport_id = " << globals->get_options()->get_airport_id() << endl;
-
     // Initialize the Aircraft directory to "" (UIUC)
     aircraft_dir = "";
 
@@ -1438,18 +1455,18 @@ int main( int argc, char **argv ) {
     guiInit();
 
     // set current_options lon/lat if an airport id is specified
-    // cout << "3. airport_id = " << globals->get_options()->get_airport_id() << endl;
-    if ( globals->get_options()->get_airport_id().length() ) {
-	// fgSetPosFromAirportID( globals->get_options()->get_airport_id() );
-	fgSetPosFromAirportIDandHdg( globals->get_options()->get_airport_id(),
-				     globals->get_options()->get_heading() );
+    // cout << "3. airport_id = " << fgGetString("/sim/startup/airport-id") << endl;
+    if ( fgGetString("/sim/startup/airport-id").length() ) {
+	// fgSetPosFromAirportID( fgGetString("/sim/startup/airport-id") );
+	fgSetPosFromAirportIDandHdg( fgGetString("/sim/startup/airport-id"),
+				     fgGetDouble("/orientation/heading") );
     }
 
     // Initialize time
-    FGPath zone( globals->get_options()->get_fg_root() );
+    FGPath zone( globals->get_fg_root() );
     zone.append( "Timezone" );
-    SGTime *t = new SGTime( globals->get_options()->get_lon() * DEG_TO_RAD,
-			    globals->get_options()->get_lat() * DEG_TO_RAD,
+    SGTime *t = new SGTime( fgGetDouble("/position/longitude") * DEG_TO_RAD,
+			    fgGetDouble("/position/latitude") * DEG_TO_RAD,
 			    zone.str() );
 
     // Handle potential user specified time offsets
@@ -1460,34 +1477,24 @@ int main( int argc, char **argv ) {
 	sgTimeGetGMT( fgLocaltime(&cur_time, t->get_zonename() ) );
 
     // Okay, we now have six possible scenarios
-    switch ( globals->get_options()->get_time_offset_type() ) {
-    case FGOptions::FG_TIME_SYS_OFFSET:
-	globals->set_warp( globals->get_options()->get_time_offset() );
-	break;
-    case FGOptions::FG_TIME_GMT_OFFSET:
-	globals->set_warp( globals->get_options()->get_time_offset() - 
-			   (currGMT - systemLocalTime) );
-	break;
-    case FGOptions::FG_TIME_LAT_OFFSET:
-	globals->set_warp( globals->get_options()->get_time_offset() - 
-			   (aircraftLocalTime - systemLocalTime) );
-	break;
-    case FGOptions::FG_TIME_SYS_ABSOLUTE:
-	globals->set_warp( globals->get_options()->get_time_offset() -
-			   cur_time );
-	//printf("warp = %d\n", warp); 
-	break;
-    case FGOptions::FG_TIME_GMT_ABSOLUTE:
-	globals->set_warp( globals->get_options()->get_time_offset() -
-			   currGMT );
-	break;
-    case FGOptions::FG_TIME_LAT_ABSOLUTE:
-	globals->set_warp( globals->get_options()->get_time_offset() - 
-			   (aircraftLocalTime - systemLocalTime) - 
+    int offset = fgGetInt("/sim/startup/time-offset");
+    const string &offset_type = fgGetString("/sim/startup/time-offset-type");
+    if (offset_type == "system-offset") {
+	globals->set_warp( offset );
+    } else if (offset_type == "gmt-offset") {
+	globals->set_warp( offset - (currGMT - systemLocalTime) );
+    } else if (offset_type == "latitude-offset") {
+	globals->set_warp( offset - (aircraftLocalTime - systemLocalTime) );
+    } else if (offset_type == "system") {
+	globals->set_warp( offset - cur_time );
+    } else if (offset_type == "gmt") {
+	globals->set_warp( offset - currGMT );
+    } else if (offset_type == "latitude") {
+	globals->set_warp( offset - (aircraftLocalTime - systemLocalTime) - 
 			   cur_time ); 
-	break;
-    default:
-	FG_LOG( FG_GENERAL, FG_ALERT, "Unsupported type" );
+    } else {
+        FG_LOG( FG_GENERAL, FG_ALERT,
+		"Unsupported offset type " << offset_type );
 	exit( -1 );
     }
 
@@ -1507,22 +1514,9 @@ int main( int argc, char **argv ) {
 	exit(-1);
     }
 
-    //
-    // some ssg test stuff (requires data from the plib source
-    // distribution) specifically from the ssg tux example
-    //
-
-    FGPath modelpath( globals->get_options()->get_fg_root() );
-    // modelpath.append( "Models" );
-    // modelpath.append( "Geometry" );
-  
-    FGPath texturepath( globals->get_options()->get_fg_root() );
-    texturepath.append( "Models" );
-    texturepath.append( "Textures" );
-  
+    FGPath modelpath( globals->get_fg_root() );
     ssgModelPath( (char *)modelpath.c_str() );
-    ssgTexturePath( (char *)texturepath.c_str() );
-
+  
     // Scene graph root
     scene = new ssgRoot;
     scene->setName( "Scene" );
@@ -1531,7 +1525,7 @@ int main( int argc, char **argv ) {
     lighting->setName( "Lighting" );
 
     // Initialize the sky
-    FGPath ephem_data_path( globals->get_options()->get_fg_root() );
+    FGPath ephem_data_path( globals->get_fg_root() );
     ephem_data_path.append( "Astro" );
     SGEphemeris *ephem = new SGEphemeris( ephem_data_path.c_str() );
     ephem->update( globals->get_time_params()->getMjd(),
@@ -1539,7 +1533,7 @@ int main( int argc, char **argv ) {
 		   0.0 );
     globals->set_ephem( ephem );
 
-    FGPath sky_tex_path( globals->get_options()->get_fg_root() );
+    FGPath sky_tex_path( globals->get_fg_root() );
     sky_tex_path.append( "Textures" );
     sky_tex_path.append( "Sky" );
     thesky = new SGSky;
@@ -1551,7 +1545,7 @@ int main( int argc, char **argv ) {
 		   globals->get_ephem()->getNumStars(),
 		   globals->get_ephem()->getStars(), 60000.0 );
 
-    if ( globals->get_options()->get_clouds() == true ) {
+    if ( fgGetBool("/environment/clouds/status") ) {
 	thesky->add_cloud_layer( 2600.0, 200.0, 50.0, 40000.0,
 				 SG_CLOUD_MOSTLY_SUNNY );
 	thesky->add_cloud_layer( 6000.0, 20.0, 10.0, 40000.0,
@@ -1581,42 +1575,68 @@ int main( int argc, char **argv ) {
     lighting->addKid( airport );
 
     // temporary visible aircraft "own ship"
-    penguin_sel = new ssgSelector;
-    penguin_pos = new ssgTransform;
-    string tux_path =
-      current_properties.getStringValue("/sim/model/path",
-					"Models/Geometry/glider.ac");
-    ssgEntity *tux_obj = ssgLoad((char *)(tux_path.c_str()));
+    acmodel_selector = new ssgSelector;
+    acmodel_pos = new ssgTransform;
+
+    string acmodel_path =
+	fgGetString("/sim/model/path", "Models/Geometry/glider.ac");
+
+    string full_model = globals->get_fg_root() + "/"
+	+ acmodel_path;
+    int pos = full_model.rfind("/");
+    
+    FGPath texturepath( full_model.substr(0, pos) );
+    cout << "Texture path = " << texturepath.str() << endl;
+    ssgTexturePath( (char *)texturepath.c_str() );
+
+    ssgEntity *acmodel_obj = ssgLoad((char *)(acmodel_path.c_str()));
+
+    // find moving parts (if this is an MDL model)
+    flaps_selector = (ssgSelector*)fgFindNode( acmodel_obj, "FLAPS" );
+    prop_selector  = (ssgSelector*)fgFindNode( acmodel_obj, "PROP"  );
+
+    acmodel_npropsettings = 0;
+    if (prop_selector != NULL) {
+      for (ssgEntity* kid = prop_selector->getKid(0); kid != NULL;
+	   kid = prop_selector->getNextKid()) {
+	int prop_low, prop_high;
+	if ( sscanf(kid->getName(), "PROP_%d_%d", 
+		    &prop_low, &prop_high) == 2 ) {
+	  prop_low  = (int)((float)prop_low  * (5000.0f / 32767.0f));
+	  prop_high = (int)((float)prop_high * (5000.0f / 32767.0f));
+	  acmodel_proprpms[acmodel_npropsettings][0] = prop_low ;
+	  acmodel_proprpms[acmodel_npropsettings][1] = prop_high;
+	  acmodel_npropsettings++;
+
+	  FG_LOG( FG_GENERAL, FG_INFO, "PROPELLER SETTING " << prop_low <<
+		  " " << prop_high );
+	}
+      }
+    }
 
     // align the model properly for FGFS
-    ssgTransform *tux_align = new ssgTransform;
-    tux_align->addKid(tux_obj);
+    ssgTransform *acmodel_align = new ssgTransform;
+    acmodel_align->addKid(acmodel_obj);
     sgMat4 rot_matrix;
     sgMat4 off_matrix;
     sgMat4 res_matrix;
-    float h_rot =
-      current_properties.getFloatValue("/sim/model/h-rotation", 0.0);
-    float p_rot =
-      current_properties.getFloatValue("/sim/model/p-rotation", 0.0);
-    float r_rot =
-      current_properties.getFloatValue("/sim/model/r-rotation", 0.0);
-    float x_off =
-      current_properties.getFloatValue("/sim/model/x-offset", 0.0);
-    float y_off =
-      current_properties.getFloatValue("/sim/model/y-offset", 0.0);
-    float z_off =
-      current_properties.getFloatValue("/sim/model/z-offset", 0.0);
+    float h_rot = fgGetFloat("/sim/model/h-rotation", 0.0);
+    float p_rot = fgGetFloat("/sim/model/p-rotation", 0.0);
+    float r_rot = fgGetFloat("/sim/model/r-rotation", 0.0);
+    float x_off = fgGetFloat("/sim/model/x-offset", 0.0);
+    float y_off = fgGetFloat("/sim/model/y-offset", 0.0);
+    float z_off = fgGetFloat("/sim/model/z-offset", 0.0);
     sgMakeRotMat4(rot_matrix, h_rot, p_rot, r_rot);
     sgMakeTransMat4(off_matrix, x_off, y_off, z_off);
     sgMultMat4(res_matrix, off_matrix, rot_matrix);
-    tux_align->setTransform(res_matrix);
+    acmodel_align->setTransform(res_matrix);
 
-    penguin_pos->addKid( tux_align );
-    penguin_sel->addKid( penguin_pos );
-    ssgFlatten( tux_obj );
-    ssgStripify( penguin_sel );
-    penguin_sel->clrTraversalMaskBits( SSGTRAV_HOT );
-    scene->addKid( penguin_sel );
+    acmodel_pos->addKid( acmodel_align );
+    acmodel_selector->addKid( acmodel_pos );
+    //ssgFlatten( acmodel_obj );
+    //ssgStripify( acmodel_selector );
+    acmodel_selector->clrTraversalMaskBits( SSGTRAV_HOT );
+    scene->addKid( acmodel_selector );
 
     // $$$ begin - added VS Renganthan 17 Oct 2K
     fgLoadDCS();
@@ -1624,7 +1644,7 @@ int main( int argc, char **argv ) {
 
 #ifdef FG_NETWORK_OLK
     // Do the network intialization
-    if ( globals->get_options()->get_network_olk() ) {
+    if ( fgGetBool("/sim/networking/network-olk") ) {
 	printf("Multipilot mode %s\n", fg_net_init( scene ) );
     }
 #endif
@@ -1642,80 +1662,126 @@ int main( int argc, char **argv ) {
 
 
 // $$$ end - added VS Renganathan, 15 Oct 2K
+//         - added Venky         , 12 Nov 2K
+
 void fgLoadDCS(void) {
 
-    string obj_filename;
+    ssgEntity *ship_obj = NULL;
+    // double bz[3];
+    // int j=0;
+    char obj_filename[25];
+
+    for (int k=0;k<32;k++)
+    {
+        ship_pos[k]=NULL;
+    }
+
+    FGPath tile_path( globals->get_fg_root());
+    tile_path.append( "Scenery" );
+    tile_path.append( "Objects.txt" );
+    fg_gzifstream in( tile_path.str() );
+    if ( ! in.is_open() ) {
+	FG_LOG( FG_TERRAIN, FG_ALERT, "Cannot open file: " << tile_path.str() );
+    }
 
-    FGPath modelpath( globals->get_options()->get_fg_root() );
+    FGPath modelpath( globals->get_fg_root() );
     modelpath.append( "Models" );
     modelpath.append( "Geometry" );
   
-    FGPath texturepath( globals->get_options()->get_fg_root() );
+    FGPath texturepath( globals->get_fg_root() );
     texturepath.append( "Models" );
     texturepath.append( "Textures" );
  
     ssgModelPath( (char *)modelpath.c_str() );
     ssgTexturePath( (char *)texturepath.c_str() );
 
-    // while ( ! in.eof() ) {
-    //     in >> obj_filename >> obj_lat >> obj_lon >> obj_alt;
-    //     totalDCSobj = totalDCSobj+1;
-
     ship_sel = new ssgSelector;
-    ship_pos = new ssgTransform;
-    ssgEntity *ship_obj = ssgLoadOBJ( "saratoga.obj" );
-    if ( ship_obj != NULL ) {
-	ship_pos->addKid( ship_obj ); // add object to transform node
-	ship_sel->addKid( ship_pos ); // add transform node to selector
-	// ssgFlatten( ship_obj );
-	// ssgStripify( ship_sel );
-	ship_sel->clrTraversalMaskBits( SSGTRAV_HOT );
-	scene->addKid( ship_sel ); //add selector node to root node
-    } else {
-	FG_LOG( FG_TERRAIN, FG_ALERT, "Cannot open file: " << "saratoga.obj" );
-    }
-
-    //     if (in.eof()) break;
 
-    // } // while
+    char c;
+    while ( ! in.eof() ) 
+    {
+       in >> ::skipws;
+       if ( in.get( c ) && c == '#' )
+       { 
+            in >> skipeol;
+       }
+       else 
+       { 
+       	in.putback(c);
+           	in >> obj_filename >> obj_lat[objc] >> obj_lon[objc] >> obj_alt[objc];
+/*       	cout << endl << obj_filename << " " << obj_lat[objc] << " " << obj_lon[objc] <<  " " << obj_alt[objc] << endl;
+       	int chj=getchar();*/
+                
+	      obj_lon[objc] *=DEG_TO_RAD;
+      	obj_lat[objc] *=DEG_TO_RAD;
+    
+            ship_pos[objc] = new ssgTransform;
+       
+       
+       	// type "repeat" in objects.txt to load one more instance of the last object.
+
+       	if ( strcmp(obj_filename,"repeat") != 0)
+                  ship_obj = ssgLoadOBJ( obj_filename );
+      
+	      if ( ship_obj != NULL ) 
+            {
+	 		ship_pos[objc]->addKid( ship_obj ); // add object to transform node
+		 	ship_sel->addKid( ship_pos[objc] ); // add transform node to selector
+			}
+       	else
+       		FG_LOG( FG_TERRAIN, FG_ALERT, "Cannot open file: " << obj_filename );
+            
+      	if (in.eof()) break;
+            objc++;
+         }
+     } // while
+
+    ship_sel->clrTraversalMaskBits( SSGTRAV_HOT );
+    scene->addKid( ship_sel ); //add selector node to root node
     return;
-}
+ }
 
 
 void fgUpdateDCS (void) {
 
     // double eye_lat,eye_lon,eye_alt;
-    static double obj_lat=15.377603*DEG_TO_RAD;
-    static double obj_lon= 73.816436*DEG_TO_RAD;
-    static double obj_alt=0.15;
     // static double obj_head;
     double sl_radius,obj_latgc;
     // float nresultmat[4][4];
+    // sgMat4 Trans,rothead,rotlon,rot180,rotlat,resultmat1,resultmat2,resultmat3;
     double bz[3];
 
-    obj_lat = obj_lat + 0.0000001;
-
     // Instantaneous Geodetic Lat/Lon/Alt of moving object
-    //    obj_lon = current_aircraft.fdm_state->get_aux5()*DEG_TO_RAD;
-    //    obj_lat = current_aircraft.fdm_state->get_aux6()*DEG_TO_RAD;
-    //    obj_alt = current_aircraft.fdm_state->get_aux7();
-	  
-    // Geodetic to Geocentric angles for rotation
-    sgGeodToGeoc(obj_lat,obj_alt,&sl_radius,&obj_latgc);
-
-    // moving object gbs-posn in cartesian coords
-    Point3D obj_posn = Point3D( obj_lon,obj_lat,obj_alt);
-    Point3D obj_pos = sgGeodToCart( obj_posn );
-
-    // Translate moving object w.r.t eye
-    Point3D Objtrans = obj_pos-scenery.center;
-    bz[0]=Objtrans.x();
-    bz[1]=Objtrans.y();
-    bz[2]=Objtrans.z();
-
-    // rotate dynamic objects for lat,lon & alt and other motion about its axes
-    if ( ship_sel != NULL ) {
-	ship_sel->select(1);
+    FGADA *fdm = (FGADA *)current_aircraft.fdm_state;
+    
+    // Deck should be the first object in objects.txt in case of fdm=ada
+
+    if (fgGetString("/sim/flight-model") == "ada")
+    {
+      obj_lon[0] = fdm->get_aux5()*DEG_TO_RAD;
+      obj_lat[0] = fdm->get_aux6()*DEG_TO_RAD;
+      obj_alt[0] = fdm->get_aux7();
+    }
+    
+    for (int m=0; m<=objc; m++)
+    {
+    	//cout << endl <<  obj_lat[m]*RAD_TO_DEG << " " << obj_lon[m]*RAD_TO_DEG << " " << obj_alt[m] << " " << objc << endl;
+	//int v=getchar();
+
+        //Geodetic to Geocentric angles for rotation
+	sgGeodToGeoc(obj_lat[m],obj_alt[m],&sl_radius,&obj_latgc);
+
+        //moving object gbs-posn in cartesian coords
+        Point3D obj_posn = Point3D( obj_lon[m],obj_lat[m],obj_alt[m]);
+        Point3D obj_pos = sgGeodToCart( obj_posn );
+
+        // Translate moving object w.r.t eye
+        Point3D Objtrans = obj_pos-scenery.center;
+        bz[0]=Objtrans.x();
+        bz[1]=Objtrans.y();
+        bz[2]=Objtrans.z();
+
+       // rotate dynamic objects for lat,lon & alt and other motion about its axes
 	
 	sgMat4 sgTRANS;
 	sgMakeTransMat4( sgTRANS, bz[0],bz[1],bz[2]);
@@ -1726,7 +1792,7 @@ void fgUpdateDCS (void) {
 	sgSetVec3( ship_up, 0.0, 0.0, 1.0); //north,yaw
 
 	sgMat4 sgROT_lon, sgROT_lat, sgROT_hdg;
-	sgMakeRotMat4( sgROT_lon, obj_lon*RAD_TO_DEG, ship_up );
+	sgMakeRotMat4( sgROT_lon, obj_lon[m]*RAD_TO_DEG, ship_up );
 	sgMakeRotMat4( sgROT_lat, 90-obj_latgc*RAD_TO_DEG, ship_rt );
 	sgMakeRotMat4( sgROT_hdg, 180.0, ship_up );
 	
@@ -1737,9 +1803,12 @@ void fgUpdateDCS (void) {
 	sgPostMultMat4( sgTUX, sgTRANS );
 
 	sgCoord shippos;
-	sgSetCoord( &shippos, sgTUX );
-	ship_pos->setTransform( &shippos );
+	sgSetCoord(&shippos, sgTUX );
+	ship_pos[m]->setTransform( &shippos );
     }
-}
+   if ( ship_sel != NULL ) 
+	ship_sel->select(0xFFFFFFFF);
+  }
 
 // $$$ end - added VS Renganathan, 15 Oct 2K
+//           added Venky         , 12 Nov 2K