fly/flightgear
1
0
Fork 0
Code Activity

Updates from Norman Vine.

Browse source
This commit is contained in:
curt 1999-10-15 20:42:28 +00:00
parent c9b58a1e44
commit 978b8af9cb
3 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Cockpit/hud.cxx
View file

@ -184,7 +184,7 @@ int fgHUDInit( fgAIRCRAFT * /* current_aircraft */ )
// int index;
int font_size;
int off = 50;
// int off = 50;
int min_x = 25; //off/2;
int max_x = 615; //640-(off/2);
// int min_y = off;
@ -221,8 +221,8 @@ int fgHUDInit( fgAIRCRAFT * /* current_aircraft */ )
// fgHUDSetBrightness( hud, BRT_LIGHT );
// case 0: // TBI
int x = 290; /*cen_x-30*/
int y = 45; /*off-5*/
// int x = 290; /*cen_x-30*/
// int y = 45; /*off-5*/
// HIptr = (instr_item *) new fgTBI_instr( x, y, ladr_w2, text_h );
HIptr = (instr_item *) new fgTBI_instr( 290, 45, 60, 10 );
HUD_deque.insert( HUD_deque.begin(), HIptr);
@ -647,10 +647,10 @@ int fgHUDInit2( fgAIRCRAFT * /* current_aircraft */ )
// int min_y = off;
int max_y = 480-off;
int cen_x = 640 / 2;
// int cen_y = 480 / 2;
int cen_y = 480 / 2;
int text_h = 10;
int ladr_w2 = 60;
// int ladr_h2 = 90;
int ladr_h2 = 90;
// int ladr_t = 35;
int compass_w = 200;
// int gap = 10;
@ -681,6 +681,9 @@ int fgHUDInit2( fgAIRCRAFT * /* current_aircraft */ )
instr_item* p;
p = new HudLadder( cen_x-ladr_w2, cen_y-ladr_h2, 2*ladr_w2, 2*ladr_h2, 1 );
HUD_deque.push_front( p );
// case 4: // GYRO COMPASS
p =new hud_card( cen_x-(compass_w/2),
max_y,
@ -754,7 +757,7 @@ int fgHUDInit2( fgAIRCRAFT * /* current_aircraft */ )
0,
TRUE );
HUD_deque.push_front( p );
#if 0
p = new instr_label( x_pos, 40, 120, 10,
get_vfc_tris_culled,
"%7.0f",
@ -780,8 +783,10 @@ int fgHUDInit2( fgAIRCRAFT * /* current_aircraft */ )
0,
TRUE );
HUD_deque.push_front( p );
p = new instr_label( x_pos, 70, 90, 10,
#endif // 0
// p = new instr_label( x_pos, 70, 90, 10,
p = new instr_label( x_pos, 40, 90, 10,
get_fov,
"%7.1f",
"FOV = ",
@ -1259,7 +1264,7 @@ void fgUpdateHUD( void ) {
extern char *fgAPget_TargetLatLonStr( void );
int apY = 480 - 80;
char scratch[128];
// char scratch[128];
// HUD_TextList.add( fgText( "AUTOPILOT", 20, apY) );
// apY -= 15;
if( fgAPHeadingEnabled() ) {

2
src/Cockpit/hud.hxx
View file

@ -741,6 +741,7 @@ class HudLadder : public dual_instr_item {
UINT minor_div;
UINT label_pos;
UINT scr_hole;
UINT minimal;
float vmax;
float vmin;
float factor;
@ -754,6 +755,7 @@ class HudLadder : public dual_instr_item {
int y,
UINT width,
UINT height,
UINT minimal = 0,
FLTFNPTR ptch_source = get_roll,
FLTFNPTR roll_source = get_pitch,
float span_units = 45.0,

7
src/Cockpit/hud_ladr.cxx
View file

@ -22,6 +22,7 @@ HudLadder :: HudLadder( int x,
int y,
UINT width,
UINT height,
UINT mini,
FLTFNPTR ptch_source,
FLTFNPTR roll_source,
float span_units,
@ -47,6 +48,7 @@ HudLadder :: HudLadder( int x,
width_units = 45;
}
factor = (float)get_span() / (float) width_units;
minimal = mini;
}
HudLadder :: ~HudLadder()
@ -114,6 +116,11 @@ void HudLadder :: draw( void )
glEnd();
#undef CENTER_DIAMOND_SIZE
if(minimal) {
glPopMatrix();
return;
}
if( div_units ) {
char TextLadder[8] ;
float label_length ;