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

refs #840, moved interpolator classes into Simulation namespace

Browse Source
This commit is contained in:
Klaus Basan
2016-12-23 23:32:55 +00:00
committed by Mathew Sutcliffe
parent 46fafde7a0
commit 667009c85e
28 changed files with 875 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/xbus/traffic.cpp
View File

@@ -14,9 +14,9 @@
#endif
#include "traffic.h"
#include "utils.h"
#include "blackmisc/interpolator.h"
#include "blackmisc/interpolatorlinear.h"
#include "blackmisc/simulation/interpolator.h"
#include "blackmisc/simulation/interpolationhints.h"
#include "blackmisc/simulation/interpolatorlinear.h"
#include "blackmisc/simulation/remoteaircraftproviderdummy.h"
#include "XPMPMultiplayer.h"
#include <XPLM/XPLMProcessing.h>
@@ -44,7 +44,7 @@ namespace XBus
CTraffic::CTraffic(QObject *parent) :
QObject(parent),
m_interpolator(new BlackMisc::CInterpolatorLinear(new BlackMisc::Simulation::CRemoteAircraftProviderDummy(this), this))
m_interpolator(new BlackMisc::Simulation::CInterpolatorLinear(new BlackMisc::Simulation::CRemoteAircraftProviderDummy(this), this))
{
}
@@ -305,7 +305,7 @@ namespace XBus
{
case xpmpDataType_Position:
{
BlackMisc::IInterpolator::InterpolationStatus status;
BlackMisc::Simulation::IInterpolator::InterpolationStatus status;
const BlackMisc::Simulation::CInterpolationHints hints;
auto situation = m_interpolator->getInterpolatedSituation(plane->situations, -1, hints, status);
if (! status.didInterpolationSucceed()) { return xpmpData_Unavailable; }

7
src/xbus/traffic.h
View File

@@ -25,11 +25,9 @@
#define XBUS_TRAFFIC_OBJECTPATH "/xbus/traffic"
//! \endcond
namespace BlackMisc { class IInterpolator; }
namespace BlackMisc { namespace Simulation { class IInterpolator; } }
namespace XBus
{
/*!
* XBus service object for traffic aircraft which is accessible through DBus
*/
@@ -144,9 +142,8 @@ namespace XBus
return static_cast<CTraffic *>(self)->getPlaneData(id, dataType, io_data);
}
BlackMisc::IInterpolator *m_interpolator = nullptr;
BlackMisc::Simulation::IInterpolator *m_interpolator = nullptr;
};
}
#endif // guard