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

Ref T259, renamed CXPlaneMPAircrafts to CXPlaneMPAircraftObjects

Browse Source 
* there is no plural for aircraft
* so the same style as for simObjects was used
This commit is contained in:
Klaus Basan
2018-02-25 17:13:08 +01:00
parent 13ede9fac1
commit 34502b6b76
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -381,13 +381,13 @@ namespace BlackSimPlugin
if (mode == CInterpolatorMulti::ModeUnknown) { return false; }
if (callsign.isEmpty())
{
const int c = m_xplaneAircraft.setInterpolatorModes(mode);
const int c = m_xplaneAircraftObjects.setInterpolatorModes(mode);
return c > 0;
}
else
{
if (!m_xplaneAircraft.contains(callsign)) { return false; }
return m_xplaneAircraft[callsign].setInterpolatorMode(mode);
if (!m_xplaneAircraftObjects.contains(callsign)) { return false; }
return m_xplaneAircraftObjects[callsign].setInterpolatorMode(mode);
}
}
else
@@ -418,7 +418,7 @@ namespace BlackSimPlugin
{
if (c_driverInterpolation)
{
return m_xplaneAircraft.contains(callsign);
return m_xplaneAircraftObjects.contains(callsign);
}
else
{
@@ -520,7 +520,7 @@ namespace BlackSimPlugin
Q_ASSERT_X(!newRemoteAircraft.getCallsign().isEmpty(), Q_FUNC_INFO, "empty callsign");
Q_ASSERT_X(newRemoteAircraft.hasModelString(), Q_FUNC_INFO, "missing model string");
m_xplaneAircraft.insert(newRemoteAircraft.getCallsign(), CXPlaneMPAircraft(newRemoteAircraft, &m_interpolationLogger));
m_xplaneAircraftObjects.insert(newRemoteAircraft.getCallsign(), CXPlaneMPAircraft(newRemoteAircraft, &m_interpolationLogger));
CAircraftModel aircraftModel = newRemoteAircraft.getModel();
QString livery = aircraftModel.getLivery().getCombinedCode(); //! \todo livery resolution for XP
m_traffic->addPlane(newRemoteAircraft.getCallsign().asString(), aircraftModel.getModelString(),
@@ -564,9 +564,9 @@ namespace BlackSimPlugin
Q_ASSERT(isConnected());
if (c_driverInterpolation)
{
if (m_xplaneAircraft.contains(situation.getCallsign()))
if (m_xplaneAircraftObjects.contains(situation.getCallsign()))
{
m_xplaneAircraft[situation.getCallsign()].addAircraftSituation(situation);
m_xplaneAircraftObjects[situation.getCallsign()].addAircraftSituation(situation);
}
}
else
@@ -620,9 +620,9 @@ namespace BlackSimPlugin
if (c_driverInterpolation)
{
if (m_xplaneAircraft.contains(callsign))
if (m_xplaneAircraftObjects.contains(callsign))
{
m_xplaneAircraft[callsign].addAircraftParts(parts);
m_xplaneAircraftObjects[callsign].addAircraftParts(parts);
}
}
else
@@ -650,21 +650,21 @@ namespace BlackSimPlugin
m_hints.remove(callsign);
// really remove from simulator
if (!m_xplaneAircraft.contains(callsign)) { return false; } // already fully removed or not yet added
if (!m_xplaneAircraftObjects.contains(callsign)) { return false; } // already fully removed or not yet added
// mark in provider
const bool updated = this->updateAircraftRendered(callsign, false);
if (updated)
{
Q_ASSERT_X(m_xplaneAircraft.contains(callsign), Q_FUNC_INFO, "Aircraft removed");
const CXPlaneMPAircraft &xplaneAircraft = m_xplaneAircraft[callsign];
Q_ASSERT_X(m_xplaneAircraftObjects.contains(callsign), Q_FUNC_INFO, "Aircraft removed");
const CXPlaneMPAircraft &xplaneAircraft = m_xplaneAircraftObjects[callsign];
CSimulatedAircraft aircraft(xplaneAircraft.getAircraft());
aircraft.setRendered(false);
emit this->aircraftRenderingChanged(aircraft);
}
m_traffic->removePlane(callsign.asString());
m_xplaneAircraft.remove(callsign);
m_xplaneAircraftObjects.remove(callsign);
// bye
return true;
@@ -688,7 +688,7 @@ namespace BlackSimPlugin
{
// remove one by one
int r = 0;
const CCallsignSet callsigns = m_xplaneAircraft.getAllCallsigns();
const CCallsignSet callsigns = m_xplaneAircraftObjects.getAllCallsigns();
for (const CCallsign &cs : callsigns)
{
if (this->physicallyRemoveRemoteAircraft(cs)) { r++; }
@@ -838,7 +838,7 @@ namespace BlackSimPlugin
const CCallsignSet callsignsToLog(m_interpolationRenderingSetup.getLogCallsigns());
// interpolation for all remote aircraft
const QList<CXPlaneMPAircraft> xplaneAircrafts(m_xplaneAircraft.values());
const QList<CXPlaneMPAircraft> xplaneAircrafts(m_xplaneAircraftObjects.values());
for (const CXPlaneMPAircraft &xplaneAircraft : xplaneAircrafts)
{
const CCallsign callsign(xplaneAircraft.getCallsign());
@@ -863,7 +863,7 @@ namespace BlackSimPlugin
// update situation
if (!xplaneAircraft.isSameAsSent(interpolatedSituation))
{
m_xplaneAircraft[xplaneAircraft.getCallsign()].setPositionAsSent(interpolatedSituation);
m_xplaneAircraftObjects[xplaneAircraft.getCallsign()].setPositionAsSent(interpolatedSituation);
m_traffic->setPlanePosition(interpolatedSituation.getCallsign().asString(),
interpolatedSituation.latitude().value(CAngleUnit::deg()),
interpolatedSituation.longitude().value(CAngleUnit::deg()),
@@ -1011,7 +1011,7 @@ namespace BlackSimPlugin
void CSimulatorXPlane::updateRemoteAircraftFromSimulator(const QString &callsign_, double latitude, double longitude, double groundElevation, double modelVerticalOffset)
{
CCallsign callsign(callsign_);
if (!m_xplaneAircraft.contains(callsign)) { return; }
if (!m_xplaneAircraftObjects.contains(callsign)) { return; }
CElevationPlane elevation(CLatitude(latitude, CAngleUnit::deg()), CLongitude(longitude, CAngleUnit::deg()), CAltitude(groundElevation, CLengthUnit::m()));
elevation.setSinglePointRadius();

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

@@ -176,8 +176,8 @@ namespace BlackSimPlugin
BlackMisc::CData<BlackMisc::Simulation::Data::TModelSetCacheXP> m_modelSet { this };
// Driver Interpolation
CXPlaneMPAircrafts m_xplaneAircraft; //!< XPlane multiplayer aircraft
int m_interpolationRequest = 0; //!< current interpolation request
CXPlaneMPAircraftObjects m_xplaneAircraftObjects; //!< XPlane multiplayer aircraft
int m_interpolationRequest = 0; //!< current interpolation request
//! \todo Add units to members? pitchDeg?, altitudeFt?
struct // data is written by DBus async method callbacks

4
src/plugins/simulator/xplane/xplanempaircraft.cpp
View File

@@ -106,12 +106,12 @@ namespace BlackSimPlugin
return m_interpolator->getInterpolatedParts(currentTimeSinceEpoc, setup, partsStatus, log);
}
CCallsignSet CXPlaneMPAircrafts::getAllCallsigns() const
CCallsignSet CXPlaneMPAircraftObjects::getAllCallsigns() const
{
return CCallsignSet(this->keys());
}
int CXPlaneMPAircrafts::setInterpolatorModes(CInterpolatorMulti::Mode mode)
int CXPlaneMPAircraftObjects::setInterpolatorModes(CInterpolatorMulti::Mode mode)
{
int c = 0;
for (const CCallsign &cs : this->keys())

2
src/plugins/simulator/xplane/xplanempaircraft.h
View File

@@ -109,7 +109,7 @@ namespace BlackSimPlugin
};
//! Simulator objects (aka AI aircraft)
class CXPlaneMPAircrafts : public QHash<BlackMisc::Aviation::CCallsign, CXPlaneMPAircraft>
class CXPlaneMPAircraftObjects : public QHash<BlackMisc::Aviation::CCallsign, CXPlaneMPAircraft>
{
public:
//! Get all callsigns