1
0
Fork 0

Frederic:

compilation without ENABLE_SP_FMDS defined gave me a lot of link errors. It appeared that symbol used by ADA was still in use in the HUD.

There is also a typo from Curt in instrument_mgr.cxx where he #include "kr_87.cxx" instead of "kr_87.hxx"
This commit is contained in:
ehofman 2004-10-20 08:15:55 +00:00
parent e2ce033a8c
commit dbbad3cdf2
3 changed files with 17 additions and 3 deletions

View file

@ -455,6 +455,7 @@ readLabel(const SGPropertyNode * node)
} }
} }
#ifdef ENABLE_SP_FMDS
if ( loadfn== "aux1" ) { if ( loadfn== "aux1" ) {
load_fn = get_aux1; load_fn = get_aux1;
} else if ( loadfn == "aux2" ) { } else if ( loadfn == "aux2" ) {
@ -491,7 +492,9 @@ readLabel(const SGPropertyNode * node)
load_fn = get_aux17; load_fn = get_aux17;
} else if ( loadfn == "aux18" ) { } else if ( loadfn == "aux18" ) {
load_fn = get_aux18; load_fn = get_aux18;
} else if ( loadfn == "ax" ) { } else
#endif
if ( loadfn == "ax" ) {
load_fn = get_Ax; load_fn = get_Ax;
} else if ( loadfn == "speed" ) { } else if ( loadfn == "speed" ) {
load_fn = get_speed; load_fn = get_speed;

View file

@ -161,13 +161,14 @@ void HudLadder :: draw( void )
alpha = get_aoa(); alpha = get_aoa();
pla = get_throttleval(); pla = get_throttleval();
#ifdef ENABLE_SP_FMDS
int lgear,wown,wowm,ilcanclaw,ihook; int lgear,wown,wowm,ilcanclaw,ihook;
ilcanclaw = get_iaux2(); ilcanclaw = get_iaux2();
lgear = get_iaux3(); lgear = get_iaux3();
wown = get_iaux4(); wown = get_iaux4();
wowm = get_iaux5(); wowm = get_iaux5();
ihook = get_iaux6(); ihook = get_iaux6();
#endif
float pitch_value = current_ch1() * SGD_RADIANS_TO_DEGREES; float pitch_value = current_ch1() * SGD_RADIANS_TO_DEGREES;
if(hudladder_type=="Climb/Dive Ladder") { if(hudladder_type=="Climb/Dive Ladder") {
@ -310,6 +311,7 @@ void HudLadder :: draw( void )
glVertex2f(vel_x, vel_y+6); glVertex2f(vel_x, vel_y+6);
glEnd(); glEnd();
#ifdef ENABLE_SP_FMDS
// OBJECT MOVING RETICLE // OBJECT MOVING RETICLE
// TYPE LINE // TYPE LINE
// ATTRIB - ON CONDITION // ATTRIB - ON CONDITION
@ -346,6 +348,7 @@ void HudLadder :: draw( void )
glVertex2f(vel_x+4, vel_y-8); glVertex2f(vel_x+4, vel_y-8);
glEnd(); glEnd();
} }
#endif
}//if velocity_vector }//if velocity_vector
//*************************************************************** //***************************************************************
@ -353,6 +356,7 @@ void HudLadder :: draw( void )
// TYPE - SQUARE_BRACKET // TYPE - SQUARE_BRACKET
// ATTRIB - ON CONDITION // ATTRIB - ON CONDITION
// alpha bracket // alpha bracket
#ifdef ENABLE_SP_FMDS
if (alpha_bracket) { if (alpha_bracket) {
if (ihook == 1) { if (ihook == 1) {
glBegin(GL_LINE_STRIP); glBegin(GL_LINE_STRIP);
@ -369,6 +373,7 @@ void HudLadder :: draw( void )
glEnd(); glEnd();
} }
} }
#endif
//printf("xvr=%f,yvr=%f,Vx=%f,Vy=%f,Vz=%f\n",xvvr,yvvr,Vx,Vy,Vz); //printf("xvr=%f,yvr=%f,Vx=%f,Vy=%f,Vz=%f\n",xvvr,yvvr,Vx,Vy,Vz);
//printf("Ax=%f,Ay=%f,Az=%f\n",Ax,Ay,Az); //printf("Ax=%f,Ay=%f,Az=%f\n",Ax,Ay,Az);
//**************************************************************** //****************************************************************
@ -417,6 +422,7 @@ void HudLadder :: draw( void )
// OBJECT STATIC RETICLE // OBJECT STATIC RETICLE
// TYPE LINE // TYPE LINE
// ATTRIB - ON CONDITION // ATTRIB - ON CONDITION
#ifdef ENABLE_SP_FMDS
if (energy_worm) { if (energy_worm) {
if (ilcanclaw == 1) { if (ilcanclaw == 1) {
glBegin(GL_LINE_STRIP); glBegin(GL_LINE_STRIP);
@ -443,6 +449,7 @@ void HudLadder :: draw( void )
glEnd(); glEnd();
} }
} }
#endif
//************************************************************* //*************************************************************
// OBJECT MOVING RETICLE // OBJECT MOVING RETICLE
// TYPE DIAMOND // TYPE DIAMOND
@ -645,12 +652,14 @@ void HudLadder :: draw( void )
// TYPE LINE // TYPE LINE
// ATTRIB - ON CONDITION // ATTRIB - ON CONDITION
// draw appraoch glide slope marker // draw appraoch glide slope marker
#ifdef ENABLE_SP_FMDS
if (glide_slope_marker) { if (glide_slope_marker) {
if (ihook) { if (ihook) {
Line(-half_span+15, (glide_slope-actslope)*factor, -half_span + hole, (glide_slope-actslope)*factor); Line(-half_span+15, (glide_slope-actslope)*factor, -half_span + hole, (glide_slope-actslope)*factor);
Line(half_span-15, (glide_slope-actslope)*factor, half_span - hole, (glide_slope-actslope)*factor); Line(half_span-15, (glide_slope-actslope)*factor, half_span - hole, (glide_slope-actslope)*factor);
} }
}// if glide_slope_marker }// if glide_slope_marker
#endif
} }
TextList.draw(); TextList.draw();
@ -670,6 +679,7 @@ void HudLadder :: draw( void )
glPopMatrix(); glPopMatrix();
//************************************************************* //*************************************************************
//************************************************************* //*************************************************************
#ifdef ENABLE_SP_FMDS
if(waypoint_marker) { if(waypoint_marker) {
//waypoint marker computation //waypoint marker computation
float fromwp_lat,towp_lat,fromwp_lon,towp_lon,dist,delx,dely,hyp,theta,brg; float fromwp_lat,towp_lat,fromwp_lon,towp_lon,dist,delx,dely,hyp,theta,brg;
@ -758,6 +768,7 @@ void HudLadder :: draw( void )
} //brg<12 } //brg<12
} // if waypoint_marker } // if waypoint_marker
#endif
}//draw }//draw
/******************************************************************/ /******************************************************************/

View file

@ -25,7 +25,7 @@
#include "dme.hxx" #include "dme.hxx"
#include "gps.hxx" #include "gps.hxx"
#include "heading_indicator.hxx" #include "heading_indicator.hxx"
#include "kr_87.cxx" #include "kr_87.hxx"
#include "mag_compass.hxx" #include "mag_compass.hxx"
#include "slip_skid_ball.hxx" #include "slip_skid_ball.hxx"
#include "turn_indicator.hxx" #include "turn_indicator.hxx"