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

refs #666 Moved interpolator to BlackMisc so xbus doesn't need to link BlackCore.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-06-02 21:54:23 +01:00
parent 37b4b81b9b
commit 7ae453b532
16 changed files with 39 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/simulator/fs9/fs9client.cpp
View File

@@ -20,7 +20,6 @@
#include <QScopedArrayPointer>
using namespace BlackMisc;
using namespace BlackCore;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::PhysicalQuantities;
@@ -114,7 +113,7 @@ namespace BlackSimPlugin
}
CFs9Client::CFs9Client(const CCallsign &callsign, const QString &modelName,
BlackCore::IInterpolator *interpolator, const CTime &updateInterval, QObject *owner) :
BlackMisc::IInterpolator *interpolator, const CTime &updateInterval, QObject *owner) :
CDirectPlayPeer(owner, callsign),
m_updateInterval(updateInterval), m_interpolator(interpolator), m_modelName(modelName)
{

6
src/plugins/simulator/fs9/fs9client.h
View File

@@ -11,7 +11,7 @@
#define DIRECTPLAY_CLIENT_H
#include "directplaypeer.h"
#include "blackcore/interpolator.h"
#include "blackmisc/interpolator.h"
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/pq/time.h"
#include "blackmisc/aviation/callsign.h"
@@ -40,7 +40,7 @@ namespace BlackSimPlugin
//! Constructor
CFs9Client(const BlackMisc::Aviation::CCallsign &callsign, const QString &modelName,
BlackCore::IInterpolator *interpolator, const BlackMisc::PhysicalQuantities::CTime &updateInterval,
BlackMisc::IInterpolator *interpolator, const BlackMisc::PhysicalQuantities::CTime &updateInterval,
QObject *owner);
//! Destructor
@@ -90,7 +90,7 @@ namespace BlackSimPlugin
void sendMultiplayerParamaters();
BlackMisc::PhysicalQuantities::CTime m_updateInterval;
BlackCore::IInterpolator *m_interpolator = nullptr;
BlackMisc::IInterpolator *m_interpolator = nullptr;
QString m_modelName;
int m_timerId = 0;

4
src/plugins/simulator/fs9/simulatorfs9.cpp
View File

@@ -14,7 +14,7 @@
#include "multiplayerpackets.h"
#include "multiplayerpacketparser.h"
#include "registermetadata.h"
#include "blackcore/interpolatorlinear.h"
#include "blackmisc/interpolatorlinear.h"
#include "blackmisc/network/textmessage.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/logmessage.h"
@@ -106,7 +106,7 @@ namespace BlackSimPlugin
m_lobbyClient(lobbyClient)
{
connect(lobbyClient.data(), &CLobbyClient::disconnected, this, std::bind(&CSimulatorFs9::simulatorStatusChanged, this, 0));
this->m_interpolator = new BlackCore::CInterpolatorLinear(remoteAircraftProvider, this);
this->m_interpolator = new BlackMisc::CInterpolatorLinear(remoteAircraftProvider, this);
m_modelMatcher.setDefaultModel(CAircraftModel(
"Boeing 737-400",
CAircraftModel::TypeModelMatchingDefaultModel,

2
src/plugins/simulator/fs9/simulatorfs9.h
View File

@@ -17,7 +17,7 @@
#include "lobbyclient.h"
#include "../fscommon/simulatorfscommon.h"
#include "blackcore/simulator.h"
#include "blackcore/interpolator.h"
#include "blackmisc/interpolator.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/pixmap.h"

2
src/plugins/simulator/fscommon/simulatorfscommon.h
View File

@@ -13,7 +13,7 @@
#define BLACKSIMPLUGIN_SIMULATOR_COMMON_H
#include "blackcore/simulatorcommon.h"
#include "blackcore/interpolator.h"
#include "blackmisc/interpolator.h"
#include "blackmisc/simulation/fscommon/aircraftcfgparser.h"
#include "fsuipc.h"

3
src/plugins/simulator/fsx/simconnectobject.cpp
View File

@@ -8,9 +8,6 @@
*/
#include "simconnectobject.h"
#include "blackcore/interpolatorlinear.h"
using namespace BlackCore;
namespace BlackSimPlugin
{

3
src/plugins/simulator/fsx/simconnectobject.h
View File

@@ -15,7 +15,8 @@
#include "blackmisc/aviation/callsign.h"
#include <QSharedPointer>
namespace BlackCore { class IInterpolator; }
namespace BlackMisc { class IInterpolator; }
namespace BlackSimPlugin
{
namespace Fsx

2
src/plugins/simulator/fsx/simulatorfsx.cpp
View File

@@ -8,8 +8,8 @@
*/
#include "simulatorfsx.h"
#include "blackcore/interpolatorlinear.h"
#include "blackcore/application.h"
#include "blackmisc/interpolatorlinear.h"
#include "blackmisc/network/textmessage.h"
#include "blackmisc/simulation/fscommon/bcdconversions.h"
#include "blackmisc/simulation/fsx/simconnectutilities.h"

4
src/plugins/simulator/fsx/simulatorfsx.h
View File

@@ -16,7 +16,7 @@
#include "simconnectobject.h"
#include "../fscommon/simulatorfscommon.h"
#include "blackcore/simulator.h"
#include "blackcore/interpolatorlinear.h"
#include "blackmisc/interpolatorlinear.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/simulation/simulatedaircraft.h"
@@ -171,7 +171,7 @@ namespace BlackSimPlugin
//! Update remote airacraft parts (send to FSX)
bool updateRemoteAircraftParts(const CSimConnectObject &simObj, const BlackMisc::Aviation::CAircraftPartsList &parts,
BlackCore::IInterpolator::PartsStatus partsStatus, const BlackMisc::Aviation::CAircraftSituation &interpolatedSituation, bool isOnGround) const;
BlackMisc::IInterpolator::PartsStatus partsStatus, const BlackMisc::Aviation::CAircraftSituation &interpolatedSituation, bool isOnGround) const;
//! Format conversion
SIMCONNECT_DATA_INITPOSITION aircraftSituationToFsxInitPosition(const BlackMisc::Aviation::CAircraftSituation &situation);