X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAIModel%2FAICarrier.cxx;h=a0dc5effdab0450e86dada91da9b3ff2f5c6a78f;hb=47a7952f893dcb3d0b1372907cac375fedf81703;hp=e522019398fd3a7932152e1d9116fa438fe5e632;hpb=f528fc7154f88eb2810958e84dfd84e85f752ed3;p=flightgear.git diff --git a/src/AIModel/AICarrier.cxx b/src/AIModel/AICarrier.cxx index e52201939..a0dc5effd 100644 --- a/src/AIModel/AICarrier.cxx +++ b/src/AIModel/AICarrier.cxx @@ -25,18 +25,9 @@ #include #include -#include -#include -#include -#include -#include - #include #include #include -#include -#include -#include #include #include
@@ -44,135 +35,6 @@ #include "AICarrier.hxx" -/// Hmm: move that kind of configuration into the model file??? -class LineCollector : public osg::NodeVisitor { - struct LinePrimitiveFunctor { - LinePrimitiveFunctor() : _lineCollector(0) - { } - void operator() (const osg::Vec3&, bool) - { } - void operator() (const osg::Vec3& v1, const osg::Vec3& v2, bool) - { if (_lineCollector) _lineCollector->addLine(v1, v2); } - void operator() (const osg::Vec3&, const osg::Vec3&, const osg::Vec3&, - bool) - { } - void operator() (const osg::Vec3&, const osg::Vec3&, const osg::Vec3&, - const osg::Vec3&, bool) - { } - LineCollector* _lineCollector; - }; - -public: - LineCollector() : - osg::NodeVisitor(osg::NodeVisitor::NODE_VISITOR, - osg::NodeVisitor::TRAVERSE_ALL_CHILDREN) - { } - virtual void apply(osg::Geode& geode) - { - osg::TemplatePrimitiveFunctor pf; - pf._lineCollector = this; - for (unsigned i = 0; i < geode.getNumDrawables(); ++i) { - geode.getDrawable(i)->accept(pf); - } - } - virtual void apply(osg::Node& node) - { - traverse(node); - } - virtual void apply(osg::Transform& transform) - { - osg::Matrix matrix = _matrix; - if (transform.computeLocalToWorldMatrix(_matrix, this)) - traverse(transform); - _matrix = matrix; - } - - const std::vector& getLineSegments() const - { return _lineSegments; } - - void addLine(const osg::Vec3& v1, const osg::Vec3& v2) - { - // Trick to get the ends in the right order. - // Use the x axis in the original coordinate system. Choose the - // most negative x-axis as the one pointing forward - SGVec3f tv1(_matrix.preMult(v1)); - SGVec3f tv2(_matrix.preMult(v2)); - if (tv1[0] > tv2[0]) - _lineSegments.push_back(SGLineSegmentf(tv1, tv2)); - else - _lineSegments.push_back(SGLineSegmentf(tv2, tv1)); - } - - void addBVHElements(osg::Node& node, simgear::BVHLineGeometry::Type type) - { - if (_lineSegments.empty()) - return; - - SGSceneUserData* userData; - userData = SGSceneUserData::getOrCreateSceneUserData(&node); - - simgear::BVHNode* bvNode = userData->getBVHNode(); - if (!bvNode && _lineSegments.size() == 1) { - simgear::BVHLineGeometry* bvLine; - bvLine = new simgear::BVHLineGeometry(_lineSegments.front(), type); - userData->setBVHNode(bvLine); - return; - } - - simgear::BVHGroup* group = new simgear::BVHGroup; - if (bvNode) - group->addChild(bvNode); - - for (unsigned i = 0; i < _lineSegments.size(); ++i) { - simgear::BVHLineGeometry* bvLine; - bvLine = new simgear::BVHLineGeometry(_lineSegments[i], type); - group->addChild(bvLine); - } - userData->setBVHNode(group); - } - -private: - osg::Matrix _matrix; - std::vector _lineSegments; -}; - -class FGCarrierVisitor : public osg::NodeVisitor { -public: - FGCarrierVisitor(FGAICarrier* carrier, - const std::list& wireObjects, - const std::list& catapultObjects) : - osg::NodeVisitor(osg::NodeVisitor::NODE_VISITOR, - osg::NodeVisitor::TRAVERSE_ALL_CHILDREN), - mWireObjects(wireObjects), - mCatapultObjects(catapultObjects) - { } - virtual void apply(osg::Node& node) - { - if (std::find(mWireObjects.begin(), mWireObjects.end(), node.getName()) - != mWireObjects.end()) { - LineCollector lineCollector; - node.accept(lineCollector); - simgear::BVHLineGeometry::Type type; - type = simgear::BVHLineGeometry::CarrierWire; - lineCollector.addBVHElements(node, type); - } - if (std::find(mCatapultObjects.begin(), mCatapultObjects.end(), - node.getName()) != mCatapultObjects.end()) { - LineCollector lineCollector; - node.accept(lineCollector); - simgear::BVHLineGeometry::Type type; - type = simgear::BVHLineGeometry::CarrierCatapult; - lineCollector.addBVHElements(node, type); - } - - traverse(node); - } - -private: - std::list mWireObjects; - std::list mCatapultObjects; -}; - FGAICarrier::FGAICarrier() : FGAIShip(otCarrier) { } @@ -207,22 +69,8 @@ void FGAICarrier::readFromScenario(SGPropertyNode* scFileNode) { } else flols_off = SGVec3d::zeros(); - std::vector props = scFileNode->getChildren("wire"); + std::vector props = scFileNode->getChildren("parking-pos"); std::vector::const_iterator it; - for (it = props.begin(); it != props.end(); ++it) { - std::string s = (*it)->getStringValue(); - if (!s.empty()) - wire_objects.push_back(s); - } - - props = scFileNode->getChildren("catapult"); - for (it = props.begin(); it != props.end(); ++it) { - std::string s = (*it)->getStringValue(); - if (!s.empty()) - catapult_objects.push_back(s); - } - - props = scFileNode->getChildren("parking-pos"); for (it = props.begin(); it != props.end(); ++it) { string name = (*it)->getStringValue("name", "unnamed"); // Transform to the right coordinate frame, configuration is done in @@ -376,7 +224,7 @@ bool FGAICarrier::init(bool search_in_AI_path) { base_course = hdg; base_speed = speed; - pos_norm = 0; + pos_norm = raw_pos_norm = 0; elevators = false; transition_time = 150; time_constant = 0.005; @@ -387,16 +235,6 @@ bool FGAICarrier::init(bool search_in_AI_path) { return true; } -void FGAICarrier::initModel(osg::Node *node) -{ - // SG_LOG(SG_GENERAL, SG_BULK, "AICarrier::initModel()" ); - FGAIShip::initModel(node); - // process the 3d model here - // mark some objects solid, mark the wires ... - FGCarrierVisitor carrierVisitor(this, wire_objects, catapult_objects); - model->accept(carrierVisitor); -} - void FGAICarrier::bind() { FGAIShip::bind(); @@ -436,8 +274,8 @@ void FGAICarrier::bind() { SGRawValuePointer(&rel_wind_speed_kts)); props->tie("environment/in-to-wind", SGRawValuePointer(&in_to_wind)); - props->tie("controls/flols/wave-off-lights", - SGRawValuePointer(&wave_off_lights)); + //props->tie("controls/flols/wave-off-lights", + // SGRawValuePointer(&wave_off_lights)); props->tie("controls/elevators", SGRawValuePointer(&elevators)); props->tie("surface-positions/elevators-pos-norm", @@ -485,7 +323,7 @@ void FGAICarrier::unbind() { props->untie("environment/rel-wind-from-degs"); props->untie("environment/rel-wind-speed-kts"); props->untie("environment/in-to-wind"); - props->untie("controls/flols/wave-off-lights"); + //props->untie("controls/flols/wave-off-lights"); props->untie("controls/elevators"); props->untie("surface-positions/elevators-pos-norm"); props->untie("controls/constants/elevators/trans-time-secs"); @@ -556,11 +394,14 @@ void FGAICarrier::UpdateWind( double dt) { rel_wind = rel_wind_from_deg - hdg; SG_NORMALIZE_RANGE(rel_wind, -180.0, 180.0); + //set in to wind property + InToWind(); + //switch the wave-off lights - if (InToWind()) - wave_off_lights = false; - else - wave_off_lights = true; + //if (InToWind()) + // wave_off_lights = false; + //else + // wave_off_lights = true; // cout << "rel wind: " << rel_wind << endl;