Mathias Fröhölöiööhlich:

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

diff --git a/src/AIModel/AIBase.hxx b/src/AIModel/AIBase.hxx
index 82c4de8867446b1642bee38aae9562d79b87637a..5def20200be6eb0c3313cb1777aca75dec8f73ff 100644 (file)
--- a/src/AIModel/AIBase.hxx
+++ b/src/AIModel/AIBase.hxx
@@ -36,11 +36,22 @@ SG_USING_STD(list);
 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;
 
-   // can be aircraft, ship, storm, thermal or ballistic
+   // can be aircraft, ship, storm, thermal, static or ballistic
    string m_type;
    string m_class;
    string path;
@@ -58,9 +69,9 @@ 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 objects
-   double diameter;           // used by thermal objects
-   double height_msl;         // used by thermal objects
+   double strength;           // used by thermal and 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
    double life;               // life span in seconds
    double buoyancy;           // acceleration in ft per sec2
@@ -73,12 +84,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
-   double radius;             // used by ship ojects, in feet
-   double x_offset;           // used by ship ojects, in meters
-   double y_offset;           // used by ship ojects, in meters
-   double z_offset;           // used by ship ojects, in meters   
-  string acType;              // used by aircraft objects
-  string company;             // used by aircraft objects
+   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;
 
 
@@ -91,8 +109,8 @@ public:
     virtual void update(double dt);
     inline Point3D GetPos() { return(pos); }
 
-    enum object_type { otNull = 0, otAircraft, otShip, otBallistic,
-                       otRocket, otStorm, otThermal, 
+    enum object_type { otNull = 0, otAircraft, otShip, otCarrier, otBallistic,
+                       otRocket, otStorm, otThermal, otStatic,
                        MAX_OBJECTS };  // Needs to be last!!!
 
     virtual bool init();
@@ -116,9 +134,12 @@ public:
     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
@@ -131,12 +152,6 @@ protected:
     double vs;          // vertical speed, feet per minute  
     double turn_radius_ft; // turn radius ft at 15 kts rudder angle 15 degrees
 
-    // these describe the flols 
-    Point3D flolspos; // WGS84 lat & lon in degrees, elev above sea-level in meters
-    double flols_x_offset;     // longitudinal distance, in meters
-    double flols_y_offset;     // lateral distance, in meters
-    double flols_z_offset;     // height, in meters
-    
     double ft_per_deg_lon;
     double ft_per_deg_lat;
 
@@ -172,7 +187,7 @@ protected:
     FGAIFlightPlan *fp;
 
     void Transform();
-
+    void CalculateMach();
     double UpdateRadar(FGAIManager* manager);
 
     string _type_str;
@@ -238,17 +253,6 @@ inline void FGAIBase::setRadius( double radius ) {
   turn_radius_ft = radius;
 }
 
-inline void FGAIBase::setXoffset( double x_offset ) {
-  flols_x_offset = x_offset;
-}
-
-inline void FGAIBase::setYoffset( double y_offset ) {
-  flols_y_offset = y_offset;
-}
-
-inline void FGAIBase::setZoffset( double z_offset ) {
-  flols_z_offset = z_offset;
-}
 inline void FGAIBase::setHeading( double heading ) {
   hdg = tgt_heading = heading;
 }