fly/flightgear
1
0
Fork 0
Code Activity

Unify SGGeodVec definition

Browse source
This commit is contained in:
James Turner 2018-08-29 14:55:23 +01:00
parent 7fe11b800a
commit b184a7f06e
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Cockpit/NavDisplay.cxx
View file

@ -74,6 +74,8 @@ using std::string;
#include <Airports/runways.hxx>
#include "od_gauge.hxx"
using namespace flightgear;
static const char *DEFAULT_FONT = "typewriter.txf";
static

13
src/Navaids/routePath.hxx
View file

@ -32,10 +32,10 @@ namespace flightgear
class Hold;
class FlightPlan;
class Via;
typedef std::vector<SGGeod> SGGeodVec;
}
typedef std::vector<SGGeod> SGGeodVec;
class RoutePath
{
public:
@ -45,7 +45,7 @@ public:
RoutePath(const RoutePath& other);
RoutePath& operator=(const RoutePath& other);
SGGeodVec pathForIndex(int index) const;
flightgear::SGGeodVec pathForIndex(int index) const;
SGGeod positionForIndex(int index) const;
@ -67,11 +67,12 @@ private:
double distanceForVia(flightgear::Via *via, int index) const;
SGGeodVec pathForHold(flightgear::Hold* hold) const;
SGGeodVec pathForVia(flightgear::Via* via, int index) const;
flightgear::SGGeodVec pathForHold(flightgear::Hold* hold) const;
flightgear::SGGeodVec pathForVia(flightgear::Via* via, int index) const;
SGGeod positionAlongVia(flightgear::Via* via, int previousIndex, double distanceM) const;
void interpolateGreatCircle(const SGGeod& aFrom, const SGGeod& aTo, SGGeodVec& r) const;
void interpolateGreatCircle(const SGGeod& aFrom, const SGGeod& aTo,
flightgear::SGGeodVec& r) const;
std::unique_ptr<RoutePathPrivate> d;