fly/flightgear
1
0
Fork 0
Code Activity

White space changes.

Browse source
This commit is contained in:
curt 2001-09-20 22:10:45 +00:00
parent 1dfe83dfd4
commit f77877ffa8
3 changed files with 1518 additions and 1636 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1014
src/Cockpit/hud.cxx
View file

File diff suppressed because it is too large Load diff

121
src/Cockpit/hud.hxx
View file

@ -70,13 +70,13 @@ SG_USING_NAMESPACE(std);
// some of Norman's crazy optimizations. :-) // some of Norman's crazy optimizations. :-)
#ifndef WIN32 #ifndef WIN32
typedef struct { typedef struct {
int x, y; int x, y;
} POINT; } POINT;
typedef struct { typedef struct {
int top, bottom, left, right; int top, bottom, left, right;
} RECT; } RECT;
#endif #endif
// View mode definitions // View mode definitions
@ -239,16 +239,16 @@ extern char *get_formated_gmt_time( void );
extern void fgHUDReshape(void); extern void fgHUDReshape(void);
enum hudinstype{ HUDno_instr, enum hudinstype{ HUDno_instr,
HUDscale, HUDscale,
HUDlabel, HUDlabel,
HUDladder, HUDladder,
HUDcirc_ladder, HUDcirc_ladder,
HUDhorizon, HUDhorizon,
HUDgauge, HUDgauge,
HUDdual_inst, HUDdual_inst,
HUDmoving_scale, HUDmoving_scale,
HUDtbi HUDtbi
}; };
typedef struct gltagRGBTRIPLE { // rgbt typedef struct gltagRGBTRIPLE { // rgbt
GLfloat Blue; GLfloat Blue;
@ -309,8 +309,7 @@ public:
int getStringWidth ( char *str ) int getStringWidth ( char *str )
{ {
if ( HUDtext && str ) if ( HUDtext && str ) {
{
float r, l ; float r, l ;
guiFntHandle->getBBox ( str, HUD_TextSize, 0, &l, &r, NULL, NULL ) ; guiFntHandle->getBBox ( str, HUD_TextSize, 0, &l, &r, NULL, NULL ) ;
return FloatToInt( r - l ); return FloatToInt( r - l );
@ -320,8 +319,7 @@ public:
int StringWidth (void ) int StringWidth (void )
{ {
if ( HUDtext && strlen( msg )) if ( HUDtext && strlen( msg )) {
{
float r, l ; float r, l ;
guiFntHandle->getBBox ( msg, HUD_TextSize, 0, &l, &r, NULL, NULL ) ; guiFntHandle->getBBox ( msg, HUD_TextSize, 0, &l, &r, NULL, NULL ) ;
return FloatToInt( r - l ); return FloatToInt( r - l );
@ -339,9 +337,9 @@ public:
char *t=msg; char *t=msg;
int p=4; int p=4;
if(t[0]=='-') //if negative value then increase the c and p values for '-' sign. if(t[0]=='-') {
{ //if negative value then increase the c and p values
c++; //for '-' sign. c++;
p++; p++;
} }
char *tmp=msg; char *tmp=msg;
@ -393,28 +391,28 @@ public:
~fgLineList( void ) {} ~fgLineList( void ) {}
void add( fgLineSeg2D seg ) { List.push_back(seg); } void add( fgLineSeg2D seg ) { List.push_back(seg); }
void erase( void ) { List.erase( List.begin(), List.end() ); } void erase( void ) { List.erase( List.begin(), List.end() ); }
void draw( void ) { void draw( void ) {
vector < fgLineSeg2D > :: iterator curSeg;
vector < fgLineSeg2D > :: iterator lastSeg;
curSeg = List.begin();
lastSeg = List.end();
glBegin(GL_LINES);
for ( ; curSeg != lastSeg; curSeg++ ) {
curSeg->draw();
}
glEnd();
}
/* void draw( void ) {
vector < fgLineSeg2D > :: iterator curSeg; vector < fgLineSeg2D > :: iterator curSeg;
vector < fgLineSeg2D > :: iterator lastSeg; vector < fgLineSeg2D > :: iterator lastSeg;
curSeg = List.begin(); curSeg = List.begin();
lastSeg = List.end(); lastSeg = List.end();
glBegin(GL_LINES); glBegin(GL_LINES);
for ( ; curSeg != lastSeg; curSeg++ ) { for ( ; curSeg != lastSeg; curSeg++ ) {
curSeg->draw(); curSeg->draw();
} }
glEnd(); glEnd();
} */ }
/* void draw( void ) {
vector < fgLineSeg2D > :: iterator curSeg;
vector < fgLineSeg2D > :: iterator lastSeg;
curSeg = List.begin();
lastSeg = List.end();
glBegin(GL_LINES);
for ( ; curSeg != lastSeg; curSeg++ ) {
curSeg->draw();
}
glEnd();
} */
}; };
class fgTextList { class fgTextList {
@ -475,14 +473,14 @@ extern fgLineList HUD_StippleLineList;
class instr_item { // An Abstract Base Class (ABC) class instr_item { // An Abstract Base Class (ABC)
private: private:
static UINT instances; // More than 64K instruments? Nah! static UINT instances; // More than 64K instruments? Nah!
static int brightness; static int brightness;
static glRGBTRIPLE color; static glRGBTRIPLE color;
UINT handle; UINT handle;
RECT scrn_pos; // Framing - affects scale dimensions RECT scrn_pos; // Framing - affects scale dimensions
// and orientation. Vert vs Horz, etc. // and orientation. Vert vs Horz, etc.
FLTFNPTR load_value_fn; FLTFNPTR load_value_fn;
float disp_factor; // Multiply by to get numbers shown on scale. float disp_factor; // Multiply by to get numbers shown on scale.
UINT opts; UINT opts;
@ -492,7 +490,7 @@ class instr_item { // An Abstract Base Class (ABC)
POINT mid_span; // POINT mid_span; //
int digits; //suma int digits; //suma
public: public:
instr_item( int x, instr_item( int x,
int y, int y,
UINT height, UINT height,
@ -524,7 +522,9 @@ class instr_item { // An Abstract Base Class (ABC)
UINT huds_vert (UINT options) { return( options & HUDS_VERT ); } UINT huds_vert (UINT options) { return( options & HUDS_VERT ); }
UINT huds_left (UINT options) { return( options & HUDS_LEFT ); } UINT huds_left (UINT options) { return( options & HUDS_LEFT ); }
UINT huds_right (UINT options) { return( options & HUDS_RIGHT ); } UINT huds_right (UINT options) { return( options & HUDS_RIGHT ); }
UINT huds_both (UINT options) { return( (options & HUDS_BOTH) == HUDS_BOTH ); } UINT huds_both (UINT options) {
return( (options & HUDS_BOTH) == HUDS_BOTH );
}
UINT huds_noticks (UINT options) { return( options & HUDS_NOTICKS ); } UINT huds_noticks (UINT options) { return( options & HUDS_NOTICKS ); }
UINT huds_notext (UINT options) { return( options & HUDS_NOTEXT ); } UINT huds_notext (UINT options) { return( options & HUDS_NOTEXT ); }
UINT huds_top (UINT options) { return( options & HUDS_TOP ); } UINT huds_top (UINT options) { return( options & HUDS_TOP ); }
@ -553,8 +553,7 @@ class instr_item { // An Abstract Base Class (ABC)
} }
int getStringWidth ( char *str ) int getStringWidth ( char *str )
{ {
if ( HUDtext && str ) if ( HUDtext && str ) {
{
float r, l ; float r, l ;
guiFntHandle->getBBox ( str, HUD_TextSize, 0, &l, &r, NULL, NULL ) ; guiFntHandle->getBBox ( str, HUD_TextSize, 0, &l, &r, NULL, NULL ) ;
return FloatToInt( r - l ); return FloatToInt( r - l );
@ -591,7 +590,7 @@ extern int HUD_style;
class instr_label : public instr_item { class instr_label : public instr_item {
private: private:
const char *pformat; const char *pformat;
const char *pre_str; const char *pre_str;
const char *post_str; const char *post_str;
@ -603,7 +602,7 @@ class instr_label : public instr_item {
bool lon; bool lon;
bool lbox; bool lbox;
public: public:
instr_label( int x, instr_label( int x,
int y, int y,
UINT width, UINT width,
@ -634,7 +633,7 @@ typedef instr_label * pInstlabel;
class lat_label : public instr_item { class lat_label : public instr_item {
private: private:
const char *pformat; const char *pformat;
const char *pre_str; const char *pre_str;
const char *post_str; const char *post_str;
@ -643,7 +642,7 @@ class lat_label : public instr_item {
int blink; int blink;
char format_buffer[80]; char format_buffer[80];
public: public:
lat_label( int x, lat_label( int x,
int y, int y,
UINT width, UINT width,
@ -670,7 +669,7 @@ class lat_label : public instr_item {
typedef lat_label * pLatlabel; typedef lat_label * pLatlabel;
class lon_label : public instr_item { class lon_label : public instr_item {
private: private:
const char *pformat; const char *pformat;
const char *pre_str; const char *pre_str;
const char *post_str; const char *post_str;
@ -679,7 +678,7 @@ class lon_label : public instr_item {
int blink; int blink;
char format_buffer[80]; char format_buffer[80];
public: public:
lon_label( int x, lon_label( int x,
int y, int y,
UINT width, UINT width,
@ -713,7 +712,7 @@ typedef lon_label * pLonlabel;
// //
class instr_scale : public instr_item { class instr_scale : public instr_item {
private: private:
float range_shown; // Width Units. float range_shown; // Width Units.
float Maximum_value; // ceiling. float Maximum_value; // ceiling.
float Minimum_value; // Representation floor. float Minimum_value; // Representation floor.
@ -723,7 +722,7 @@ class instr_scale : public instr_item {
UINT Modulo; // Roll over point UINT Modulo; // Roll over point
int signif_digits; // digits to show to the right. int signif_digits; // digits to show to the right.
public: public:
instr_scale( int x, instr_scale( int x,
int y, int y,
UINT width, UINT width,
@ -760,7 +759,7 @@ class instr_scale : public instr_item {
// line. // line.
class hud_card : public instr_scale { class hud_card : public instr_scale {
private: private:
float val_span; float val_span;
string type; string type;
float half_width_units; float half_width_units;
@ -786,7 +785,7 @@ class hud_card : public instr_scale {
UINT Min_div; //suma UINT Min_div; //suma
public: public:
hud_card( int x, hud_card( int x,
int y, int y,
UINT width, UINT width,
@ -824,7 +823,7 @@ class hud_card : public instr_scale {
~hud_card(); ~hud_card();
hud_card( const hud_card & image); hud_card( const hud_card & image);
hud_card & operator = (const hud_card & rhs ); hud_card & operator = (const hud_card & rhs );
// virtual void display_enable( bool setting ); // virtual void display_enable( bool setting );
virtual void draw( void ); // Required method in base class virtual void draw( void ); // Required method in base class
void circles(float,float,float); // suma void circles(float,float,float); // suma
void fixed(float,float,float,float,float,float); //suma void fixed(float,float,float,float,float,float); //suma
@ -834,7 +833,7 @@ class hud_card : public instr_scale {
typedef hud_card * pCardScale; typedef hud_card * pCardScale;
class gauge_instr : public instr_scale { class gauge_instr : public instr_scale {
public: public:
gauge_instr( int x, gauge_instr( int x,
int y, int y,
UINT width, UINT width,
@ -862,10 +861,10 @@ typedef gauge_instr * pGaugeInst;
// for both panel and HUD Turn Bank Indicators. // for both panel and HUD Turn Bank Indicators.
class dual_instr_item : public instr_item { class dual_instr_item : public instr_item {
private: private:
FLTFNPTR alt_data_source; FLTFNPTR alt_data_source;
public: public:
dual_instr_item ( int x, dual_instr_item ( int x,
int y, int y,
UINT width, UINT width,
@ -886,14 +885,14 @@ class dual_instr_item : public instr_item {
class fgTBI_instr : public dual_instr_item class fgTBI_instr : public dual_instr_item
{ {
private: private:
UINT BankLimit; UINT BankLimit;
UINT SlewLimit; UINT SlewLimit;
UINT scr_hole; UINT scr_hole;
bool tsi; //suma bool tsi; //suma
float rad; //suma float rad; //suma
public: public:
fgTBI_instr( int x, fgTBI_instr( int x,
int y, int y,
UINT width, UINT width,
@ -921,7 +920,7 @@ class fgTBI_instr : public dual_instr_item
typedef fgTBI_instr * pTBI; typedef fgTBI_instr * pTBI;
class HudLadder : public dual_instr_item { class HudLadder : public dual_instr_item {
private: private:
UINT width_units; UINT width_units;
int div_units; int div_units;
UINT minor_div; UINT minor_div;
@ -951,7 +950,7 @@ class HudLadder : public dual_instr_item {
fgLineList LineList; fgLineList LineList;
fgLineList StippleLineList; fgLineList StippleLineList;
public: public:
HudLadder( string name, HudLadder( string name,
int x, int x,
int y, int y,

2019
src/Cockpit/hud_card.cxx
View file

File diff suppressed because it is too large Load diff