flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 12:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #873, FSX: do not send parts if they are equal

Browse Source 
* == operator for struct
* do not send when equal
* fixed missing init of guessed parts struct
This commit is contained in:
Klaus Basan
2017-01-30 19:16:20 +01:00
committed by Mathew Sutcliffe
parent 3090413849
commit f701d6ad4a
4 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/simulator/fsx/simconnectdatadefinition.cpp
View File

@@ -9,6 +9,7 @@
#include "simconnectdatadefinition.h"
#include "blackmisc/logmessage.h"
#include <tuple>
using namespace BlackMisc;
@@ -178,5 +179,17 @@ namespace BlackSimPlugin
}
return hr;
}
bool DataDefinitionRemoteAircraftParts::operator==(const DataDefinitionRemoteAircraftParts &rhs) const
{
return std::tie(lightBeacon, lightLanding, lightLogo, lightNav, lightStrobe,
flapsLeadingEdgeLeftPercent, flapsLeadingEdgeRightPercent, flapsTrailingEdgeLeftPercent, flapsTrailingEdgeRightPercent,
gearHandlePosition, spoilersHandlePosition,
engine1Combustion, engine2Combustion, engine3Combustion, engine4Combustion) ==
std::tie(rhs.lightBeacon, rhs.lightLanding, rhs.lightLogo, rhs.lightNav, rhs.lightStrobe,
rhs.flapsLeadingEdgeLeftPercent, rhs.flapsLeadingEdgeRightPercent, rhs.flapsTrailingEdgeLeftPercent, rhs.flapsTrailingEdgeRightPercent,
rhs.gearHandlePosition, rhs.spoilersHandlePosition,
rhs.engine1Combustion, rhs.engine2Combustion, rhs.engine3Combustion, rhs.engine4Combustion);
}
} // namespace
} // namespace

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

@@ -92,6 +92,9 @@ namespace BlackSimPlugin
double engine2Combustion; //!< Engine 2 combustion flag
double engine3Combustion; //!< Engine 3 combustion flag
double engine4Combustion; //!< Engine 4 combustion flag
//! Equal to other parts
bool operator==(const DataDefinitionRemoteAircraftParts &rhs) const;
};
//! Data for AI object sent back from simulator

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

@@ -735,6 +735,7 @@ namespace BlackSimPlugin
// call in SIM
SimConnect_AIRemoveObject(m_hSimConnect, static_cast<SIMCONNECT_OBJECT_ID>(simObject.getObjectId()), static_cast<SIMCONNECT_DATA_REQUEST_ID>(m_requestId++));
m_hints.remove(simObject.getCallsign());
m_lastPartsSendToSim.remove(simObject.getObjectId());
// mark in provider
bool updated = updateAircraftRendered(callsign, false);
@@ -911,7 +912,11 @@ namespace BlackSimPlugin
}
else
{
this->guessAndUpdateRemoteAircraftParts(simObj, interpolatedSituation, interpolatorStatus);
// guess on position, but not every frame
if (m_interpolationRequest % 20 == 0)
{
this->guessAndUpdateRemoteAircraftParts(simObj, interpolatedSituation, interpolatorStatus);
}
}
} // all callsigns
const qint64 dt = QDateTime::currentMSecsSinceEpoch() - currentTimestamp;
@@ -920,13 +925,12 @@ namespace BlackSimPlugin
m_statsUpdateAircraftTimeAvgMs = m_statsUpdateAircraftTimeTotalMs / m_statsUpdateAircraftCountMs;
}
bool CSimulatorFsx::guessAndUpdateRemoteAircraftParts(const CSimConnectObject &simObj, const CAircraftSituation &interpolatedSituation, const IInterpolator::InterpolationStatus &interpolationStatus) const
bool CSimulatorFsx::guessAndUpdateRemoteAircraftParts(const CSimConnectObject &simObj, const CAircraftSituation &interpolatedSituation, const IInterpolator::InterpolationStatus &interpolationStatus)
{
if (!simObj.hasValidRequestAndObjectId()) { return false; }
if (!interpolationStatus.didInterpolationSucceed()) { return false; }
if (this->m_interpolationRequest % 20 != 0) { return false; } // only update every 20th cycle
DataDefinitionRemoteAircraftParts ddRemoteAircraftParts;
DataDefinitionRemoteAircraftParts ddRemoteAircraftParts = {}; // init members
const bool isOnGround = interpolatedSituation.isOnGround() == CAircraftSituation::OnGround;
ddRemoteAircraftParts.gearHandlePosition = isOnGround ? 1 : 0;
@@ -969,12 +973,12 @@ namespace BlackSimPlugin
return this->sendRemoteAircraftPartsToSim(simObj, ddRemoteAircraftParts);
}
bool CSimulatorFsx::updateRemoteAircraftParts(const CSimConnectObject &simObj, const CAircraftParts &parts, const IInterpolator::PartsStatus &partsStatus) const
bool CSimulatorFsx::updateRemoteAircraftParts(const CSimConnectObject &simObj, const CAircraftParts &parts, const IInterpolator::PartsStatus &partsStatus)
{
if (!simObj.hasValidRequestAndObjectId()) { return false; }
if (!partsStatus.isSupportingParts()) { return false; }
DataDefinitionRemoteAircraftParts ddRemoteAircraftParts;
DataDefinitionRemoteAircraftParts ddRemoteAircraftParts; // no init, all values will be set
ddRemoteAircraftParts.lightStrobe = parts.getLights().isStrobeOn() ? 1 : 0;
ddRemoteAircraftParts.lightLanding = parts.getLights().isLandingOn() ? 1 : 0;
@@ -996,13 +1000,20 @@ namespace BlackSimPlugin
return this->sendRemoteAircraftPartsToSim(simObj, ddRemoteAircraftParts);
}
bool CSimulatorFsx::sendRemoteAircraftPartsToSim(const CSimConnectObject &simObj, DataDefinitionRemoteAircraftParts &ddRemoteAircraftParts) const
bool CSimulatorFsx::sendRemoteAircraftPartsToSim(const CSimConnectObject &simObj, DataDefinitionRemoteAircraftParts &ddRemoteAircraftParts)
{
Q_ASSERT(m_hSimConnect);
HRESULT hr = S_OK;
hr += SimConnect_SetDataOnSimObject(m_hSimConnect, CSimConnectDefinitions::DataRemoteAircraftParts,
static_cast<SIMCONNECT_OBJECT_ID>(simObj.getObjectId()), 0, 0,
sizeof(DataDefinitionRemoteAircraftParts), &ddRemoteAircraftParts);
const DWORD objectId = simObj.getObjectId();
if (m_lastPartsSendToSim.contains(objectId))
{
// no need to send same parts
if (m_lastPartsSendToSim[objectId] == ddRemoteAircraftParts) { return true; }
}
m_lastPartsSendToSim[objectId] = ddRemoteAircraftParts;
HRESULT hr = SimConnect_SetDataOnSimObject(m_hSimConnect, CSimConnectDefinitions::DataRemoteAircraftParts,
objectId, 0, 0,
sizeof(DataDefinitionRemoteAircraftParts), &ddRemoteAircraftParts);
if (hr != S_OK) { CLogMessage(this).warning("Failed so set parts on SimObject '%1' callsign: '%2'") << simObj.getObjectId() << simObj.getCallsign(); }
return hr == S_OK;
@@ -1126,6 +1137,7 @@ namespace BlackSimPlugin
{
m_simConnectObjects.clear();
m_outOfRealityBubble.clear();
m_lastPartsSendToSim.clear();
CSimulatorFsCommon::clearAllAircraft();
}

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

@@ -169,14 +169,14 @@ namespace BlackSimPlugin
//! Update remote aircraft parts (send to FSX)
bool updateRemoteAircraftParts(const CSimConnectObject &simObj,
const BlackMisc::Aviation::CAircraftParts &parts, const BlackMisc::Simulation::IInterpolator::PartsStatus &partsStatus) const;
const BlackMisc::Aviation::CAircraftParts &parts, const BlackMisc::Simulation::IInterpolator::PartsStatus &partsStatus);
//! Update remote aircraft parts by guessing (send to FSX)
bool guessAndUpdateRemoteAircraftParts(const CSimConnectObject &simObj,
const BlackMisc::Aviation::CAircraftSituation &interpolatedSituation, const BlackMisc::Simulation::IInterpolator::InterpolationStatus &interpolationStatus) const;
const BlackMisc::Aviation::CAircraftSituation &interpolatedSituation, const BlackMisc::Simulation::IInterpolator::InterpolationStatus &interpolationStatus);
//! Send parts to sim
bool sendRemoteAircraftPartsToSim(const CSimConnectObject &simObj, DataDefinitionRemoteAircraftParts &ddRemoteAircraftParts) const;
bool sendRemoteAircraftPartsToSim(const CSimConnectObject &simObj, DataDefinitionRemoteAircraftParts &ddRemoteAircraftParts);
//! Called when data about our own aircraft are received
void updateOwnAircraftFromSimulator(const DataDefinitionOwnAircraft &simulatorOwnAircraft);
@@ -235,7 +235,8 @@ namespace BlackSimPlugin
HANDLE m_hSimConnect = nullptr; //!< handle to SimConnect object
CSimConnectObjects m_simConnectObjects; //!< AI objects and their object / request ids
QTimer m_realityBubbleTimer { this }; //!< updating of aircraft out of reality bubble
BlackMisc::Simulation::CSimulatedAircraftList m_outOfRealityBubble; //!< aircraft removed by FSX because they are out of reality bubble
BlackMisc::Simulation::CSimulatedAircraftList m_outOfRealityBubble; //!< aircraft removed by FSX because they are out of reality bubble
QHash<DWORD, DataDefinitionRemoteAircraftParts> m_lastPartsSendToSim; //!< Last parts send to simulator, avoid always sending same parts
};
//! Listener for FSX