From 0179cab894c7c832d1b7dbb3e09f704def3a5da1 Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 12 Aug 2003 15:57:17 +0000 Subject: [PATCH] Norman Vine: Attached patch gets rid of all mention of GLUT from the cockpit directory. --- src/Cockpit/cockpit.cxx | 2 -- src/Cockpit/hud.cxx | 1 - src/Cockpit/hud.hxx | 1 - src/Cockpit/hud_card.cxx | 46 ++++++++++++++++++++-------------------- src/Cockpit/hud_gaug.cxx | 12 +++++------ src/Cockpit/hud_labl.cxx | 8 +++---- src/Cockpit/hud_lat.cxx | 8 +++---- src/Cockpit/hud_lon.cxx | 8 +++---- src/Cockpit/panel.hxx | 2 -- 9 files changed, 41 insertions(+), 47 deletions(-) diff --git a/src/Cockpit/cockpit.cxx b/src/Cockpit/cockpit.cxx index 98ab091e8..931cb517d 100644 --- a/src/Cockpit/cockpit.cxx +++ b/src/Cockpit/cockpit.cxx @@ -29,8 +29,6 @@ # include #endif -#include - #include #include #include diff --git a/src/Cockpit/hud.cxx b/src/Cockpit/hud.cxx index 687cc3658..10762dbd8 100644 --- a/src/Cockpit/hud.cxx +++ b/src/Cockpit/hud.cxx @@ -40,7 +40,6 @@ #include -#include #include #include // char related functions #include // strcmp() diff --git a/src/Cockpit/hud.hxx b/src/Cockpit/hud.hxx index e1ac94f1a..56afcbc6e 100644 --- a/src/Cockpit/hud.hxx +++ b/src/Cockpit/hud.hxx @@ -38,7 +38,6 @@ # include #endif -#include #include #include diff --git a/src/Cockpit/hud_card.cxx b/src/Cockpit/hud_card.cxx index ca153418e..ee5fad245 100644 --- a/src/Cockpit/hud_card.cxx +++ b/src/Cockpit/hud_card.cxx @@ -2,9 +2,9 @@ #include "hud.hxx" #ifdef USE_HUD_TextList -#define textString( x , y, text, font,digit) TextString( text, x , y ,digit ) //suma +#define textString( x , y, text, digit) TextString( text, x , y ,digit ) //suma #else -#define textString( x , y, text, font,digit ) puDrawString ( guiFnt, text, x, y ); //suma +#define textString( x , y, text, digit ) puDrawString ( guiFnt, text, x, y ); //suma #endif //========== Top of hud_card class member definitions ============= @@ -234,11 +234,11 @@ draw( void ) // (HUD_scale * pscale ) int l = abs((int)theta); if (l) { if( l<10) - textString (x,y,TextScale,GLUT_BITMAP_8_BY_13,0 ); + textString (x,y,TextScale,0 ); else if(l<100) - textString (x-1.0,y,TextScale,GLUT_BITMAP_8_BY_13,0 ); + textString (x-1.0,y,TextScale,0 ); else if( l<360 ) - textString (x-2.0,y,TextScale,GLUT_BITMAP_8_BY_13,0 ); + textString (x-2.0,y,TextScale,0 ); } } @@ -584,7 +584,7 @@ draw( void ) // (HUD_scale * pscale ) if( !huds_notext(options)) { textString ( marker_xs + 2, marker_ys, - TextScale, GLUT_BITMAP_8_BY_13,0 ); + TextScale,0 ); } } else { //begin suma @@ -601,11 +601,11 @@ draw( void ) // (HUD_scale * pscale ) if( huds_left(options) ) { textString( marker_xs - 8 * lenstr - 2, marker_ys - 4, - TextScale, GLUT_BITMAP_8_BY_13,0 ); + TextScale, 0 ); } else { textString( marker_xe + 3 * lenstr, marker_ys - 4, - TextScale, GLUT_BITMAP_8_BY_13,0 ); + TextScale, 0 ); } //End if huds_left } //End if !huds_notext } //End if huds-both @@ -844,7 +844,7 @@ draw( void ) // (HUD_scale * pscale ) if( !huds_notext(options) ) { textString ( marker_xs - 4 * lenstr, marker_ys + 4, - TextScale, GLUT_BITMAP_8_BY_13,0 ); //suma + TextScale, 0 ); //suma } } else { drawOneLine( marker_xs, marker_ys, @@ -853,11 +853,11 @@ draw( void ) // (HUD_scale * pscale ) if( huds_top(options) ) { textString ( marker_xs - 4 * lenstr, height - 10, - TextScale, GLUT_BITMAP_8_BY_13,0 ); //suma + TextScale, 0 ); //suma } else { textString( marker_xs - 4 * lenstr, scrn_rect.top, - TextScale, GLUT_BITMAP_8_BY_13,0 ); //suma + TextScale, 0 ); //suma } } } @@ -1000,7 +1000,7 @@ zoomed_scale(int first, int last) sprintf(TextScale,"%3.0f\n",(float)(data[centre] * data_scaling())); if( !huds_notext(options)) { - textString (x, ycentre, TextScale, GLUT_BITMAP_8_BY_13,0 ); + textString (x, ycentre, TextScale, 0 ); } for(i=1;i<5;i++) { @@ -1019,12 +1019,12 @@ zoomed_scale(int first, int last) sprintf(TextScale,"%3.0f\n",(float)(data[centre-i-1] * data_scaling())); if( !huds_notext(options)) - textString (x, yfirst, TextScale, GLUT_BITMAP_8_BY_13,0 ); + textString (x, yfirst, TextScale, 0 ); sprintf(TextScale,"%3.0f\n",(float)(data[centre+i+1] * data_scaling())); if( !huds_notext(options)) - textString (x, ysecond, TextScale, GLUT_BITMAP_8_BY_13,0 ); + textString (x, ysecond, TextScale, 0 ); yfirst -= factors; @@ -1052,7 +1052,7 @@ zoomed_scale(int first, int last) sprintf(TextScale,"%3.0f\n",(float)(data[centre] * data_scaling())); if( !huds_notext(options)) { - textString (w, ycentre, TextScale, GLUT_BITMAP_8_BY_13,0 ); + textString (w, ycentre, TextScale, 0 ); } for(i=1;i<5;i++) { @@ -1071,12 +1071,12 @@ zoomed_scale(int first, int last) sprintf(TextScale,"%3.0f\n",(float)(data[centre-i-1] * data_scaling())); if( !huds_notext(options)) - textString (w, yfirst, TextScale, GLUT_BITMAP_8_BY_13,0 ); + textString (w, yfirst, TextScale, 0 ); sprintf(TextScale,"%3.0f\n",(float)(data[centre+i+1] * data_scaling())); if( !huds_notext(options)) - textString (w, ysecond, TextScale, GLUT_BITMAP_8_BY_13,0 ); + textString (w, ysecond, TextScale, 0 ); yfirst -= factors; ysecond += factors; @@ -1166,7 +1166,7 @@ zoomed_scale(int first, int last) sprintf(TextScale,"%3.0f\n",(float)(data[centre] * data_scaling())); if( !huds_notext(options)) { - textString (xcentre-10.0, y, TextScale, GLUT_BITMAP_8_BY_13,0 ); + textString (xcentre-10.0, y, TextScale, 0 ); } for(i=1;i<5;i++) { @@ -1185,12 +1185,12 @@ zoomed_scale(int first, int last) sprintf(TextScale,"%3.0f\n",(float)(data[centre-i-1] * data_scaling())); if( !huds_notext(options)) - textString (xfirst-10.0, y, TextScale, GLUT_BITMAP_8_BY_13,0 ); + textString (xfirst-10.0, y, TextScale, 0 ); sprintf(TextScale,"%3.0f\n",(float)(data[centre+i+1] * data_scaling())); if( !huds_notext(options)) - textString (xsecond-10.0, y, TextScale, GLUT_BITMAP_8_BY_13,0 ); + textString (xsecond-10.0, y, TextScale, 0 ); xfirst -= factors; @@ -1219,7 +1219,7 @@ zoomed_scale(int first, int last) sprintf(TextScale,"%3.0f\n",(float)(data[centre] * data_scaling())); if( !huds_notext(options)) { - textString (xcentre-10.0, h, TextScale, GLUT_BITMAP_8_BY_13,0 ); + textString (xcentre-10.0, h, TextScale, 0 ); } for(i=1;i<5;i++) { @@ -1238,12 +1238,12 @@ zoomed_scale(int first, int last) sprintf(TextScale,"%3.0f\n",(float)(data[centre-i-1] * data_scaling())); if( !huds_notext(options)) - textString (xfirst-10.0,h, TextScale, GLUT_BITMAP_8_BY_13,0 ); + textString (xfirst-10.0,h, TextScale, 0 ); sprintf(TextScale,"%3.0f\n",(float)(data[centre+i+1] * data_scaling())); if( !huds_notext(options)) - textString (xsecond-10.0,h, TextScale, GLUT_BITMAP_8_BY_13,0 ); + textString (xsecond-10.0,h, TextScale, 0 ); xfirst -= factors; diff --git a/src/Cockpit/hud_gaug.cxx b/src/Cockpit/hud_gaug.cxx index eb6a95a2f..e72b6c7a4 100644 --- a/src/Cockpit/hud_gaug.cxx +++ b/src/Cockpit/hud_gaug.cxx @@ -3,9 +3,9 @@ #ifdef USE_HUD_TextList -#define textString( x , y, text, font,digit ) TextString( text, x , y,digit ) //suma +#define textString( x , y, text, digit ) TextString( text, x , y,digit ) //suma #else -#define textString( x , y, text, font,digit ) puDrawString ( guiFnt, text, x, y ); //suma +#define textString( x , y, text, digit ) puDrawString ( guiFnt, text, x, y ); //suma #endif //============== Top of gauge_instr class member definitions ============== @@ -214,7 +214,7 @@ void gauge_instr :: draw (void) } // Now we know where to put the text. text_y = marker_ys; - textString( text_x, text_y, TextScale, GLUT_BITMAP_8_BY_13,0 ); //suma + textString( text_x, text_y, TextScale, 0 ); //suma } } } // @@ -350,7 +350,7 @@ void gauge_instr :: draw (void) if( !huds_notext(options) ) { textString ( marker_xs - lenstr, marker_ys + 4, - TextScale, GLUT_BITMAP_8_BY_13 ,0); //suma + TextScale ,0); //suma } } else { @@ -361,11 +361,11 @@ void gauge_instr :: draw (void) if( huds_top(options) ) { textString ( marker_xs - lenstr, height - 10, - TextScale, GLUT_BITMAP_8_BY_13,0 ); //suma + TextScale, 0 ); //suma } else { textString( marker_xs - lenstr, scrn_rect.top, - TextScale, GLUT_BITMAP_8_BY_13,0 ); //suma + TextScale, 0 ); //suma } } } diff --git a/src/Cockpit/hud_labl.cxx b/src/Cockpit/hud_labl.cxx index 2c8c62f67..95d5cc19a 100644 --- a/src/Cockpit/hud_labl.cxx +++ b/src/Cockpit/hud_labl.cxx @@ -3,9 +3,9 @@ #ifdef USE_HUD_TextList -#define textString( x , y, text, font,digit ) TextString( text, x , y,digit ) //suma +#define textString( x , y, text, digit ) TextString( text, x , y,digit ) //suma #else -#define textString( x , y, text, font,digit ) puDrawString ( guiFnt, text, x, y ); //suma +#define textString( x , y, text, digit ) puDrawString ( guiFnt, text, x, y ); //suma #endif //======================= Top of instr_label class ========================= @@ -189,12 +189,12 @@ draw( void ) // Required method in base class if( fontSize == HUD_FONT_SMALL ) { textString( scrn_rect.left + posincr, scrn_rect.top, - label_buffer, GLUT_BITMAP_8_BY_13 ,get_digits()); //suma + label_buffer, get_digits()); //suma } else { if( fontSize == HUD_FONT_LARGE ) { textString( scrn_rect.left + posincr, scrn_rect.top, - label_buffer, GLUT_BITMAP_9_BY_15 ,get_digits()); //suma + label_buffer, get_digits()); //suma } } } diff --git a/src/Cockpit/hud_lat.cxx b/src/Cockpit/hud_lat.cxx index 035dff65e..0f9c79268 100644 --- a/src/Cockpit/hud_lat.cxx +++ b/src/Cockpit/hud_lat.cxx @@ -3,9 +3,9 @@ #ifdef USE_HUD_TextList -#define textString( x , y, text, font,digit ) TextString( text, x , y,digit ) //suma +#define textString( x , y, text, digit ) TextString( text, x , y,digit ) //suma #else -#define textString( x , y, text, font,digit ) puDrawString ( guiFnt, text, x, y ); //suma +#define textString( x , y, text, digit ) puDrawString ( guiFnt, text, x, y ); //suma #endif //======================= Top of instr_label class ========================= @@ -138,12 +138,12 @@ draw( void ) // Required method in base class if( fontSize == HUD_FONT_SMALL ) { textString( scrn_rect.left + posincr, scrn_rect.top, - label_buffer, GLUT_BITMAP_8_BY_13, get_digits()); //suma + label_buffer, get_digits()); //suma } else { if( fontSize == HUD_FONT_LARGE ) { textString( scrn_rect.left + posincr, scrn_rect.top, - label_buffer, GLUT_BITMAP_9_BY_15,get_digits()); //suma + label_buffer, get_digits()); //suma } } } diff --git a/src/Cockpit/hud_lon.cxx b/src/Cockpit/hud_lon.cxx index f68b6928f..0676f4e4c 100644 --- a/src/Cockpit/hud_lon.cxx +++ b/src/Cockpit/hud_lon.cxx @@ -3,9 +3,9 @@ #ifdef USE_HUD_TextList -#define textString( x , y, text, font,digit ) TextString( text, x , y,digit ) //suma +#define textString( x , y, text, digit ) TextString( text, x , y,digit ) //suma #else -#define textString( x , y, text, font,digit ) puDrawString ( guiFnt, text, x, y ); //suma +#define textString( x , y, text, digit ) puDrawString ( guiFnt, text, x, y ); //suma #endif //======================= Top of instr_label class ========================= @@ -141,12 +141,12 @@ draw( void ) // Required method in base class if( fontSize == HUD_FONT_SMALL ) { textString( scrn_rect.left + posincr, scrn_rect.top, - label_buffer, GLUT_BITMAP_8_BY_13, get_digits()); //suma + label_buffer, get_digits()); //suma } else { if( fontSize == HUD_FONT_LARGE ) { textString( scrn_rect.left + posincr, scrn_rect.top, - label_buffer, GLUT_BITMAP_9_BY_15, get_digits()); //suma + label_buffer, get_digits()); //suma } } } diff --git a/src/Cockpit/panel.hxx b/src/Cockpit/panel.hxx index caf148b33..d39a2a2d5 100644 --- a/src/Cockpit/panel.hxx +++ b/src/Cockpit/panel.hxx @@ -36,8 +36,6 @@ # include #endif -#include - #include #include