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

Ref T229, adjusted renamings because of CInterpolationStatus changes

Browse Source
This commit is contained in:
Klaus Basan
2018-01-19 03:08:27 +01:00
parent 75c2eec3d1
commit 0991f20f7d
6 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackmisc/simulation/interpolator.cpp
View File

@@ -71,9 +71,9 @@ namespace BlackMisc
const auto interpolant = derived()->getInterpolant(currentTimeMsSinceEpoc, setup, hints, status, log);
// succeeded so far?
if (!status.didInterpolationSucceed())
if (!status.isInterpolated())
{
status.setValidSituation(currentSituation);
status.checkIfValidSituation(currentSituation);
return currentSituation;
}
@@ -114,16 +114,15 @@ namespace BlackMisc
CInterpolator::setGroundFlagFromInterpolator(hints, NoGroundFactor, currentSituation);
}
if (setup.isForcingFullInterpolation() || hints.isVtolAircraft() || status.hasChangedPosition())
if (setup.isForcingFullInterpolation() || hints.isVtolAircraft() || status.isInterpolated())
{
const auto pbh = interpolant.pbh();
currentSituation.setHeading(pbh.getHeading());
currentSituation.setPitch(pbh.getPitch());
currentSituation.setBank(pbh.getBank());
currentSituation.setGroundSpeed(pbh.getGroundSpeed());
status.setChangedPosition(true);
status.setInterpolatedAndCheckSituation(true, currentSituation);
}
status.setInterpolationSucceeded(true, currentSituation);
m_isFirstInterpolation = false;
if (m_logger && hints.isLoggingInterpolation())

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

@@ -73,7 +73,7 @@ namespace BlackMisc
if (situationsOlder.isEmpty())
{
const CAircraftSituation currentSituation(*(situationsNewer.end() - 1)); // oldest newest
status.setInterpolationSucceeded(false, currentSituation);
status.setInterpolatedAndCheckSituation(false, currentSituation);
return currentSituation;
}
@@ -81,7 +81,7 @@ namespace BlackMisc
if (situationsOlder.size() < 2)
{
const CAircraftSituation currentSituation(situationsOlder.front()); // latest oldest
status.setInterpolationSucceeded(false, currentSituation);
status.setInterpolatedAndCheckSituation(false, currentSituation);
return currentSituation;
}
@@ -124,9 +124,7 @@ namespace BlackMisc
currentSituation.setTimeOffsetMs(oldSituation.getTimeOffsetMs() + (newSituation.getTimeOffsetMs() - oldSituation.getTimeOffsetMs()) * simulationTimeFraction);
currentSituation.setMSecsSinceEpoch(oldSituation.getMSecsSinceEpoch() + deltaTimeFractionMs);
status.setChangedPosition(m_isFirstInterpolation || oldSituation.getPosition() != newSituation.getPosition() || oldSituation.getAltitude() != newSituation.getAltitude());
status.setInterpolationSucceeded(true, currentSituation);
status.setInterpolatedAndCheckSituation(true, currentSituation);
log.oldSituation = oldSituation;
log.newSituation = newSituation;

3
src/blackmisc/simulation/interpolatorspline.cpp
View File

@@ -135,8 +135,7 @@ namespace BlackMisc
log.oldSituation = m_pbh.getOldSituation();
log.newSituation = m_pbh.getNewSituation();
status.setInterpolationSucceeded(true);
status.setChangedPosition(true);
status.setInterpolated(true);
const double dt1 = static_cast<double>(currentTimeMsSinceEpoc - m_prevSampleTime);
const double dt2 = static_cast<double>(m_nextSampleTime - m_prevSampleTime);
const double timeFraction = dt1 / dt2;

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

@@ -1157,7 +1157,7 @@ namespace BlackSimPlugin
bool CSimulatorFsxCommon::guessAndUpdateRemoteAircraftParts(const CSimConnectObject &simObj, const CAircraftSituation &interpolatedSituation, const CInterpolationStatus &interpolationStatus)
{
if (!simObj.hasValidRequestAndObjectId()) { return false; }
if (!interpolationStatus.didInterpolationSucceed()) { return false; }
if (!interpolationStatus.isInterpolated()) { return false; }
CAircraftLights lights;
DataDefinitionRemoteAircraftPartsWithoutLights ddRemoteAircraftPartsWintoutLights = {}; // init members