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

refs #865, based on discussion https://dev.vatsim-germany.org/issues/865#note-12

Browse Source 
* do not call XP`s elevation provider if not needed in interpolator
* some renaming/utility functions
This commit is contained in:
Klaus Basan
2017-01-29 22:03:14 +01:00
committed by Mathew Sutcliffe
parent 47aa04b5e9
commit 1d967b08e8
6 changed files with 51 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/blackmisc/simulation/interpolationhints.cpp
View File

@@ -26,19 +26,19 @@ namespace BlackMisc
CAltitude CInterpolationHints::getGroundElevation(const Aviation::CAircraftSituation &situation) const
{
if (m_elevationProvider) { return m_elevationProvider(situation); }
if (m_elevation.isNull() || !m_elevation.isWithinRange(situation)) { return CAltitude::null(); }
return m_elevation.geodeticHeight();
if (m_elevationPlane.isNull() || !m_elevationPlane.isWithinRange(situation)) { return CAltitude::null(); }
return m_elevationPlane.geodeticHeight();
}
void CInterpolationHints::resetElevation()
void CInterpolationHints::resetElevationPlane()
{
m_elevation = CElevationPlane();
m_elevationPlane = CElevationPlane();
}
bool CInterpolationHints::isWithinRange(const Geo::ICoordinateGeodetic &coordinate) const
{
if (m_elevation.isNull()) return false;
return m_elevation.isWithinRange(coordinate);
if (m_elevationPlane.isNull()) return false;
return m_elevationPlane.isWithinRange(coordinate);
}
void CInterpolationHints::setAircraftParts(const CAircraftParts &parts, bool hasParts)
@@ -47,6 +47,11 @@ namespace BlackMisc
m_aircraftParts = parts;
}
bool CInterpolationHints::hasElevationProvider() const
{
return static_cast<bool>(m_elevationProvider);
}
CVariant CInterpolationHints::propertyByIndex(const CPropertyIndex &index) const
{
if (index.isMyself()) { return CVariant::from(*this); }
@@ -56,7 +61,7 @@ namespace BlackMisc
case IndexCenterOfGravity:
return this->m_cgAboveGround.propertyByIndex(index.copyFrontRemoved());
case IndexElevationPlane:
return this->m_elevation.propertyByIndex(index.copyFrontRemoved());
return this->m_elevationPlane.propertyByIndex(index.copyFrontRemoved());
case IndexIsVtolAircraft:
return CVariant::fromValue(m_isVtol);
default:
@@ -74,7 +79,7 @@ namespace BlackMisc
this->m_cgAboveGround.setPropertyByIndex(index.copyFrontRemoved(), variant);
break;
case IndexElevationPlane:
this->m_elevation.setPropertyByIndex(index.copyFrontRemoved(), variant);
this->m_elevationPlane.setPropertyByIndex(index.copyFrontRemoved(), variant);
break;
case IndexIsVtolAircraft:
this->m_isVtol = variant.toBool();
@@ -88,17 +93,17 @@ namespace BlackMisc
QString CInterpolationHints::convertToQString(bool i18n) const
{
static const QString s("%1 %2");
return s.arg(m_elevation.toQString(i18n), m_cgAboveGround.toQString(i18n));
return s.arg(m_elevationPlane.toQString(i18n), m_cgAboveGround.toQString(i18n));
}
QString CInterpolationHints::debugInfo(const Geo::CElevationPlane &deltaElevation) const
{
static const QString s("Lat: %1 Lng: %2 Elv: %3");
if (m_elevation.isNull() || deltaElevation.isNull()) return "null";
if (m_elevationPlane.isNull() || deltaElevation.isNull()) return "null";
return s.arg(
(deltaElevation.latitude() - m_elevation.latitude()).valueRoundedWithUnit(CAngleUnit::deg(), 10),
(deltaElevation.longitude() - m_elevation.longitude()).valueRoundedWithUnit(CAngleUnit::deg(), 10),
(deltaElevation.geodeticHeight() - m_elevation.geodeticHeight()).valueRoundedWithUnit(CLengthUnit::ft(), 2)
(deltaElevation.latitude() - m_elevationPlane.latitude()).valueRoundedWithUnit(CAngleUnit::deg(), 10),
(deltaElevation.longitude() - m_elevationPlane.longitude()).valueRoundedWithUnit(CAngleUnit::deg(), 10),
(deltaElevation.geodeticHeight() - m_elevationPlane.geodeticHeight()).valueRoundedWithUnit(CLengthUnit::ft(), 2)
);
}
} // namespace

21
src/blackmisc/simulation/interpolationhints.h
View File

@@ -42,17 +42,17 @@ namespace BlackMisc
CInterpolationHints(bool isVtolAircraft);
//! Get elevation
const BlackMisc::Geo::CElevationPlane &getElevation() const { return m_elevation;}
const BlackMisc::Geo::CElevationPlane &getElevationPlane() const { return m_elevationPlane;}
//! Set elevation
void setElevationPlane(const BlackMisc::Geo::CElevationPlane &elevation) { m_elevationPlane = elevation; }
//! Elevation plane set to null
void resetElevationPlane();
//! Get elevation from CInterpolationHints::getElevationProvider or CInterpolationHints::getElevation
Aviation::CAltitude getGroundElevation(const BlackMisc::Aviation::CAircraftSituation &situation) const;
//! Set elevation
void setElevation(const BlackMisc::Geo::CElevationPlane &elevation) { m_elevation = elevation; }
//! Elevation set to null
void resetElevation();
//! Check if elevation is within radius and can be used
bool isWithinRange(const BlackMisc::Geo::ICoordinateGeodetic &coordinate) const;
@@ -90,6 +90,9 @@ namespace BlackMisc
//! Function object that can obtain ground elevation
using ElevationProvider = std::function<BlackMisc::Aviation::CAltitude(const BlackMisc::Aviation::CAircraftSituation &)>;
//! Has elevation provider
bool hasElevationProvider() const;
//! Function object that can obtain ground elevation
//! \remark either a provider or a value set can be used
const ElevationProvider &getElevationProvider() const { return m_elevationProvider; }
@@ -114,14 +117,14 @@ namespace BlackMisc
bool m_hasParts = false; //!< Has valid aircraft parts?
bool m_logInterpolation = false; //!< log interpolation
BlackMisc::Aviation::CAircraftParts m_aircraftParts; //!< Aircraft parts
BlackMisc::Geo::CElevationPlane m_elevation; //!< aircraft's elevation if available
BlackMisc::Geo::CElevationPlane m_elevationPlane; //!< aircraft's elevation if available
ElevationProvider m_elevationProvider; //!< Provider of ground elevation (lazy computation)
BlackMisc::PhysicalQuantities::CLength m_cgAboveGround { 0, nullptr }; //!< center of gravity above ground
BLACK_METACLASS(
CInterpolationHints,
BLACK_METAMEMBER(isVtol),
BLACK_METAMEMBER(elevation),
BLACK_METAMEMBER(elevationPlane),
BLACK_METAMEMBER(cgAboveGround),
BLACK_METAMEMBER(hasParts),
BLACK_METAMEMBER(aircraftParts),

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

@@ -100,7 +100,8 @@ namespace BlackMisc
}
// take hint into account to calculate elevation and above ground level
if (!hints.getElevation().isNull())
// do not call for XP (lazy init)
if (!hints.hasElevationProvider())
{
IInterpolator::setGroundElevationFromHint(hints, oldSituation, false);
IInterpolator::setGroundElevationFromHint(hints, newSituation, false);
@@ -147,11 +148,11 @@ namespace BlackMisc
+ oldAlt,
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); }
// 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
// As XP uses lazy init we will call getGroundElevation only when needed, so default here via getElevationPlane
CAltitude currentGroundElevation(hints.getElevationPlane().getAltitudeIfWithinRadius(currentSituation));
// Interpolate between altitude and ground elevation, with proportions weighted according to interpolated onGround flag
if (hints.hasAircraftParts())
@@ -160,6 +161,7 @@ namespace BlackMisc
log.groundFactor = groundFactor;
if (groundFactor > 0.0)
{
currentGroundElevation = hints.getGroundElevation(currentSituation); // calls provider on XP
if (!currentGroundElevation.isNull())
{
Q_ASSERT_X(currentGroundElevation.getReferenceDatum() == CAltitude::MeanSeaLevel, Q_FUNC_INFO, "Need MSL value");
@@ -168,12 +170,14 @@ namespace BlackMisc
oldAlt.getReferenceDatum()));
}
}
currentSituation.setGroundElevation(currentGroundElevation);
IInterpolator::setGroundFlagFromInterpolator(hints, groundFactor, currentSituation);
}
else
{
// guess ground flag
constexpr double NoGroundFactor = -1;
currentSituation.setGroundElevation(currentGroundElevation);
IInterpolator::setGroundFlagFromInterpolator(hints, NoGroundFactor, currentSituation);
}