Roy Vegard Ovesen:

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

diff --git a/src/AIModel/AIBase.cxx b/src/AIModel/AIBase.cxx
index 0ee8c8d9528d2df793cdb3a7c2d53fd7763dfa96..bb1af2279ad82017c5e666fcafdbee922ac6944b 100644 (file)
--- a/src/AIModel/AIBase.cxx
+++ b/src/AIModel/AIBase.cxx
@@ -47,9 +47,16 @@ FGAIBase *FGAIBase::_self = NULL;
 FGAIBase::FGAIBase() {
     _self = this;
     _type_str = "model";
+    tgt_roll = roll = tgt_pitch = tgt_yaw = tgt_vs = vs = pitch = 0.0;
+    bearing = elevation = range = rdot = 0.0;
+    x_shift = y_shift = rotation = 0.0;
+    invisible = true;
+    model_path = "";
+    _otype = otNull;
 }
 
 FGAIBase::~FGAIBase() {
+    unbind();
     _self = NULL;
 }
 
@@ -58,9 +65,11 @@ void FGAIBase::update(double dt) {
 
 
 void FGAIBase::Transform() {
-    aip.setPosition(pos.lon(), pos.lat(), pos.elev() * SG_METER_TO_FEET);
-    aip.setOrientation(roll, pitch, hdg);
-    aip.update( globals->get_scenery()->get_center() );    
+    if (!invisible) {
+      aip.setPosition(pos.lon(), pos.lat(), pos.elev() * SG_METER_TO_FEET);
+      aip.setOrientation(roll, pitch, hdg);
+      aip.update( globals->get_scenery()->get_center() );    
+    }
 }
 
 
@@ -72,26 +81,38 @@ bool FGAIBase::init() {
    p_vec.clear();
 
    props = root->getNode(_type_str, num, true);
-   ssgBranch *model = sgLoad3DModel( globals->get_fg_root(),
-                                    model_path.c_str(),
-                                     props,
-                                    globals->get_sim_time_sec() );
+   ssgBranch *model = 0;
+   if (model_path != "") {
+      model = sgLoad3DModel( globals->get_fg_root(),
+                            model_path.c_str(),
+                             props,
+                            globals->get_sim_time_sec() );
+   }
    if (model) {
      aip.init( model );
      aip.setVisible(true);
+     invisible = false;
      globals->get_scenery()->get_scene_graph()->addKid(aip.getSceneGraph());
    } else {
-     SG_LOG(SG_INPUT, SG_WARN, "AIBase: Could not load aircraft model.");
+     if (model_path != "") { 
+       SG_LOG(SG_INPUT, SG_WARN, "AIBase: Could not load model.");
+     }
    } 
 
-   tgt_roll = tgt_pitch = tgt_yaw = tgt_vs = vs = roll = pitch = 0.0;
    setDie(false);
 
    return true;
 }
 
+bool FGAIBase::isa( object_type otype ) {
+ if ( otype == _otype ) { return true; }
+ else { return false; } 
+}
+
+
 void FGAIBase::bind() {
-   props->tie("velocities/airspeed-kt",  SGRawValuePointer<double>(&speed));
+   props->tie("id", SGRawValuePointer<int>(&id));
+   props->tie("velocities/true-airspeed-kt",  SGRawValuePointer<double>(&speed));
    props->tie("velocities/vertical-speed-fps",
                SGRawValueFunctions<double>(FGAIBase::_getVS_fps,
                                            FGAIBase::_setVS_fps));
@@ -108,7 +129,17 @@ void FGAIBase::bind() {
 
    props->tie("orientation/pitch-deg",   SGRawValuePointer<double>(&pitch));
    props->tie("orientation/roll-deg",    SGRawValuePointer<double>(&roll));
-   props->tie("orientation/heading-deg", SGRawValuePointer<double>(&hdg));
+   props->tie("orientation/true-heading-deg", SGRawValuePointer<double>(&hdg));
+
+   props->tie("radar/bearing-deg",   SGRawValueFunctions<double>(FGAIBase::_getBearing));
+   props->tie("radar/elevation-deg", SGRawValueFunctions<double>(FGAIBase::_getElevation));
+   props->tie("radar/range-nm",      SGRawValueFunctions<double>(FGAIBase::_getRange));
+//   props->tie("radar/rdot-kts",      SGRawValueFunctions<double>(FGAIBase::_getRdot));
+   props->tie("radar/h-offset", SGRawValueFunctions<double>(FGAIBase::_getH_offset));
+   props->tie("radar/v-offset", SGRawValueFunctions<double>(FGAIBase::_getV_offset)); 
+   props->tie("radar/x-shift", SGRawValueFunctions<double>(FGAIBase::_getX_shift));
+   props->tie("radar/y-shift", SGRawValueFunctions<double>(FGAIBase::_getY_shift));
+   props->tie("radar/rotation", SGRawValueFunctions<double>(FGAIBase::_getRotation));
 
    props->tie("controls/lighting/nav-lights",
                SGRawValueFunctions<bool>(FGAIBase::_isNight));
@@ -117,7 +148,8 @@ void FGAIBase::bind() {
 }
 
 void FGAIBase::unbind() {
-    props->untie("velocities/airspeed-kt");
+    props->untie("id");
+    props->untie("velocities/true-airspeed-kt");
     props->untie("velocities/vertical-speed-fps");
 
     props->untie("position/altitude-ft");
@@ -126,7 +158,17 @@ void FGAIBase::unbind() {
 
     props->untie("orientation/pitch-deg");
     props->untie("orientation/roll-deg");
-    props->untie("orientation/heading-deg");
+    props->untie("orientation/true-heading-deg");
+
+    props->untie("radar/bearing-deg");
+    props->untie("radar/elevation-deg");
+    props->untie("radar/range-nm");
+//    props->untie("radar/rdot-kts");
+    props->untie("radar/h-offset");
+    props->untie("radar/v-offset");
+    props->untie("radar/x-shift");
+    props->untie("radar/y-shift");
+    props->untie("radar/rotation");
 
     props->untie("controls/controls/lighting/nav-lights");
 }