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

refactor: Simplify interpolatePositionAndAltitude method

Browse Source
This commit is contained in:
Lars Toenning
2024-01-09 21:06:24 +01:00
parent 8253b73db2
commit 2cd88fa493
5 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,7 @@ namespace BlackMisc::Simulation
void CInterpolatorLinear::anchor()
{}
CAircraftSituation CInterpolatorLinear::CInterpolant::interpolatePositionAndAltitude(const CAircraftSituation &situation) const
std::tuple<Geo::CCoordinateGeodetic, Aviation::CAltitude> CInterpolatorLinear::CInterpolant::interpolatePositionAndAltitude() const
{
const std::array<double, 3> startVec(m_startSituation.getPosition().normalVectorDouble());
const std::array<double, 3> endVec(m_endSituation.getPosition().normalVectorDouble());
@@ -77,12 +77,7 @@ namespace BlackMisc::Simulation
const CAltitude altitude((newAlt - oldAlt) * tf + oldAlt,
oldAlt.getReferenceDatum());
CAircraftSituation interpolatedSituation(situation);
interpolatedSituation.setPosition(interpolatedPosition);
interpolatedSituation.setAltitude(altitude);
interpolatedSituation.setMSecsSinceEpoch(this->getInterpolatedTime());
return interpolatedSituation;
return { interpolatedPosition, altitude };
}
Aviation::COnGroundInfo CInterpolatorLinear::CInterpolant::interpolateGroundFactor() const