Clean up various compiler warnings that have crept into the code. This
by no means get's them all, but it's a start.
This commit is contained in:
parent
db79413b6e
commit
2acdd02879
31 changed files with 98 additions and 68 deletions
src
AIModel
Airports
Autopilot
Cockpit
FDM
Input
Instrumentation
Main
MultiPlayer
Network
Replay
Scenery
Scripting
Systems
Time
|
@ -216,7 +216,7 @@ void FGAIAircraft::Run(double dt) {
|
||||||
double user_heading = manager->get_user_heading();
|
double user_heading = manager->get_user_heading();
|
||||||
double user_pitch = manager->get_user_pitch();
|
double user_pitch = manager->get_user_pitch();
|
||||||
double user_yaw = manager->get_user_yaw();
|
double user_yaw = manager->get_user_yaw();
|
||||||
double user_speed = manager->get_user_speed();
|
// double user_speed = manager->get_user_speed();
|
||||||
|
|
||||||
// calculate range to target in feet and nautical miles
|
// calculate range to target in feet and nautical miles
|
||||||
double lat_range = fabs(pos.lat() - user_latitude) * ft_per_deg_lat;
|
double lat_range = fabs(pos.lat() - user_latitude) * ft_per_deg_lat;
|
||||||
|
|
|
@ -105,7 +105,7 @@ void FGAIStorm::Run(double dt) {
|
||||||
double user_heading = manager->get_user_heading();
|
double user_heading = manager->get_user_heading();
|
||||||
double user_pitch = manager->get_user_pitch();
|
double user_pitch = manager->get_user_pitch();
|
||||||
double user_yaw = manager->get_user_yaw();
|
double user_yaw = manager->get_user_yaw();
|
||||||
double user_speed = manager->get_user_speed();
|
// double user_speed = manager->get_user_speed();
|
||||||
|
|
||||||
// calculate range to target in feet and nautical miles
|
// calculate range to target in feet and nautical miles
|
||||||
double lat_range = fabs(pos.lat() - user_latitude) * ft_per_deg_lat;
|
double lat_range = fabs(pos.lat() - user_latitude) * ft_per_deg_lat;
|
||||||
|
|
|
@ -84,7 +84,7 @@ void FGAIThermal::Run(double dt) {
|
||||||
ft_per_deg_lat = 366468.96 - 3717.12 * cos(pos.lat()/SG_RADIANS_TO_DEGREES);
|
ft_per_deg_lat = 366468.96 - 3717.12 * cos(pos.lat()/SG_RADIANS_TO_DEGREES);
|
||||||
ft_per_deg_lon = 365228.16 * cos(pos.lat() / SG_RADIANS_TO_DEGREES);
|
ft_per_deg_lon = 365228.16 * cos(pos.lat() / SG_RADIANS_TO_DEGREES);
|
||||||
|
|
||||||
double altitude_ft = altitude * SG_METER_TO_FEET;
|
// double altitude_ft = altitude * SG_METER_TO_FEET;
|
||||||
|
|
||||||
//###########################//
|
//###########################//
|
||||||
// do calculations for range //
|
// do calculations for range //
|
||||||
|
@ -93,7 +93,7 @@ void FGAIThermal::Run(double dt) {
|
||||||
// copy values from the AIManager
|
// copy values from the AIManager
|
||||||
double user_latitude = manager->get_user_latitude();
|
double user_latitude = manager->get_user_latitude();
|
||||||
double user_longitude = manager->get_user_longitude();
|
double user_longitude = manager->get_user_longitude();
|
||||||
double user_altitude = manager->get_user_altitude();
|
// double user_altitude = manager->get_user_altitude();
|
||||||
|
|
||||||
// calculate range to target in feet and nautical miles
|
// calculate range to target in feet and nautical miles
|
||||||
double lat_range = fabs(pos.lat() - user_latitude) * ft_per_deg_lat;
|
double lat_range = fabs(pos.lat() - user_latitude) * ft_per_deg_lat;
|
||||||
|
|
|
@ -30,7 +30,7 @@ int main( int argc, char **argv ) {
|
||||||
double rwy_lon = atof( argv[5] );
|
double rwy_lon = atof( argv[5] );
|
||||||
double rwy_hdg = atof( argv[6] );
|
double rwy_hdg = atof( argv[6] );
|
||||||
double rwy_len = atof( argv[7] ) * SG_DEGREES_TO_RADIANS;
|
double rwy_len = atof( argv[7] ) * SG_DEGREES_TO_RADIANS;
|
||||||
double rwy_wid = atof( argv[8] );
|
// double rwy_wid = atof( argv[8] );
|
||||||
|
|
||||||
if ( dir == "FOR" ) {
|
if ( dir == "FOR" ) {
|
||||||
rwy_hdg += 180.0;
|
rwy_hdg += 180.0;
|
||||||
|
|
|
@ -34,6 +34,8 @@ FGPIDController::FGPIDController( SGPropertyNode *node ):
|
||||||
debug( false ),
|
debug( false ),
|
||||||
y_n( 0.0 ),
|
y_n( 0.0 ),
|
||||||
r_n( 0.0 ),
|
r_n( 0.0 ),
|
||||||
|
y_scale( 1.0 ),
|
||||||
|
r_scale( 1.0 ),
|
||||||
Kp( 0.0 ),
|
Kp( 0.0 ),
|
||||||
alpha( 0.1 ),
|
alpha( 0.1 ),
|
||||||
beta( 1.0 ),
|
beta( 1.0 ),
|
||||||
|
@ -45,9 +47,7 @@ FGPIDController::FGPIDController( SGPropertyNode *node ):
|
||||||
ep_n_1( 0.0 ),
|
ep_n_1( 0.0 ),
|
||||||
edf_n_1( 0.0 ),
|
edf_n_1( 0.0 ),
|
||||||
edf_n_2( 0.0 ),
|
edf_n_2( 0.0 ),
|
||||||
u_n_1( 0.0 ),
|
u_n_1( 0.0 )
|
||||||
r_scale( 1.0 ),
|
|
||||||
y_scale( 1.0 )
|
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
for ( i = 0; i < node->nChildren(); ++i ) {
|
for ( i = 0; i < node->nChildren(); ++i ) {
|
||||||
|
@ -344,10 +344,10 @@ FGPISimpleController::FGPISimpleController( SGPropertyNode *node ):
|
||||||
debug( false ),
|
debug( false ),
|
||||||
y_n( 0.0 ),
|
y_n( 0.0 ),
|
||||||
r_n( 0.0 ),
|
r_n( 0.0 ),
|
||||||
u_min( 0.0 ),
|
|
||||||
u_max( 0.0 ),
|
|
||||||
y_scale( 1.0 ),
|
y_scale( 1.0 ),
|
||||||
r_scale ( 1.0 )
|
r_scale ( 1.0 ),
|
||||||
|
u_min( 0.0 ),
|
||||||
|
u_max( 0.0 )
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
for ( i = 0; i < node->nChildren(); ++i ) {
|
for ( i = 0; i < node->nChildren(); ++i ) {
|
||||||
|
@ -512,12 +512,12 @@ void FGPISimpleController::update( double dt ) {
|
||||||
|
|
||||||
|
|
||||||
FGPredictor::FGPredictor ( SGPropertyNode *node ):
|
FGPredictor::FGPredictor ( SGPropertyNode *node ):
|
||||||
debug( false ),
|
|
||||||
ivalue( 0.0 ),
|
|
||||||
last_value ( 999999999.9 ),
|
last_value ( 999999999.9 ),
|
||||||
average ( 0.0 ),
|
average ( 0.0 ),
|
||||||
seconds( 0.0 ),
|
seconds( 0.0 ),
|
||||||
filter_gain( 0.0 )
|
filter_gain( 0.0 ),
|
||||||
|
debug( false ),
|
||||||
|
ivalue( 0.0 )
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
for ( i = 0; i < node->nChildren(); ++i ) {
|
for ( i = 0; i < node->nChildren(); ++i ) {
|
||||||
|
|
|
@ -149,7 +149,7 @@ operator = (const fgTBI_instr & rhs )
|
||||||
|
|
||||||
else //if tsi enabled
|
else //if tsi enabled
|
||||||
{
|
{
|
||||||
float factor = My_box.right / 6.0;
|
// float factor = My_box.right / 6.0;
|
||||||
|
|
||||||
drawOneLine(cen_x-1.0, My_box.top, cen_x+1.0, My_box.top);
|
drawOneLine(cen_x-1.0, My_box.top, cen_x+1.0, My_box.top);
|
||||||
drawOneLine(cen_x-1.0, My_box.top, cen_x-1.0, My_box.top+10.0);
|
drawOneLine(cen_x-1.0, My_box.top, cen_x-1.0, My_box.top+10.0);
|
||||||
|
|
|
@ -43,6 +43,8 @@
|
||||||
|
|
||||||
FGExternalPipe::FGExternalPipe( double dt, string name ) {
|
FGExternalPipe::FGExternalPipe( double dt, string name ) {
|
||||||
valid = true;
|
valid = true;
|
||||||
|
last_weight = 0.0;
|
||||||
|
last_cg_offset = -9999.9;
|
||||||
|
|
||||||
buf = new char[sizeof(char) + sizeof(int) + sizeof(ctrls)];
|
buf = new char[sizeof(char) + sizeof(int) + sizeof(ctrls)];
|
||||||
|
|
||||||
|
@ -168,6 +170,7 @@ void FGExternalPipe::init() {
|
||||||
SG_LOG( SG_IO, SG_ALERT, "Write error to named pipe: " << fifo_name_1 );
|
SG_LOG( SG_IO, SG_ALERT, "Write error to named pipe: " << fifo_name_1 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
last_weight = weight;
|
||||||
|
|
||||||
if ( cg_offset > -5.0 || cg_offset < 5.0 ) {
|
if ( cg_offset > -5.0 || cg_offset < 5.0 ) {
|
||||||
sprintf( cmd, "1aircraft-cg-offset-inches=%.2f", cg_offset );
|
sprintf( cmd, "1aircraft-cg-offset-inches=%.2f", cg_offset );
|
||||||
|
@ -176,6 +179,7 @@ void FGExternalPipe::init() {
|
||||||
SG_LOG( SG_IO, SG_ALERT, "Write error to named pipe: " << fifo_name_1 );
|
SG_LOG( SG_IO, SG_ALERT, "Write error to named pipe: " << fifo_name_1 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
last_cg_offset = cg_offset;
|
||||||
|
|
||||||
SG_LOG( SG_IO, SG_INFO, "before sending reset command." );
|
SG_LOG( SG_IO, SG_INFO, "before sending reset command." );
|
||||||
|
|
||||||
|
@ -221,7 +225,6 @@ void FGExternalPipe::update( double dt ) {
|
||||||
last_weight = weight;
|
last_weight = weight;
|
||||||
|
|
||||||
double cg_offset = fgGetDouble( "/sim/aircraft-cg-offset-inches" );
|
double cg_offset = fgGetDouble( "/sim/aircraft-cg-offset-inches" );
|
||||||
static double last_cg_offset = -9999.9;
|
|
||||||
if ( fabs( cg_offset - last_cg_offset ) > 0.01 ) {
|
if ( fabs( cg_offset - last_cg_offset ) > 0.01 ) {
|
||||||
char cmd[256];
|
char cmd[256];
|
||||||
sprintf( cmd, "1aircraft-cg-offset-inches=%.2f", cg_offset );
|
sprintf( cmd, "1aircraft-cg-offset-inches=%.2f", cg_offset );
|
||||||
|
@ -241,18 +244,24 @@ void FGExternalPipe::update( double dt ) {
|
||||||
*((int *)ptr) = iterations;
|
*((int *)ptr) = iterations;
|
||||||
ptr += sizeof(int);
|
ptr += sizeof(int);
|
||||||
memcpy( ptr, (char *)(&ctrls), length );
|
memcpy( ptr, (char *)(&ctrls), length );
|
||||||
|
cout << "writing control structure to remote fdm." << endl;
|
||||||
result = write( pd1, buf, length + 1 );
|
result = write( pd1, buf, length + 1 );
|
||||||
if ( result == -1 ) {
|
if ( result == -1 ) {
|
||||||
SG_LOG( SG_IO, SG_ALERT, "Write error to named pipe: "
|
SG_LOG( SG_IO, SG_ALERT, "Write error to named pipe: "
|
||||||
<< fifo_name_1 );
|
<< fifo_name_1 );
|
||||||
|
} else {
|
||||||
|
cout << " write successful = " << length + 1 << endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read fdm values
|
// Read fdm values
|
||||||
length = sizeof(fdm);
|
length = sizeof(fdm);
|
||||||
|
cout << "about to read fdm data from remote fdm." << endl;
|
||||||
result = read( pd2, (char *)(& fdm), length );
|
result = read( pd2, (char *)(& fdm), length );
|
||||||
if ( result == -1 ) {
|
if ( result == -1 ) {
|
||||||
SG_LOG( SG_IO, SG_ALERT, "Read error from named pipe: "
|
SG_LOG( SG_IO, SG_ALERT, "Read error from named pipe: "
|
||||||
<< fifo_name_2 );
|
<< fifo_name_2 );
|
||||||
|
} else {
|
||||||
|
cout << " read successful." << endl;
|
||||||
}
|
}
|
||||||
FGNetFDM2Props( &fdm, false );
|
FGNetFDM2Props( &fdm, false );
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -44,6 +44,9 @@ private:
|
||||||
FGNetFDM fdm;
|
FGNetFDM fdm;
|
||||||
char *buf;
|
char *buf;
|
||||||
|
|
||||||
|
double last_weight;
|
||||||
|
double last_cg_offset;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
// Constructor
|
// Constructor
|
||||||
|
|
|
@ -207,7 +207,7 @@ static SCALAR interp(SCALAR *y_table, SCALAR *x_table, int Ntable, SCALAR x)
|
||||||
void c172_aero( SCALAR dt, int Initialize ) {
|
void c172_aero( SCALAR dt, int Initialize ) {
|
||||||
|
|
||||||
|
|
||||||
static int init = 0;
|
// static int init = 0;
|
||||||
static int fi=0;
|
static int fi=0;
|
||||||
static SCALAR lastFlapHandle=0;
|
static SCALAR lastFlapHandle=0;
|
||||||
static SCALAR Ai;
|
static SCALAR Ai;
|
||||||
|
|
|
@ -46,8 +46,12 @@
|
||||||
|
|
||||||
$Header$
|
$Header$
|
||||||
$Log$
|
$Log$
|
||||||
Revision 1.1 2002/09/10 01:14:02 curt
|
Revision 1.2 2004/04/01 15:27:55 curt
|
||||||
Initial revision
|
Clean up various compiler warnings that have crept into the code. This
|
||||||
|
by no means get's them all, but it's a start.
|
||||||
|
|
||||||
|
Revision 1.1.1.1 2002/09/10 01:14:02 curt
|
||||||
|
Initial revision of FlightGear-0.9.0
|
||||||
|
|
||||||
Revision 1.1.1.1 1999/06/17 18:07:34 curt
|
Revision 1.1.1.1 1999/06/17 18:07:34 curt
|
||||||
Start of 0.7.x branch
|
Start of 0.7.x branch
|
||||||
|
@ -176,7 +180,7 @@ int nr_gaussj(double **a, int n, double **b, int m)
|
||||||
|
|
||||||
{
|
{
|
||||||
int *indxc, *indxr, *ipiv;
|
int *indxc, *indxr, *ipiv;
|
||||||
int i, icol, irow, j, k, l, ll;
|
int i, icol = 0, irow = 0, j, k, l, ll;
|
||||||
double big, dum, pivinv, temp;
|
double big, dum, pivinv, temp;
|
||||||
|
|
||||||
int bexists = ((m != 0) || (b == 0));
|
int bexists = ((m != 0) || (b == 0));
|
||||||
|
|
|
@ -55,7 +55,7 @@ void FGMagicCarpet::update( double dt ) {
|
||||||
if (is_suspended())
|
if (is_suspended())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
int multiloop = _calc_multiloop(dt);
|
// int multiloop = _calc_multiloop(dt);
|
||||||
|
|
||||||
double time_step = dt;
|
double time_step = dt;
|
||||||
|
|
||||||
|
|
|
@ -212,7 +212,7 @@ float Airplane::getFuel(int tank)
|
||||||
|
|
||||||
float Airplane::setFuel(int tank, float fuel)
|
float Airplane::setFuel(int tank, float fuel)
|
||||||
{
|
{
|
||||||
((Tank*)_tanks.get(tank))->fill = fuel;
|
return ((Tank*)_tanks.get(tank))->fill = fuel;
|
||||||
}
|
}
|
||||||
|
|
||||||
float Airplane::getFuelDensity(int tank)
|
float Airplane::getFuelDensity(int tank)
|
||||||
|
|
|
@ -515,7 +515,7 @@ Rotor* FGFDM::parseRotor(XMLAttributes* a, const char* type)
|
||||||
{
|
{
|
||||||
Rotor* w = new Rotor();
|
Rotor* w = new Rotor();
|
||||||
|
|
||||||
float defDihed = 0;
|
// float defDihed = 0;
|
||||||
|
|
||||||
float pos[3];
|
float pos[3];
|
||||||
pos[0] = attrf(a, "x");
|
pos[0] = attrf(a, "x");
|
||||||
|
|
|
@ -665,7 +665,7 @@ void Rotor::compile()
|
||||||
//_delta=omega*_delta;
|
//_delta=omega*_delta;
|
||||||
_delta*=maxpitchforce/(_max_pitch*omega*lentocenter*2*_weight_per_blade*.453);
|
_delta*=maxpitchforce/(_max_pitch*omega*lentocenter*2*_weight_per_blade*.453);
|
||||||
float phi=Math::atan2(2*omega*_delta,omega0*omega0-omega*omega);
|
float phi=Math::atan2(2*omega*_delta,omega0*omega0-omega*omega);
|
||||||
float phi2=Math::abs(omega0-omega)<.000000001?pi/2:Math::atan(2*omega*_delta/(omega0*omega0-omega*omega));
|
// float phi2=Math::abs(omega0-omega)<.000000001?pi/2:Math::atan(2*omega*_delta/(omega0*omega0-omega*omega));
|
||||||
float relamp=omega*omega/(2*_delta*Math::sqrt(sqr(omega0*omega0-omega*omega)+4*_delta*_delta*omega*omega));
|
float relamp=omega*omega/(2*_delta*Math::sqrt(sqr(omega0*omega0-omega*omega)+4*_delta*_delta*omega*omega));
|
||||||
if (!_no_torque)
|
if (!_no_torque)
|
||||||
{
|
{
|
||||||
|
@ -699,7 +699,8 @@ void Rotor::compile()
|
||||||
<< " relamp: " << relamp
|
<< " relamp: " << relamp
|
||||||
<< " delta: " <<_delta);
|
<< " delta: " <<_delta);
|
||||||
|
|
||||||
float lspeed[3],dirzentforce[3];
|
// float lspeed[3];
|
||||||
|
float dirzentforce[3];
|
||||||
|
|
||||||
float f=(!_ccw)?1:-1;
|
float f=(!_ccw)?1:-1;
|
||||||
//Math::mul3(f*speed,directions[1],lspeed);
|
//Math::mul3(f*speed,directions[1],lspeed);
|
||||||
|
|
|
@ -217,8 +217,8 @@ FGInput::makeDefault (bool status)
|
||||||
void
|
void
|
||||||
FGInput::doKey (int k, int modifiers, int x, int y)
|
FGInput::doKey (int k, int modifiers, int x, int y)
|
||||||
{
|
{
|
||||||
static SGPropertyNode *heading_enabled
|
// static SGPropertyNode *heading_enabled
|
||||||
= fgGetNode("/autopilot/locks/heading", true);
|
// = fgGetNode("/autopilot/locks/heading", true);
|
||||||
|
|
||||||
// Sanity check.
|
// Sanity check.
|
||||||
if (k < 0 || k >= MAX_KEYS) {
|
if (k < 0 || k >= MAX_KEYS) {
|
||||||
|
|
|
@ -49,8 +49,8 @@ adjust_range (double transmitter_elevation_ft, double aircraft_altitude_ft,
|
||||||
|
|
||||||
|
|
||||||
ADF::ADF ()
|
ADF::ADF ()
|
||||||
: _last_frequency_khz(-1),
|
: _time_before_search_sec(0),
|
||||||
_time_before_search_sec(0),
|
_last_frequency_khz(-1),
|
||||||
_transmitter_valid(false),
|
_transmitter_valid(false),
|
||||||
_transmitter_elevation_ft(0),
|
_transmitter_elevation_ft(0),
|
||||||
_transmitter_range_nm(0)
|
_transmitter_range_nm(0)
|
||||||
|
|
|
@ -172,8 +172,9 @@ GPS::update (double delta_time_sec)
|
||||||
double wp_latitude_deg = _wp_latitude_node->getDoubleValue();
|
double wp_latitude_deg = _wp_latitude_node->getDoubleValue();
|
||||||
double wp_course_deg =
|
double wp_course_deg =
|
||||||
_wp_course_node->getDoubleValue();
|
_wp_course_node->getDoubleValue();
|
||||||
double wp_distance, wp_bearing_deg, wp_actual_radial_deg,
|
double wp_distance, wp_bearing_deg, wp_course_deviation_deg,
|
||||||
wp_course_deviation_deg, wp_course_error_m, wp_TTW;
|
wp_course_error_m, wp_TTW;
|
||||||
|
// double wp_actual_radial_deg;
|
||||||
string wp_ID = _wp_ID_node->getStringValue();
|
string wp_ID = _wp_ID_node->getStringValue();
|
||||||
|
|
||||||
// If the get-nearest-airport-node is true.
|
// If the get-nearest-airport-node is true.
|
||||||
|
|
|
@ -227,6 +227,11 @@ do_reinit (const SGPropertyNode * arg)
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
//
|
||||||
|
// these routines look useful ??? but are never used in the code ???
|
||||||
|
//
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Built-in command: suspend one or more subsystems.
|
* Built-in command: suspend one or more subsystems.
|
||||||
*
|
*
|
||||||
|
@ -275,6 +280,8 @@ do_resume (const SGPropertyNode * arg)
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Built-in command: load flight.
|
* Built-in command: load flight.
|
||||||
|
|
|
@ -660,6 +660,11 @@ static double fgGetAirportElev( const string& id ) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
//
|
||||||
|
// This function is never used, but maybe useful in the future ???
|
||||||
|
//
|
||||||
|
|
||||||
// Preset lon/lat given an airport id
|
// Preset lon/lat given an airport id
|
||||||
static bool fgSetPosFromAirportID( const string& id ) {
|
static bool fgSetPosFromAirportID( const string& id ) {
|
||||||
FGAirport a;
|
FGAirport a;
|
||||||
|
@ -687,6 +692,7 @@ static bool fgSetPosFromAirportID( const string& id ) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// Set current tower position lon/lat given an airport id
|
// Set current tower position lon/lat given an airport id
|
||||||
|
@ -1438,8 +1444,6 @@ bool fgInitSubsystems() {
|
||||||
// static const SGPropertyNode *altitude
|
// static const SGPropertyNode *altitude
|
||||||
// = fgGetNode("/sim/presets/altitude-ft");
|
// = fgGetNode("/sim/presets/altitude-ft");
|
||||||
|
|
||||||
FGLight *l = (FGLight *)(globals->get_subsystem("lighting"));
|
|
||||||
|
|
||||||
SG_LOG( SG_GENERAL, SG_INFO, "Initialize Subsystems");
|
SG_LOG( SG_GENERAL, SG_INFO, "Initialize Subsystems");
|
||||||
SG_LOG( SG_GENERAL, SG_INFO, "========== ==========");
|
SG_LOG( SG_GENERAL, SG_INFO, "========== ==========");
|
||||||
|
|
||||||
|
@ -1568,8 +1572,8 @@ bool fgInitSubsystems() {
|
||||||
= fgGetNode("/sim/presets/longitude-deg");
|
= fgGetNode("/sim/presets/longitude-deg");
|
||||||
static const SGPropertyNode *latitude
|
static const SGPropertyNode *latitude
|
||||||
= fgGetNode("/sim/presets/latitude-deg");
|
= fgGetNode("/sim/presets/latitude-deg");
|
||||||
static const SGPropertyNode *altitude
|
// static const SGPropertyNode *altitude
|
||||||
= fgGetNode("/sim/presets/altitude-ft");
|
// = fgGetNode("/sim/presets/altitude-ft");
|
||||||
|
|
||||||
SGPath cloud_path(globals->get_fg_root());
|
SGPath cloud_path(globals->get_fg_root());
|
||||||
#if 0
|
#if 0
|
||||||
|
|
|
@ -818,8 +818,8 @@ void fgUpdateTimeDepCalcs() {
|
||||||
= fgGetNode( "/sim/freeze/replay", true );
|
= fgGetNode( "/sim/freeze/replay", true );
|
||||||
static SGPropertyNode *replay_time
|
static SGPropertyNode *replay_time
|
||||||
= fgGetNode( "/sim/replay/time", true );
|
= fgGetNode( "/sim/replay/time", true );
|
||||||
static const SGPropertyNode *replay_end_time
|
// static const SGPropertyNode *replay_end_time
|
||||||
= fgGetNode( "/sim/replay/end-time", true );
|
// = fgGetNode( "/sim/replay/end-time", true );
|
||||||
|
|
||||||
//SG_LOG(SG_FLIGHT,SG_INFO, "Updating time dep calcs()");
|
//SG_LOG(SG_FLIGHT,SG_INFO, "Updating time dep calcs()");
|
||||||
|
|
||||||
|
@ -902,8 +902,8 @@ static void fgMainLoop( void ) {
|
||||||
= fgGetNode("/sim/freeze/clock", true);
|
= fgGetNode("/sim/freeze/clock", true);
|
||||||
static const SGPropertyNode *cur_time_override
|
static const SGPropertyNode *cur_time_override
|
||||||
= fgGetNode("/sim/time/cur-time-override", true);
|
= fgGetNode("/sim/time/cur-time-override", true);
|
||||||
static const SGPropertyNode *replay_master
|
// static const SGPropertyNode *replay_master
|
||||||
= fgGetNode("/sim/freeze/replay", true);
|
// = fgGetNode("/sim/freeze/replay", true);
|
||||||
|
|
||||||
// Update the elapsed time.
|
// Update the elapsed time.
|
||||||
static bool first_time = true;
|
static bool first_time = true;
|
||||||
|
|
|
@ -874,7 +874,7 @@ fgSetupProxy( const char *arg )
|
||||||
{
|
{
|
||||||
string options = arg;
|
string options = arg;
|
||||||
string host, port, auth;
|
string host, port, auth;
|
||||||
int pos;
|
unsigned int pos;
|
||||||
|
|
||||||
host = port = auth = "";
|
host = port = auth = "";
|
||||||
if ((pos = options.find("@")) != string::npos)
|
if ((pos = options.find("@")) != string::npos)
|
||||||
|
|
|
@ -51,7 +51,8 @@ FGViewMgr::init ()
|
||||||
bool at_model = false;
|
bool at_model = false;
|
||||||
int from_model_index = 0;
|
int from_model_index = 0;
|
||||||
int at_model_index = 0;
|
int at_model_index = 0;
|
||||||
double damp_alt, damp_roll, damp_pitch, damp_heading;
|
// double damp_alt;
|
||||||
|
double damp_roll = 0.0, damp_pitch = 0.0, damp_heading = 0.0;
|
||||||
double x_offset_m, y_offset_m, z_offset_m, fov_deg;
|
double x_offset_m, y_offset_m, z_offset_m, fov_deg;
|
||||||
double heading_offset_deg, pitch_offset_deg, roll_offset_deg;
|
double heading_offset_deg, pitch_offset_deg, roll_offset_deg;
|
||||||
double target_x_offset_m, target_y_offset_m, target_z_offset_m;
|
double target_x_offset_m, target_y_offset_m, target_z_offset_m;
|
||||||
|
|
|
@ -233,7 +233,7 @@ void FGMultiplayRxMgr::ProcessData(void) {
|
||||||
|
|
||||||
// Data received
|
// Data received
|
||||||
if (iBytes > 0) {
|
if (iBytes > 0) {
|
||||||
if (iBytes >= sizeof(MsgHdr)) {
|
if (iBytes >= (int)sizeof(MsgHdr)) {
|
||||||
|
|
||||||
// Read header
|
// Read header
|
||||||
MsgHdr = (T_MsgHdr *)sMsg;
|
MsgHdr = (T_MsgHdr *)sMsg;
|
||||||
|
|
|
@ -64,7 +64,7 @@ const char sMULTIPLAYTXMGR_HID[] = MULTIPLAYTXMGR_HID;
|
||||||
******************************************************************/
|
******************************************************************/
|
||||||
FGMultiplayTxMgr::FGMultiplayTxMgr() {
|
FGMultiplayTxMgr::FGMultiplayTxMgr() {
|
||||||
|
|
||||||
int iPlayerCnt; // Count of players in player array
|
// int iPlayerCnt; // Count of players in player array
|
||||||
|
|
||||||
// Initialise private members
|
// Initialise private members
|
||||||
m_bInitialised = false;
|
m_bInitialised = false;
|
||||||
|
@ -216,10 +216,10 @@ void FGMultiplayTxMgr::SendMyPosition(const sgMat4 PlayerPosMat4) {
|
||||||
******************************************************************/
|
******************************************************************/
|
||||||
void FGMultiplayTxMgr::SendTextMessage(const string &sMsgText) const {
|
void FGMultiplayTxMgr::SendTextMessage(const string &sMsgText) const {
|
||||||
|
|
||||||
bool bResult = false;
|
// bool bResult = false;
|
||||||
T_MsgHdr MsgHdr;
|
T_MsgHdr MsgHdr;
|
||||||
T_ChatMsg ChatMsg;
|
T_ChatMsg ChatMsg;
|
||||||
int iNextBlockPosition = 0;
|
unsigned int iNextBlockPosition = 0;
|
||||||
char sMsg[sizeof(T_MsgHdr) + sizeof(T_ChatMsg)];
|
char sMsg[sizeof(T_MsgHdr) + sizeof(T_ChatMsg)];
|
||||||
|
|
||||||
if (m_bInitialised) {
|
if (m_bInitialised) {
|
||||||
|
|
|
@ -133,8 +133,7 @@ bool FGGeneric::gen_message() {
|
||||||
string generic_sentence;
|
string generic_sentence;
|
||||||
char tmp[255];
|
char tmp[255];
|
||||||
|
|
||||||
int v;
|
double val;
|
||||||
double d;
|
|
||||||
|
|
||||||
for (unsigned int i = 0; i < _message.size(); i++) {
|
for (unsigned int i = 0; i < _message.size(); i++) {
|
||||||
|
|
||||||
|
@ -143,9 +142,9 @@ bool FGGeneric::gen_message() {
|
||||||
|
|
||||||
switch (_message[i].type) {
|
switch (_message[i].type) {
|
||||||
case FG_INT:
|
case FG_INT:
|
||||||
v = _message[i].offset +
|
val = _message[i].offset +
|
||||||
_message[i].prop->getIntValue() * _message[i].factor;
|
_message[i].prop->getIntValue() * _message[i].factor;
|
||||||
snprintf(tmp, 255, _message[i].format.c_str(), v);
|
snprintf(tmp, 255, _message[i].format.c_str(), (int)val);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case FG_BOOL:
|
case FG_BOOL:
|
||||||
|
@ -154,9 +153,9 @@ bool FGGeneric::gen_message() {
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case FG_DOUBLE:
|
case FG_DOUBLE:
|
||||||
d = _message[i].offset +
|
val = _message[i].offset +
|
||||||
_message[i].prop->getDoubleValue() * _message[i].factor;
|
_message[i].prop->getDoubleValue() * _message[i].factor;
|
||||||
snprintf(tmp, 255, _message[i].format.c_str(), d);
|
snprintf(tmp, 255, _message[i].format.c_str(), val);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default: // SG_STRING
|
default: // SG_STRING
|
||||||
|
|
|
@ -48,15 +48,6 @@ FGOpenGC::FGOpenGC() :
|
||||||
wind_dir_node(fgGetNode("/environment/wind-from-heading-deg", true)),
|
wind_dir_node(fgGetNode("/environment/wind-from-heading-deg", true)),
|
||||||
wind_speed_node(fgGetNode("/environment/wind-speed-kt", true)),
|
wind_speed_node(fgGetNode("/environment/wind-speed-kt", true)),
|
||||||
mag_var_node(fgGetNode("/environment/magnetic-variation-deg", true)),
|
mag_var_node(fgGetNode("/environment/magnetic-variation-deg", true)),
|
||||||
p_left_aileron(fgGetNode("surface-positions/left-aileron-pos-norm", true)),
|
|
||||||
p_right_aileron(fgGetNode("surface-positions/right-aileron-pos-norm", true)),
|
|
||||||
p_elevator(fgGetNode("surface-positions/elevator-pos-norm", true)),
|
|
||||||
p_elevator_trim(fgGetNode("surface-positions/elevator_trim-pos-norm", true)),
|
|
||||||
p_rudder(fgGetNode("surface-positions/rudder-pos-norm", true)),
|
|
||||||
p_flaps(fgGetNode("surface-positions/flap-pos-norm", true)),
|
|
||||||
p_flaps_cmd(fgGetNode("/controls/flaps", true)),
|
|
||||||
p_alphadot(fgGetNode("/fdm/jsbsim/aero/alphadot-radsec", true)),
|
|
||||||
p_betadot(fgGetNode("/fdm/jsbsim/aero/betadot-radsec", true)),
|
|
||||||
p_latitude(fgGetNode("/position/latitude-deg", true)),
|
p_latitude(fgGetNode("/position/latitude-deg", true)),
|
||||||
p_longitude(fgGetNode("/position/longitude-deg", true)),
|
p_longitude(fgGetNode("/position/longitude-deg", true)),
|
||||||
p_alt_node(fgGetNode("/position/altitude-ft", true)),
|
p_alt_node(fgGetNode("/position/altitude-ft", true)),
|
||||||
|
@ -65,7 +56,16 @@ FGOpenGC::FGOpenGC() :
|
||||||
egt0_node(fgGetNode("/engines/engine/egt-degf", true)),
|
egt0_node(fgGetNode("/engines/engine/egt-degf", true)),
|
||||||
egt1_node(fgGetNode("/engines/engine[1]/egt-degf", true)),
|
egt1_node(fgGetNode("/engines/engine[1]/egt-degf", true)),
|
||||||
egt2_node(fgGetNode("/engines/engine[2]/egt-degf", true)),
|
egt2_node(fgGetNode("/engines/engine[2]/egt-degf", true)),
|
||||||
egt3_node(fgGetNode("/engines/engine[3]/egt-degf", true))
|
egt3_node(fgGetNode("/engines/engine[3]/egt-degf", true)),
|
||||||
|
p_left_aileron(fgGetNode("surface-positions/left-aileron-pos-norm", true)),
|
||||||
|
p_right_aileron(fgGetNode("surface-positions/right-aileron-pos-norm", true)),
|
||||||
|
p_elevator(fgGetNode("surface-positions/elevator-pos-norm", true)),
|
||||||
|
p_elevator_trim(fgGetNode("surface-positions/elevator_trim-pos-norm", true)),
|
||||||
|
p_rudder(fgGetNode("surface-positions/rudder-pos-norm", true)),
|
||||||
|
p_flaps(fgGetNode("surface-positions/flap-pos-norm", true)),
|
||||||
|
p_flaps_cmd(fgGetNode("/controls/flaps", true)),
|
||||||
|
p_alphadot(fgGetNode("/fdm/jsbsim/aero/alphadot-radsec", true)),
|
||||||
|
p_betadot(fgGetNode("/fdm/jsbsim/aero/betadot-radsec", true))
|
||||||
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
@ -102,7 +102,8 @@ void FGReplay::unbind() {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void FGReplay::update( double dt ) {
|
void FGReplay::update( double dt ) {
|
||||||
static SGPropertyNode *replay_master = fgGetNode( "/sim/freeze/replay" );
|
static SGPropertyNode *replay_master
|
||||||
|
= fgGetNode( "/sim/freeze/replay", true );
|
||||||
|
|
||||||
if ( replay_master->getBoolValue() ) {
|
if ( replay_master->getBoolValue() ) {
|
||||||
// don't record the replay session
|
// don't record the replay session
|
||||||
|
|
|
@ -507,7 +507,7 @@ void FGHitList::Intersect( ssgBranch *scene, sgdMat4 m, sgdVec3 orig, sgdVec3 di
|
||||||
|
|
||||||
// Determine scenery altitude via ssg.
|
// Determine scenery altitude via ssg.
|
||||||
// returned results are in meters
|
// returned results are in meters
|
||||||
static double hitlist1_time = 0.0;
|
// static double hitlist1_time = 0.0;
|
||||||
|
|
||||||
bool fgCurrentElev( sgdVec3 abs_view_pos, double max_alt_m,
|
bool fgCurrentElev( sgdVec3 abs_view_pos, double max_alt_m,
|
||||||
sgdVec3 scenery_center,
|
sgdVec3 scenery_center,
|
||||||
|
@ -590,7 +590,7 @@ bool fgCurrentElev( sgdVec3 abs_view_pos, double max_alt_m,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static double hitlist2_time = 0.0;
|
// static double hitlist2_time = 0.0;
|
||||||
|
|
||||||
// Determine scenery altitude via ssg.
|
// Determine scenery altitude via ssg.
|
||||||
// returned results are in meters
|
// returned results are in meters
|
||||||
|
|
|
@ -177,7 +177,7 @@ static naRef f_getChildren(naContext c, naRef args)
|
||||||
if(!naIsString(name)) return naNil();
|
if(!naIsString(name)) return naNil();
|
||||||
vector<SGPropertyNode_ptr> children
|
vector<SGPropertyNode_ptr> children
|
||||||
= (*node)->getChildren(naStr_data(name));
|
= (*node)->getChildren(naStr_data(name));
|
||||||
for(int i=0; i<children.size(); i++)
|
for(unsigned int i=0; i<children.size(); i++)
|
||||||
naVec_append(result, propNodeGhostCreate(c, children[i]));
|
naVec_append(result, propNodeGhostCreate(c, children[i]));
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
|
|
|
@ -41,7 +41,7 @@ StaticSystem::update (double dt)
|
||||||
|
|
||||||
double target = _pressure_in_node->getDoubleValue();
|
double target = _pressure_in_node->getDoubleValue();
|
||||||
double current = _pressure_out_node->getDoubleValue();
|
double current = _pressure_out_node->getDoubleValue();
|
||||||
double delta = target - current;
|
// double delta = target - current;
|
||||||
_pressure_out_node->setDoubleValue(fgGetLowPass(current, target, dt));
|
_pressure_out_node->setDoubleValue(fgGetLowPass(current, target, dt));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -70,8 +70,8 @@ FGLight::FGLight ()
|
||||||
_diffuse_tbl( NULL ),
|
_diffuse_tbl( NULL ),
|
||||||
_specular_tbl( NULL ),
|
_specular_tbl( NULL ),
|
||||||
_sky_tbl( NULL ),
|
_sky_tbl( NULL ),
|
||||||
_sun_rotation( 0.0 ),
|
|
||||||
_prev_sun_angle(-9999.0),
|
_prev_sun_angle(-9999.0),
|
||||||
|
_sun_rotation( 0.0 ),
|
||||||
_dt_total( 0.0 )
|
_dt_total( 0.0 )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -163,7 +163,7 @@ void FGLight::update( double dt ) {
|
||||||
|
|
||||||
void FGLight::update_sky_color () {
|
void FGLight::update_sky_color () {
|
||||||
// if the 4th field is 0.0, this specifies a direction ...
|
// if the 4th field is 0.0, this specifies a direction ...
|
||||||
const GLfloat white[4] = { 1.0, 1.0, 1.0, 1.0 };
|
// const GLfloat white[4] = { 1.0, 1.0, 1.0, 1.0 };
|
||||||
const GLfloat base_sky_color[4] = { 0.31, 0.43, 0.69, 1.0 };
|
const GLfloat base_sky_color[4] = { 0.31, 0.43, 0.69, 1.0 };
|
||||||
const GLfloat base_fog_color[4] = { 0.84, 0.87, 1.0, 1.0 };
|
const GLfloat base_fog_color[4] = { 0.84, 0.87, 1.0, 1.0 };
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue