Merge branch 'durk/traffic'

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

diff --git a/src/AIModel/AIBase.cxx b/src/AIModel/AIBase.cxx
index a57b5505d636c4d50ca17048702c93ff56d99ae2..de107a682bfc8ae356784e42c119304aa80098b3 100644 (file)
--- a/src/AIModel/AIBase.cxx
+++ b/src/AIModel/AIBase.cxx
@@ -41,9 +41,9 @@
 
 #include <Main/globals.hxx>
 #include <Scenery/scenery.hxx>
+#include <Scripting/NasalSys.hxx>
 
 #include "AIBase.hxx"
-#include "AIModelData.hxx"
 #include "AIManager.hxx"
 
 const char *default_model = "Models/Geometry/glider.ac";
@@ -82,6 +82,40 @@ FGAIBase::FGAIBase(object_type ot) :
     _impact_reported = false;
     _collision_reported = false;
     _subID = 0;
+
+    _x_offset = 0;
+    _y_offset = 0;
+    _z_offset = 0;
+
+    _pitch_offset = 0;
+    _roll_offset = 0;
+    _yaw_offset = 0;
+
+    userpos = SGGeod::fromDeg(0, 0);
+
+    pos = SGGeod::fromDeg(0, 0);
+    speed = 0;
+    altitude_ft = 0;
+    speed_north_deg_sec = 0;
+    speed_east_deg_sec = 0;
+    turn_radius_ft = 0;
+
+    ft_per_deg_lon = 0;
+    ft_per_deg_lat = 0;
+
+    horiz_offset = 0;
+    vert_offset = 0;
+    ht_diff = 0;
+
+    serviceable = false;
+
+    fp = 0;
+
+    rho = 1;
+    T = 280;
+    p = 1e5;
+    a = 340;
+    Mach = 0;
 }
 
 FGAIBase::~FGAIBase() {
@@ -191,10 +225,8 @@ bool FGAIBase::init(bool search_in_AI_path) {
 void FGAIBase::initModel(osg::Node *node)
 {
     if (model.valid()) {
-        // Disable altitude computations for general AI models.
-        model->setNodeMask(model->getNodeMask() & ~SG_NODEMASK_TERRAIN_BIT);
 
-        fgSetString("/ai/models/model-added", props->getPath());
+        fgSetString("/ai/models/model-added", props->getPath().c_str());
 
     } else if (!model_path.empty()) {
         SG_LOG(SG_INPUT, SG_WARN, "AIBase: Could not load model " << model_path);
@@ -207,7 +239,8 @@ void FGAIBase::initModel(osg::Node *node)
 
 osg::Node* FGAIBase::load3DModel(const string &path, SGPropertyNode *prop_root)
 {
-  model = SGModelLib::loadPagedModel(path, prop_root, new FGAIModelData(this, prop_root));
+  model = SGModelLib::loadPagedModel(path, prop_root, new FGNasalModelData(prop_root));
+  initModel(model.get());
   return model.get();
 }
 
@@ -317,9 +350,16 @@ void FGAIBase::unbind() {
     props->untie("radar/ht-diff-ft");
 
     props->untie("controls/lighting/nav-lights");
+
+    props->setBoolValue("/sim/controls/radar/", true);
+
 }
 
 double FGAIBase::UpdateRadar(FGAIManager* manager) {
+    bool control = fgGetBool("/sim/controls/radar", true);
+
+    if(!control) return 0;
+
     double radar_range_ft2 = fgGetDouble("/instrumentation/radar/range");
     bool force_on = fgGetBool("/instrumentation/radar/debug-mode", false);
     radar_range_ft2 *= SG_NM_TO_METER * SG_METER_TO_FEET * 1.1; // + 10%
@@ -444,6 +484,12 @@ SGVec3d FGAIBase::getCartPos() const {
     return cartPos;
 }
 
+bool FGAIBase::getGroundElevationM(const SGGeod& pos, double& elev,
+                                   const SGMaterial** material) const {
+    return globals->get_scenery()->get_elevation_m(pos, elev, material,
+                                                   model.get());
+}
+
 double FGAIBase::_getCartPosX() const {
     SGVec3d cartPos = getCartPos();
     return cartPos.x();