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

refs #865, set current elevation from hints also for current situation

Browse Source 
This is better than the copied elevation from old situation
This commit is contained in:
Klaus Basan
2017-01-29 00:14:40 +01:00
committed by Mathew Sutcliffe
parent bc3bd41c97
commit 578a092b0c
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackmisc/simulation/interpolatorlinear.cpp
View File

@@ -102,8 +102,8 @@ namespace BlackMisc
// take hint into account to calculate elevation and above ground level // take hint into account to calculate elevation and above ground level
if (!hints.getElevation().isNull()) if (!hints.getElevation().isNull())
{ {
IInterpolator::setGroundElevationFromHint(hints, oldSituation); IInterpolator::setGroundElevationFromHint(hints, oldSituation, false);
IInterpolator::setGroundElevationFromHint(hints, newSituation); IInterpolator::setGroundElevationFromHint(hints, newSituation, false);
} }
CAircraftSituation currentSituation(oldSituation); // also sets ground elevation if available CAircraftSituation currentSituation(oldSituation); // also sets ground elevation if available
@@ -147,6 +147,12 @@ namespace BlackMisc
+ oldAlt, + oldAlt,
oldAlt.getReferenceDatum())); oldAlt.getReferenceDatum()));
// update current position by hints' elevation
// for XP provided by hints.getElevationProvider at current position
// for FSX/P3D provided as hints.getElevation which is set to current position of remote aircraft in simulator
const CAltitude currentGroundElevation = hints.getGroundElevation(currentSituation);
if (!currentGroundElevation.isNull()) { currentSituation.setGroundElevation(currentGroundElevation); }
// Interpolate between altitude and ground elevation, with proportions weighted according to interpolated onGround flag // Interpolate between altitude and ground elevation, with proportions weighted according to interpolated onGround flag
if (hints.hasAircraftParts()) if (hints.hasAircraftParts())
{ {
@@ -154,12 +160,11 @@ namespace BlackMisc
log.groundFactor = groundFactor; log.groundFactor = groundFactor;
if (groundFactor > 0.0) if (groundFactor > 0.0)
{ {
const CAltitude groundElevation = hints.getGroundElevation(currentSituation); if (!currentGroundElevation.isNull())
if (!groundElevation.isNull())
{ {
Q_ASSERT_X(groundElevation.getReferenceDatum() == CAltitude::MeanSeaLevel, Q_FUNC_INFO, "Need MSL value"); Q_ASSERT_X(currentGroundElevation.getReferenceDatum() == CAltitude::MeanSeaLevel, Q_FUNC_INFO, "Need MSL value");
currentSituation.setAltitude(CAltitude(currentSituation.getAltitude() * (1.0 - groundFactor) currentSituation.setAltitude(CAltitude(currentSituation.getAltitude() * (1.0 - groundFactor)
+ groundElevation * groundFactor, + currentGroundElevation * groundFactor,
oldAlt.getReferenceDatum())); oldAlt.getReferenceDatum()));
} }
} }