flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 11:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #896 Using CInterpolatorMulti in simulator drivers.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2017-03-15 21:38:53 +00:00
parent b491a1432c
commit 6e488533f5
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/simulator/fsxcommon/simconnectobject.cpp
View File

@@ -8,8 +8,7 @@
*/ */
#include "simconnectobject.h" #include "simconnectobject.h"
#include "blackmisc/simulation/interpolatorlinear.h" #include "blackmisc/simulation/interpolatormulti.h"
#include "blackmisc/simulation/interpolatorspline.h"
using namespace BlackMisc::Aviation; using namespace BlackMisc::Aviation;
using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation;
@@ -25,7 +24,7 @@ namespace BlackSimPlugin
DWORD requestId, DWORD requestId,
BlackMisc::Simulation::CInterpolationLogger *logger) : BlackMisc::Simulation::CInterpolationLogger *logger) :
m_aircraft(aircraft), m_requestId(requestId), m_validRequestId(true), m_aircraft(aircraft), m_requestId(requestId), m_validRequestId(true),
m_interpolator(QSharedPointer<BlackMisc::Simulation::CInterpolatorSpline>::create(aircraft.getCallsign())) m_interpolator(QSharedPointer<BlackMisc::Simulation::CInterpolatorMulti>::create(aircraft.getCallsign()))
{ {
m_interpolator->attachLogger(logger); m_interpolator->attachLogger(logger);
} }

6
src/plugins/simulator/fsxcommon/simconnectobject.h
View File

@@ -21,7 +21,7 @@ namespace BlackMisc
namespace Simulation namespace Simulation
{ {
class CInterpolatorLinear; class CInterpolatorLinear;
class CInterpolatorSpline; class CInterpolatorMulti;
class CInterpolationLogger; class CInterpolationLogger;
} }
} }
@@ -54,7 +54,7 @@ namespace BlackSimPlugin
const QString &getAircraftModelString() const { return m_aircraft.getModelString(); } const QString &getAircraftModelString() const { return m_aircraft.getModelString(); }
//! Interpolator //! Interpolator
BlackMisc::Simulation::CInterpolatorSpline *getInterpolator() const { return m_interpolator.data(); } BlackMisc::Simulation::CInterpolatorMulti *getInterpolator() const { return m_interpolator.data(); }
//! Add parts for interpolator //! Add parts for interpolator
void addAircraftParts(const BlackMisc::Aviation::CAircraftParts &parts); void addAircraftParts(const BlackMisc::Aviation::CAircraftParts &parts);
@@ -142,7 +142,7 @@ namespace BlackSimPlugin
BlackMisc::Aviation::CAircraftLights m_lightsAsSent { nullptr }; //!< lights as sent to simulator BlackMisc::Aviation::CAircraftLights m_lightsAsSent { nullptr }; //!< lights as sent to simulator
SIMCONNECT_PERIOD m_requestSimDataPeriod = SIMCONNECT_PERIOD_NEVER; //!< how often do we query ground elevation SIMCONNECT_PERIOD m_requestSimDataPeriod = SIMCONNECT_PERIOD_NEVER; //!< how often do we query ground elevation
// QSharedPointer<BlackMisc::Simulation::CInterpolatorLinear> m_interpolator; //!< shared pointer because CSimConnectObject can be copied // QSharedPointer<BlackMisc::Simulation::CInterpolatorLinear> m_interpolator; //!< shared pointer because CSimConnectObject can be copied
QSharedPointer<BlackMisc::Simulation::CInterpolatorSpline> m_interpolator; //!< shared pointer because CSimConnectObject can be copied QSharedPointer<BlackMisc::Simulation::CInterpolatorMulti> m_interpolator; //!< shared pointer because CSimConnectObject can be copied
}; };
//! Simulator objects (aka AI aircraft) //! Simulator objects (aka AI aircraft)

3
src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
View File

@@ -14,8 +14,7 @@
#include "blackmisc/simulation/fscommon/bcdconversions.h" #include "blackmisc/simulation/fscommon/bcdconversions.h"
#include "blackmisc/simulation/fscommon/fscommonutil.h" #include "blackmisc/simulation/fscommon/fscommonutil.h"
#include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/simulation/interpolatorlinear.h" #include "blackmisc/simulation/interpolatormulti.h"
#include "blackmisc/simulation/interpolatorspline.h"
#include "blackmisc/simulation/interpolationhints.h" #include "blackmisc/simulation/interpolationhints.h"
#include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/aviation/airportlist.h" #include "blackmisc/aviation/airportlist.h"

4
src/xbus/traffic.h
View File

@@ -16,7 +16,7 @@
#include "terrainprobe.h" #include "terrainprobe.h"
#include "blackmisc/aviation/aircraftsituationlist.h" #include "blackmisc/aviation/aircraftsituationlist.h"
#include "blackmisc/aviation/aircraftpartslist.h" #include "blackmisc/aviation/aircraftpartslist.h"
#include "blackmisc/simulation/interpolatorspline.h" #include "blackmisc/simulation/interpolatormulti.h"
#include <QObject> #include <QObject>
#include <QHash> #include <QHash>
#include <QVector> #include <QVector>
@@ -131,7 +131,7 @@ namespace XBus
bool hasSurfaces = false; bool hasSurfaces = false;
bool hasXpdr = false; bool hasXpdr = false;
char label[32] {}; char label[32] {};
BlackMisc::Simulation::CInterpolatorSpline interpolator; BlackMisc::Simulation::CInterpolatorMulti interpolator;
CTerrainProbe terrainProbe; CTerrainProbe terrainProbe;
BlackMisc::Simulation::CInterpolationHints hints(); BlackMisc::Simulation::CInterpolationHints hints();
XPMPPlaneSurfaces_t surfaces; XPMPPlaneSurfaces_t surfaces;