fly/flightgear
1
0
Fork 0
Code Activity

Code reorganization.

Browse source
This commit is contained in:
curt 2000-02-15 03:30:01 +00:00
parent 7f9c6d72ab
commit 485230b443
153 changed files with 1079 additions and 2315 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Aircraft/Makefile.am
View file

@ -2,4 +2,4 @@ noinst_LIBRARIES = libAircraft.a
libAircraft_a_SOURCES = aircraft.cxx aircraft.hxx
INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
INCLUDES += -I$(top_builddir) -I$(top_builddir)/src

5
src/Aircraft/aircraft.cxx
View file

@ -23,9 +23,10 @@
#include <stdio.h>
#include <simgear/logstream.hxx>
#include <simgear/constants.h>
#include "aircraft.hxx"
#include <Debug/logstream.hxx>
#include <Include/fg_constants.h>
// This is a record containing all the info for the aircraft currently
// being operated

2
src/Airports/Makefile.am
View file

@ -4,4 +4,4 @@ libAirports_a_SOURCES = \
genapt.cxx genapt.hxx \
simple.cxx simple.hxx
INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
INCLUDES += -I$(top_builddir) -I$(top_builddir)/src

16
src/Airports/genapt.cxx
View file

@ -22,7 +22,7 @@
// $Id$
#include <Include/compiler.h>
#include <simgear/compiler.h>
#include STL_STRING
#include <vector>
@ -36,13 +36,13 @@
# include <strings.h>
#endif
#include <Debug/logstream.hxx>
// #include <Include/fg_types.h>
#include <Math/fg_geodesy.hxx>
#include <Math/mat3.h>
#include <Math/point3d.hxx>
#include <Math/polar3d.hxx>
#include <Misc/fgstream.hxx>
#include <simgear/logstream.hxx>
#include <simgear/fg_geodesy.hxx>
#include <simgear/mat3.h>
#include <simgear/point3d.hxx>
#include <simgear/polar3d.hxx>
#include <simgear/fgstream.hxx>
#include <Objects/materialmgr.hxx>
// #include <gpc/gpc.h>

2
src/Airports/genapt.hxx
View file

@ -31,7 +31,7 @@
#endif
#include <Include/compiler.h>
#include <simgear/compiler.h>
#include STL_STRING
#include <set>

9
src/Airports/simple.cxx
View file

@ -24,11 +24,12 @@
// $Id$
#include <Include/compiler.h>
#include <simgear/compiler.h>
#include <simgear/logstream.hxx>
#include <simgear/fgpath.hxx>
#include <simgear/fgstream.hxx>
#include <Debug/logstream.hxx>
#include <Misc/fgpath.hxx>
#include <Misc/fgstream.hxx>
#include <Main/options.hxx>
#include STL_STRING

3
src/Airports/simple.hxx
View file

@ -33,7 +33,8 @@
#endif
#include <Include/compiler.h>
#include <simgear/compiler.h>
#ifdef FG_HAVE_STD_INCLUDES
# include <istream>
#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS )

2
src/Autopilot/Makefile.am
View file

@ -2,4 +2,4 @@ noinst_LIBRARIES = libAutopilot.a
libAutopilot_a_SOURCES = autopilot.cxx autopilot.hxx
INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
INCLUDES += -I$(top_builddir) -I$(top_builddir)/src

7
src/Autopilot/autopilot.cxx
View file

@ -33,16 +33,17 @@
#include <Scenery/scenery.hxx>
#include "autopilot.hxx"
#include <simgear/constants.h>
#include <simgear/logstream.hxx>
#include <Include/fg_constants.h>
#include <Debug/logstream.hxx>
#include <Airports/simple.hxx>
#include <GUI/gui.h>
#include <Main/fg_init.hxx>
#include <Main/options.hxx>
#include <Time/fg_time.hxx>
#include "autopilot.hxx"
#define mySlider puSlider

2
src/Autopilot/autopilot.hxx
View file

@ -24,7 +24,7 @@
#ifndef _AUTOPILOT_HXX
#define _AUTOPILOT_HXX
#include <Include/compiler.h>
#include <simgear/compiler.h>
#include STL_STRING

2
src/Cockpit/Makefile.am
View file

@ -9,4 +9,4 @@ libCockpit_a_SOURCES = \
hud_scal.cxx hud_tbi.cxx \
panel.cxx panel.hxx
INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
INCLUDES += -I$(top_builddir) -I$(top_builddir)/src

13
src/Cockpit/cockpit.cxx
View file

@ -30,21 +30,22 @@
#endif
#include <GL/glut.h>
#include <XGL/xgl.h>
#include <simgear/xgl.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <simgear/logstream.hxx>
#include <simgear/constants.h>
#include <simgear/fg_random.h>
#include <simgear/mat3.h>
#include <simgear/polar3d.hxx>
#include <Aircraft/aircraft.hxx>
#include <Debug/logstream.hxx>
#include <Include/fg_constants.h>
#include <Include/general.hxx>
#include <Main/options.hxx>
#include <Main/views.hxx>
#include <Math/fg_random.h>
#include <Math/mat3.h>
#include <Math/polar3d.hxx>
#include <Scenery/scenery.hxx>
#include <Time/fg_timer.hxx>
#include <Time/fg_time.hxx>

11
src/Cockpit/hud.cxx
View file

@ -42,14 +42,15 @@
# include <values.h> // for MAXINT
#endif
#include <simgear/logstream.hxx>
#include <simgear/constants.h>
#include <simgear/fg_random.h>
#include <simgear/mat3.h>
#include <simgear/polar3d.hxx>
#include <Aircraft/aircraft.hxx>
#include <Debug/logstream.hxx>
#include <GUI/gui.h>
#include <Include/fg_constants.h>
#include <Main/options.hxx>
#include <Math/fg_random.h>
#include <Math/mat3.h>
#include <Math/polar3d.hxx>
#ifdef FG_NETWORK_OLK
#include <NetworkOLK/network.h>
#endif

5
src/Cockpit/hud.hxx
View file

@ -47,13 +47,14 @@
#include <vector> // STL vector
#include <deque> // STL double ended queue
#include <simgear/constants.h>
#include <simgear/mat3.h>
#include <fg_typedefs.h>
#include <fg_constants.h>
#include <Aircraft/aircraft.hxx>
#include <FDM/flight.hxx>
#include <Controls/controls.hxx>
#include <GUI/gui.h>
#include <Math/mat3.h>
FG_USING_STD(deque);
FG_USING_STD(vector);

10
src/Cockpit/hud_card.cxx
View file

@ -7,12 +7,14 @@
#endif
#include <stdlib.h>
#include <string.h>
#include <simgear/constants.h>
#include <simgear/fg_random.h>
#include <simgear/mat3.h>
#include <simgear/polar3d.hxx>
#include <Aircraft/aircraft.hxx>
#include <GUI/gui.h>
#include <Include/fg_constants.h>
#include <Math/fg_random.h>
#include <Math/mat3.h>
#include <Math/polar3d.hxx>
#include <Scenery/scenery.hxx>
#include <Time/fg_timer.hxx>

13
src/Cockpit/hud_dnst.cxx
View file

@ -5,19 +5,22 @@
#ifdef HAVE_WINDOWS_H
# include <windows.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <simgear/constants.h>
#include <simgear/fg_random.h>
#include <simgear/mat3.h>
#include <simgear/polar3d.hxx>
#include <Aircraft/aircraft.hxx>
#include <Include/fg_constants.h>
#include <Math/fg_random.h>
#include <Math/mat3.h>
#include <Math/polar3d.hxx>
#include <Scenery/scenery.hxx>
#include <Time/fg_timer.hxx>
#include "hud.hxx"
//============ Top of dual_instr_item class member definitions ============
dual_instr_item ::

12
src/Cockpit/hud_guag.cxx
View file

@ -5,19 +5,23 @@
#ifdef HAVE_WINDOWS_H
# include <windows.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <simgear/constants.h>
#include <simgear/fg_random.h>
#include <simgear/mat3.h>
#include <simgear/polar3d.hxx>
#include <Aircraft/aircraft.hxx>
#include <GUI/gui.h>
#include <Include/fg_constants.h>
#include <Math/fg_random.h>
#include <Math/mat3.h>
#include <Math/polar3d.hxx>
#include <Scenery/scenery.hxx>
#include <Time/fg_timer.hxx>
#include "hud.hxx"
#ifdef USE_HUD_TextList
#define textString( x , y, text, font ) TextString( text, x , y )
#else

12
src/Cockpit/hud_inst.cxx
View file

@ -10,17 +10,19 @@
#include <stdlib.h>
#include <string.h>
#include <simgear/constants.h>
#include <simgear/fg_random.h>
#include <simgear/mat3.h>
#include <simgear/polar3d.hxx>
#include <Aircraft/aircraft.hxx>
#include <Include/fg_constants.h>
#include <Math/fg_random.h>
#include <Math/mat3.h>
#include <Math/polar3d.hxx>
#include <Scenery/scenery.hxx>
#include <Time/fg_timer.hxx>
#include "hud.hxx"
UINT instr_item :: instances = 0; // Initial value of zero
int instr_item :: brightness = BRT_MEDIUM;
glRGBTRIPLE instr_item :: color = {0.1, 0.7, 0.0};

12
src/Cockpit/hud_labl.cxx
View file

@ -5,19 +5,23 @@
#ifdef HAVE_WINDOWS_H
# include <windows.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <simgear/constants.h>
#include <simgear/fg_random.h>
#include <simgear/mat3.h>
#include <simgear/polar3d.hxx>
#include <Aircraft/aircraft.hxx>
#include <GUI/gui.h>
#include <Include/fg_constants.h>
#include <Math/fg_random.h>
#include <Math/mat3.h>
#include <Math/polar3d.hxx>
#include <Scenery/scenery.hxx>
#include <Time/fg_timer.hxx>
#include "hud.hxx"
#ifdef USE_HUD_TextList
#define textString( x , y, text, font ) TextString( text, x , y )
#else

13
src/Cockpit/hud_ladr.cxx
View file

@ -5,18 +5,23 @@
#ifdef HAVE_WINDOWS_H
# include <windows.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <simgear/constants.h>
#include <simgear/fg_random.h>
#include <simgear/mat3.h>
#include <simgear/polar3d.hxx>
#include <Aircraft/aircraft.hxx>
#include <Include/fg_constants.h>
#include <Math/fg_random.h>
#include <Math/mat3.h>
#include <Math/polar3d.hxx>
#include <Scenery/scenery.hxx>
#include <Time/fg_timer.hxx>
#include <GUI/gui.h>
#include "hud.hxx"
//====================== Top of HudLadder Class =======================
HudLadder :: HudLadder( int x,
int y,

11
src/Cockpit/hud_lat.cxx
View file

@ -5,14 +5,17 @@
#ifdef HAVE_WINDOWS_H
# include <windows.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <simgear/constants.h>
#include <simgear/fg_random.h>
#include <simgear/mat3.h>
#include <simgear/polar3d.hxx>
#include <Aircraft/aircraft.hxx>
#include <GUI/gui.h>
#include <Include/fg_constants.h>
#include <Math/fg_random.h>
#include <Math/mat3.h>
#include <Math/polar3d.hxx>
#include <Scenery/scenery.hxx>
#include <Time/fg_timer.hxx>

13
src/Cockpit/hud_lon.cxx
View file

@ -5,20 +5,23 @@
#ifdef HAVE_WINDOWS_H
# include <windows.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <simgear/constants.h>
#include <simgear/fg_random.h>
#include <simgear/mat3.h>
#include <simgear/polar3d.hxx>
#include <Aircraft/aircraft.hxx>
#include <GUI/gui.h>
#include <Include/fg_constants.h>
#include <Math/fg_random.h>
#include <Math/mat3.h>
#include <Math/polar3d.hxx>
#include <Scenery/scenery.hxx>
#include <Time/fg_timer.hxx>
#include "hud.hxx"
#ifdef USE_HUD_TextList
#define textString( x , y, text, font ) TextString( text, x , y )
#else

14
src/Cockpit/hud_scal.cxx
View file

@ -5,18 +5,22 @@
#ifdef HAVE_WINDOWS_H
# include <windows.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <simgear/constants.h>
#include <simgear/fg_random.h>
#include <simgear/mat3.h>
#include <simgear/polar3d.hxx>
#include <Aircraft/aircraft.hxx>
#include <Include/fg_constants.h>
#include <Math/fg_random.h>
#include <Math/mat3.h>
#include <Math/polar3d.hxx>
#include <Scenery/scenery.hxx>
#include <Time/fg_timer.hxx>
#include "hud.hxx"
//============== Top of instr_scale class memeber definitions ===============
//
// Notes:

14
src/Cockpit/hud_tbi.cxx
View file

@ -5,18 +5,22 @@
#ifdef HAVE_WINDOWS_H
# include <windows.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <simgear/constants.h>
#include <simgear/fg_random.h>
#include <simgear/mat3.h>
#include <simgear/polar3d.hxx>
#include <Aircraft/aircraft.hxx>
#include <Include/fg_constants.h>
#include <Math/fg_random.h>
#include <Math/mat3.h>
#include <Math/polar3d.hxx>
#include <Scenery/scenery.hxx>
#include <Time/fg_timer.hxx>
#include "hud.hxx"
//============ Top of fgTBI_instr class member definitions ==============
fgTBI_instr ::

1244
src/Cockpit/panel.cxx
View file

File diff suppressed because it is too large Load diff

337
src/Cockpit/panel.hxx
View file

@ -1,8 +1,6 @@
// panel.hxx -- instrument panel defines and prototypes
// panel.cxx - default, 2D single-engine prop instrument panel
//
// Written by Friedemann Reinhard, started June 1998.
//
// Major code reorganization by David Megginson, November 1999.
// Written by David Megginson, started January 2000.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License as
@ -20,10 +18,8 @@
//
// $Id$
#ifndef _PANEL_HXX
#define _PANEL_HXX
#ifndef __PANEL_HXX
#define __PANEL_HXX
#ifndef __cplusplus
# error This library requires C++
@ -39,227 +35,218 @@
#endif
#include <GL/glut.h>
#include <XGL/xgl.h>
#include <simgear/xgl.h>
class FGInstrument; // FIXME: rearrange to avoid this?
#include <plib/ssg.h>
class FGPanelInstrument;
/**
* Top-level class to hold an instance of a panel.
*/
class FGPanel{
////////////////////////////////////////////////////////////////////////
// Instrument panel class.
////////////////////////////////////////////////////////////////////////
class FGPanel
{
public:
static FGPanel *OurPanel; // current_panel would be better
// FIXME: a few other classes have a
// dependency on this information; it
// would be nice to fix that.
GLuint panel_tex_id[2];
FGPanel();
FGPanel ();
virtual ~FGPanel ();
virtual float get_height(void) { return height; }
virtual void ReInit( int x, int y, int finx, int finy);
virtual void Update(void);
// Legacy interface from old panel.
static FGPanel * OurPanel;
virtual float get_height () const;
virtual void ReInit (int x, int y, int finx, int finy);
virtual void Update () const;
private:
int _x, _y, _w, _h;
int _panel_h;
int height;
int width;
GLubyte *background;
GLubyte *imag;
int imag_width, imag_height;
GLubyte *img;
int img_width, img_height;
// The instruments on the panel.
FGInstrument * horizonIndicator;
FGInstrument * turnCoordinator;
FGInstrument * rpmIndicator;
FGInstrument * airspeedIndicator;
FGInstrument * verticalSpeedIndicator;
FGInstrument * altimeter;
FGInstrument * altimeter2;
ssgTexture * _bg;
const FGPanelInstrument * _airspeed;
const FGPanelInstrument * _horizon;
const FGPanelInstrument * _altimeter;
const FGPanelInstrument * _coordinator;
const FGPanelInstrument * _gyro;
const FGPanelInstrument * _vertical;
const FGPanelInstrument * _flaps;
const FGPanelInstrument * _rpm;
};
/**
* Abstract base class for all panel instruments.
*/
class FGInstrument{
////////////////////////////////////////////////////////////////////////
// Instrument base class.
////////////////////////////////////////////////////////////////////////
class FGPanelInstrument
{
public:
FGInstrument (void) {}
virtual ~FGInstrument (void) {}
virtual void Init(void) = 0;
virtual void Render(void) = 0;
FGPanelInstrument ();
FGPanelInstrument (int x, int y, int w, int h);
virtual ~FGPanelInstrument ();
virtual void draw () const = 0;
virtual void setPosition(int x, int y);
virtual void setSize(int w, int h);
virtual int getXPos () const;
virtual int getYPos () const;
protected:
float XPos;
float YPos;
int _x, _y, _w, _h;
};
/**
* Instrument: the artificial horizon.
*/
class FGHorizon : public FGInstrument
{
////////////////////////////////////////////////////////////////////////
// An instrument composed of layered textures.
////////////////////////////////////////////////////////////////////////
public:
FGHorizon (float inXPos, float inYPos);
virtual ~FGHorizon (void);
virtual void Init (void);
virtual void Render (void);
private:
float texXPos;
float texYPos;
float radius;
float bottom; // tell the program the offset between midpoint and bottom
float top; // guess what ;-)
float vertices[180][2];
float normals[180][3];
float texCoord[180][2];
};
/**
* Instrument: the turn co-ordinator.
*/
class FGTurnCoordinator : public FGInstrument
{
public:
FGTurnCoordinator (float inXPos, float inYPos);
virtual ~FGTurnCoordinator (void);
virtual void Init (void);
virtual void Render(void);
private:
float PlaneTexXPos;
float PlaneTexYPos;
float alpha;
float PlaneAlpha;
float alphahist[2];
float rollhist[2];
float BallXPos;
float BallYPos;
float BallTexXPos;
float BallTexYPos;
float BallRadius;
GLfloat vertices[72];
static GLfloat wingArea[];
static GLfloat elevatorArea[];
static GLfloat rudderArea[];
};
/**
* Abstract base class for gauges with needles and textured backgrounds.
*
* The airspeed indicator, vertical speed indicator, altimeter, and RPM
* gauge are all derived from this class.
*/
class FGTexInstrument : public FGInstrument
class FGTexturedInstrument : public FGPanelInstrument
{
public:
FGTexInstrument (void);
virtual ~FGTexInstrument ();
virtual void Init(void);
virtual void Render(void);
static const int MAX_LAYERS = 8;
FGTexturedInstrument (int x, int y, int w, int h);
virtual ~FGTexturedInstrument ();
virtual void addLayer (int layer, const char * textureName);
virtual void addLayer (int layer, ssgTexture * texture);
virtual void setLayerCenter (int layer, int x, int y);
virtual void setLayerRot (int layer, double rotation) const;
virtual void setLayerOffset (int layer, int xoffset, int yoffset) const;
virtual bool hasLayer (int layer) const;
virtual void draw () const;
protected:
virtual void CreatePointer(void);
virtual void UpdatePointer(void);
virtual double getValue () const = 0;
float radius;
float length;
float width;
float angle;
float tape[2];
float value1;
float value2;
float alpha1;
float alpha2;
float textureXPos;
float textureYPos;
GLfloat vertices[20];
bool _layers[MAX_LAYERS];
mutable int _xcenter[MAX_LAYERS];
mutable int _ycenter[MAX_LAYERS];
mutable double _rotation[MAX_LAYERS];
mutable int _xoffset[MAX_LAYERS];
mutable int _yoffset[MAX_LAYERS];
ssgTexture * _textures[MAX_LAYERS];
};
/**
* Instrument: the airspeed indicator.
*/
class FGAirspeedIndicator : public FGTexInstrument
////////////////////////////////////////////////////////////////////////
// Airspeed indicator.
////////////////////////////////////////////////////////////////////////
class FGAirspeedIndicator : public FGTexturedInstrument
{
public:
FGAirspeedIndicator (int x, int y);
virtual ~FGAirspeedIndicator ();
protected:
double getValue () const;
virtual void draw () const;
};
/**
* Instrument: the vertical speed indicator.
*/
class FGVerticalSpeedIndicator : public FGTexInstrument
////////////////////////////////////////////////////////////////////////
// Artificial Horizon.
////////////////////////////////////////////////////////////////////////
class FGHorizon : public FGTexturedInstrument
{
public:
FGVerticalSpeedIndicator (int x, int y);
virtual ~FGVerticalSpeedIndicator ();
protected:
double getValue () const;
FGHorizon (int x, int y);
virtual ~FGHorizon ();
virtual void draw () const;
};
/**
* Instrument: the altimeter (big hand?)
*/
class FGAltimeter : public FGTexInstrument
////////////////////////////////////////////////////////////////////////
// Altimeter.
////////////////////////////////////////////////////////////////////////
class FGAltimeter : public FGTexturedInstrument
{
public:
FGAltimeter (int x, int y);
virtual ~FGAltimeter ();
protected:
double getValue () const;
virtual void draw () const;
};
/**
* Instrument: the altimeter (little hand?)
*/
class FGAltimeter2 : public FGTexInstrument
////////////////////////////////////////////////////////////////////////
// Turn Co-ordinator.
////////////////////////////////////////////////////////////////////////
class FGTurnCoordinator : public FGTexturedInstrument
{
public:
FGAltimeter2 (int x, int y);
virtual ~FGAltimeter2 ();
protected:
double getValue () const;
FGTurnCoordinator (int x, int y);
virtual ~FGTurnCoordinator ();
virtual void draw () const;
};
/**
* Instrument: the RPM gauge (actually manifold pressure right now).
*/
class FGRPMIndicator : public FGTexInstrument
////////////////////////////////////////////////////////////////////////
// Gyro Compass.
////////////////////////////////////////////////////////////////////////
class FGGyroCompass : public FGTexturedInstrument
{
public:
FGRPMIndicator (int x, int y);
virtual ~FGRPMIndicator ();
protected:
double getValue () const;
FGGyroCompass (int x, int y);
virtual ~FGGyroCompass ();
virtual void draw () const;
};
// FIXME: move to FGPanel, somehow
void fgEraseArea(GLfloat *array, int NumVerti, GLfloat texXPos, GLfloat texYPos, GLfloat XPos, GLfloat YPos, int Texid, float ScaleFactor);
////////////////////////////////////////////////////////////////////////
// Vertical velocity indicator.
////////////////////////////////////////////////////////////////////////
class FGVerticalVelocity : public FGTexturedInstrument
{
public:
FGVerticalVelocity (int x, int y);
virtual ~FGVerticalVelocity ();
virtual void draw () const;
};
////////////////////////////////////////////////////////////////////////
// RPM gauge.
////////////////////////////////////////////////////////////////////////
class FGRPMGauge : public FGTexturedInstrument
{
public:
FGRPMGauge (int x, int y);
virtual ~FGRPMGauge ();
virtual void draw () const;
};
////////////////////////////////////////////////////////////////////////
// Flap position indicator.
////////////////////////////////////////////////////////////////////////
class FGFlapIndicator : public FGTexturedInstrument
{
public:
FGFlapIndicator (int x, int y);
virtual ~FGFlapIndicator ();
virtual void draw () const;
};
#endif // __PANEL_HXX
// end of panel.hxx
#endif // _PANEL_HXX

2
src/Controls/Makefile.am
View file

@ -2,4 +2,4 @@ noinst_LIBRARIES = libControls.a
libControls_a_SOURCES = controls.cxx controls.hxx
INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
INCLUDES += -I$(top_builddir) -I$(top_builddir)/src

166
src/Done
View file

@ -1,166 +0,0 @@
--------------------------------------------------------------------------
| Done
--------------------------------------------------------------------------
7/21/98 - add a --enable/disable-sound option.
7/11/98 - Ground collision detection
7/3/98 - Generate and store the transform matrix when rendering by
material property so we don't have to push, transform, pop
continually. See mesa code for gluLookAt()
6/11/98 - convert to static libraries and reduce libtool usage ...
6/11/98 - Converted to GL_FOG_EXP2
5/29/98 - Widened edges of tiles to overlap a bit. This should help
reduce floating point induced gaps between tiles.
5/27/98 - Rewrote airport list manager using an STL "map" (associative
array) for quick lookup.
5/26/98 - Impose a maximum triangle area during scenery generation so
even very flat areas will get split into a few smaller sub
triangles.
5/26/98 - Overhaul view parameter generation ... see if we can piggy
back off of larcsim calcs, and consolate potentially
redundant code -- Norman Vine
5/24/98 - Fine grain view frustum culling
5/20/98 - fix winding problem with tri-strips in obj.c (wait for next
version of stripe)
5/17/98 - Course grain (tile based) view frustum culling
5/6/98 - HUD updates from Jeff Goeke-Smith.
5/5/98 - Added a visual frame rate counter on the HUD.
5/2/98 - Option to go full screen. call glutFullScreen()
4/29/98 - Option to toggle between smooth / flat shading.
4/28/98 - Physically check if airport list overruns array size when loading.
4/28/98 - Wrap up zlib so we can conditionally compile back in normal
behavior on systems that have trouble building zlib.
4/27/98 - Do a better job of translating scenery tiles towards (0,0,0)
4/27/98 - fgTIME fgVIEW struct -> typedef
4/27/98 - Add a option to disable texturing.
4/25/98 - Clean up initialization sequence and eliminate
interdependencies between lighting and position.
4/23/98 - encapsulate all #include <config.h>'s with #ifdef HAVE_CONFIG_H
4/23/98 - Give all textured polygons ambient and diffuse glMaterial()
properties of "white" so GL_MODULATE works as expected and
textures are not oddly tinted.
4/21/98 - Convert lighting equations to table lookups
4/21/98 - Make sure all #ifdef _cplusplus are after any other includes
Make sure all .hxx files have #ifndef cplusplus #error
4/21/98 - various autoconf cleanups/preparation for C++
4/9/98 - Fixed a bug in event management where the next event run time
was miscalculated so it was never run.
4/6/98 - Cleanups
--------------------------------------------------------------------------
4/3/98 - Released version 0.40
4/3/98 - Incorporated the Gnu automake/autoconf/libtool system.
3/17/98 - Fix time jumping problem on win32
3/1/98 - Unify sun position render code with existing sunpos
calculations so the sun doesn't do it's little jump every
hour.
2/19/98 - Fixed a problem with smooth view (scenery center) switch
when entering a new tile.
2/18/98 - Fixed a problem with terrain generation that was causing
some strips to be put in the wrong winding list.
2/9/98 - Fixed a problem with terrain tiles not quite matching up perfectly.
2/2/98 - Fix warning when compiling with c++ ... also successfully built
with cygnus-g++. There should be nothing holding us back from
using C++.
1/30/98 - remove Scenery/geometry.c and Scenery/mesh.c
1/28/98 - Dynamic unloading of scenery.
1/26/98 - Debug message system.
1/26/98 - Dynamic loading of scenery
1/24/98 - Remove some of the unused files such as ls_sync.c
1/23/98 - in all .h's change #ifdef FILE_H -> #ifdef _FILE_H
--------------------------------------------------------------------------
1/22/98 - Released version 0.25
1/19/98 - Compile with c++
1/17/98 - Change all "type function();" to "type function( void );"
--------------------------------------------------------------------------
1/16/98 - Release verison 0.23
1/6/98 - Added FGwin32.mak (a MSVC++ Makefile for building win32 versions)
--------------------------------------------------------------------------
1/5/98 - Released version 0.21
12/31/97 - remove Unix dependencies from .../Time/fg_time.c
--------------------------------------------------------------------------
12/30/97 - Released version 0.20
12/30/97 - Released version 0.19
12/30/97 - Event manager
12/23/97 - First stab at a reasonable sky ... I'm going to probably
leave this for now so I don't spend the rest of my life
trying to tweak it.
12/17/97 - Released version 0.18
12/17/97 - Fix sun/moon initialization code so display lists aren't
re-created at every Init().
12/12/97 - Released verison 0.17
12/10/97 - Released version 0.16
12/9/97 - Released demtools version 0.01
12/9/97 - Released version 0.15
11/25/97 - Released version 0.14
10/24/97 - Released version 0.13
9/22/97 - Released version 0.12
9/16/97 - Released version 0.11

11
src/FDM/Balloon.cxx
View file

@ -37,7 +37,7 @@ HISTORY
/* INCLUDES */
/****************************************************************************/
#include <Include/compiler.h>
#include <simgear/compiler.h>
#ifdef FG_MATH_EXCEPTION_CLASH
# include <math.h>
@ -45,13 +45,14 @@ HISTORY
#include STL_STRING
#include <simgear/logstream.hxx>
#include <simgear/constants.h>
#include <simgear/fg_geodesy.hxx>
#include <simgear/fgpath.hxx>
#include <Aircraft/aircraft.hxx>
#include <Controls/controls.hxx>
#include <Debug/logstream.hxx>
#include <Include/fg_constants.h>
#include <Main/options.hxx>
#include <Math/fg_geodesy.hxx>
#include <Misc/fgpath.hxx>
#include "Balloon.h"

3
src/FDM/Balloon/BalloonSim.cpp
View file

@ -42,8 +42,9 @@ HISTORY
// #include <conio.h>
#include <math.h>
#include <simgear/constants.h>
#include <Aircraft/aircraft.hxx>
#include <Include/fg_constants.h>
#include <Main/options.hxx>
#include <WeatherCM/FGLocalWeatherDatabase.h>

2
src/FDM/Balloon/Makefile.am
View file

@ -2,4 +2,4 @@ noinst_LIBRARIES = libBalloon.a
libBalloon_a_SOURCES = BalloonSim.cpp BalloonSim.h
INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
INCLUDES += -I$(top_builddir) -I$(top_builddir)/src

12
src/FDM/JSBSim.cxx
View file

@ -21,7 +21,7 @@
// $Id$
#include <Include/compiler.h>
#include <simgear/compiler.h>
#ifdef FG_MATH_EXCEPTION_CLASH
# include <math.h>
@ -29,13 +29,14 @@
#include STL_STRING
#include <simgear/logstream.hxx>
#include <simgear/constants.h>
#include <simgear/fg_geodesy.hxx>
#include <simgear/fgpath.hxx>
#include <Aircraft/aircraft.hxx>
#include <Controls/controls.hxx>
#include <Debug/logstream.hxx>
#include <Include/fg_constants.h>
#include <Main/options.hxx>
#include <Math/fg_geodesy.hxx>
#include <Misc/fgpath.hxx>
#include <FDM/JSBsim/FGFDMExec.h>
#include <FDM/JSBsim/FGAircraft.h>
@ -47,7 +48,6 @@
#include <FDM/JSBsim/FGAuxiliary.h>
#include <FDM/JSBsim/FGDefs.h>
#include "JSBsim.hxx"

2
src/FDM/JSBSim/FGAircraft.cpp
View file

@ -106,7 +106,7 @@ INCLUDES
#ifdef FGFS
# ifndef __BORLANDC__
# include <Include/compiler.h>
# include <simgear/compiler.h>
# endif
# ifdef FG_HAVE_STD_INCLUDES
# include <cmath>

2
src/FDM/JSBSim/FGAircraft.h
View file

@ -97,7 +97,7 @@ INCLUDES
*******************************************************************************/
#ifdef FGFS
# include <Include/compiler.h>
# include <simgear/compiler.h>
# ifdef FG_HAVE_STD_INCLUDES
# include <fstream>
# include <vector>

2
src/FDM/JSBSim/FGCoefficient.h
View file

@ -38,7 +38,7 @@ SENTRY
INCLUDES
*******************************************************************************/
#ifdef FGFS
# include <Include/compiler.h>
# include <simgear/compiler.h>
# include STL_STRING
# ifdef FG_HAVE_STD_INCLUDES
# include <fstream>

2
src/FDM/JSBSim/FGEngine.cpp
View file

@ -39,7 +39,7 @@ INCLUDES
*******************************************************************************/
#ifdef FGFS
# include <Include/compiler.h>
# include <simgear/compiler.h>
# ifdef FG_HAVE_STD_INCLUDES
# include <fstream>
# else

2
src/FDM/JSBSim/FGEngine.h
View file

@ -45,7 +45,7 @@ INCLUDES
*******************************************************************************/
#ifdef FGFS
# include <Include/compiler.h>
# include <simgear/compiler.h>
# include STL_STRING
FG_USING_STD(string);
#else

2
src/FDM/JSBSim/FGFDMExec.cpp
View file

@ -39,7 +39,7 @@ INCLUDES
*******************************************************************************/
#ifdef FGFS
# include <Include/compiler.h>
# include <simgear/compiler.h>
# ifdef FG_HAVE_STD_INCLUDES
# include <iostream>
# include <ctime>

2
src/FDM/JSBSim/FGLGear.h
View file

@ -55,7 +55,7 @@ INCLUDES
*******************************************************************************/
#ifdef FGFS
# include <Include/compiler.h>
# include <simgear/compiler.h>
# include STL_STRING
# ifdef FG_HAVE_STD_INCLUDES
# include <fstream>

2
src/FDM/JSBSim/FGModel.h
View file

@ -41,7 +41,7 @@ INCLUDES
#include "FGDefs.h"
#ifdef FGFS
# include <Include/compiler.h>
# include <simgear/compiler.h>
# include STL_STRING
# ifdef FG_HAVE_STD_INCLUDES
# include <iostream>

2
src/FDM/JSBSim/FGOutput.h
View file

@ -41,7 +41,7 @@ INCLUDES
#include "FGModel.h"
#ifdef FGFS
# include <Include/compiler.h>
# include <simgear/compiler.h>
# ifdef FG_HAVE_STD_INCLUDES
# include <iostream>
# include <fstream>

2
src/FDM/JSBSim/FGPosition.cpp
View file

@ -54,7 +54,7 @@ INCLUDES
*******************************************************************************/
#ifdef FGFS
# include <Include/compiler.h>
# include <simgear/compiler.h>
# ifdef FG_HAVE_STD_INCLUDES
# include <cmath>
# else

2
src/FDM/JSBSim/FGRotation.h
View file

@ -57,7 +57,7 @@ INCLUDES
*******************************************************************************/
#ifdef FGFS
# include <Include/compiler.h>
# include <simgear/compiler.h>
# ifdef FG_HAVE_STD_INCLUDES
# include <cmath>
# else

2
src/FDM/JSBSim/FGState.cpp
View file

@ -37,7 +37,7 @@ INCLUDES
*******************************************************************************/
#ifdef FGFS
# include <Include/compiler.h>
# include <simgear/compiler.h>
# ifdef FG_HAVE_STD_INCLUDES
# include <cmath>
# else

2
src/FDM/JSBSim/FGState.h
View file

@ -45,7 +45,7 @@ INCLUDES
*******************************************************************************/
#ifdef FGFS
# include <Include/compiler.h>
# include <simgear/compiler.h>
# include STL_STRING
# ifdef FG_HAVE_STD_INCLUDES
# include <fstream>

2
src/FDM/JSBSim/FGTank.h
View file

@ -44,7 +44,7 @@ SENTRY
INCLUDES
*******************************************************************************/
#ifdef FGFS
# include <Include/compiler.h>
# include <simgear/compiler.h>
# include STL_STRING
# ifdef FG_HAVE_STD_INCLUDES
# include <fstream>

2
src/FDM/JSBSim/FGTranslation.h
View file

@ -57,7 +57,7 @@ INCLUDES
*******************************************************************************/
#ifdef FGFS
# include <Include/compiler.h>
# include <simgear/compiler.h>
# ifdef FG_HAVE_STD_INCLUDES
# include <cmath>
# else

2
src/FDM/JSBSim/FGUtility.cpp
View file

@ -43,7 +43,7 @@ INCLUDES
*******************************************************************************/
#ifdef FGFS
# include <Include/compiler.h>
# include <simgear/compiler.h>
# ifdef FG_HAVE_STD_INCLUDES
# include <cmath>
# else

2
src/FDM/JSBSim/FGfdmSocket.h
View file

@ -47,7 +47,7 @@ INCLUDES
#ifdef FGFS
# pragma message("FGFS defined")
# include <Include/compiler.h>
# include <simgear/compiler.h>
# include STL_STRING
# ifdef FG_HAVE_STD_INCLUDES
# include <fstream>

2
src/FDM/JSBSim/JSBSim.cpp
View file

@ -78,7 +78,7 @@ USEUNIT("FGfdmSocket.cpp");
#include "FGOutput.h"
#ifdef FGFS
#include <Include/compiler.h>
#include <simgear/compiler.h>
#include STL_IOSTREAM
# ifdef FG_HAVE_STD_INCLUDES
# include <ctime>

4
src/FDM/LaRCsim.cxx
View file

@ -23,11 +23,11 @@
#include "LaRCsim.hxx"
#include <Include/fg_constants.h>
#include <simgear/constants.h>
#include <simgear/logstream.hxx>
#include <Aircraft/aircraft.hxx>
#include <Controls/controls.hxx>
#include <Debug/logstream.hxx>
#include <FDM/flight.hxx>
#include <FDM/LaRCsim/ls_cockpit.h>
#include <FDM/LaRCsim/ls_generic.h>

2
src/FDM/LaRCsim/Makefile.am
View file

@ -32,4 +32,4 @@ libLaRCsim_a_SOURCES = \
$(AIRCRAFT_MODEL) \
ls_interface.c ls_interface.h
INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
INCLUDES += -I$(top_builddir) -I$(top_builddir)/src

7
src/FDM/MagicCarpet.cxx
View file

@ -21,11 +21,12 @@
// $Id$
#include <simgear/fg_geodesy.hxx>
#include <simgear/point3d.hxx>
#include <simgear/polar3d.hxx>
#include <Controls/controls.hxx>
#include <Main/options.hxx>
#include <Math/fg_geodesy.hxx>
#include <Math/point3d.hxx>
#include <Math/polar3d.hxx>
#include "MagicCarpet.hxx"

2
src/FDM/Makefile.am
View file

@ -10,4 +10,4 @@ libFlight_a_SOURCES = \
LaRCsim.cxx LaRCsim.hxx \
MagicCarpet.cxx MagicCarpet.hxx
INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
INCLUDES += -I$(top_builddir) -I$(top_builddir)/src

7
src/FDM/flight.cxx
View file

@ -23,11 +23,12 @@
#include <stdio.h>
#include <Debug/logstream.hxx>
#include <simgear/logstream.hxx>
#include <simgear/constants.h>
#include <simgear/fg_geodesy.hxx>
#include <FDM/LaRCsim/ls_interface.h>
#include <Include/fg_constants.h>
#include <Main/options.hxx>
#include <Math/fg_geodesy.hxx>
#include <Time/timestamp.hxx>
#include "External.hxx"

2
src/FDM/flight.hxx
View file

@ -81,7 +81,7 @@
*/
#include <Include/compiler.h>
#include <simgear/compiler.h>
#include <math.h>

5
src/GUI/Makefile.am
View file

@ -2,7 +2,4 @@ noinst_LIBRARIES = libGUI.a
libGUI_a_SOURCES = gui.cxx gui.h
INCLUDES += -I$(top_builddir) \
-I$(top_builddir)/Lib \
-I$(top_builddir)/Lib/plib/include \
-I$(top_builddir)/Simulator
INCLUDES += -I$(top_builddir) -I$(top_builddir)/src

13
src/GUI/gui.cxx
View file

@ -28,7 +28,7 @@
# include <config.h>
#endif
#include <Include/compiler.h>
#include <simgear/compiler.h>
#ifdef FG_MATH_EXCEPTION_CLASH
# include <math.h>
@ -39,7 +39,7 @@
#endif
#include <GL/glut.h>
#include <XGL/xgl.h>
#include <simgear/xgl.h>
#if defined(FX) && defined(XMESA)
# include <GL/xmesa.h>
@ -50,9 +50,12 @@
#include <stdlib.h>
#include <string.h>
#include <simgear/constants.h>
#include <simgear/logstream.hxx>
#include <simgear/fgpath.hxx>
#include <simgear/screen-dump.hxx>
#include <Include/general.hxx>
#include <Include/fg_constants.h>
#include <Debug/logstream.hxx>
#include <Aircraft/aircraft.hxx>
#include <Airports/simple.hxx>
#include <Cockpit/panel.hxx>
@ -61,11 +64,9 @@
#include <Main/options.hxx>
#include <Main/fg_init.hxx>
#include <Main/views.hxx>
#include <Misc/fgpath.hxx>
#ifdef FG_NETWORK_OLK
#include <NetworkOLK/network.h>
#endif
#include <Screen/screen-dump.hxx>
#include <Time/fg_time.hxx>
#if defined( WIN32 ) && !defined( __CYGWIN__ )

1
src/GUI/gui.h
View file

@ -25,6 +25,7 @@
#ifndef _GUI_H_
#define _GUI_H_
#include <GL/glut.h> // needed before pu.h
#include <plib/pu.h> // plib include
extern void guiInit();

303
src/Include/compiler.h
View file

@ -1,303 +0,0 @@
/**************************************************************************
* compiler.h -- C++ Compiler Portability Macros
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Id$
**************************************************************************/
#ifndef _COMPILER_H
#define _COMPILER_H
// What this file does.
// (1) Defines macros for some STL includes which may be affected
// by file name length limitations.
// (2) Defines macros for some features not supported by all C++ compilers.
// (3) Defines 'explicit' as a null macro if the compiler doesn't support
// the explicit keyword.
// (4) Defines 'typename' as a null macro if the compiler doesn't support
// the typename keyword.
// (5) Defines bool, true and false if the compiler doesn't do so.
// (6) Defines FG_EXPLICIT_FUNCTION_TMPL_ARGS if the compiler
// supports calling a function template by providing its template
// arguments explicitly.
// (7) Defines FG_NEED_AUTO_PTR if STL doesn't provide auto_ptr<>.
// (8) Defines FG_NO_ARROW_OPERATOR if the compiler is unable
// to support operator->() for iterators.
// (9) Defines FG_USE_EXCEPTIONS if the compiler supports exceptions.
// Note: no FlightGear code uses exceptions.
// (10) Define FG_NAMESPACES if the compiler supports namespaces.
// (11) FG_MATH_FN_IN_NAMESPACE_STD -- not used??
// (12) Define FG_HAVE_STD if std namespace is supported.
// (13) Defines FG_CLASS_PARTIAL_SPECIALIZATION if the compiler
// supports partial specialization of class templates.
// (14) Defines FG_HAVE_STD_INCLUDES to use ISO C++ Standard headers.
// (15) Defines FG_HAVE_STREAMBUF if <streambuf> of <streambuf.h> are present.
// (16) Define FG_MATH_EXCEPTION_CLASH if math.h defines an exception class
// that clashes with the one defined in <stdexcept>.
#ifdef __GNUC__
# if __GNUC__ == 2
# if __GNUC_MINOR__ < 8
// g++-2.7.x
# define STL_ALGORITHM <algorithm>
# define STL_FUNCTIONAL <functional>
# define STL_IOMANIP <iomanip.h>
# define STL_IOSTREAM <iostream.h>
# define STL_FSTREAM <fstream.h>
# define STL_STDEXCEPT <stdexcept>
# define STL_STRING <string>
# define STL_STRSTREAM <strstream.h>
# define FG_NEED_AUTO_PTR
# define FG_NO_DEFAULT_TEMPLATE_ARGS
# define FG_INCOMPLETE_FUNCTIONAL
# define FG_NO_ARROW_OPERATOR
# elif __GNUC_MINOR__ >= 8
// g++-2.8.x and egcs-1.x
# define FG_EXPLICIT_FUNCTION_TMPL_ARGS
# define FG_NEED_AUTO_PTR
# define FG_MEMBER_TEMPLATES
# define FG_NAMESPACES
# define FG_HAVE_STD
# define FG_HAVE_STREAMBUF
# define FG_CLASS_PARTIAL_SPECIALIZATION
# define STL_ALGORITHM <algorithm>
# define STL_FUNCTIONAL <functional>
# define STL_IOMANIP <iomanip>
# define STL_IOSTREAM <iostream>
# define STL_FSTREAM <fstream>
# define STL_STDEXCEPT <stdexcept>
# define STL_STRING <string>
# define STL_STRSTREAM <strstream>
# endif
# else
# error Time to upgrade. GNU compilers < 2.7 not supported
# endif
#endif
//
// Metrowerks
//
#if defined(__MWERKS__)
/*
CodeWarrior compiler from Metrowerks, Inc.
*/
# define FG_HAVE_TRAITS
# define FG_HAVE_STD_INCLUDES
# define FG_HAVE_STD
# define FG_NAMESPACES
# define STL_ALGORITHM <algorithm>
# define STL_FUNCTIONAL <functional>
# define STL_IOMANIP <iomanip>
# define STL_IOSTREAM <iostream>
# define STL_FSTREAM <fstream>
# define STL_STDEXCEPT <stdexcept>
# define STL_STRING <string>
// Temp:
# define bcopy(from, to, n) memcpy(to, from, n)
// -rp- please use FG_MEM_COPY everywhere !
# define FG_MEM_COPY(to,from,n) memcpy(to, from, n)
// -dw- currently used glut has no game mode stuff
# define GLUT_WRONG_VERSION
#endif
//
// Microsoft compilers.
//
#ifdef _MSC_VER
# if _MSC_VER == 1200 // msvc++ 6.0
# define FG_NAMESPACES
# define FG_HAVE_STD
# define FG_HAVE_STD_INCLUDES
# define FG_HAVE_STREAMBUF
# define STL_ALGORITHM <algorithm>
# define STL_FUNCTIONAL <functional>
# define STL_IOMANIP <iomanip>
# define STL_IOSTREAM <iostream>
# define STL_FSTREAM <fstream>
# define STL_STDEXCEPT <stdexcept>
# define STL_STRING <string>
# define STL_STRSTREAM <strstream>
# pragma warning(disable: 4786) // identifier was truncated to '255' characters
# pragma warning(disable: 4244) // conversion from double to float
# pragma warning(disable: 4305) //
# elif _MSC_VER == 1100 // msvc++ 5.0
# error MSVC++ 5.0 still to be supported...
# else
# error What version of MSVC++ is this?
# endif
#endif
#ifdef __BORLANDC__
# if defined(HAVE_SGI_STL_PORT)
// Use quotes around long file names to get around Borland's include hackery
# define STL_ALGORITHM "algorithm"
# define STL_FUNCTIONAL "functional"
# define FG_MATH_EXCEPTION_CLASH
# else
# define STL_ALGORITHM <algorithm>
# define STL_FUNCTIONAL <functional>
# define STL_IOMANIP <iomanip>
# define STL_STDEXCEPT <stdexcept>
# define STL_STRSTREAM <strstream>
# define FG_INCOMPLETE_FUNCTIONAL
# endif // HAVE_SGI_STL_PORT
# define STL_IOSTREAM <iostream>
# define STL_FSTREAM <fstream>
# define STL_STRING <string>
# define FG_NO_DEFAULT_TEMPLATE_ARGS
# define FG_NAMESPACES
// # define FG_HAVE_STD
#endif // __BORLANDC__
//
// Native SGI compilers
//
#if defined ( sgi ) && !defined( __GNUC__ )
# define FG_HAVE_NATIVE_SGI_COMPILERS
# define FG_EXPLICIT_FUNCTION_TMPL_ARGS
# define FG_NEED_AUTO_PTR
# define FG_MEMBER_TEMPLATES
# define FG_NAMESPACES
# define FG_HAVE_STD
# define FG_CLASS_PARTIAL_SPECIALIZATION
# define STL_ALGORITHM <algorithm>
# define STL_FUNCTIONAL <functional>
# define STL_IOMANIP <iomanip.h>
# define STL_IOSTREAM <iostream.h>
# define STL_FSTREAM <fstream.h>
# define STL_STDEXCEPT <stdexcept>
# define STL_STRING <string>
# define STL_STRSTREAM <strstream>
#endif // Native SGI compilers
#if defined ( sun )
# include <strings.h>
# include <memory.h>
# if defined ( __cplusplus )
// typedef unsigned int size_t;
extern "C" {
extern void *memmove(void *, const void *, size_t);
}
# else
extern void *memmove(void *, const void *, size_t);
# endif // __cplusplus
#endif // sun
//
// No user modifiable definitions beyond here.
//
#ifdef FG_NEED_EXPLICIT
# define explicit
#endif
#ifdef FG_NEED_TYPENAME
# define typename
#endif
#ifdef FG_NEED_MUTABLE
# define mutable
#endif
#ifdef FG_NEED_BOOL
typedef int bool;
# define true 1
# define false 0
#endif
#ifdef FG_EXPLICIT_FUNCTION_TMPL_ARGS
# define FG_NULL_TMPL_ARGS <>
#else
# define FG_NULL_TMPL_ARGS
#endif
#ifdef FG_CLASS_PARTIAL_SPECIALIZATION
# define FG_TEMPLATE_NULL template<>
#else
# define FG_TEMPLATE_NULL
#endif
// FG_NO_NAMESPACES is a hook so that users can disable namespaces
// without having to edit library headers.
#if defined(FG_NAMESPACES) && !defined(FG_NO_NAMESPACES)
# define FG_NAMESPACE(X) namespace X {
# define FG_NAMESPACE_END }
# define FG_USING_NAMESPACE(X) using namespace X
# else
# define FG_NAMESPACE(X)
# define FG_NAMESPACE_END
# define FG_USING_NAMESPACE(X)
#endif
# ifdef FG_HAVE_STD
# define FG_USING_STD(X) using std::X
# define STD std
# else
# define FG_USING_STD(X)
# define STD
# endif
// Additional <functional> implementation from SGI STL 3.11
// Adapter function objects: pointers to member functions
#ifdef FG_INCOMPLETE_FUNCTIONAL
template <class _Ret, class _Tp>
class const_mem_fun_ref_t
#ifndef __BORLANDC__
: public unary_function<_Tp,_Ret>
#endif // __BORLANDC__
{
public:
explicit const_mem_fun_ref_t(_Ret (_Tp::*__pf)() const) : _M_f(__pf) {}
_Ret operator()(const _Tp& __r) const { return (__r.*_M_f)(); }
private:
_Ret (_Tp::*_M_f)() const;
};
template <class _Ret, class _Tp>
inline const_mem_fun_ref_t<_Ret,_Tp> mem_fun_ref(_Ret (_Tp::*__f)() const)
{ return const_mem_fun_ref_t<_Ret,_Tp>(__f); }
#endif // FG_INCOMPLETE_FUNCTIONAL
#endif // _COMPILER_H

170
src/Include/fg_constants.h
View file

@ -1,170 +0,0 @@
// fg_constants.h -- various constant definitions
//
// Written by Curtis Olson, started July 1997.
//
// Copyright (C) 1997 Curtis L. Olson - curt@flightgear.org
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License as
// published by the Free Software Foundation; either version 2 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// $Id$
#ifndef _FG_CONSTANTS_H
#define _FG_CONSTANTS_H
/*
#ifndef __cplusplus
# error This library requires C++
#endif
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include "Include/compiler.h"
#ifdef FG_HAVE_STD_INCLUDES
# include <cmath>
#else
# ifdef FG_MATH_EXCEPTION_CLASH
# define exception C_exception
# endif
# include <math.h>
#endif
// This should be defined via autoconf in configure.in
#ifndef VERSION
#define VERSION "\"not defined\""
#endif
// Make sure PI is defined in its various forms
// PI, only PI, and nothing but PI
#ifdef M_PI
# define FG_PI M_PI
#else
# define FG_PI 3.14159265358979323846
#endif
// 2 * PI
#define FG_2PI 6.28318530717958647692
// PI / 2
#ifdef M_PI_2
# define FG_PI_2 M_PI_2
#else
# define FG_PI_2 1.57079632679489661923
#endif
// PI / 4
#define FG_PI_4 0.78539816339744830961
#ifndef M_E
# define M_E 2.7182818284590452354
#endif
// ONE_SECOND is pi/180/60/60, or about 100 feet at earths' equator
#define ONE_SECOND 4.848136811E-6
// Radius of Earth in kilometers at the equator. Another source had
// 6378.165 but this is probably close enough
#define EARTH_RAD 6378.155
// Earth parameters for WGS 84, taken from LaRCsim/ls_constants.h
// Value of earth radius from [8]
#define EQUATORIAL_RADIUS_FT 20925650. // ft
#define EQUATORIAL_RADIUS_M 6378138.12 // meter
// Radius squared
#define RESQ_FT 437882827922500. // ft
#define RESQ_M 40680645877797.1344 // meter
// Value of earth flattening parameter from ref [8]
//
// Note: FP = f
// E = 1-f
// EPS = sqrt(1-(1-f)^2)
//
#define FP 0.003352813178
#define E 0.996647186
#define EPS 0.081819221
#define INVG 0.031080997
// Time Related Parameters
#define MJD0 2415020.0
#define J2000 (2451545.0 - MJD0)
#define SIDRATE .9972695677
// Conversions
// Degrees to Radians
#define DEG_TO_RAD 0.017453292 // deg*pi/180 = rad
// Radians to Degrees
#define RAD_TO_DEG 57.29577951 // rad*180/pi = deg
// Arc seconds to radians // (arcsec*pi)/(3600*180) = rad
#define ARCSEC_TO_RAD 4.84813681109535993589e-06
// Radians to arc seconds // (rad*3600*180)/pi = arcsec
#define RAD_TO_ARCSEC 206264.806247096355156
// Feet to Meters
#define FEET_TO_METER 0.3048
// Meters to Feet
#define METER_TO_FEET 3.28083989501312335958
// Meters to Nautical Miles, 1 nm = 6076.11549 feet
#define METER_TO_NM 0.00053995680
// Nautical Miles to Meters
#define NM_TO_METER 1852.0000
// Radians to Nautical Miles, 1 nm = 1/60 of a degree
#define NM_TO_RAD 0.00029088820866572159
// Nautical Miles to Radians
#define RAD_TO_NM 3437.7467707849392526
// For divide by zero avoidance, this will be close enough to zero
#define FG_EPSILON 0.0000001
// Timing constants for Flight Model updates
#define NEW_DEFAULT_MODEL_HZ 120
// Field of view limits
#define FG_FOV_MIN 0.1
#define FG_FOV_MAX 179.9
// Maximum nodes per tile
#define FG_MAX_NODES 2000
#endif // _FG_CONSTANTS_H

23
src/Include/fg_traits.hxx
View file

@ -1,23 +0,0 @@
#ifndef _FG_TRAITS_HXX
#define _FG_TRAITS_HXX
#include "Include/compiler.h"
#ifndef FG_HAVE_TRAITS
// Dummy up some char traits for now.
template<class charT> struct char_traits{};
FG_TEMPLATE_NULL
struct char_traits<char>
{
typedef char char_type;
typedef int int_type;
typedef streampos pos_type;
typedef streamoff off_type;
static int_type eof() { return EOF; }
};
#endif // FG_HAVE_TRAITS
#endif // _FG_TRAITS_HXX

73
src/Include/fg_types.hxx
View file

@ -1,73 +0,0 @@
// fg_types.hxx -- commonly used types I don't want to have to keep redefining
//
// Written by Curtis Olson, started March 1999.
//
// Copyright (C) 1999 Curtis L. Olson - curt@flightgear.org
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License as
// published by the Free Software Foundation; either version 2 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// $Id$
#ifndef _CONSTRUCT_TYPES_HXX
#define _CONSTRUCT_TYPES_HXX
#ifndef __cplusplus
# error This library requires C++
#endif
#include <Include/compiler.h>
#include STL_STRING
#include <vector>
#include <Math/point3d.hxx>
FG_USING_STD(vector);
FG_USING_STD(string);
typedef vector < int > int_list;
typedef int_list::iterator int_list_iterator;
typedef int_list::const_iterator const_int_list_iterator;
typedef vector < Point3D > point_list;
typedef point_list::iterator point_list_iterator;
typedef point_list::const_iterator const_point_list_iterator;
typedef vector < string > string_list;
typedef string_list::iterator string_list_iterator;
typedef string_list::const_iterator const_string_list_iterator;
class point2d {
public:
union {
double x;
double dist;
double lon;
};
union {
double y;
double theta;
double lat;
};
};
#endif // _CONSTRUCT_TYPES_HXX

82
src/Include/fg_zlib.h
View file

@ -1,82 +0,0 @@
/**************************************************************************
* fg_zlib.h -- a zlib wrapper to replace zlib calls with normal uncompressed
* calls for systems that have problems building zlib.
*
* Written by Curtis Olson, started April 1998.
*
* Copyright (C) 1998 Curtis L. Olson - curt@me.umn.edu
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Id$
**************************************************************************/
#ifndef _FG_ZLIB_H
#define _FG_ZLIB_H
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#ifdef AVOID_USING_ZLIB
#include <stdio.h>
#define fgFile FILE *
/* fgFile fgopen(char *filename, const char *flags) */
#define fgopen(P, F) (fopen((P), (F)))
/* int fgseek(fgFile *file, long offset, int whence) */
#define fgseek(F, O, W) (fseek((F), (O), (W)))
/* fgread(fgFile file, void *buf, int size); */
#define fgread(F, B, S) (fread((B), (S), 1, (F)))
/* int fggets(fgFile fd, char *buffer, int len) */
#define fggets(F, B, L) (fgets((B), (L), (F)))
/* int fgclose(fgFile fd) */
#define fgclose(F) (fclose((F)))
#else
#include <zlib/zlib.h>
#define fgFile gzFile
/* fgFile fgopen(char *filename, const char *flags) */
#define fgopen(P, F) (gzopen((P), (F)))
/* int fgseek(fgFile *file, long offset, int whence) */
#define fgseek(F, O, W) (gzseek((F), (O), (W)))
/* fgread(fgFile file, void *buf, int size); */
#define fgread(F, B, S) (gzread((F), (B), (S)))
/* int fggets(fgFile fd, char *buffer, int len) */
#define fggets(F, B, L) (gzgets((F), (B), (L)))
/* int fgclose(fgFile fd) */
#define fgclose(F) (gzclose((F)))
#endif /* #ifdef AVOID_USING_ZLIB #else #endif */
#endif /* _FG_ZLIB_H */

5
src/Joystick/Makefile.am
View file

@ -6,7 +6,4 @@ noinst_PROGRAMS = js_demo
js_demo_SOURCES = js_demo.cxx
INCLUDES += -I$(top_builddir) \
-I$(top_builddir)/Lib \
-I$(top_builddir)/Lib/plib/include \
-I$(top_builddir)/Simulator
INCLUDES += -I$(top_builddir) -I$(top_builddir)/src

5
src/Joystick/joystick.cxx
View file

@ -29,15 +29,16 @@
# include <windows.h>
#endif
#include <simgear/logstream.hxx>
#include <Aircraft/aircraft.hxx>
#include <Debug/logstream.hxx>
#include <Main/options.hxx>
#if defined( ENABLE_PLIB_JOYSTICK )
# include <plib/js.h> // plib include
#elif defined( ENABLE_GLUT_JOYSTICK )
# include <GL/glut.h>
# include <XGL/xgl.h>
# include <simgear/xgl.h>
#endif

58
src/Main/Makefile.am
View file

@ -1,22 +1,22 @@
if ENABLE_UNIX_SERIAL
SERIAL_LIBS = $(top_builddir)/Lib/Serial/libSerial.a
SERIAL_LIBS = -lsgserial
else
SERIAL_LIBS =
endif
if ENABLE_OLD_WEATHER
WEATHER_LIBS = $(top_builddir)/Simulator/Weather/libWeather.a
WEATHER_LIBS = $(top_builddir)/src/Weather/libWeather.a
else
WEATHER_LIBS = $(top_builddir)/Simulator/WeatherCM/libWeatherCM.a
WEATHER_LIBS = $(top_builddir)/src/WeatherCM/libWeatherCM.a
endif
if ENABLE_NETWORK_OLK
NETWORK_LIBS = \
$(top_builddir)/Simulator/Network/libNetwork.a \
$(top_builddir)/Simulator/NetworkOLK/libNetworkOLK.a
$(top_builddir)/src/Network/libNetwork.a \
$(top_builddir)/src/NetworkOLK/libNetworkOLK.a
else
NETWORK_LIBS = \
$(top_builddir)/Simulator/Network/libNetwork.a
$(top_builddir)/src/Network/libNetwork.a
endif
if OLD_AUTOMAKE
@ -44,37 +44,29 @@ fgfs_SOURCES = \
# fg_serial.cxx fg_serial.hxx \
fgfs_LDADD = \
$(top_builddir)/Simulator/Aircraft/libAircraft.a \
$(top_builddir)/Simulator/Astro/libAstro.a \
$(top_builddir)/Simulator/Autopilot/libAutopilot.a \
$(top_builddir)/Simulator/Cockpit/libCockpit.a \
$(top_builddir)/Simulator/Controls/libControls.a \
$(top_builddir)/Simulator/FDM/libFlight.a \
$(top_builddir)/Simulator/FDM/Balloon/libBalloon.a \
$(top_builddir)/Simulator/FDM/JSBsim/libJSBsim.a \
$(top_builddir)/Simulator/FDM/LaRCsim/libLaRCsim.a \
$(top_builddir)/Simulator/GUI/libGUI.a \
$(top_builddir)/Simulator/Scenery/libScenery.a \
$(top_builddir)/Simulator/Airports/libAirports.a \
$(top_builddir)/src/Aircraft/libAircraft.a \
$(top_builddir)/src/Astro/libAstro.a \
$(top_builddir)/src/Autopilot/libAutopilot.a \
$(top_builddir)/src/Cockpit/libCockpit.a \
$(top_builddir)/src/Controls/libControls.a \
$(top_builddir)/src/FDM/libFlight.a \
$(top_builddir)/src/FDM/Balloon/libBalloon.a \
$(top_builddir)/src/FDM/JSBsim/libJSBsim.a \
$(top_builddir)/src/FDM/LaRCsim/libLaRCsim.a \
$(top_builddir)/src/GUI/libGUI.a \
$(top_builddir)/src/Scenery/libScenery.a \
$(top_builddir)/src/Airports/libAirports.a \
$(NETWORK_LIBS) \
$(top_builddir)/Simulator/Objects/libObjects.a \
$(top_builddir)/Simulator/Clouds/libClouds.a \
$(top_builddir)/Simulator/Time/libTime.a \
$(top_builddir)/src/Objects/libObjects.a \
$(top_builddir)/src/Clouds/libClouds.a \
$(top_builddir)/src/Time/libTime.a \
$(WEATHER_LIBS) \
$(top_builddir)/Simulator/Joystick/libJoystick.a \
$(top_builddir)/src/Joystick/libJoystick.a \
$(SERIAL_LIBS) \
$(top_builddir)/Lib/Screen/libScreen.a \
$(top_builddir)/Lib/Math/libMath.a \
$(top_builddir)/Lib/Bucket/libBucket.a \
$(top_builddir)/Lib/Debug/libDebug.a \
-lsgscreen -lsgmath -lsgbucket -lsgdebug -lsgmisc \
-lplibpu -lplibfnt -lplibssg -lplibsg \
$(top_builddir)/Lib/Misc/libMisc.a \
$(top_builddir)/Lib/zlib/libz.a \
-lz \
$(opengl_LIBS) \
$(audio_LIBS)
INCLUDES += \
-I$(top_builddir) \
-I$(top_builddir)/Lib \
-I$(top_builddir)/Simulator
INCLUDES += -I$(top_builddir) -I$(top_builddir)/src

17
src/Main/fg_init.cxx
View file

@ -33,7 +33,7 @@
#endif
#include <GL/glut.h>
#include <XGL/xgl.h>
#include <simgear/xgl.h>
#include <stdio.h>
#include <stdlib.h>
@ -44,11 +44,17 @@
# define _G_NO_EXTERN_TEMPLATES
#endif
#include <Include/compiler.h>
#include <simgear/compiler.h>
#include STL_STRING
#include <Debug/logstream.hxx>
#include <simgear/logstream.hxx>
#include <simgear/constants.h>
#include <simgear/fg_geodesy.hxx>
#include <simgear/point3d.hxx>
#include <simgear/polar3d.hxx>
#include <simgear/fgpath.hxx>
#include <Aircraft/aircraft.hxx>
#include <Airports/simple.hxx>
#include <Astro/sky.hxx>
@ -61,13 +67,8 @@
#include <FDM/JSBsim.hxx>
#include <FDM/LaRCsim.hxx>
#include <FDM/MagicCarpet.hxx>
#include <Include/fg_constants.h>
#include <Include/general.hxx>
#include <Joystick/joystick.hxx>
#include <Math/fg_geodesy.hxx>
#include <Math/point3d.hxx>
#include <Math/polar3d.hxx>
#include <Misc/fgpath.hxx>
#include <Scenery/scenery.hxx>
#include <Scenery/tilemgr.hxx>
#include <Time/event.hxx>

7
src/Main/fg_io.cxx
View file

@ -21,12 +21,13 @@
// $Id$
#include <Include/compiler.h>
#include <simgear/compiler.h>
#include STL_STRING
#include <Debug/logstream.hxx>
#include <Include/fg_types.hxx>
#include <simgear/logstream.hxx>
#include <simgear/fg_types.hxx>
#include <Main/options.hxx>
#include <Network/iochannel.hxx>

2
src/Main/fg_io.hxx
View file

@ -25,7 +25,7 @@
#define _FG_IO_HXX
#include "Include/compiler.h"
#include <simgear/compiler.h>
#include <Network/iochannel.hxx>

9
src/Main/keyboard.cxx
View file

@ -30,7 +30,7 @@
#endif
#include <GL/glut.h>
#include <XGL/xgl.h>
#include <simgear/xgl.h>
#if defined(FX) && defined(XMESA)
#include <GL/xmesa.h>
@ -41,15 +41,16 @@
#include <plib/pu.h> // plib include
#include <Debug/logstream.hxx>
#include <simgear/logstream.hxx>
#include <simgear/constants.h>
#include <simgear/fgpath.hxx>
#include <Aircraft/aircraft.hxx>
#include <Astro/solarsystem.hxx>
#include <Astro/sky.hxx>
#include <Autopilot/autopilot.hxx>
#include <Cockpit/hud.hxx>
#include <GUI/gui.h>
#include <Include/fg_constants.h>
#include <Misc/fgpath.hxx>
#include <Scenery/tilemgr.hxx>
#include <Objects/materialmgr.hxx>
#include <Time/fg_time.hxx>

2
src/Main/keyboard.hxx
View file

@ -39,7 +39,7 @@
#endif
#include <GL/glut.h>
#include <XGL/xgl.h>
#include <simgear/xgl.h>
// Handle keyboard events

18
src/Main/main.cxx
View file

@ -38,7 +38,8 @@
#endif
#include <GL/glut.h>
#include <XGL/xgl.h>
#include <simgear/xgl.h>
#include <stdio.h>
#include <string.h>
#include <string>
@ -63,10 +64,16 @@
# include <plib/sm.h> // plib include
#endif
#include <Include/fg_constants.h> // for VERSION
#include <simgear/constants.h> // for VERSION
#include <simgear/logstream.hxx>
#include <simgear/fg_geodesy.hxx>
#include <simgear/mat3.h>
#include <simgear/polar3d.hxx>
#include <simgear/fg_random.h>
#include <simgear/fgpath.hxx>
#include <Include/general.hxx>
#include <Debug/logstream.hxx>
#include <Aircraft/aircraft.hxx>
#include <Astro/sky.hxx>
#include <Astro/stars.hxx>
@ -76,11 +83,6 @@
#include <Cockpit/cockpit.hxx>
#include <GUI/gui.h>
#include <Joystick/joystick.hxx>
#include <Math/fg_geodesy.hxx>
#include <Math/mat3.h>
#include <Math/polar3d.hxx>
#include <Math/fg_random.h>
#include <Misc/fgpath.hxx>
#ifdef FG_NETWORK_OLK
#include <NetworkOLK/network.h>
#endif

10
src/Main/options.cxx
View file

@ -29,7 +29,7 @@
bool global_fullscreen = true;
#endif
#include <Include/compiler.h>
#include <simgear/compiler.h>
#include <math.h> // rint()
#include <stdio.h>
@ -38,9 +38,10 @@ bool global_fullscreen = true;
#include STL_STRING
#include <Debug/logstream.hxx>
#include <Misc/fgstream.hxx>
#include <Include/fg_constants.h>
#include <simgear/logstream.hxx>
#include <simgear/fgstream.hxx>
#include <simgear/constants.h>
#include <Include/general.hxx>
#include <Cockpit/cockpit.hxx>
#include <FDM/flight.hxx>
@ -49,6 +50,7 @@ bool global_fullscreen = true;
#endif
#include <Time/fg_time.hxx>
#include "views.hxx"
#include "options.hxx"
FG_USING_STD(string);

9
src/Main/options.hxx
View file

@ -33,20 +33,20 @@
# include <config.h>
#endif
#include <Include/compiler.h>
#include <simgear/compiler.h>
#ifdef HAVE_WINDOWS_H
# include <windows.h>
#endif
#include <GL/glut.h>
#include <XGL/xgl.h>
#include <simgear/xgl.h>
#if defined(FX) && defined(XMESA)
extern bool global_fullscreen;
#endif
#include <Include/fg_types.hxx>
#include <simgear/fg_types.hxx>
#include STL_STRING
#include <vector>
@ -54,6 +54,9 @@ extern bool global_fullscreen;
FG_USING_STD(vector);
FG_USING_STD(string);
#define NEW_DEFAULT_MODEL_HZ 120
class fgOPTIONS {
public:

6
src/Main/save.cxx
View file

@ -38,8 +38,9 @@ TODO:
#include <iostream>
#include <Include/fg_types.hxx>
#include <Include/fg_constants.h>
#include <simgear/fg_types.hxx>
#include <simgear/constants.h>
#include <Aircraft/aircraft.hxx>
#include <Controls/controls.hxx>
#include <Autopilot/autopilot.hxx>
@ -50,7 +51,6 @@ TODO:
# include <Weather/weather.hxx>
#endif
#include "options.hxx"
#include "save.hxx"
#include "fg_init.hxx"

2
src/Main/save.hxx
View file

@ -31,7 +31,7 @@
# include <config.h>
#endif
#include <Include/fg_types.hxx>
#include <simgear/fg_types.hxx>
#include <iostream>
FG_USING_NAMESPACE(std);

9
src/Main/splash.cxx
View file

@ -35,14 +35,15 @@
#endif
#include <GL/glut.h>
#include <XGL/xgl.h>
#include <simgear/xgl.h>
#include <string.h>
#include <Debug/logstream.hxx>
#include <simgear/logstream.hxx>
#include <simgear/fg_random.h>
#include <simgear/fgpath.hxx>
#include <Main/options.hxx>
#include <Math/fg_random.h>
#include <Misc/fgpath.hxx>
#include <Objects/texload.h>
#include "splash.hxx"

11
src/Main/views.cxx
View file

@ -28,13 +28,14 @@
#include <plib/ssg.h> // plib include
#include <simgear/logstream.hxx>
#include <simgear/constants.h>
#include <simgear/point3d.hxx>
#include <simgear/polar3d.hxx>
#include <simgear/vector.hxx>
#include <Aircraft/aircraft.hxx>
#include <Cockpit/panel.hxx>
#include <Debug/logstream.hxx>
#include <Include/fg_constants.h>
#include <Math/point3d.hxx>
#include <Math/polar3d.hxx>
#include <Math/vector.hxx>
#include <Scenery/scenery.hxx>
#include <Time/fg_time.hxx>

6
src/Main/views.hxx
View file

@ -29,14 +29,14 @@
# error This library requires C++
#endif
#include <Include/compiler.h>
#include <simgear/compiler.h>
#include <list>
#include <plib/sg.h> // plib include
#include <FDM/flight.hxx>
#include <Math/point3d.hxx>
#include <simgear/point3d.hxx>
#include <Time/fg_time.hxx>
#include <Time/light.hxx>
@ -47,6 +47,8 @@ FG_USING_STD(list);
// used in views.cxx and tilemgr.cxx
#define USE_FAST_FOV_CLIP
#define FG_FOV_MIN 0.1
#define FG_FOV_MAX 179.9
// Define a structure containing view information

2
src/Network/Makefile.am
View file

@ -12,4 +12,4 @@ libNetwork_a_SOURCES = \
pve.cxx pve.hxx \
rul.cxx rul.hxx
INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
INCLUDES += -I$(top_builddir) -I$(top_builddir)/src

4
src/Network/fg_file.cxx
View file

@ -21,11 +21,11 @@
// $Id$
#include <Include/compiler.h>
#include <simgear/compiler.h>
#include STL_STRING
#include <Debug/logstream.hxx>
#include <simgear/logstream.hxx>
#include "fg_file.hxx"

2
src/Network/fg_file.hxx
View file

@ -29,7 +29,7 @@
# error This library requires C++
#endif
#include "Include/compiler.h"
#include <simgear/compiler.h>
#include <string>

7
src/Network/fg_serial.cxx
View file

@ -21,13 +21,14 @@
// $Id$
#include <Include/compiler.h>
#include <simgear/compiler.h>
#include STL_STRING
#include <Debug/logstream.hxx>
#include <simgear/logstream.hxx>
#include <simgear/serial.hxx>
#include <Aircraft/aircraft.hxx>
#include <Serial/serial.hxx>
#include "fg_serial.hxx"

4
src/Network/fg_serial.hxx
View file

@ -29,7 +29,7 @@
# error This library requires C++
#endif
#include "Include/compiler.h"
#include <simgear/compiler.h>
#include <string>
@ -39,7 +39,7 @@
// # include <time.h>
// #endif
#include <Serial/serial.hxx>
#include <simgear/serial.hxx>
#include "iochannel.hxx"
#include "protocol.hxx"

4
src/Network/fg_socket.cxx
View file

@ -21,7 +21,7 @@
// $Id$
#include <Include/compiler.h>
#include <simgear/compiler.h>
#include <sys/time.h> // select()
#include <sys/types.h> // socket(), bind(), select(), accept()
@ -36,7 +36,7 @@
#include STL_STRING
#include <Debug/logstream.hxx>
#include <simgear/logstream.hxx>
#include "fg_socket.hxx"

4
src/Network/fg_socket.hxx
View file

@ -29,11 +29,11 @@
# error This library requires C++
#endif
#include <Include/compiler.h>
#include <simgear/compiler.h>
#include <string>
#include <Include/fg_types.hxx>
#include <simgear/fg_types.hxx>
#include "iochannel.hxx"
#include "protocol.hxx"

5
src/Network/garmin.cxx
View file

@ -21,9 +21,10 @@
// $Id$
#include <Debug/logstream.hxx>
#include <simgear/logstream.hxx>
#include <simgear/fg_geodesy.hxx>
#include <FDM/flight.hxx>
#include <Math/fg_geodesy.hxx>
#include <Time/fg_time.hxx>
#include "iochannel.hxx"

2
src/Network/garmin.hxx
View file

@ -25,7 +25,7 @@
#define _FG_GARMIN_HXX
#include "Include/compiler.h"
#include <simgear/compiler.h>
#include STL_STRING

2
src/Network/iochannel.hxx
View file

@ -25,7 +25,7 @@
#define _IOCHANNEL_HXX
#include "Include/compiler.h"
#include <simgear/compiler.h>
#include "protocol.hxx"

5
src/Network/native.cxx
View file

@ -21,8 +21,9 @@
// $Id$
#include <Debug/logstream.hxx>
#include <Math/fg_geodesy.hxx>
#include <simgear/logstream.hxx>
#include <simgear/fg_geodesy.hxx>
#include <Time/fg_time.hxx>
#include "iochannel.hxx"

3
src/Network/native.hxx
View file

@ -25,11 +25,12 @@
#define _FG_NATIVE_HXX
#include "Include/compiler.h"
#include <simgear/compiler.h>
#include STL_STRING
#include <FDM/flight.hxx>
#include "protocol.hxx"
FG_USING_STD(string);

5
src/Network/nmea.cxx
View file

@ -21,9 +21,10 @@
// $Id$
#include <Debug/logstream.hxx>
#include <simgear/logstream.hxx>
#include <simgear/fg_geodesy.hxx>
#include <FDM/flight.hxx>
#include <Math/fg_geodesy.hxx>
#include <Time/fg_time.hxx>
#include "iochannel.hxx"

2
src/Network/nmea.hxx
View file

@ -25,7 +25,7 @@
#define _FG_NMEA_HXX
#include "Include/compiler.h"
#include <simgear/compiler.h>
#include STL_STRING

2
src/Network/protocol.cxx
View file

@ -21,7 +21,7 @@
// $Id$
#include <Debug/logstream.hxx>
#include <simgear/logstream.hxx>
#include "iochannel.hxx"
#include "protocol.hxx"

2
src/Network/protocol.hxx
View file

@ -25,7 +25,7 @@
#define _PROTOCOL_HXX
#include "Include/compiler.h"
#include <simgear/compiler.h>
#include STL_STRING
#include <vector>

5
src/Network/pve.cxx
View file

@ -21,9 +21,10 @@
// $Id$
#include <Debug/logstream.hxx>
#include <simgear/logstream.hxx>
#include <simgear/fg_geodesy.hxx>
#include <FDM/flight.hxx>
#include <Math/fg_geodesy.hxx>
#include <Time/fg_time.hxx>
#include "iochannel.hxx"

2
src/Network/pve.hxx
View file

@ -25,7 +25,7 @@
#define _FG_PVE_HXX
#include "Include/compiler.h"
#include <simgear/compiler.h>
#include STL_STRING

5
src/Network/rul.cxx
View file

@ -22,9 +22,10 @@
// $Id$
#include <Debug/logstream.hxx>
#include <simgear/logstream.hxx>
#include <simgear/fg_geodesy.hxx>
#include <FDM/flight.hxx>
#include <Math/fg_geodesy.hxx>
#include <Time/fg_time.hxx>
#include "iochannel.hxx"

2
src/Network/rul.hxx
View file

@ -26,7 +26,7 @@
#define _FG_RUL_HXX
#include "Include/compiler.h"
#include <simgear/compiler.h>
#include STL_STRING

Some files were not shown because too many files have changed in this diff Show more