Oops, make sure that one of the default splash screens gets used when the splash...

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

diff --git a/src/AIModel/AIBase.cxx b/src/AIModel/AIBase.cxx
index 11b17dc412c190632d08d11c7cf888dcecd42887..e5d63821501fe4bcf28abf4c121d246c15d3dcb9 100644 (file)
--- a/src/AIModel/AIBase.cxx
+++ b/src/AIModel/AIBase.cxx
@@ -22,20 +22,35 @@
 #  include <config.h>
 #endif
 
+#include <simgear/compiler.h>
+
+#include STL_STRING
+
 #include <plib/sg.h>
 #include <plib/ssg.h>
-#include <Main/globals.hxx>
-#include <Scenery/scenery.hxx>
+
 #include <simgear/math/point3d.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/scene/model/location.hxx>
 #include <simgear/scene/model/model.hxx>
 #include <simgear/debug/logstream.hxx>
-#include <string>
+#include <simgear/props/props.hxx>
+
+#include <Main/globals.hxx>
+#include <Scenery/scenery.hxx>
+
 
 #include "AIBase.hxx"
 
+FGAIBase *FGAIBase::_self = NULL;
+
+FGAIBase::FGAIBase() {
+    _self = this;
+    _type_str = "model";
+}
+
 FGAIBase::~FGAIBase() {
+    _self = NULL;
 }
 
 void FGAIBase::update(double dt) {
@@ -50,9 +65,16 @@ void FGAIBase::Transform() {
 
 
 bool FGAIBase::init() {
+
+   SGPropertyNode *root = globals->get_props()->getNode("ai/models", true);
+   vector<SGPropertyNode_ptr> p_vec = root->getChildren(_type_str);
+   unsigned num = p_vec.size();
+   p_vec.clear();
+
+   props = root->getNode(_type_str, num, true);
    ssgBranch *model = sgLoad3DModel( globals->get_fg_root(),
                                     model_path.c_str(),
-                                    globals->get_props(),
+                                     props,
                                     globals->get_sim_time_sec() );
    if (model) {
      aip.init( model );
@@ -66,33 +88,45 @@ bool FGAIBase::init() {
    setDie(false);
 }
 
-
-void FGAIBase::setPath( const char* model ) {
-  model_path.append(model);
+void FGAIBase::bind() {
+   props->tie("velocities/airspeed-kt",  SGRawValuePointer<double>(&speed));
+   props->tie("velocities/vertical-speed-fps", SGRawValuePointer<double>(&vs));
+
+   props->tie("position/altitude-ft", SGRawValuePointer<double>(&altitude));
+   props->tie("position/latitude-deg",
+               SGRawValueFunctions<double>(FGAIBase::_getLatitude,
+                                           FGAIBase::_setLatitude));
+   props->tie("position/longitude-deg",
+               SGRawValueFunctions<double>(FGAIBase::_getLongitude,
+                                           FGAIBase::_setLongitude));
+
+   props->tie("orientation/pitch-deg", SGRawValuePointer<double>(&pitch));
+   props->tie("orientation/roll-deg", SGRawValuePointer<double>(&roll));
+   props->tie("orientation/heading-deg", SGRawValuePointer<double>(&hdg));
 }
 
-void FGAIBase::setSpeed( double speed_KTAS ) {
-  speed = tgt_speed = speed_KTAS;
-}
+void FGAIBase::unbind() {
+    props->untie("velocities/airspeed-kt");
+    props->untie("velocities/vertical-speed-fps");
 
-void FGAIBase::setAltitude( double altitude_ft ) {
-  altitude = tgt_altitude = altitude_ft;
-  pos.setelev(altitude * 0.3048);
-}
+    props->untie("position/altitude-ft");
+    props->untie("position/latitude-deg");
+    props->untie("position/longitude-deg");
 
-void FGAIBase::setLongitude( double longitude ) {
-  pos.setlon(longitude);
+    props->untie("orientation/pitch-deg");
+    props->untie("orientation/roll-deg");
+    props->untie("orientation/heading-deg");
 }
 
-void FGAIBase::setLatitude( double latitude ) {
-  pos.setlat(latitude);
-}
 
-void FGAIBase::setHeading( double heading ) {
-  hdg = tgt_heading = heading;
+void FGAIBase::_setLongitude( double longitude ) {
+    _self->pos.setlon(longitude);
 }
 
-void FGAIBase::setDie( bool die ) {
-  delete_me = die;
+void FGAIBase::_setLatitude ( double latitude )  {
+    _self->pos.setlat(latitude);
 }
 
+double FGAIBase::_getLongitude() { return _self->pos.lon(); }
+
+double FGAIBase::_getLatitude () { return _self->pos.lat(); }