David Culp:

[flightgear.git] / src / AIModel / AIBase.hxx

diff --git a/src/AIModel/AIBase.hxx b/src/AIModel/AIBase.hxx
index 14467a2366066af68bb26a26df87867e0a9f5305..4d1f630b1915516948a57e8ea3e3a1e342c2e88f 100644 (file)
--- a/src/AIModel/AIBase.hxx
+++ b/src/AIModel/AIBase.hxx
@@ -37,6 +37,18 @@ class FGAIManager;
 class FGAIFlightPlan;
 
 
+struct ParkPosition {
+  ParkPosition(const ParkPosition& pp)
+    : name(pp.name), offset(pp.offset), heading_deg(pp.heading_deg)
+  {}
+  ParkPosition(const string& n, const Point3D& off = Point3D(), double heading = 0)
+    : name(n), offset(off), heading_deg(heading)
+  {}
+  string name;
+  Point3D offset;
+  double heading_deg;
+};
+
 typedef struct {
    string callsign;
 
@@ -58,7 +70,8 @@ typedef struct {
    double azimuth;            // used by ballistic objects
    double elevation;          // used by ballistic objects
    double rudder;             // used by ship objects
-   double strength;           // used by thermal and storm objects
+   double strength;           // used by thermal 
+   double turb_strength;      // used by storm objects
    double diameter;           // used by thermal and storm objects
    double height_msl;         // used by thermal and storm objects
    double eda;                // used by ballistic objects
@@ -73,13 +86,19 @@ typedef struct {
    list<string> solid_objects;    // List of solid object names
    list<string> wire_objects;     // List of wire object names
    list<string> catapult_objects; // List of catapult object names
-   list<Point3D> ppositions;  // List of positions on a carrier where an aircraft can start.
+   list<ParkPosition> ppositions; // List of positions on a carrier where an aircraft can start.
    Point3D flols_offset;      // used by carrier objects, in meters
    double radius;             // used by ship objects, in feet
    string name;               // used by carrier objects
    string pennant_number;     // used by carrier objects
    string acType;             // used by aircraft objects
    string company;            // used by aircraft objects
+   string TACAN_channel_ID;   // used by carrier objects
+   double max_lat;            // used by carrier objects
+   double min_lat;            // used by carrier objects
+   double max_long;            // used by carrier objects
+   double min_long;            // used by carrier objects
+   
 } FGAIModelEntity;
 
 
@@ -90,7 +109,7 @@ public:
     FGAIBase();
     virtual ~FGAIBase();
     virtual void update(double dt);
-    inline Point3D GetPos() { return(pos); }
+    inline const Point3D& GetPos() const { return(pos); }
 
     enum object_type { otNull = 0, otAircraft, otShip, otCarrier, otBallistic,
                        otRocket, otStorm, otThermal, otStatic,
@@ -112,14 +131,17 @@ public:
     void setYoffset( double y_offset );
     void setZoffset( double z_offset );
 
+    int getID() const;
 
-    void* getID();
     void setDie( bool die );
     bool getDie();
 
+    Point3D getCartPosAt(const Point3D& off) const;
+    Point3D getGeocPosAt(const Point3D& off) const;
+
 protected:
 
-    SGPropertyNode *props;
+    SGPropertyNode_ptr props;
     FGAIManager* manager;
 
     // these describe the model's actual state
@@ -174,6 +196,11 @@ protected:
     object_type _otype;
     int index;
 
+    static int _newAIModelID();
+
+private:
+    const int _refID;
+
 public:
 
     object_type getType();
@@ -209,8 +236,6 @@ public:
     static const double e;
     static const double lbs_to_slugs;
 
-    int _getID() const;
-
     inline double _getRange() { return range; };
   ssgBranch * load3DModel(const string& fg_root, 
                          const string &path,
@@ -259,8 +284,6 @@ inline bool FGAIBase::getDie() { return delete_me; }
 
 inline FGAIBase::object_type FGAIBase::getType() { return _otype; }
 
-inline void* FGAIBase::getID() { return this; }
-
 
 
 #endif // _FG_AIBASE_HXX