try to fix yet another crash bug (don't worry, there's one for anybody!)

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

diff --git a/src/ATC/AIEntity.hxx b/src/ATC/AIEntity.hxx
index f8ad8131a85f6941838b06829b59ed6abcaf358c..dc9070b8bfebc3e4bd1c52387c62231b65b96e64 100644 (file)
--- a/src/ATC/AIEntity.hxx
+++ b/src/ATC/AIEntity.hxx
@@ -16,23 +16,14 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-/*****************************************************************
-*
-* WARNING - Curt has some ideas about AI traffic so anything in here
-* may get rewritten or scrapped.  Contact Curt curt@flightgear.org 
-* before spending any time or effort on this code!!!
-*
-******************************************************************/
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef _FG_AIEntity_HXX
 #define _FG_AIEntity_HXX
 
-#include <Model/model.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>
 
 
 /*****************************************************************
@@ -47,37 +38,35 @@ class FGAIEntity {
 
 public:
 
-    // We need some way for this class to display its radio transmissions if on the 
-    // same frequency and in the vicinity of the user's aircraft
-    // This may need to be done independently of ATC eg CTAF
-
+       FGAIEntity();
     virtual ~FGAIEntity();
+       
+       // Set the 3D model to use (Must be called)
+  void SetModel(osg::Node* model);
 
     // Run the internal calculations
-    virtual void Update(double dt);
-
+    virtual void Update(double dt)=0;
+       
+    // 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)=0;
+       
+       inline const Point3D& GetPos() const { return(_pos); }
+       
+       virtual const string& GetCallsign()=0;
+       
 protected:
 
-    Point3D pos;       // WGS84 lat & lon in degrees, elev above sea-level in meters
-    //double lat;              //WGS84
-    //double lon;              //WGS84
-    //double elev;     //Meters
-    double hdg;                //True heading in degrees
-    double roll;       //degrees
-    double pitch;      //degrees
-
-    char* model_path;  //Path to the 3D model
-    FGModelPlacement aip;
+    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
 
-    //ssgEntity* model;
-    //ssgTransform* position;
+    char* _model_path; //Path to the 3D model
+    osg::ref_ptr<osg::Node> _model;    // Pointer to the model
+    SGModelPlacement _aip;
 
     void Transform();
-
-    //void WorldCoordinate(sgCoord *obj_pos, Point3D center);
-
-    //void FastWorldCoordinate(sgCoord *obj_pos, Point3D center);
-
 };
 
 #endif  // _FG_AIEntity_HXX