# include <config.h>
#endif
-#ifdef FG_MATH_EXCEPTION_CLASH
+#include <simgear/compiler.h>
+#include <simgear/misc/exception.hxx>
+
+#ifdef SG_MATH_EXCEPTION_CLASH
# include <math.h>
#endif
#ifdef HAVE_WINDOWS_H
-# include <windows.h>
-# include <float.h>
+# include <windows.h>
+# include <float.h>
#endif
#include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
#include <stdio.h>
#include <string.h>
# include <unistd.h> // for stat()
#endif
+// #ifdef HAVE_LIBX11
+// # include <GL/glext.h>
+// #endif
+
+#include <plib/netChat.h>
#include <plib/pu.h>
#include <plib/ssg.h>
-#ifdef ENABLE_AUDIO_SUPPORT
-# include <plib/sl.h>
-# include <plib/sm.h>
-#endif
-
#include <simgear/constants.h> // for VERSION
#include <simgear/debug/logstream.hxx>
#include <simgear/math/polar3d.hxx>
#include <simgear/math/sg_random.h>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
#include <simgear/sky/sky.hxx>
#include <simgear/timing/sg_time.hxx>
#include <simgear/timing/lowleveltime.h>
#include <FDM/UIUCModel/uiuc_aircraftdir.h>
#include <GUI/gui.h>
#include <GUI/sgVec3Slider.hxx>
-#include <Joystick/joystick.hxx>
+// #include <Joystick/joystick.hxx>
#ifdef FG_NETWORK_OLK
#include <NetworkOLK/network.h>
#endif
+#include <Objects/matlib.hxx>
#include <Scenery/scenery.hxx>
#include <Scenery/tilemgr.hxx>
+#ifdef ENABLE_AUDIO_SUPPORT
+# include <Sound/soundmgr.hxx>
+# include <Sound/morse.hxx>
+#endif
#include <Time/event.hxx>
#include <Time/fg_timer.hxx>
#include <Time/light.hxx>
#include <Time/sunpos.hxx>
#include <Time/tmp.hxx>
+#include <Input/input.hxx>
+
// begin - added Venky
// $$$ begin - added VS Renganathan
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
#include <FDM/flight.hxx>
#include <FDM/ADA.hxx>
void fgLoadDCS (void);
#include "version.h"
-#include "bfi.hxx"
#include "fg_init.hxx"
#include "fg_io.hxx"
+#include "fg_props.hxx"
#include "globals.hxx"
-#include "keyboard.hxx"
#include "splash.hxx"
+#include "viewmgr.hxx"
#ifdef macintosh
# include <console.h> // -dw- for command line dialog
// Global structures for the Audio library
#ifdef ENABLE_AUDIO_SUPPORT
-slEnvelope pitch_envelope ( 1, SL_SAMPLE_ONE_SHOT ) ;
-slEnvelope volume_envelope ( 1, SL_SAMPLE_ONE_SHOT ) ;
-slScheduler *audio_sched;
-smMixer *audio_mixer;
-slSample *s1;
-slSample *s2;
+ static FGSimpleSound *s1;
+ static FGSimpleSound *s2;
#endif
}
+// For HiRes screen Dumps using Brian Pauls TR Library
+void trRenderFrame( void ) {
+
+ if ( fgPanelVisible() ) {
+ GLfloat height = fgGetInt("/sim/startup/ysize");
+ GLfloat view_h =
+ (current_panel->getViewHeight() - current_panel->getYOffset())
+ * (height / 768.0) + 1;
+ glTranslatef( 0.0, view_h, 0.0 );
+ }
+
+ static double m_log01 = -log( 0.01 );
+ static double sqrt_m_log01 = sqrt( m_log01 );
+
+ static GLfloat black[4] = { 0.0, 0.0, 0.0, 1.0 };
+ static GLfloat white[4] = { 1.0, 1.0, 1.0, 1.0 };
+
+ fgLIGHT *l = &cur_light_params;
+
+ glClearColor(l->adj_fog_color[0], l->adj_fog_color[1],
+ l->adj_fog_color[2], l->adj_fog_color[3]);
+
+ glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
+
+ // set the opengl state to known default values
+ default_state->force();
+
+ // update fog params
+ double actual_visibility = thesky->get_visibility();
+ // GLfloat fog_exp_density = m_log01 / actual_visibility;
+ GLfloat fog_exp2_density = sqrt_m_log01 / actual_visibility;
+ GLfloat fog_exp2_punch_through = sqrt_m_log01 / ( actual_visibility * 1.5 );
+
+ glEnable( GL_FOG );
+ glFogf ( GL_FOG_DENSITY, fog_exp2_density);
+ glFogi ( GL_FOG_MODE, GL_EXP2 );
+ glFogfv ( GL_FOG_COLOR, l->adj_fog_color );
+
+ // GL_LIGHT_MODEL_AMBIENT has a default non-zero value so if
+ // we only update GL_AMBIENT for our lights we will never get
+ // a completely dark scene. So, we set GL_LIGHT_MODEL_AMBIENT
+ // explicitely to black.
+ glLightModelfv( GL_LIGHT_MODEL_AMBIENT, black );
+
+ ssgGetLight( 0 ) -> setColour( GL_AMBIENT, l->scene_ambient );
+
+ // texture parameters
+ glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ) ;
+ glHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST ) ;
+
+ // we need a white diffuse light for the phase of the moon
+ ssgGetLight( 0 ) -> setColour( GL_DIFFUSE, white );
+ thesky->preDraw();
+
+ // draw the ssg scene
+ // return to the desired diffuse color
+ ssgGetLight( 0 ) -> setColour( GL_DIFFUSE, l->scene_diffuse );
+ glEnable( GL_DEPTH_TEST );
+ ssgCullAndDraw( scene );
+
+ // draw the lights
+ glFogf (GL_FOG_DENSITY, fog_exp2_punch_through);
+ ssgCullAndDraw( lighting );
+
+ thesky->postDraw( cur_fdm_state->get_Altitude() * SG_FEET_TO_METER );
+
+ // need to do this here as hud_and_panel state is static to
+ // main.cxx and HUD and Panel routines have to be called with
+ // knowledge of the the TR struct < see gui.cxx::HighResDump()
+ hud_and_panel->apply();
+}
+
+
// Update all Visuals (redraws anything graphics related)
void fgRenderFrame( void ) {
- // Update the BFI.
- FGBFI::update();
+ // Update the default (kludged) properties.
+ fgUpdateProps();
fgLIGHT *l = &cur_light_params;
static double last_visibility = -9999;
// now work without seg faulting the system.
// printf("Ground = %.2f Altitude = %.2f\n", scenery.cur_elev,
- // FG_Altitude * FEET_TO_METER);
+ // FG_Altitude * SG_FEET_TO_METER);
// this is just a temporary hack, to make me understand Pui
// timerText -> setLabel (ctime (&t->cur_time));
pilot_view->set_geod_view_pos( cur_fdm_state->get_Longitude(),
cur_fdm_state->get_Lat_geocentric(),
cur_fdm_state->get_Altitude() *
- FEET_TO_METER );
+ SG_FEET_TO_METER );
pilot_view->set_sea_level_radius( cur_fdm_state->
get_Sea_level_radius() *
- FEET_TO_METER );
+ SG_FEET_TO_METER );
pilot_view->set_rph( cur_fdm_state->get_Phi(),
cur_fdm_state->get_Theta(),
cur_fdm_state->get_Psi() );
sgVec3 po; // chase view pilot_offset
sgVec3 wup; // chase view world up
- sgSetVec3( po, 0.0, 0.0, 50.0 );
+ sgSetVec3( po, 0.0, 0.0, 100.0 );
sgCopyVec3( wup, pilot_view->get_world_up() );
sgMat4 CXFM; // chase view + pilot offset xform
sgMakeRotMat4( CXFM,
- chase_view->get_view_offset() * RAD_TO_DEG -
- cur_fdm_state->get_Psi() * RAD_TO_DEG,
+ chase_view->get_view_offset() * SGD_RADIANS_TO_DEGREES -
+ cur_fdm_state->get_Psi() * SGD_RADIANS_TO_DEGREES,
wup );
sgVec3 npo; // new pilot offset after rotation
sgVec3 *pPO = PilotOffsetGet();
chase_view->set_geod_view_pos( cur_fdm_state->get_Longitude(),
cur_fdm_state->get_Lat_geocentric(),
cur_fdm_state->get_Altitude() *
- FEET_TO_METER );
+ SG_FEET_TO_METER );
chase_view->set_sea_level_radius( cur_fdm_state->
get_Sea_level_radius() *
- FEET_TO_METER );
+ SG_FEET_TO_METER );
chase_view->set_pilot_offset( npo[0], npo[1], npo[2] );
chase_view->set_view_forward( pilot_view->get_view_pos() );
chase_view->set_view_up( wup );
thesky->set_visibility( current_weather.get_visibility() );
#endif
- thesky->modify_vis( cur_fdm_state->get_Altitude() * FEET_TO_METER,
+ thesky->modify_vis( cur_fdm_state->get_Altitude() * SG_FEET_TO_METER,
( global_multi_loop *
fgGetInt("/sim/speed-up") ) /
(double)fgGetInt("/sim/model-hz") );
// cout << "----> updating fog params" << endl;
// for GL_FOG_EXP
- fog_exp_density = -log(0.01 / actual_visibility);
+ fog_exp_density = -log(0.01) / actual_visibility;
// for GL_FOG_EXP2
fog_exp2_density = sqrt( -log(0.01) ) / actual_visibility;
globals->get_current_view()->get_world_up(),
cur_fdm_state->get_Longitude(),
cur_fdm_state->get_Latitude(),
- cur_fdm_state->get_Altitude() * FEET_TO_METER,
+ cur_fdm_state->get_Altitude() * SG_FEET_TO_METER,
cur_light_params.sun_rotation,
globals->get_time_params()->getGst(),
globals->get_ephem()->getSunRightAscension(),
}
glEnable( GL_DEPTH_TEST );
- if ( fgGetString("/sim/rendering/fog") != "disabled" ) {
+ if ( fgGetString("/sim/rendering/fog") != (string)"disabled" ) {
glEnable( GL_FOG );
glFogi( GL_FOG_MODE, GL_EXP2 );
glFogfv( GL_FOG_COLOR, l->adj_fog_color );
}
- // set lighting parameters
+ // set sun/lighting parameters
+ ssgGetLight( 0 ) -> setPosition( l->sun_vec );
+
+ // GL_LIGHT_MODEL_AMBIENT has a default non-zero value so if
+ // we only update GL_AMBIENT for our lights we will never get
+ // a completely dark scene. So, we set GL_LIGHT_MODEL_AMBIENT
+ // explicitely to black.
GLfloat black[4] = { 0.0, 0.0, 0.0, 1.0 };
- glLightModelfv( GL_LIGHT_MODEL_AMBIENT, l->scene_ambient );
- glLightfv( GL_LIGHT0, GL_AMBIENT, black );
- glLightfv( GL_LIGHT0, GL_DIFFUSE, l->scene_diffuse );
- // glLightfv(GL_LIGHT0, GL_SPECULAR, white );
+ GLfloat white[4] = { 1.0, 1.0, 1.0, 1.0 };
+ glLightModelfv( GL_LIGHT_MODEL_AMBIENT, black );
+
+ ssgGetLight( 0 ) -> setColour( GL_AMBIENT, l->scene_ambient );
+ ssgGetLight( 0 ) -> setColour( GL_DIFFUSE, l->scene_diffuse );
+ // ssgGetLight( 0 ) -> setColour( GL_SPECULAR, l->scene_white );
// texture parameters
// glEnable( GL_TEXTURE_2D );
glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ) ;
glHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST ) ;
- // set base color (I don't think this is doing anything here)
- // glMaterialfv (GL_FRONT, GL_AMBIENT, white);
- // (GL_FRONT, GL_DIFFUSE, white);
- // glMaterialfv (GL_FRONT, GL_SPECULAR, white);
- // glMaterialfv (GL_FRONT, GL_SHININESS, mat_shininess);
-
- sgVec3 sunpos;
- sgSetVec3( sunpos, l->sun_vec[0], l->sun_vec[1], l->sun_vec[2] );
- ssgGetLight( 0 ) -> setPosition( sunpos );
// glMatrixMode( GL_PROJECTION );
// glLoadIdentity();
float fov = globals->get_current_view()->get_fov();
ssgSetFOV(fov, fov * globals->get_current_view()->get_win_ratio());
- double agl = current_aircraft.fdm_state->get_Altitude() * FEET_TO_METER
+ double agl = current_aircraft.fdm_state->get_Altitude() * SG_FEET_TO_METER
- scenery.cur_elev;
- // FG_LOG( FG_ALL, FG_INFO, "visibility is "
+ // SG_LOG( SG_ALL, SG_INFO, "visibility is "
// << current_weather.get_visibility() );
if ( agl > 10.0 ) {
// set up moving parts
if (flaps_selector != NULL) {
- flaps_selector->select( (controls.get_flaps() > 0.5f) ? 1 : 2 );
+ flaps_selector->select( (globals->get_controls()->get_flaps() > 0.5f) ? 1 : 2 );
}
if (prop_selector != NULL) {
int propsel_mask = 0;
+ double rpm = fgGetDouble("/engines/engine[0]/rpm");
for (int i = 0; i < acmodel_npropsettings; i++) {
- if (FGBFI::getRPM() >= acmodel_proprpms[i][0] &&
- FGBFI::getRPM() <= acmodel_proprpms[i][1]) {
+ if (rpm >= acmodel_proprpms[i][0] &&
+ rpm <= acmodel_proprpms[i][1]) {
propsel_mask |= 1 << i;
}
}
if ( fgGetBool("/sim/rendering/skyblend") ) {
// draw the sky backdrop
+
+ // we need a white diffuse light for the phase of the moon
+ ssgGetLight( 0 ) -> setColour( GL_DIFFUSE, white );
+
thesky->preDraw();
+
+ // return to the desired diffuse color
+ ssgGetLight( 0 ) -> setColour( GL_DIFFUSE, l->scene_diffuse );
}
// draw the ssg scene
if ( fgGetBool("/sim/rendering/skyblend") ) {
// draw the sky cloud layers
- thesky->postDraw( cur_fdm_state->get_Altitude() * FEET_TO_METER );
+ thesky->postDraw( cur_fdm_state->get_Altitude() * SG_FEET_TO_METER );
}
// display HUD && Panel
// glDisable( GL_CULL_FACE );
// glDisable( GL_TEXTURE_2D );
+ // update the input subsystem
+ current_input.update();
+
// update the controls subsystem
- controls.update();
+ globals->get_controls()->update();
hud_and_panel->apply();
fgCockpitUpdate();
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) *
+ long remainder = elapsed - (long)( (multi_loop*1000000) *
cur_fdm_state->get_delta_t() );
cur_fdm_state->set_remainder( remainder );
// cout << "remainder = " << remainder << endl;
cur_fdm_state->update( 0 );
FGSteam::update( 0 );
- if ( global_tile_mgr.queue_size() == 0 ) {
+ //if ( global_tile_mgr.queue_size() == 0 ) {
initial_freeze = false;
- }
+ //}
}
if ( fgGetString("/sim/view-mode") == "pilot" ) {
// current_view.goal_view_offset
if ( v->get_goal_view_offset() > v->get_view_offset() )
{
- if ( v->get_goal_view_offset() - v->get_view_offset() < FG_PI ){
+ if ( v->get_goal_view_offset() - v->get_view_offset() < SGD_PI ){
v->inc_view_offset( 0.01 );
} else {
v->inc_view_offset( -0.01 );
}
} else {
- if ( v->get_view_offset() - v->get_goal_view_offset() < FG_PI ){
+ if ( v->get_view_offset() - v->get_goal_view_offset() < SGD_PI ){
v->inc_view_offset( -0.01 );
} else {
v->inc_view_offset( 0.01 );
}
}
- if ( v->get_view_offset() > FG_2PI ) {
- v->inc_view_offset( -FG_2PI );
+ if ( v->get_view_offset() > SGD_2PI ) {
+ v->inc_view_offset( -SGD_2PI );
} else if ( v->get_view_offset() < 0 ) {
- v->inc_view_offset( FG_2PI );
+ v->inc_view_offset( SGD_2PI );
}
}
}
- double tmp = -(l->sun_rotation + FG_PI)
+ double tmp = -(l->sun_rotation + SGD_PI)
- (cur_fdm_state->get_Psi() -
globals->get_current_view()->get_view_offset() );
while ( tmp < 0.0 ) {
- tmp += FG_2PI;
+ tmp += SGD_2PI;
}
- while ( tmp > FG_2PI ) {
- tmp -= FG_2PI;
+ while ( tmp > SGD_2PI ) {
+ tmp -= SGD_2PI;
}
/* printf("Psi = %.2f, viewoffset = %.2f sunrot = %.2f rottosun = %.2f\n",
- FG_Psi * RAD_TO_DEG, current_view.view_offset * RAD_TO_DEG,
- -(l->sun_rotation+FG_PI) * RAD_TO_DEG, tmp * RAD_TO_DEG); */
+ FG_Psi * SGD_RADIANS_TO_DEGREES, current_view.view_offset * SGD_RADIANS_TO_DEGREES,
+ -(l->sun_rotation+SGD_PI) * SGD_RADIANS_TO_DEGREES, tmp * SGD_RADIANS_TO_DEGREES); */
l->UpdateAdjFog();
// Update solar system
static const double alt_adjust_ft = 3.758099;
-static const double alt_adjust_m = alt_adjust_ft * FEET_TO_METER;
+static const double alt_adjust_m = alt_adjust_ft * SG_FEET_TO_METER;
// What should we do when we have nothing else to do? Let's get ready
SGTime *t = globals->get_time_params();
- FG_LOG( FG_ALL, FG_DEBUG, "Running Main Loop");
- FG_LOG( FG_ALL, FG_DEBUG, "======= ==== ====");
+ SG_LOG( SG_ALL, SG_DEBUG, "Running Main Loop");
+ SG_LOG( SG_ALL, SG_DEBUG, "======= ==== ====");
#ifdef FG_NETWORK_OLK
if ( fgGetBool("/sim/networking/network-olk") ) {
#if defined( ENABLE_PLIB_JOYSTICK )
// Read joystick and update control settings
- if ( fgGetString("/sim/control-mode") == "joystick" )
- {
- fgJoystickRead();
- }
+ // if ( fgGetString("/sim/control-mode") == "joystick" )
+ // {
+ // fgJoystickRead();
+ // }
#elif defined( ENABLE_GLUT_JOYSTICK )
// Glut joystick support works by feeding a joystick handler
// function to glut. This is taken care of once in the joystick
/* printf("Before - ground = %.2f runway = %.2f alt = %.2f\n",
scenery.cur_elev,
- cur_fdm_state->get_Runway_altitude() * FEET_TO_METER,
- cur_fdm_state->get_Altitude() * FEET_TO_METER); */
+ cur_fdm_state->get_Runway_altitude() * SG_FEET_TO_METER,
+ cur_fdm_state->get_Altitude() * SG_FEET_TO_METER); */
if ( scenery.cur_elev > -9990 ) {
- if ( cur_fdm_state->get_Altitude() * FEET_TO_METER <
+ if ( cur_fdm_state->get_Altitude() * SG_FEET_TO_METER <
(scenery.cur_elev + alt_adjust_m - 3.0) ) {
// now set aircraft altitude above ground
printf("(*) Current Altitude = %.2f < %.2f forcing to %.2f\n",
- cur_fdm_state->get_Altitude() * FEET_TO_METER,
+ cur_fdm_state->get_Altitude() * SG_FEET_TO_METER,
scenery.cur_elev + alt_adjust_m - 3.0,
scenery.cur_elev + alt_adjust_m );
fgFDMForceAltitude( fgGetString("/sim/flight-model"),
scenery.cur_elev + alt_adjust_m );
- FG_LOG( FG_ALL, FG_DEBUG,
+ SG_LOG( SG_ALL, SG_DEBUG,
"<*> resetting altitude to "
- << cur_fdm_state->get_Altitude() * FEET_TO_METER
+ << cur_fdm_state->get_Altitude() * SG_FEET_TO_METER
<< " meters" );
}
}
/* printf("Adjustment - ground = %.2f runway = %.2f alt = %.2f\n",
scenery.cur_elev,
- cur_fdm_state->get_Runway_altitude() * FEET_TO_METER,
- cur_fdm_state->get_Altitude() * FEET_TO_METER); */
+ cur_fdm_state->get_Runway_altitude() * SG_FEET_TO_METER,
+ cur_fdm_state->get_Altitude() * SG_FEET_TO_METER); */
+
+ // cout << "Warp = " << globals->get_warp() << endl;
// update "time"
if ( globals->get_warp_delta() != 0 ) {
// update magvar model
globals->get_mag()->update( cur_fdm_state->get_Longitude(),
cur_fdm_state->get_Latitude(),
- cur_fdm_state->get_Altitude()* FEET_TO_METER,
+ cur_fdm_state->get_Altitude()* SG_FEET_TO_METER,
globals->get_time_params()->getJD() );
// Get elapsed time (in usec) for this past frame
elapsed = fgGetTimeInterval();
- FG_LOG( FG_ALL, FG_DEBUG,
+ SG_LOG( SG_ALL, SG_DEBUG,
"Elapsed time interval is = " << elapsed
<< ", previous remainder is = " << remainder );
#else
if ( (t->get_cur_time() != last_time) && (last_time > 0) ) {
general.set_frame_rate( frames );
- FG_LOG( FG_ALL, FG_DEBUG,
+ SG_LOG( SG_ALL, SG_DEBUG,
"--> Frame rate is = " << general.get_frame_rate() );
frames = 0;
}
fgGetInt("/sim/model-hz"));
remainder = elapsed - ( (global_multi_loop*1000000) /
fgGetInt("/sim/model-hz") );
- FG_LOG( FG_ALL, FG_DEBUG,
+ SG_LOG( SG_ALL, SG_DEBUG,
"Model iterations needed = " << global_multi_loop
<< ", new remainder = " << remainder );
if ( global_multi_loop > 0 ) {
fgUpdateTimeDepCalcs();
} else {
- FG_LOG( FG_ALL, FG_DEBUG,
+ SG_LOG( SG_ALL, SG_DEBUG,
"Elapsed time is zero ... we're zinging" );
}
#endif
// see if we need to load any new scenery tiles
- global_tile_mgr.update( cur_fdm_state->get_Longitude() * RAD_TO_DEG,
- cur_fdm_state->get_Latitude() * RAD_TO_DEG );
+ global_tile_mgr.update( cur_fdm_state->get_Longitude()
+ * SGD_RADIANS_TO_DEGREES,
+ cur_fdm_state->get_Latitude()
+ * SGD_RADIANS_TO_DEGREES );
+
+ // see if we need to load any deferred-load textures
+ material_lib.load_next_deferred();
// Process/manage pending events
global_events.Process();
// Run audio scheduler
#ifdef ENABLE_AUDIO_SUPPORT
- if ( fgGetBool("/sim/sound") && !audio_sched->not_working() ) {
-
+ if ( fgGetBool("/sim/sound") && globals->get_soundmgr()->is_working() ) {
if ( fgGetString("/sim/aircraft") == "c172" ) {
// pitch corresponds to rpm
// volume corresponds to manifold pressure
+ // cout << "AUDIO working = "
+ // << globals->get_soundmgr()->is_working() << endl;
+
double rpm_factor;
if ( cur_fdm_state->get_engine(0) != NULL ) {
rpm_factor = cur_fdm_state->get_engine(0)->get_RPM() / 2500.0;
// and sounds bad to boot. :-)
if (pitch < 0.7) { pitch = 0.7; }
if (pitch > 5.0) { pitch = 5.0; }
- // cout << "pitch = " << pitch << endl;
double mp_factor;
if ( cur_fdm_state->get_engine(0) != NULL ) {
<< cur_fdm_state->get_engine(0)->get_Manifold_Pressure()
<< endl; */
- double volume = 0.3 + mp_factor;
+ double volume = 0.15 + mp_factor / 2.0;
- if ( volume < 0.3 ) { volume = 0.3; }
- if ( volume > 1.0 ) { volume = 1.0; }
+ if ( volume < 0.15 ) { volume = 0.15; }
+ if ( volume > 0.5 ) { volume = 0.5; }
// cout << "volume = " << volume << endl;
- pitch_envelope.setStep ( 0, 0.01, pitch );
- volume_envelope.setStep ( 0, 0.01, volume );
+ s1->set_pitch( pitch );
+ s1->set_volume( volume );
} else {
- double param = controls.get_throttle( 0 ) * 2.0 + 1.0;
- pitch_envelope.setStep ( 0, 0.01, param );
- volume_envelope.setStep ( 0, 0.01, param );
+ double param
+ = globals->get_controls()->get_throttle( 0 ) * 2.0 + 1.0;
+ s1->set_pitch( param );
+ s1->set_volume( param );
}
- audio_sched -> update();
+ globals->get_soundmgr()->update();
}
#endif
// redraw display
fgRenderFrame();
- FG_LOG( FG_ALL, FG_DEBUG, "" );
+ SG_LOG( SG_ALL, SG_DEBUG, "" );
}
idle_state++;
} else if ( idle_state == 1 ) {
+ // Initialize audio support
+#ifdef ENABLE_AUDIO_SUPPORT
+
// Start the intro music
#if !defined(WIN32)
if ( fgGetBool("/sim/startup/intro-music") ) {
- string lockfile = "/tmp/mpg123.running";
- FGPath mp3file( globals->get_fg_root() );
+ SGPath mp3file( globals->get_fg_root() );
mp3file.append( "Sounds/intro.mp3" );
- string command = "(touch " + lockfile + "; mpg123 "
- + mp3file.str() + "> /dev/null 2>&1; /bin/rm "
- + lockfile + ") &";
- FG_LOG( FG_GENERAL, FG_INFO,
+ SG_LOG( SG_GENERAL, SG_INFO,
"Starting intro music: " << mp3file.str() );
+
+ string command = "mpg123 " + mp3file.str() + "> /dev/null 2>&1";
system ( command.c_str() );
}
+#endif // !WIN32
+
+ FGSoundMgr *soundmgr = new FGSoundMgr;
+ globals->set_soundmgr( soundmgr );
+
+ if ( fgGetBool("/sim/sound") ) {
+ globals->get_soundmgr()->init();
+
+ s1 = new FGSimpleSound( fgGetString("/sim/sounds/engine",
+ "Sounds/wasp.wav") );
+ globals->get_soundmgr()->add( s1, "engine loop" );
+ globals->get_soundmgr()->play_looped( "engine loop" );
+ SG_LOG( SG_GENERAL, SG_INFO,
+ "Rate = " << s1->get_sample()->getRate()
+ << " Bps = " << s1->get_sample()->getBps()
+ << " Stereo = " << s1->get_sample()->getStereo() );
+
+ // s2 = new FGSimpleSound( "Sounds/corflaps.wav" );
+ // s2->set_volume( 0.3 );
+ // globals->get_soundmgr()->add( s2, "flaps" );
+ }
#endif
idle_state++;
// a subsystem to flightgear, its initialization call should
// located in this routine.
if( !fgInitSubsystems()) {
- FG_LOG( FG_GENERAL, FG_ALERT,
+ SG_LOG( SG_GENERAL, SG_ALERT,
"Subsystem initializations failed ..." );
exit(-1);
}
idle_state++;
} else if ( idle_state == 6 ) {
- // Initialize audio support
-#ifdef ENABLE_AUDIO_SUPPORT
-
-#if !defined(WIN32)
- if ( fgGetBool("/sim/startup/intro-music") ) {
- // Let's wait for mpg123 to finish
- string lockfile = "/tmp/mpg123.running";
- struct stat stat_buf;
-
- FG_LOG( FG_GENERAL, FG_INFO,
- "Waiting for mpg123 player to finish ..." );
- while ( stat(lockfile.c_str(), &stat_buf) == 0 ) {
- // file exist, wait ...
- sleep(1);
- FG_LOG( FG_GENERAL, FG_INFO, ".");
- }
- FG_LOG( FG_GENERAL, FG_INFO, "");
- }
-#endif // WIN32
-
- 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_fg_root() );
- slfile.append( "Sounds/wasp.wav" );
-
- s1 = new slSample ( (char *)slfile.c_str() );
- FG_LOG( FG_GENERAL, FG_INFO,
- "Rate = " << s1 -> getRate()
- << " Bps = " << s1 -> getBps()
- << " Stereo = " << s1 -> getStereo() );
- audio_sched -> loopSample ( s1 );
-
- if ( audio_sched->not_working() ) {
- // skip
- } else {
- pitch_envelope.setStep ( 0, 0.01, 0.6 );
- volume_envelope.setStep ( 0, 0.01, 0.6 );
-
- audio_sched -> addSampleEnvelope( s1, 0, 0,
- &pitch_envelope,
- SL_PITCH_ENVELOPE );
- audio_sched -> addSampleEnvelope( s1, 0, 1,
- &volume_envelope,
- SL_VOLUME_ENVELOPE );
- }
-
- // strcpy(slfile, path);
- // strcat(slfile, "thunder.wav");
- // s2 -> loadFile ( slfile );
- // s2 -> adjustVolume(0.5);
- // audio_sched -> playSample ( s2 );
- }
-#endif
-
// sleep(1);
idle_state = 1000;
// Define Display Parameters
glutInitDisplayMode( GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE );
- FG_LOG( FG_GENERAL, FG_INFO, "Opening a window: " <<
+ SG_LOG( SG_GENERAL, SG_INFO, "Opening a window: " <<
fgGetInt("/sim/startup/xsize") << "x"
<< fgGetInt("/sim/startup/ysize") );
fgGetInt("/sim/startup/ysize"),
fgGetInt("/sim/rendering/bits-per-pixel"));
- FG_LOG( FG_GENERAL, FG_INFO,
+ SG_LOG( SG_GENERAL, SG_INFO,
"game mode params = " << game_mode_str );
glutGameModeString( game_mode_str );
glutEnterGameMode();
general.set_glVendor( (char *)glGetString ( GL_VENDOR ) );
general.set_glRenderer( (char *)glGetString ( GL_RENDERER ) );
general.set_glVersion( (char *)glGetString ( GL_VERSION ) );
- FG_LOG( FG_GENERAL, FG_INFO, general.get_glRenderer() );
+ SG_LOG( SG_GENERAL, SG_INFO, general.get_glRenderer() );
GLint tmp;
glGetIntegerv( GL_MAX_TEXTURE_SIZE, &tmp );
general.set_glMaxTexSize( tmp );
- FG_LOG ( FG_GENERAL, FG_INFO, "Max texture size = " << tmp );
+ SG_LOG ( SG_GENERAL, SG_INFO, "Max texture size = " << tmp );
glGetIntegerv( GL_DEPTH_BITS, &tmp );
general.set_glDepthBits( tmp );
- FG_LOG ( FG_GENERAL, FG_INFO, "Depth buffer bits = " << tmp );
+ SG_LOG ( SG_GENERAL, SG_INFO, "Depth buffer bits = " << tmp );
return 1;
}
glutReshapeFunc( fgReshape );
// call GLUTkey() on keyboard event
- glutKeyboardFunc( GLUTkey );
- glutSpecialFunc( GLUTspecialkey );
+ glutKeyboardFunc(GLUTkey);
+ glutKeyboardUpFunc(GLUTkeyup);
+ glutSpecialFunc(GLUTspecialkey);
+ glutSpecialUpFunc(GLUTspecialkeyup);
// call guiMouseFunc() whenever our little rodent is used
glutMouseFunc ( guiMouseFunc );
}
-// Main ...
-int main( int argc, char **argv ) {
+// Main loop
+int mainLoop( int argc, char **argv ) {
#if defined( macintosh )
freopen ("stdout.txt", "w", stdout );
#endif
// set default log levels
- fglog().setLogLevels( FG_ALL, FG_INFO );
+ sglog().setLogLevels( SG_ALL, SG_INFO );
string version;
#ifdef FLIGHTGEAR_VERSION
#else
version = "unknown version";
#endif
- FG_LOG( FG_GENERAL, FG_INFO, "FlightGear: Version "
+ SG_LOG( SG_GENERAL, SG_INFO, "FlightGear: Version "
<< 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 );
+ FGControls *controls = new FGControls;
+ globals->set_controls( controls );
+
FGViewMgr *viewmgr = new FGViewMgr;
globals->set_viewmgr( viewmgr );
// fg_root was specified (ignore all other options for now)
fgInitFGRoot(argc, argv);
+ // Check for the correct base package version
+ string base_version = fgBasePackageVersion();
+ if ( !(base_version == "0.7.9") ) {
+ SG_LOG( SG_GENERAL, SG_ALERT, "Base package check failed ... "
+ << "Found version " << base_version );
+ SG_LOG( SG_GENERAL, SG_ALERT, "Please upgrade to version 0.7.9" );
+ exit(-1);
+ }
+
// Initialize the Aircraft directory to "" (UIUC)
aircraft_dir = "";
// Load the configuration parameters
if ( !fgInitConfig(argc, argv) ) {
- FG_LOG( FG_GENERAL, FG_ALERT, "Config option parsing failed ..." );
+ SG_LOG( SG_GENERAL, SG_ALERT, "Config option parsing failed ..." );
exit(-1);
}
// Initialize the Window/Graphics environment.
if( !fgGlutInit(&argc, argv) ) {
- FG_LOG( FG_GENERAL, FG_ALERT, "GLUT initialization failed ..." );
+ SG_LOG( SG_GENERAL, SG_ALERT, "GLUT initialization failed ..." );
exit(-1);
}
// Initialize the various GLUT Event Handlers.
if( !fgGlutInitEvents() ) {
- FG_LOG( FG_GENERAL, FG_ALERT,
+ SG_LOG( SG_GENERAL, SG_ALERT,
"GLUT event handler initialization failed ..." );
exit(-1);
}
-
+
+ // Initialize plib net interface
+ netInit( &argc, argv );
+
// Initialize ssg (from plib). Needs to come before we do any
// other ssg stuff, but after opengl/glut has been initialized.
ssgInit();
// fonts !!!
guiInit();
+#ifdef GL_EXT_texture_lod_bias
+ glTexEnvf( GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, -0.5 ) ;
+#endif
+
+#if 0
+#ifdef GL_EXT_texture_filter_anisotropic
+ float max_anisotropy;
+ glGetFloatv( GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &max_anisotropy );
+ glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT,
+ max_anisotropy );
+ cout << "Max anisotropy = " << max_anisotropy << endl;
+#endif
+#endif
+
// set current_options lon/lat if an airport id is specified
// 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") );
+ fgGetDouble("/orientation/heading-deg") );
}
// Initialize time
- FGPath zone( globals->get_fg_root() );
+ SGPath zone( globals->get_fg_root() );
zone.append( "Timezone" );
- SGTime *t = new SGTime( fgGetDouble("/position/longitude") * DEG_TO_RAD,
- fgGetDouble("/position/latitude") * DEG_TO_RAD,
+ SGTime *t = new SGTime( fgGetDouble("/position/longitude-deg") * SGD_DEGREES_TO_RADIANS,
+ fgGetDouble("/position/latitude-deg") * SGD_DEGREES_TO_RADIANS,
zone.str() );
// Handle potential user specified time offsets
globals->set_warp( offset - (aircraftLocalTime - systemLocalTime) -
cur_time );
} else {
- FG_LOG( FG_GENERAL, FG_ALERT,
+ SG_LOG( SG_GENERAL, SG_ALERT,
"Unsupported offset type " << offset_type );
exit( -1 );
}
- FG_LOG( FG_GENERAL, FG_INFO, "After time init, warp = "
+ SG_LOG( SG_GENERAL, SG_INFO, "After time init, warp = "
<< globals->get_warp() );
globals->set_warp_delta( 0 );
// Do some quick general initializations
if( !fgInitGeneral()) {
- FG_LOG( FG_GENERAL, FG_ALERT,
+ SG_LOG( SG_GENERAL, SG_ALERT,
"General initializations failed ..." );
exit(-1);
}
- FGPath modelpath( globals->get_fg_root() );
+ SGPath modelpath( globals->get_fg_root() );
ssgModelPath( (char *)modelpath.c_str() );
// Scene graph root
lighting->setName( "Lighting" );
// Initialize the sky
- FGPath ephem_data_path( globals->get_fg_root() );
+ SGPath 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(),
0.0 );
globals->set_ephem( ephem );
- FGPath sky_tex_path( globals->get_fg_root() );
+ thesky = new SGSky;
+
+ SGPath sky_tex_path( globals->get_fg_root() );
sky_tex_path.append( "Textures" );
sky_tex_path.append( "Sky" );
- thesky = new SGSky;
thesky->texture_path( sky_tex_path.str() );
thesky->build( 550.0, 550.0,
globals->get_ephem()->getStars(), 60000.0 );
if ( fgGetBool("/environment/clouds/status") ) {
+ // thesky->add_cloud_layer( 2000.0, 200.0, 50.0, 40000.0,
+ // SG_CLOUD_OVERCAST );
thesky->add_cloud_layer( 2600.0, 200.0, 50.0, 40000.0,
- SG_CLOUD_MOSTLY_SUNNY );
+ SG_CLOUD_MOSTLY_CLOUDY );
+ // thesky->add_cloud_layer( 3000.0, 200.0, 50.0, 40000.0,
+ // SG_CLOUD_MOSTLY_SUNNY );
thesky->add_cloud_layer( 6000.0, 20.0, 10.0, 40000.0,
SG_CLOUD_CIRRUS );
- // thesky->add_cloud_layer( 1000.0, 200.0, 50.0,
- // SG_CLOUD_MOSTLY_SUNNY );
- // thesky->add_cloud_layer( 1800.0, 400.0, 100.0, SG_CLOUD_OVERCAST );
- // thesky->add_cloud_layer( 5000.0, 20.0, 10.0, SG_CLOUD_CIRRUS );
}
// Initialize MagVar model
acmodel_selector = new ssgSelector;
acmodel_pos = new ssgTransform;
+ // Get the model location, and load textures from the same
+ // directory. Use an absolute path for the model to avoid
+ // incompatibilities in different versions of PLIB.
string acmodel_path =
fgGetString("/sim/model/path", "Models/Geometry/glider.ac");
+ SGPath full_model = globals->get_fg_root();
+ full_model.append(acmodel_path);
- 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() );
+#if !defined( PLIB_1_2_X )
+ // this should be redundant ... but it breaks for relative paths
+ // ssgModelPath( (char *)full_model.dir().c_str() );
+#endif
- ssgEntity *acmodel_obj = ssgLoad((char *)(acmodel_path.c_str()));
+ ssgTexturePath( (char *)full_model.dir().c_str() );
+ ssgEntity *acmodel_obj = ssgLoad( (char *)full_model.c_str() );
+ if( !acmodel_obj ) {
+ // fall back to default
+ acmodel_obj = ssgLoad( (char *)"Models/Geometry/glider.ac" );
+ if( !acmodel_obj ) {
+ SG_LOG( SG_GENERAL, SG_ALERT, "FAILED to LOAD an AC model! ..." );
+ exit(-1);
+ }
+ }
// find moving parts (if this is an MDL model)
flaps_selector = (ssgSelector*)fgFindNode( acmodel_obj, "FLAPS" );
acmodel_proprpms[acmodel_npropsettings][1] = prop_high;
acmodel_npropsettings++;
- FG_LOG( FG_GENERAL, FG_INFO, "PROPELLER SETTING " << prop_low <<
+ SG_LOG( SG_GENERAL, SG_INFO, "PROPELLER SETTING " << prop_low <<
" " << prop_high );
}
}
sgMat4 rot_matrix;
sgMat4 off_matrix;
sgMat4 res_matrix;
- 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);
+ float h_rot = fgGetFloat("/sim/model/heading-offset-deg", 0.0);
+ float p_rot = fgGetFloat("/sim/model/roll-offset-deg", 0.0);
+ float r_rot = fgGetFloat("/sim/model/pitch-offset-deg", 0.0);
+ float x_off = fgGetFloat("/sim/model/x-offset-m", 0.0);
+ float y_off = fgGetFloat("/sim/model/y-offset-m", 0.0);
+ float z_off = fgGetFloat("/sim/model/z-offset-m", 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);
// $$$ end - added VS Renganathan, 15 Oct 2K
// - added Venky , 12 Nov 2K
+// Main entry point; catch any exceptions that have made it this far.
+int main ( int argc, char **argv ) {
+ // FIXME: add other, more specific
+ // exceptions.
+ try {
+ mainLoop(argc, argv);
+ } catch (sg_throwable &t) {
+ SG_LOG(SG_GENERAL, SG_ALERT,
+ "Fatal error: " << t.getFormattedMessage()
+ << "\n (received from " << t.getOrigin() << ')');
+ exit(1);
+ }
+}
+
+
void fgLoadDCS(void) {
ssgEntity *ship_obj = NULL;
// int j=0;
char obj_filename[25];
- for (int k=0;k<32;k++)
- {
+ for ( int k = 0; k < 32; k++ ) {
ship_pos[k]=NULL;
}
- FGPath tile_path( globals->get_fg_root());
+ SGPath tile_path( globals->get_fg_root());
tile_path.append( "Scenery" );
tile_path.append( "Objects.txt" );
- fg_gzifstream in( tile_path.str() );
+ sg_gzifstream in( tile_path.str() );
if ( ! in.is_open() ) {
- FG_LOG( FG_TERRAIN, FG_ALERT, "Cannot open file: " << tile_path.str() );
- }
+ SG_LOG( SG_TERRAIN, SG_ALERT, "Cannot open file: " << tile_path.str() );
+ } else {
- FGPath modelpath( globals->get_fg_root() );
- modelpath.append( "Models" );
- modelpath.append( "Geometry" );
+ SGPath modelpath( globals->get_fg_root() );
+ modelpath.append( "Models" );
+ modelpath.append( "Geometry" );
- FGPath texturepath( globals->get_fg_root() );
- texturepath.append( "Models" );
- texturepath.append( "Textures" );
+ SGPath texturepath( globals->get_fg_root() );
+ texturepath.append( "Models" );
+ texturepath.append( "Textures" );
- ssgModelPath( (char *)modelpath.c_str() );
- ssgTexturePath( (char *)texturepath.c_str() );
-
- ship_sel = new ssgSelector;
-
- 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();*/
+ ssgModelPath( (char *)modelpath.c_str() );
+ ssgTexturePath( (char *)texturepath.c_str() );
+
+ ship_sel = new ssgSelector;
+
+ 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;
-
+ obj_lon[objc] *=SGD_DEGREES_TO_RADIANS;
+ obj_lat[objc] *=SGD_DEGREES_TO_RADIANS;
+
+ ship_pos[objc] = new ssgTransform;
- // type "repeat" in objects.txt to load one more instance of the last object.
+ // 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 ( 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 ( 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 {
+ SG_LOG( SG_TERRAIN, SG_ALERT, "Cannot open file: "
+ << obj_filename );
+ }
- if (in.eof()) break;
- objc++;
- }
- } // while
+ objc++;
+
+ if (in.eof()) break;
+ }
+ } // while
+
+ SG_LOG ( SG_TERRAIN, SG_ALERT, "Finished object processing." );
+
+ ship_sel->clrTraversalMaskBits( SSGTRAV_HOT );
+ scene->addKid( ship_sel ); //add selector node to root node
+ }
- ship_sel->clrTraversalMaskBits( SSGTRAV_HOT );
- scene->addKid( ship_sel ); //add selector node to root node
return;
}
// 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();
+ if (fgGetString("/sim/flight-model") == "ada") {
+ obj_lon[0] = fdm->get_aux5()*SGD_DEGREES_TO_RADIANS;
+ obj_lat[0] = fdm->get_aux6()*SGD_DEGREES_TO_RADIANS;
+ 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;
+ for ( int m = 0; m < objc; m++ ) {
+ //cout << endl << obj_lat[m]*SGD_RADIANS_TO_DEGREES << " " << obj_lon[m]*SGD_RADIANS_TO_DEGREES << " " << obj_alt[m] << " " << objc << endl;
//int v=getchar();
//Geodetic to Geocentric angles for rotation
sgSetVec3( ship_up, 0.0, 0.0, 1.0); //north,yaw
sgMat4 sgROT_lon, sgROT_lat, sgROT_hdg;
- sgMakeRotMat4( sgROT_lon, obj_lon[m]*RAD_TO_DEG, ship_up );
- sgMakeRotMat4( sgROT_lat, 90-obj_latgc*RAD_TO_DEG, ship_rt );
+ sgMakeRotMat4( sgROT_lon, obj_lon[m]*SGD_RADIANS_TO_DEGREES, ship_up );
+ sgMakeRotMat4( sgROT_lat, 90-obj_latgc*SGD_RADIANS_TO_DEGREES, ship_rt );
sgMakeRotMat4( sgROT_hdg, 180.0, ship_up );
sgMat4 sgTUX;
sgSetCoord(&shippos, sgTUX );
ship_pos[m]->setTransform( &shippos );
}
- if ( ship_sel != NULL )
+ if ( ship_sel != NULL ) {
ship_sel->select(0xFFFFFFFF);
- }
+ }
+}
// $$$ end - added VS Renganathan, 15 Oct 2K
// added Venky , 12 Nov 2K
projects / flightgear.git / blobdiff