From: Vivian Meazza Date: Tue, 28 Sep 2010 19:46:02 +0000 (+0100) Subject: Add coefficients configurable at runtime, and bugfix. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2b95158704aa45476f0221267d4300f4f39f4946;p=flightgear.git Add coefficients configurable at runtime, and bugfix. Signed-off-by: Vivian Meazza --- diff --git a/src/AIModel/AIWingman.cxx b/src/AIModel/AIWingman.cxx index e3357b85f..6c93f3955 100644 --- a/src/AIModel/AIWingman.cxx +++ b/src/AIModel/AIWingman.cxx @@ -33,7 +33,9 @@ _break_angle(-90), _break(false), _join(false), _coeff_hdg(5.0), -_coeff_pch(5.0) +_coeff_pch(5.0), +_coeff_bnk(5.0), +_coeff_spd(2.0) { invisible = false; @@ -56,7 +58,6 @@ void FGAIWingman::readFromScenario(SGPropertyNode* scFileNode) { setNoRoll(scFileNode->getBoolValue("no-roll", false)); setName(scFileNode->getStringValue("name", "Wingman")); setParentName(scFileNode->getStringValue("parent", "")); - //setSMPath(scFileNode->getStringValue("submodel-path", "")); setSubID(scFileNode->getIntValue("SubID", 0)); setXoffset(scFileNode->getDoubleValue("x-offset", 0.0)); setYoffset(scFileNode->getDoubleValue("y-offset", 0.0)); @@ -121,8 +122,6 @@ void FGAIWingman::bind() { props->tie("controls/coefficients/speed", SGRawValuePointer(&_coeff_spd)); - - props->tie("orientation/pitch-deg", SGRawValuePointer(&pitch)); props->tie("orientation/roll-deg", SGRawValuePointer(&roll)); props->tie("orientation/true-heading-deg", SGRawValuePointer(&hdg)); @@ -145,7 +144,6 @@ void FGAIWingman::bind() { props->tie("velocities/speed-north-fps", SGRawValuePointer(&_speed_north_fps)); - props->tie("position/x-offset", SGRawValueMethods(*this, &FGAIBase::_getXOffset, &FGAIBase::setXoffset)); props->tie("position/y-offset", @@ -171,11 +169,11 @@ void FGAIWingman::unbind() { props->untie("orientation/true-heading-deg"); props->untie("controls/formate-to-ac"); + props->untie("controls/break"); + props->untie("controls/join"); props->untie("controls/tgt-heading-deg"); props->untie("controls/tgt-speed-kt"); props->untie("controls/break-deg-rel"); - props->untie("controls/break"); - props->untie("controls/join"); props->untie("controls/coefficients/heading"); props->untie("controls/coefficients/pitch"); props->untie("controls/coefficients/bank"); @@ -228,6 +226,7 @@ bool FGAIWingman::init(bool search_in_AI_path) { } void FGAIWingman::update(double dt) { + // FGAIBallistic::update(dt); if (_formate_to_ac){ @@ -287,7 +286,6 @@ void FGAIWingman::formateToAC(double dt){ p_hdg = _p_hdg_node->getDoubleValue(); p_pch = _p_pch_node->getDoubleValue(); p_rll = _p_rll_node->getDoubleValue(); - //agl = _p_agl_node->getDoubleValue(); p_ht = _p_alt_node->getDoubleValue(); setOffsetPos(_parentpos, p_hdg, p_pch, p_rll); setSpeed(_p_spd_node->getDoubleValue()); @@ -296,7 +294,6 @@ void FGAIWingman::formateToAC(double dt){ p_hdg = manager->get_user_heading(); p_pch = manager->get_user_pitch(); p_rll = manager->get_user_roll(); - //agl = manager->get_user_agl(); p_ht = manager->get_user_altitude(); setOffsetPos(userpos, p_hdg,p_pch, p_rll); setSpeed(manager->get_user_speed());