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

Ref T268, XPlane driver improvements

Browse Source 
* 2 queues, one for pending "to be added" aircraft and one for "adding in progress" (easier timeout detection)
* disconnect DBus when unloading
* check if aircraft "are still in range" before adding
* adding to XPlane only in one place
* data for aircraft can be explicitly request and are requested directly when an aircraft has been added
This commit is contained in:
Klaus Basan
2018-07-06 21:22:06 +02:00
parent 79c1691fdc
commit df869373e8
2 changed files with 273 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/plugins/simulator/xplane/simulatorxplane.h
View File

@@ -39,6 +39,8 @@
#include <QObject>
#include <QString>
#include <QStringList>
#include <QHash>
#include <QPair>
#include <QTimer>
class QDBusServiceWatcher;
@@ -117,6 +119,9 @@ namespace BlackSimPlugin
BlackMisc::Network::IClientProvider *clientProvider,
QObject *parent = nullptr);
//! Dtor
virtual ~CSimulatorXPlane();
//! \name ISimulator implementations
//! @{
virtual bool isTimeSynchronized() const override { return false; } // TODO: Can we query the XP intrinisc feature?
@@ -133,6 +138,9 @@ namespace BlackSimPlugin
virtual BlackMisc::Aviation::CCallsignSet physicallyRenderedAircraft() const override;
virtual bool followAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
virtual void unload() override;
virtual QString getStatisticsSimulatorSpecific() const override;
virtual void resetAircraftStatistics() override;
virtual void clearAllRemoteAircraftData() override;
//! @}
//! \copydoc BlackMisc::Simulation::ISimulationEnvironmentProvider::requestElevation
@@ -173,15 +181,43 @@ namespace BlackSimPlugin
//! \remark this is where the interpolated data are set
void updateRemoteAircraft();
//! Update airports
void updateAirportsInRange();
//! Request elevation and CG from XPlane @{
void requestRemoteAircraftDataFromXPlane();
void requestRemoteAircraftDataFromXPlane(const BlackMisc::Aviation::CCallsignSet &callsigns);
void triggerRequestRemoteAircraftDataFromXPlane(const BlackMisc::Aviation::CCallsignSet &callsigns);
//! @}
//! Adding new aircraft @{
void addNextPendingAircraft();
void triggerAddNextPendingAircraft();
//! @}
//! Detect timeouts on adding
int detectTimeoutAdding();
//! Trigger a removal of an aircraft
void triggerRemoveAircraft(const BlackMisc::Aviation::CCallsign &callsign, qint64 deferMs);
//! Timestamps of aircraft currently adding
QPair<qint64, qint64> minMaxTimestampsAddInProgress() const;
//! Can the next aircraft be added?
bool canAddAircraft() const;
//! Callbacks from simulator @{
void onRemoteAircraftAdded(const QString &callsign);
void onRemoteAircraftAddingFailed(const QString &callsign);
void updateRemoteAircraftFromSimulator(const QStringList &callsigns, const QDoubleList &latitudesDeg, const QDoubleList &longitudesDeg,
const QDoubleList &elevationsM, const QDoubleList &verticalOffsets);
void updateAirportsInRange();
void remoteAircraftAdded(const QString &callsign);
void remoteAircraftAddingFailed(const QString &callsign);
void remoteAircraftAddingTimeout();
//! @}
// XSwiftBus interpolation
//! Dsiconnect from DBus
void disconnectFromDBus();
static constexpr qint64 TimeoutAdding = 10000;
QDBusConnection m_dBusConnection { "default" };
QDBusServiceWatcher *m_watcher { nullptr };
CXSwiftBusServiceProxy *m_serviceProxy { nullptr };
@@ -190,16 +226,19 @@ namespace BlackSimPlugin
QTimer m_fastTimer;
QTimer m_slowTimer;
QTimer m_airportUpdater;
BlackMisc::Aviation::CAirportList m_airportsInRange; //!< aiports in range of own aircraft
BlackMisc::CData<BlackMisc::Simulation::Data::TModelSetCacheXP> m_modelSet { this };
// Driver Interpolation
BlackMisc::Simulation::CSimulatedAircraftList m_pendingToBeAddedAircraft;
CXPlaneMPAircraftObjects m_xplaneAircraftObjects; //!< XPlane multiplayer aircraft
QTimer m_pendingAddedTimer;
BlackMisc::Aviation::CAirportList m_airportsInRange; //!< aiports in range of own aircraft
BlackMisc::CData<BlackMisc::Simulation::Data::TModelSetCacheXP> m_modelSet { this }; //!< XPlane model set
BlackMisc::Simulation::CSimulatedAircraftList m_pendingToBeAddedAircraft; //!< aircraft to be added
QHash<BlackMisc::Aviation::CCallsign, qint64> m_addingInProgressAircraft; //!< aircraft just adding
BlackMisc::Simulation::CSimulatedAircraftList m_aircraftAddedFailed; //! aircraft for which adding failed
CXPlaneMPAircraftObjects m_xplaneAircraftObjects; //!< XPlane multiplayer aircraft
XPlaneData m_xplaneData; //!< XPlane data
// statistics
qint64 m_statsAddMaxTimeMs = -1;
qint64 m_statsAddCurrentTimeMs = -1;
//! Reset the XPlane data
void resetXPlaneData()
{