From: Vivian Meazza Date: Thu, 9 Sep 2010 20:38:49 +0000 (+0100) Subject: Remove debugging statement. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f08012d14f6c5093ac7d849f523279233f51d90f;p=flightgear.git Remove debugging statement. Signed-off-by: Vivian Meazza --- diff --git a/src/AIModel/AIBallistic.cxx b/src/AIModel/AIBallistic.cxx index 1ea0e89b5..5446a5d35 100644 --- a/src/AIModel/AIBallistic.cxx +++ b/src/AIModel/AIBallistic.cxx @@ -157,6 +157,7 @@ bool FGAIBallistic::init(bool search_in_AI_path) { } setParentNodes(_selected_ac); + //props->setStringValue("vector/path", _vector_path.c_str()); // start with high value so that animations don't trigger yet diff --git a/src/AIModel/AIBase.cxx b/src/AIModel/AIBase.cxx index 6f576078c..8681bc1b1 100644 --- a/src/AIModel/AIBase.cxx +++ b/src/AIModel/AIBase.cxx @@ -533,8 +533,13 @@ void FGAIBase::_setSubID( int s ) { _subID = s; } -void FGAIBase::setParentNode() { -// cout << "AIBase: setParentNode " << _parent << endl; +bool FGAIBase::setParentNode() { + + if (_parent == ""){ + SG_LOG(SG_GENERAL, SG_ALERT, "AIBase: " << _name + << " parent not set "); + return false; + } const SGPropertyNode_ptr ai = fgGetNode("/ai/models", true); @@ -564,15 +569,16 @@ void FGAIBase::setParentNode() { if (_selected_ac != 0){ const string name = _selected_ac->getStringValue("name"); - //setParent(); - + return true; } else { - SG_LOG(SG_GENERAL, SG_ALERT, "AIEscort: " << _name + SG_LOG(SG_GENERAL, SG_ALERT, "AIBase: " << _name << " parent not found: dying "); setDie(true); + return false; } } + double FGAIBase::_getLongitude() const { return pos.getLongitudeDeg(); } diff --git a/src/AIModel/AIBase.hxx b/src/AIModel/AIBase.hxx index 3d756254a..c1a533bed 100644 --- a/src/AIModel/AIBase.hxx +++ b/src/AIModel/AIBase.hxx @@ -86,7 +86,7 @@ public: void setImpactLon( double lon ); void setImpactElev( double e ); void setParentName(const string& p); - void setParentNode(); + bool setParentNode(); int getID() const; int _getSubID() const; diff --git a/src/AIModel/AIEscort.cxx b/src/AIModel/AIEscort.cxx index a59a07c95..255524cc7 100644 --- a/src/AIModel/AIEscort.cxx +++ b/src/AIModel/AIEscort.cxx @@ -140,12 +140,13 @@ bool FGAIEscort::init(bool search_in_AI_path) { no_roll = false; props->setStringValue("controls/parent-name", _parent.c_str()); - setParentNode(); - setParent(); - pos = _tgtpos; - speed = _parent_speed; - hdg = _parent_hdg; + if (setParentNode()){ + setParent(); + pos = _tgtpos; + speed = _parent_speed; + hdg = _parent_hdg; + } return true; } diff --git a/src/AIModel/AIEscort.hxx b/src/AIModel/AIEscort.hxx index 235b81c39..e492d830e 100644 --- a/src/AIModel/AIEscort.hxx +++ b/src/AIModel/AIEscort.hxx @@ -102,4 +102,3 @@ private: }; #endif // FG_AIGROUNDVEHICLE_HXX - diff --git a/src/AIModel/AIGroundVehicle.cxx b/src/AIModel/AIGroundVehicle.cxx index 3facbaf68..1303b60e0 100644 --- a/src/AIModel/AIGroundVehicle.cxx +++ b/src/AIModel/AIGroundVehicle.cxx @@ -37,7 +37,6 @@ FGAIShip(otGroundVehicle), _pitch(0), _pitch_deg(0), _speed_kt(0), -_selected_ac(0), _range_ft(0), _relbrg (0), _parent_speed(0), @@ -50,6 +49,7 @@ _break_count(0) { invisible = false; + _parent = ""; } FGAIGroundVehicle::~FGAIGroundVehicle() {} @@ -149,7 +149,19 @@ bool FGAIGroundVehicle::init(bool search_in_AI_path) { no_roll = true; props->setStringValue("controls/parent-name", _parent.c_str()); - setParentNode(); + + if (setParentNode()){ + _parent_x_offset = _selected_ac->getDoubleValue("hitch/x-offset-ft"); + _parent_y_offset = _selected_ac->getDoubleValue("hitch/y-offset-ft"); + _parent_z_offset = _selected_ac->getDoubleValue("hitch/z-offset-ft"); + _hitch_x_offset_m = _selected_ac->getDoubleValue("hitch/x-offset-ft") + * SG_FEET_TO_METER; + _hitch_y_offset_m = _selected_ac->getDoubleValue("hitch/y-offset-ft") + * SG_FEET_TO_METER; + _hitch_z_offset_m = _selected_ac->getDoubleValue("hitch/z-offset-ft") + * SG_FEET_TO_METER; + setParent(); + } return true; } @@ -344,56 +356,56 @@ bool FGAIGroundVehicle::getPitch() { return true; } -void FGAIGroundVehicle::setParentNode() { - - if(_parent == "") - return; - - const SGPropertyNode_ptr ai = fgGetNode("/ai/models", true); - - for (int i = ai->nChildren() - 1; i >= -1; i--) { - SGPropertyNode_ptr model; - - if (i < 0) { // last iteration: selected model - model = _selected_ac; - } else { - model = ai->getChild(i); - string path = ai->getPath(); - const string name = model->getStringValue("name"); - - if (!model->nChildren()){ - continue; - } - if (name == _parent) { - _selected_ac = model; // save selected model for last iteration - break; - } - - } - if (!model) - continue; - - }// end for loop - - if (_selected_ac != 0){ - const string name = _selected_ac->getStringValue("name"); - _parent_x_offset = _selected_ac->getDoubleValue("hitch/x-offset-ft"); - _parent_y_offset = _selected_ac->getDoubleValue("hitch/y-offset-ft"); - _parent_z_offset = _selected_ac->getDoubleValue("hitch/z-offset-ft"); - _hitch_x_offset_m = _selected_ac->getDoubleValue("hitch/x-offset-ft") - * SG_FEET_TO_METER; - _hitch_y_offset_m = _selected_ac->getDoubleValue("hitch/y-offset-ft") - * SG_FEET_TO_METER; - _hitch_z_offset_m = _selected_ac->getDoubleValue("hitch/z-offset-ft") - * SG_FEET_TO_METER; - setParent(); - } else { - SG_LOG(SG_GENERAL, SG_ALERT, "AIGroundVeh1cle: " << _name - << " parent not found: dying "); - setDie(true); - } - -} +//void FGAIGroundVehicle::setParentNode() { +// +// if(_parent == "") +// return; +// +// const SGPropertyNode_ptr ai = fgGetNode("/ai/models", true); +// +// for (int i = ai->nChildren() - 1; i >= -1; i--) { +// SGPropertyNode_ptr model; +// +// if (i < 0) { // last iteration: selected model +// model = _selected_ac; +// } else { +// model = ai->getChild(i); +// string path = ai->getPath(); +// const string name = model->getStringValue("name"); +// +// if (!model->nChildren()){ +// continue; +// } +// if (name == _parent) { +// _selected_ac = model; // save selected model for last iteration +// break; +// } +// +// } +// if (!model) +// continue; +// +// }// end for loop +// +// if (_selected_ac != 0){ +// const string name = _selected_ac->getStringValue("name"); +// //_parent_x_offset = _selected_ac->getDoubleValue("hitch/x-offset-ft"); +// //_parent_y_offset = _selected_ac->getDoubleValue("hitch/y-offset-ft"); +// //_parent_z_offset = _selected_ac->getDoubleValue("hitch/z-offset-ft"); +// //_hitch_x_offset_m = _selected_ac->getDoubleValue("hitch/x-offset-ft") +// // * SG_FEET_TO_METER; +// //_hitch_y_offset_m = _selected_ac->getDoubleValue("hitch/y-offset-ft") +// // * SG_FEET_TO_METER; +// //_hitch_z_offset_m = _selected_ac->getDoubleValue("hitch/z-offset-ft") +// // * SG_FEET_TO_METER; +// //setParent(); +// } else { +// SG_LOG(SG_GENERAL, SG_ALERT, "AIGroundVeh1cle: " << _name +// << " parent not found: dying "); +// setDie(true); +// } +// +//} void FGAIGroundVehicle::setParent(){ diff --git a/src/AIModel/AIGroundVehicle.hxx b/src/AIModel/AIGroundVehicle.hxx index 4f0519c18..05b1d505b 100644 --- a/src/AIModel/AIGroundVehicle.hxx +++ b/src/AIModel/AIGroundVehicle.hxx @@ -62,10 +62,8 @@ private: void setElevation(double _elevation, double dt, double _elevation_coeff); void setPitch(double _pitch, double dt, double _pitch_coeff); void setTowAngle(double _relbrg, double dt, double _towangle_coeff); -// void setParentName(const string& p); void setTrainSpeed(double s, double dt, double coeff); void setParent(); - void setParentNode(); void AdvanceFP(); void setTowSpeed(); void RunGroundVehicle(double dt); @@ -98,9 +96,6 @@ private: double _dt_count, _next_run, _break_count; const SGMaterial* _material; - SGPropertyNode_ptr _selected_ac; - -// string _parent; }; diff --git a/src/AIModel/AIShip.cxx b/src/AIModel/AIShip.cxx index b27b21d96..a00f9c941 100644 --- a/src/AIModel/AIShip.cxx +++ b/src/AIModel/AIShip.cxx @@ -70,7 +70,8 @@ _range_rate(0), _roll_constant(0.001), _hdg_constant(0.01), _roll_factor(-0.0083335), -_restart(false) +_restart(false), +_name("") { invisible = false;