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

Ref T436, used interpolated situation if possible for new FSX/P3D aircraft

Browse Source
This commit is contained in:
Klaus Basan
2018-11-30 05:37:38 +01:00
parent 0da8d85999
commit 07eac1d46f
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
View File

@@ -1511,11 +1511,22 @@ namespace BlackSimPlugin
bool adding = false; // will be added flag
const SIMCONNECT_DATA_REQUEST_ID requestId = probe ? this->obtainRequestIdForSimObjTerrainProbe() : this->obtainRequestIdForSimObjAircraft();
// Initial situation, if possible from interpolation
CAircraftSituation initialSituation = newRemoteAircraft.getSituation(); // default
{
// Dummy CSimConnectObject just for interpolation
const CSimConnectObject dummyObject = CSimConnectObject(newRemoteAircraft, 0, this, this, this->getRemoteAircraftProvider(), &m_interpolationLogger);
const CInterpolationResult result = dummyObject.getInterpolation(QDateTime::currentMSecsSinceEpoch(), setup, 0);
if (result.getInterpolationStatus().isInterpolated())
{
initialSituation = result.getInterpolatedSituation();
}
}
// under flow can cause a model not to be added
// FSX: underflow and NO(!) gnd flag can cause adding/remove issue
// P3D: underflow did not cause such issue
CStatusMessage underflowStatus;
const CAircraftSituation initialSituation = newRemoteAircraft.getSituation();
const SIMCONNECT_DATA_INITPOSITION initialPosition = CSimulatorFsxCommon::aircraftSituationToFsxPosition(initialSituation, sendGround, true, &underflowStatus);
const QString modelString(newRemoteAircraft.getModelString());
@@ -2036,7 +2047,8 @@ namespace BlackSimPlugin
SIMCONNECT_DATA_INITPOSITION position = CSimulatorFsxCommon::coordinateToFsxPosition(situation);
if (forceUnderflowDetection)
{
position.Altitude = situation.getCorrectedAltitude(true, &altCorrection).value(CLengthUnit::ft());
const CAltitude alt = situation.getCorrectedAltitude(true, &altCorrection);
position.Altitude = alt.value(CLengthUnit::ft());
}
// MSFS has inverted pitch and bank angles