X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCockpit%2Fhud.hxx;h=0ce27ec3003883ce621793cc2cb23a435f16090b;hb=b07ad149aebeb1d060bc9a0d505fdc1ca1081654;hp=91249e851e84ac5b97a26be2091e05745dbed1ad;hpb=00f8463ab42692427a479151a797a1c9a3e1712a;p=flightgear.git diff --git a/src/Cockpit/hud.hxx b/src/Cockpit/hud.hxx index 91249e851..0ce27ec30 100644 --- a/src/Cockpit/hud.hxx +++ b/src/Cockpit/hud.hxx @@ -34,8 +34,8 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include +#ifdef __CYGWIN__ +#include #endif #include @@ -44,9 +44,11 @@ #include // for_each() #include // STL vector #include // STL double ended queue -#include STL_FSTREAM +#include -#include +namespace osg { + class State; +} #include #include @@ -59,13 +61,11 @@ #include
#include
#include
-#include -#include +class FGRunway; -SG_USING_STD(deque); -SG_USING_STD(vector); -SG_USING_NAMESPACE(std); +using std::deque; +using std::vector; #define float_to_int(v) SGMiscf::roundToInt(v) @@ -508,7 +508,7 @@ private: bool drawLine(const sgdVec3& a1, const sgdVec3& a2, const sgdVec3& p1, const sgdVec3& p2); void drawArrow(); - bool get_active_runway(FGRunway& rwy); + FGRunway* get_active_runway(); void get_rwy_points(sgdVec3 *points); void setLineWidth(void); @@ -516,7 +516,7 @@ private: double mm[16],pm[16], arrowScale, arrowRad, lnScale; double scaleDist, default_pitch, default_heading; GLint view[4]; - FGRunway runway; + FGRunway* runway; FGViewer* cockpit_view; unsigned short stippleOut, stippleCen; bool drawIA, drawIAAlways;