X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAIModel%2FAICarrier.hxx;h=da3380502fc44e5e045b7c48b5e9b39071052162;hb=04f09258c4042105044e9095a0dbbbdc87a3b505;hp=bd6e7a7b75635a39ab5eb9eeab05d8faef4b3385;hpb=c9813d1b5d79b4aad13c263690a0223086af25ac;p=flightgear.git

diff --git a/src/AIModel/AICarrier.hxx b/src/AIModel/AICarrier.hxx
index bd6e7a7b7..da3380502 100644
--- a/src/AIModel/AICarrier.hxx
+++ b/src/AIModel/AICarrier.hxx
@@ -23,11 +23,11 @@
 
 #include <string>
 #include <list>
-#include <plib/ssg.h>
+
 #include <simgear/compiler.h>
 
-SG_USING_STD(string);
-SG_USING_STD(list);
+using std::string;
+using std::list;
 
 #include "AIShip.hxx"
 
@@ -37,42 +37,6 @@ SG_USING_STD(list);
 class FGAIManager;
 class FGAICarrier;
 
-class FGAICarrierHardware : public ssgBase {
-public:
-
-    enum Type { Catapult, Wire, Solid };
-
-    FGAICarrier *carrier;
-    int id;
-    Type type;
-
-    static FGAICarrierHardware* newCatapult(FGAICarrier *c) {
-        FGAICarrierHardware* ch = new FGAICarrierHardware;
-        ch->carrier = c;
-        ch->type = Catapult;
-        ch->id = unique_id++;
-        return ch;
-    }
-    static FGAICarrierHardware* newWire(FGAICarrier *c) {
-        FGAICarrierHardware* ch = new FGAICarrierHardware;
-        ch->carrier = c;
-        ch->type = Wire;
-        ch->id = unique_id++;
-        return ch;
-    }
-    static FGAICarrierHardware* newSolid(FGAICarrier *c) {
-        FGAICarrierHardware* ch = new FGAICarrierHardware;
-        ch->carrier = c;
-        ch->type = Solid;
-        ch->id = unique_id++;
-        return ch;
-    }
-
-private:
-    static int unique_id;
-};
-
-
 class FGAICarrier  : public FGAIShip {
 public:
 
@@ -84,7 +48,6 @@ public:
     void setSign(const string& );
     void setTACANChannelID(const string &);
 
-    void getVelocityWrtEarth(sgdVec3& v, sgdVec3& omega, sgdVec3& pivot);
     virtual void bind();
     virtual void unbind();
     void UpdateWind ( double dt );
@@ -94,13 +57,15 @@ public:
     void setMinLat( double deg );
     void setMaxLong( double deg );
     void setMinLong( double deg );
+    void setMPControl( bool c );
+    void setAIControl( bool c );
     void TurnToLaunch();
+    void TurnToRecover();
     void TurnToBase();
     void ReturnToBox();
-    float Horizon(float h);
     bool OutsideBox();
 
-    bool init();
+    bool init(bool search_in_AI_path=false);
 
     virtual const char* getTypeString(void) const { return "carrier"; }
 
@@ -124,28 +89,16 @@ private:
 
 
     void update(double dt);
-    void mark_nohot(ssgEntity*);
-
-    bool mark_wires(ssgEntity*, const list<string>&, bool = false);
-    bool mark_cat(ssgEntity*, const list<string>&, bool = false);
-    bool mark_solid(ssgEntity*, const list<string>&, bool = false);
     double wind_from_east;  // fps
     double wind_from_north; // fps
     double rel_wind_speed_kts;
     double rel_wind_from_deg;
 
 
-    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<ParkPosition> ppositions;    // List of positions where an aircraft can start.
     string sign;                      // The sign of this carrier.
 
-    // Velocity wrt earth.
-    SGVec3d vel_wrt_earth;
-    SGVec3d rot_wrt_earth;
-    SGVec3d rot_pivot_wrt_earth;
-
     // these describe the flols
     SGVec3d flols_off;
 
@@ -153,10 +106,10 @@ private:
     double angle;
     int source;             // the flols light which is visible at the moment
     bool wave_off_lights;
+    bool in_to_wind;
 
     // these are for maneuvering the carrier
-    Point3D carrierpos;
-    Point3D initialpos;
+    SGGeod mOpBoxPos;
 
     double wind_speed_from_north_kts ;
     double wind_speed_from_east_kts  ;
@@ -167,8 +120,11 @@ private:
     double base_course, base_speed;
 
     bool turn_to_launch_hdg;
+    bool turn_to_recovery_hdg;
+    bool turn_to_base_course;
     bool returning;      // set if the carrier is returning to an operating box
     bool InToWind();     // set if the carrier is in to wind
+    bool MPControl, AIControl;
 
 
     SGPropertyNode_ptr _longitude_node;
@@ -176,17 +132,22 @@ private:
     SGPropertyNode_ptr _altitude_node;
     SGPropertyNode_ptr _surface_wind_from_deg_node;
     SGPropertyNode_ptr _surface_wind_speed_node;
-
+    SGPropertyNode_ptr _launchbar_state_node;
     // this is for tacan
 
     string TACAN_channel_id;
 
     // these are for moving the elevators
     void UpdateElevator( double dt, double transition_time);
-    double step;
     double pos_norm, raw_pos_norm;
     double transition_time, time_constant;
     bool elevators;
+
+    // these are for moving the jet blast deflectors
+    void UpdateJBD( double dt, double jbd_transition_time);
+    double jbd_pos_norm, raw_jbd_pos_norm;
+    double jbd_transition_time, jbd_time_constant;
+    bool jbd;
 };
 
 #endif  // _FG_AICARRIER_HXX