Mathias Fröhlich:

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

diff --git a/src/ATC/AIEntity.hxx b/src/ATC/AIEntity.hxx
index 3156c4724782ed120feb006b98e18df7dedb243b..0cf5e52cad12e06d7b90c6ca714612b1c0482120 100644 (file)
--- a/src/ATC/AIEntity.hxx
+++ b/src/ATC/AIEntity.hxx
@@ -21,13 +21,11 @@
 #ifndef _FG_AIEntity_HXX
 #define _FG_AIEntity_HXX
 
-#include <plib/sg.h>
-#include <plib/ssg.h>
-
 #include <simgear/math/point3d.hxx>
+#include <simgear/scene/model/model.hxx>
 #include <simgear/scene/model/placement.hxx>
 
-#include <Model/model.hxx>
+class ssgBranch;
 
 
 /*****************************************************************
@@ -42,7 +40,11 @@ class FGAIEntity {
 
 public:
 
+       FGAIEntity();
     virtual ~FGAIEntity();
+       
+       // Set the 3D model to use (Must be called)
+       void SetModel(ssgBranch* model);
 
     // Run the internal calculations
     virtual void Update(double dt);
@@ -50,16 +52,21 @@ public:
     // Send a transmission *TO* the AIEntity.
     // FIXME int code is a hack - eventually this will receive Alexander's coded messages.
     virtual void RegisterTransmission(int code);
-
+       
+       inline Point3D GetPos() { return(_pos); }
+       
+       virtual string GetCallsign();
+       
 protected:
 
-    Point3D pos;       // WGS84 lat & lon in degrees, elev above sea-level in meters
-    double hdg;                //True heading in degrees
-    double roll;       //degrees
-    double pitch;      //degrees
+    Point3D _pos;      // WGS84 lat & lon in degrees, elev above sea-level in meters
+    double _hdg;               //True heading in degrees
+    double _roll;      //degrees
+    double _pitch;     //degrees
 
-    char* model_path;  //Path to the 3D model
-    FGModelPlacement aip;
+    char* _model_path; //Path to the 3D model
+       ssgBranch* _model;      // Pointer to the model
+    SGModelPlacement _aip;
 
     void Transform();
 };