X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAIModel%2FAIBallistic.hxx;h=a9566221fc4620ccfccb4943453aea48b7af591c;hb=afbc360eeded20d4447ab005ee0e234a43f068cd;hp=84fcc8ee76fdfacf2156747e64356e04152bf34b;hpb=a61f34667fdb43198f707e719f56f5bbaf2fb7b5;p=flightgear.git

diff --git a/src/AIModel/AIBallistic.hxx b/src/AIModel/AIBallistic.hxx
index 84fcc8ee7..a9566221f 100644
--- a/src/AIModel/AIBallistic.hxx
+++ b/src/AIModel/AIBallistic.hxx
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
@@ -68,31 +68,32 @@ public:
     void setWeight( double w );
     void setNoRoll( bool nr );
     void setRandom( bool r );
-	void setRandomness( double r );
+    void setRandomness( double r );
     void setName(const string&);
     void setCollision(bool c);
-	void setExpiry(bool e);
+    void setExpiry(bool e);
     void setImpact(bool i);
     void setImpactReportNode(const string&);
-    void setContentsNode(const string&);
+    void setContentsNode(const SGPropertyNode_ptr);
     void setFuseRange(double f);
     void setSMPath(const string&);
     void setSubID(int i);
     void setSubmodel(const string&);
     void setExternalForce( bool f );
     void setForcePath(const string&);
+    void setContentsPath(const string&);
     void setForceStabilisation( bool val );
     void setGroundOffset(double g);
     void setLoadOffset(double l);
     void setSlaved(bool s);
     void setSlavedLoad(bool s);
-    void setHitchPos();
     void setPch (double e, double dt, double c);
     void setHdg (double az, double dt, double c);
     void setBnk(double r, double dt, double c);
     void setHt(double h, double dt, double c);
-    void setHitchVelocity(double dt);
     void setFormate(bool f);
+    void setParentNodes(const SGPropertyNode_ptr);
+    void setParentPos();
 
     double _getTime() const;
     double getRelBrgHitchToUser() const;
@@ -102,8 +103,9 @@ public:
 
     SGVec3d getCartHitchPos() const;
 
-    bool getHtAGL();
+    bool getHtAGL(double start);
     bool getSlaved() const;
+    bool getFormate() const;
     bool getSlavedLoad() const;
 
     virtual const char* getTypeString(void) const { return "ballistic"; }
@@ -114,13 +116,13 @@ public:
     SGPropertyNode_ptr _force_azimuth_node;
     SGPropertyNode_ptr _force_elevation_node;
 
-    SGGeod hitchpos;
-
     double _height;
     double _ht_agl_ft;       // height above ground level
     double _azimuth;         // degrees true
     double _elevation;       // degrees
     double _rotation;        // degrees
+    double _speed_north_fps;
+    double _speed_east_fps;
 
     bool   _formate_to_ac;
 
@@ -153,7 +155,7 @@ private:
     double _Cd;              // drag coefficient
     double _mass;            // slugs
     bool   _random;          // modifier for Cd, life, az
-	double _randomness;		 // dimension for _random
+    double _randomness;		 // dimension for _random, only applies to life at present
     double _load_resistance; // ground load resistanc N/m^2
     double _frictionFactor;  // dimensionless modifier for Coefficient of Friction
     bool   _solid;           // if true ground is solid for FDMs
@@ -163,41 +165,56 @@ private:
     bool   _slave_load_to_ac;// if true, object will be slaved to the parent ac pos
     double _contents_lb;     // contents of the object
     double _weight_lb;       // weight of the object (no contents if appropriate) (lbs)
+    string _mat_name;
 
     bool   _report_collision;       // if true a collision point with AI Objects is calculated
     bool   _report_impact;          // if true an impact point on the terrain is calculated
     bool   _external_force;         // if true then apply external force
-	bool   _report_expiry;
+    bool   _report_expiry;
 
     SGPropertyNode_ptr _impact_report_node;  // report node for impact and collision
-    SGPropertyNode_ptr _contents_node;  // report node for impact and collision
+    SGPropertyNode_ptr _contents_node;  // node for droptank etc. contents
+    SGPropertyNode_ptr _pnode; // node for parent model
+    SGPropertyNode_ptr _p_pos_node; // nodes for parent parameters 
+    SGPropertyNode_ptr _p_lat_node;
+    SGPropertyNode_ptr _p_lon_node;
+    SGPropertyNode_ptr _p_alt_node;
+    SGPropertyNode_ptr _p_ori_node;
+    SGPropertyNode_ptr _p_pch_node;
+    SGPropertyNode_ptr _p_rll_node;
+    SGPropertyNode_ptr _p_hdg_node;
+    SGPropertyNode_ptr _p_vel_node;
+    SGPropertyNode_ptr _p_spd_node;
 
     double _fuse_range;
     double _distance;
     double _dt_count;
     double _next_run;
 
-    string _name;
-    string _path;
     string _submodel;
     string _force_path;
+    string _contents_path;
 
     const SGMaterial* _material;
 
     void handle_collision();
-	void handle_expiry();
+    void handle_expiry();
     void handle_impact();
     void report_impact(double elevation, const FGAIBase *target = 0);
     void slaveToAC(double dt);
     void setContents(double c);
     void formateToAC(double dt);
+    void calcVSHS();
+    void calcNE();
+    void setOffsetPos(SGGeod pos, double heading, double pitch, double roll);
+    void setOffsetVelocity(double dt, SGGeod pos);
 
     SGVec3d getCartUserPos() const;
+    SGVec3d getCartOffsetPos(SGGeod pos, double heading, double pitch, double roll) const;
 
     double getDistanceLoadToHitch() const;
     double getElevLoadToHitch() const;
     double getBearingLoadToHitch() const;
-
     double getRecip(double az);
     double getMass() const;
 
@@ -206,9 +223,13 @@ private:
     double _load_offset;
     double _old_height;
 
-    SGVec3d _oldcarthitchPos;
+    SGVec3d _oldcartoffsetPos;
+    SGVec3d _oldcartPos;
 
-    SGGeod oldhitchpos;
+    SGGeod _parentpos;
+    SGGeod _oldpos;
+    SGGeod _offsetpos;
+    SGGeod _oldoffsetpos;
 
 };