warnings--

[flightgear.git] / src / AIModel / AIBallistic.cxx

diff --git a/src/AIModel/AIBallistic.cxx b/src/AIModel/AIBallistic.cxx
index 2a9f97e733993674164850c7e873cdb60c6ed249..c7a5ab72c2c78f94318df4e1fe7ba902e9d40c88 100644 (file)
--- a/src/AIModel/AIBallistic.cxx
+++ b/src/AIModel/AIBallistic.cxx
@@ -15,7 +15,7 @@
 //
 // 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.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
@@ -27,24 +27,40 @@
 #include "AIBallistic.hxx"
 
 
-FGAIBallistic::FGAIBallistic(FGAIManager* mgr) {
-    manager = mgr;
-    _type_str = "ballistic";
-    _otype = otBallistic;
+FGAIBallistic::FGAIBallistic() : FGAIBase(otBallistic) {
     drag_area = 0.007;
     life_timer = 0.0;
     gravity = 32;
 //  buoyancy = 64;
     no_roll = false;
+    aero_stabilised = false;
 }
 
 FGAIBallistic::~FGAIBallistic() {
 }
 
+void FGAIBallistic::readFromScenario(SGPropertyNode* scFileNode) {
+  if (!scFileNode)
+    return;
+
+  FGAIBase::readFromScenario(scFileNode);
+
+  setAzimuth(scFileNode->getDoubleValue("azimuth", 0.0));
+  setElevation(scFileNode->getDoubleValue("elevation", 0.0));
+  setDragArea(scFileNode->getDoubleValue("eda", 0.007));
+  setLife(scFileNode->getDoubleValue("life", 900.0));
+  setBuoyancy(scFileNode->getDoubleValue("buoyancy", 0));
+  setWind_from_east(scFileNode->getDoubleValue("wind_from_east", 0));
+  setWind_from_north(scFileNode->getDoubleValue("wind_from_north", 0));
+  setWind(scFileNode->getBoolValue("wind", false));
+  setRoll(scFileNode->getDoubleValue("roll", 0.0));
+  setCd(scFileNode->getDoubleValue("cd", 0.029));
+  setMass(scFileNode->getDoubleValue("mass", 0.007));
+  setStabilisation(scFileNode->getBoolValue("aero_stabilized", false));
+}
 
 bool FGAIBallistic::init() {
    FGAIBase::init();
-   aero_stabilized = true;
    hdg = azimuth;
    pitch = elevation;
    roll = rotation;
@@ -84,8 +100,8 @@ void FGAIBallistic::setRoll(double rl) {
    rotation = rl;
 }
 
-void FGAIBallistic::setStabilization(bool val) {
-   aero_stabilized = val;
+void FGAIBallistic::setStabilisation(bool val) {
+   aero_stabilised = val;
 }
 
 void FGAIBallistic::setDragArea(double a) {
@@ -153,7 +169,7 @@ void FGAIBallistic::Run(double dt) {
    
    // calculate vertical and horizontal speed components
    vs = sin( pitch * SG_DEGREES_TO_RADIANS ) * speed;
-   hs = cos( pitch * SG_DEGREES_TO_RADIANS ) * speed;
+   double hs = cos( pitch * SG_DEGREES_TO_RADIANS ) * speed;
 
    // convert horizontal speed (fps) to degrees per second
    speed_north_deg_sec = cos(hdg / SG_RADIANS_TO_DEGREES) * hs / ft_per_deg_lat;
@@ -170,24 +186,25 @@ void FGAIBallistic::Run(double dt) {
    wind_speed_from_east_deg_sec  = wind_from_east / ft_per_deg_lon;
    
    // set new position
-   pos.setlat( pos.lat() + (speed_north_deg_sec - wind_speed_from_north_deg_sec) * dt );
-   pos.setlon( pos.lon() + (speed_east_deg_sec - wind_speed_from_east_deg_sec) * dt ); 
+   pos.setLatitudeDeg( pos.getLatitudeDeg() + (speed_north_deg_sec - wind_speed_from_north_deg_sec) * dt );
+   pos.setLongitudeDeg( pos.getLongitudeDeg() + (speed_east_deg_sec - wind_speed_from_east_deg_sec) * dt ); 
 
    // adjust vertical speed for acceleration of gravity and buoyancy
    vs -= (gravity - buoyancy) * dt;
    
    // adjust altitude (feet)
-   altitude += vs * dt;
-   pos.setelev(altitude * SG_FEET_TO_METER); 
+   altitude_ft += vs * dt;
+   pos.setElevationFt(altitude_ft); 
 
    // recalculate pitch (velocity vector) if aerostabilized
-   if (aero_stabilized) pitch = atan2( vs, hs ) * SG_RADIANS_TO_DEGREES;
+   //   cout << "aero_stabilised " << aero_stabilised  << endl ;
+   if (aero_stabilised) pitch = atan2( vs, hs ) * SG_RADIANS_TO_DEGREES;
 
    // recalculate total speed
    speed = sqrt( vs * vs + hs * hs);
 
    // set destruction flag if altitude less than sea level -1000
-   if (altitude < -1000.0) setDie(true);
+   if (altitude_ft < -1000.0) setDie(true);
 
 }  // end Run