Merge branch 'next' into durk-atc

[flightgear.git] / src / Airports / groundnetwork.hxx

diff --git a/src/Airports/groundnetwork.hxx b/src/Airports/groundnetwork.hxx
index 319d8b2dd540b069b427a94300f4a75585f7cd6e..87dafe0a01d44f65dc9517aa2bf754b1b529156c 100644 (file)
--- a/src/Airports/groundnetwork.hxx
+++ b/src/Airports/groundnetwork.hxx
@@ -24,6 +24,12 @@
 #ifndef _GROUNDNETWORK_HXX_
 #define _GROUNDNETWORK_HXX_
 
+#include <osg/Geode>
+#include <osg/Geometry>
+#include <osg/MatrixTransform>
+#include <osg/Shape>
+
+
 #include <simgear/compiler.h>
 #include <simgear/route/waypoint.hxx>
 
@@ -37,6 +43,7 @@ using std::vector;
 #include "parking.hxx"
 #include <ATC/trafficcontrol.hxx>
 
+
 class FGTaxiSegment; // forward reference
 class FGAIFlightPlan; // forward reference
 class FGAirport;      // forward reference
@@ -174,6 +181,7 @@ public:
     routes = rts;
     distance = dist; 
     currNode = nodes.begin();
+    currRoute = routes.begin();
 //    depth = dpth;
   };
 
@@ -242,6 +250,8 @@ private:
   void checkHoldPosition(int id, double lat, double lon, 
                         double heading, double speed, double alt);
 
+
+
 public:
   FGGroundNetwork();
   ~FGGroundNetwork();
@@ -277,7 +287,9 @@ public:
   bool checkTransmissionState(int minState, int MaxState, TrafficVectorIterator i, time_t now, AtcMsgId msgId,
                                AtcMsgDir msgDir);
   bool checkForCircularWaits(int id);
-  osg::Node* getRenderNode();
+  virtual void render(bool);
+  virtual string getName();
+
 };