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

refactor: Split position/altitude and groundfactor interpolation

Browse Source
This commit is contained in:
Lars Toenning
2024-01-09 09:37:36 +01:00
parent a27c2b3f51
commit 8253b73db2
5 changed files with 64 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -258,7 +258,13 @@ namespace BlackMisc::Simulation
// use derived interpolant function
const bool interpolateGndFlag = pbh.getEndSituation().hasGroundDetailsForGndInterpolation() && pbh.getStartSituation().hasGroundDetailsForGndInterpolation();
currentSituation = interpolant.interpolatePositionAndAltitude(currentSituation, interpolateGndFlag);
currentSituation = interpolant.interpolatePositionAndAltitude(currentSituation);
if (interpolateGndFlag)
{
currentSituation.setOnGroundInfo(interpolant.interpolateGroundFactor());
}
if (currentSituation.isNull()) { break; }
// if we get here and the vector is invalid it means we haven't handled it correctly in one of the interpolators

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

@@ -45,7 +45,7 @@ namespace BlackMisc::Simulation
void CInterpolatorLinear::anchor()
{}
CAircraftSituation CInterpolatorLinear::CInterpolant::interpolatePositionAndAltitude(const CAircraftSituation &situation, bool interpolateGndFactor) const
CAircraftSituation CInterpolatorLinear::CInterpolant::interpolatePositionAndAltitude(const CAircraftSituation &situation) const
{
const std::array<double, 3> startVec(m_startSituation.getPosition().normalVectorDouble());
const std::array<double, 3> endVec(m_endSituation.getPosition().normalVectorDouble());
@@ -82,27 +82,29 @@ namespace BlackMisc::Simulation
interpolatedSituation.setAltitude(altitude);
interpolatedSituation.setMSecsSinceEpoch(this->getInterpolatedTime());
if (interpolateGndFactor)
{
const double startGroundFactor = m_startSituation.getOnGroundInfo().getGroundFactor();
const double endGroundFactor = m_endSituation.getOnGroundInfo().getGroundFactor();
if (CAircraftSituation::isGfEqualAirborne(startGroundFactor, endGroundFactor))
{
interpolatedSituation.setOnGroundInfo({ COnGroundInfo::NotOnGround, COnGroundInfo::OnGroundByInterpolation });
}
else if (CAircraftSituation::isGfEqualOnGround(startGroundFactor, endGroundFactor))
{
interpolatedSituation.setOnGroundInfo({ COnGroundInfo::OnGround, COnGroundInfo::OnGroundByInterpolation });
}
else
{
const double interpolatedGroundFactor = (endGroundFactor - startGroundFactor) * tf + startGroundFactor;
interpolatedSituation.setOnGroundInfo(COnGroundInfo(interpolatedGroundFactor));
}
}
return interpolatedSituation;
}
Aviation::COnGroundInfo CInterpolatorLinear::CInterpolant::interpolateGroundFactor() const
{
const double startGroundFactor = m_startSituation.getOnGroundInfo().getGroundFactor();
const double endGroundFactor = m_endSituation.getOnGroundInfo().getGroundFactor();
if (CAircraftSituation::isGfEqualAirborne(startGroundFactor, endGroundFactor))
{
return { COnGroundInfo::NotOnGround, COnGroundInfo::OnGroundByInterpolation };
}
else if (CAircraftSituation::isGfEqualOnGround(startGroundFactor, endGroundFactor))
{
return { COnGroundInfo::OnGround, COnGroundInfo::OnGroundByInterpolation };
}
else
{
const double tf = clampValidTimeFraction(m_simulationTimeFraction);
const double interpolatedGroundFactor = (endGroundFactor - startGroundFactor) * tf + startGroundFactor;
return COnGroundInfo(interpolatedGroundFactor);
}
}
CInterpolatorLinear::CInterpolant CInterpolatorLinear::getInterpolant(SituationLog &log)
{
// set default situations

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

@@ -49,9 +49,11 @@ namespace BlackMisc
//! Perform the interpolation
//! \param situation situation used as a base for interpolation. Contains for example the already interpolated PBH.
//! \param interpolateGndFactor whether to interpolate the GND factor.
//! \return \p situation with interpolated position and altitude, updated timestamp and possibly interpolated GND factor
Aviation::CAircraftSituation interpolatePositionAndAltitude(const Aviation::CAircraftSituation &situation, bool interpolateGndFactor) const;
//! \return \p situation with interpolated position and altitude and updated timestamp
Aviation::CAircraftSituation interpolatePositionAndAltitude(const Aviation::CAircraftSituation &situation) const;
//! Interpolate the ground information/factor
Aviation::COnGroundInfo interpolateGroundFactor() const;
//! Start situation
const Aviation::CAircraftSituation &getStartSituation() const { return m_startSituation; }

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

@@ -315,7 +315,7 @@ namespace BlackMisc::Simulation
m_situationsAvailable = pa.size();
}
CAircraftSituation CInterpolatorSpline::CInterpolant::interpolatePositionAndAltitude(const CAircraftSituation &currentSituation, bool interpolateGndFactor) const
CAircraftSituation CInterpolatorSpline::CInterpolant::interpolatePositionAndAltitude(const CAircraftSituation &currentSituation) const
{
const double t1 = m_pa.t[1];
const double t2 = m_pa.t[2]; // latest (adjusted)
@@ -361,28 +361,34 @@ namespace BlackMisc::Simulation
newSituation.setAltitude(alt);
newSituation.setMSecsSinceEpoch(this->getInterpolatedTime());
if (interpolateGndFactor)
{
const double gnd1 = m_pa.gnd[1];
const double gnd2 = m_pa.gnd[2]; // latest
if (CAircraftSituation::isGfEqualAirborne(gnd1, gnd2))
{
newSituation.setOnGroundInfo({ COnGroundInfo::NotOnGround, COnGroundInfo::OnGroundByInterpolation });
}
else if (CAircraftSituation::isGfEqualOnGround(gnd1, gnd2))
{
newSituation.setOnGroundInfo({ COnGroundInfo::OnGround, COnGroundInfo::OnGroundByInterpolation });
}
else
{
const double newGnd = evalSplineInterval(m_currentTimeMsSinceEpoc, t1, t2, gnd1, gnd2, m_pa.dgnd[1], m_pa.dgnd[2]);
newSituation.setOnGroundInfo(COnGroundInfo(newGnd));
}
}
return newSituation;
}
Aviation::COnGroundInfo CInterpolatorSpline::CInterpolant::interpolateGroundFactor() const
{
const double t1 = m_pa.t[1];
const double t2 = m_pa.t[2]; // latest (adjusted)
bool valid = (t1 < t2) && (m_currentTimeMsSinceEpoc >= t1) && (m_currentTimeMsSinceEpoc < t2);
if (!valid) { return { COnGroundInfo::OnGroundSituationUnknown, COnGroundInfo::NotSetGroundDetails }; }
const double gnd1 = m_pa.gnd[1];
const double gnd2 = m_pa.gnd[2]; // latest
if (CAircraftSituation::isGfEqualAirborne(gnd1, gnd2))
{
return { COnGroundInfo::NotOnGround, COnGroundInfo::OnGroundByInterpolation };
}
else if (CAircraftSituation::isGfEqualOnGround(gnd1, gnd2))
{
return { COnGroundInfo::OnGround, COnGroundInfo::OnGroundByInterpolation };
}
else
{
const double newGnd = evalSplineInterval(m_currentTimeMsSinceEpoc, t1, t2, gnd1, gnd2, m_pa.dgnd[1], m_pa.dgnd[2]);
return COnGroundInfo(newGnd);
}
}
void CInterpolatorSpline::CInterpolant::setTimes(qint64 currentTimeMs, double timeFraction, qint64 interpolatedTimeMs)
{
m_currentTimeMsSinceEpoc = currentTimeMs;

8
src/blackmisc/simulation/interpolatorspline.h
View File

@@ -65,9 +65,11 @@ namespace BlackMisc::Simulation
//! Perform the interpolation
//! \param situation situation used as a base for interpolation. Contains for example the already interpolated PBH.
//! \param interpolateGndFactor whether to interpolate the GND factor.
//! \return \p situation with interpolated position and altitude, updated timestamp and possibly interpolated GND factor
Aviation::CAircraftSituation interpolatePositionAndAltitude(const Aviation::CAircraftSituation &currentSituation, bool interpolateGndFactor) const;
//! \return \p situation with interpolated position and altitude and updated timestamp
Aviation::CAircraftSituation interpolatePositionAndAltitude(const Aviation::CAircraftSituation &currentSituation) const;
//! Interpolate the ground information/factor
Aviation::COnGroundInfo interpolateGroundFactor() const;
//! Set the time values
void setTimes(qint64 currentTimeMs, double timeFraction, qint64 interpolatedTimeMs);