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

Formatting

Browse Source
This commit is contained in:
Klaus Basan
2018-05-25 21:22:00 +02:00
parent f80b2293f5
commit 464c8dfe83
11 changed files with 63 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,11 +242,11 @@ namespace BlackMisc
qint64 m_currentTimeMsSinceEpoch = -1; //!< current time
Aviation::CAircraftSituationList m_currentSituations; //!< current situations
Aviation::CAircraftSituationChange m_currentSituationChange; //!< situations change
PhysicalQuantities::CLength m_currentSceneryOffset = PhysicalQuantities::CLength::null(); //!< calculated scenery offset if any
CInterpolationAndRenderingSetupPerCallsign m_currentSetup; //!< used setup
CInterpolationStatus m_currentInterpolationStatus; //!< this step's status
CPartsStatus m_currentPartsStatus; //!< this step's status
Aviation::CAircraftSituation m_lastInterpolation { Aviation::CAircraftSituation::null() }; //!< latest interpolation
Aviation::CAircraftSituation m_lastInterpolation { Aviation::CAircraftSituation::null() }; //!< latest interpolation
PhysicalQuantities::CLength m_currentSceneryOffset { PhysicalQuantities::CLength::null() }; //!< calculated scenery offset if any
qint64 m_situationsLastModified { -1 }; //!< when situations were last modified
qint64 m_situationsLastModifiedUsed { -1 }; //!< interpolant based on situations last updated

2
src/blackmisc/simulation/remoteaircraftprovider.h
View File

@@ -387,7 +387,7 @@ namespace BlackMisc
CSimulatedAircraftList m_aircraftInRange; //!< aircraft, thread safe access required
QMap<Aviation::CCallsign, CStatusMessageList> m_reverseLookupMessages;
QMap<Aviation::CCallsign, CStatusMessageList> m_aircraftPartsHistory;
QMap<Aviation::CCallsign, CStatusMessageList> m_aircraftPartsHistory; //!< JSON aircraft parts history
QMap<Aviation::CCallsign, qint64> m_situationsLastModified;
QMap<Aviation::CCallsign, qint64> m_partsLastModified;
QMap<Aviation::CCallsign, PhysicalQuantities::CLength> m_testOffset;

4
src/blackmisc/variant.h
View File

@@ -168,13 +168,13 @@ namespace BlackMisc
CVariant &operator =(const CVariant &other) = default;
//! Move assignment operatior.
CVariant &operator =(CVariant && other) noexcept = default;
CVariant &operator =(CVariant &&other) noexcept = default;
//! Change the internal QVariant
CVariant &operator =(const QVariant &var) { m_v = var; return *this; }
//! Change the internal QVariant
CVariant &operator =(QVariant && var) noexcept { m_v = std::move(var); return *this; }
CVariant &operator =(QVariant &&var) noexcept { m_v = std::move(var); return *this; }
//! Swap this variant with another.
void swap(CVariant &other) noexcept { m_v.swap(other.m_v); }