Merge branch 'next' into durk-atc

[flightgear.git] / src / ATC / trafficcontrol.hxx

diff --git a/src/ATC/trafficcontrol.hxx b/src/ATC/trafficcontrol.hxx
index 66381af52f140e930c307c33a790b13e7546340c..fcbaf9bf07a2a029a1bdd3c47b25991294074ab1 100644 (file)
--- a/src/ATC/trafficcontrol.hxx
+++ b/src/ATC/trafficcontrol.hxx
@@ -26,6 +26,10 @@
 # error This library requires C++
 #endif
 
+#include <osg/Geode>
+#include <osg/Geometry>
+#include <osg/MatrixTransform>
+#include <osg/Shape>
 
 #include <simgear/compiler.h>
 // There is probably a better include than sg_geodesy to get the SG_NM_TO_METER...
@@ -48,6 +52,7 @@ typedef vector<int>::iterator intVecIterator;
 class FGAIFlightPlan;  // forward reference
 class FGGroundNetwork; // forward reference
 class FGAIAircraft;    // forward reference
+class FGAirportDynamics;
 
 /**************************************************************************************
  * class FGATCInstruction
@@ -182,6 +187,8 @@ public:
   void allowRepeatedTransmissions () { allowTransmission=true; };
   void nextFrequency() { frequencyId++; };
   int  getNextFrequency() { return frequencyId; };
+  intVec& getIntentions() { return intentions; };
+  int getCurrentPosition() { return currentPos; };
 };
 
 typedef vector<FGTrafficRecord> TrafficVector;
@@ -231,7 +238,7 @@ protected:
   time_t lastTransmission;
 
   double dt_count;
-
+  osg::Group* group;
 
   string formatATCFrequency3_2(int );
   string genTransponderCode(string fltRules);
@@ -278,8 +285,12 @@ public:
   void   setDt(double dt) { dt_count = dt;};
   void transmit(FGTrafficRecord *rec, AtcMsgId msgId, AtcMsgDir msgDir, bool audible);
   string getGateName(FGAIAircraft *aircraft);
+  virtual void render(bool) = 0;
+  virtual string getName()  = 0;
+
 
 private:
+
  AtcMsgDir lastTransmissionDirection;
 };
 
@@ -291,9 +302,10 @@ class FGTowerController : public FGATCController
 private:
   TrafficVector activeTraffic;
   ActiveRunwayVec activeRunways;
+  FGAirportDynamics *parent;
   
 public:
-  FGTowerController();
+  FGTowerController(FGAirportDynamics *parent);
   virtual ~FGTowerController() {};
   virtual void announcePosition(int id, FGAIFlightPlan *intendedRoute, int currentRoute,
                                double lat, double lon,
@@ -305,6 +317,8 @@ public:
   virtual bool             hasInstruction(int id);
   virtual FGATCInstruction getInstruction(int id);
 
+  virtual void render(bool);
+  virtual string getName();
   bool hasActiveTraffic() { return activeTraffic.size() != 0; };
   TrafficVector &getActiveTraffic() { return activeTraffic; };
 };
@@ -319,9 +333,10 @@ class FGStartupController : public FGATCController
 private:
   TrafficVector activeTraffic;
   //ActiveRunwayVec activeRunways;
+  FGAirportDynamics *parent;
   
 public:
-  FGStartupController();
+  FGStartupController(FGAirportDynamics *parent);
   virtual ~FGStartupController() {};
   virtual void announcePosition(int id, FGAIFlightPlan *intendedRoute, int currentRoute,
                                double lat, double lon,
@@ -333,6 +348,9 @@ public:
   virtual bool             hasInstruction(int id);
   virtual FGATCInstruction getInstruction(int id);
 
+  virtual void render(bool);
+  virtual string getName();
+
   bool hasActiveTraffic() { return activeTraffic.size() != 0; };
   TrafficVector &getActiveTraffic() { return activeTraffic; };
 
@@ -350,10 +368,11 @@ class FGApproachController : public FGATCController
 private:
   TrafficVector activeTraffic;
   ActiveRunwayVec activeRunways;
+  FGAirportDynamics *parent;
   
 public:
-  FGApproachController();
-  virtual ~FGApproachController() {};
+  FGApproachController(FGAirportDynamics * parent);
+  virtual ~FGApproachController() { };
   virtual void announcePosition(int id, FGAIFlightPlan *intendedRoute, int currentRoute,
                                double lat, double lon,
                                double hdg, double spd, double alt, double radius, int leg,
@@ -364,6 +383,9 @@ public:
   virtual bool             hasInstruction(int id);
   virtual FGATCInstruction getInstruction(int id);
 
+  virtual void render(bool);
+  virtual string getName();
+
   ActiveRunway* getRunway(string name);
 
   bool hasActiveTraffic() { return activeTraffic.size() != 0; };