flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 01:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T259, Ref T243 removed interpolation hints

Browse Source 
* no longer needed with providers in that form
* pure refactoring commit, just guarantees compilation
* already minor adjustments to use providers
This commit is contained in:
Klaus Basan
2018-03-20 20:15:26 +01:00
parent 476768f6ec
commit 0c06ac26f7
37 changed files with 140 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackmisc/simulation/interpolator.h
View File

@@ -14,6 +14,8 @@
#include "interpolationrenderingsetup.h"
#include "blackmisc/simulation/remoteaircraftprovider.h"
#include "blackmisc/simulation/interpolationsetupprovider.h"
#include "blackmisc/simulation/simulationenvironmentprovider.h"
#include "blackmisc/aviation/aircraftpartslist.h"
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/aviation/aircraftpartslist.h"
@@ -29,7 +31,6 @@ namespace BlackMisc
namespace Aviation { class CCallsign; }
namespace Simulation
{
class CInterpolationHints;
class CInterpolationLogger;
class CInterpolatorLinear;
class CInterpolatorSpline;
@@ -38,14 +39,18 @@ namespace BlackMisc
//! Interpolator, calculation inbetween positions
template <typename Derived>
class CInterpolator : public QObject
class CInterpolator :
public CSimulationEnvironmentAware,
public CInterpolationSetupAware,
public CRemoteAircraftAware,
public QObject
{
public:
//! Log categories
const CLogCategoryList &getLogCategories();
//! Current interpolated situation
Aviation::CAircraftSituation getInterpolatedSituation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, const CInterpolationHints &hints, CInterpolationStatus &status);
Aviation::CAircraftSituation getInterpolatedSituation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, CInterpolationStatus &status);
//! Parts before given offset time (aka pending parts)
Aviation::CAircraftParts getInterpolatedParts(
@@ -78,7 +83,6 @@ namespace BlackMisc
}
//! Attach an observer to read the interpolator's state for debugging
//! \remark situation logging requires CInterpolationHints::isLoggingInterpolation to be \c true
//! \remark parts logging has a \c bool \c log flag
void attachLogger(CInterpolationLogger *logger) { m_logger = logger; }
@@ -112,7 +116,7 @@ namespace BlackMisc
CInterpolator(const QString &objectName, const Aviation::CCallsign &callsign, QObject *parent);
//! Set on ground flag
static void setGroundFlagFromInterpolator(const CInterpolationHints &hints, double groundFactor, Aviation::CAircraftSituation &situation);
void setGroundFlagFromInterpolator(double groundFactor, Aviation::CAircraftSituation &situation) const;
private:
CInterpolationLogger *m_logger = nullptr;