X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFDM%2Fflight.hxx;h=bf1bf28bbe59a5f87cfb2aabaaabbc6ce2d69d61;hb=4e6f0e18fd63decc293984f759f1de74c2693a17;hp=35ae2550a900924e25987fb9c63ccd008fe12829;hpb=ab84ff5904df7682316cf114014b8cd24fe7b359;p=flightgear.git diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx index 35ae2550a..bf1bf28bb 100644 --- a/src/FDM/flight.hxx +++ b/src/FDM/flight.hxx @@ -82,12 +82,17 @@ #include #include #include +#include #include using std::list; using std::vector; using std::string; +namespace simgear { +class BVHMaterial; +} + /** * A little helper class to update the track if * the position has changed. In the constructor, @@ -127,7 +132,7 @@ private: bool inited; // Have we bound to the property system - bool bound; + bool bound; // periodic update management variable. This is a scheme to run // the fdm with a fixed delta-t. We control how many iteration of @@ -186,6 +191,9 @@ private: double climb_rate; // in feet per second double altitude_agl; double track; + double delta_loops; + + simgear::TiedPropertyList _tiedProperties; // the ground cache object itself. FGGroundCache ground_cache; @@ -688,11 +696,11 @@ public: // contact point. bool get_agl_m(double t, const double pt[3], double max_altoff, double contact[3], double normal[3], double linearVel[3], - double angularVel[3], SGMaterial const*& material, + double angularVel[3], simgear::BVHMaterial const*& material, simgear::BVHNode::Id& id); bool get_agl_ft(double t, const double pt[3], double max_altoff, double contact[3], double normal[3], double linearVel[3], - double angularVel[3], SGMaterial const*& material, + double angularVel[3], simgear::BVHMaterial const*& material, simgear::BVHNode::Id& id); double get_groundlevel_m(double lat, double lon, double alt); double get_groundlevel_m(const SGGeod& geod); @@ -703,11 +711,11 @@ public: // position pt. bool get_nearest_m(double t, const double pt[3], double maxDist, double contact[3], double normal[3], double linearVel[3], - double angularVel[3], SGMaterial const*& material, + double angularVel[3], simgear::BVHMaterial const*& material, simgear::BVHNode::Id& id); bool get_nearest_ft(double t, const double pt[3], double maxDist, double contact[3], double normal[3],double linearVel[3], - double angularVel[3], SGMaterial const*& material, + double angularVel[3], simgear::BVHMaterial const*& material, simgear::BVHNode::Id& id);