mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-24 06:25:37 +08:00
Ref T259, Ref T243 removed ground factor interpolation from parts (now in situation where it belongs)
This commit is contained in:
@@ -171,14 +171,5 @@ namespace BlackMisc
|
|||||||
{
|
{
|
||||||
*this = guessedParts(situation);
|
*this = guessedParts(situation);
|
||||||
}
|
}
|
||||||
|
|
||||||
double CAircraftParts::isOnGroundInterpolated() const
|
|
||||||
{
|
|
||||||
if (m_isOnGroundInterpolated < 0)
|
|
||||||
{
|
|
||||||
return m_isOnGround ? 1.0 : 0.0;
|
|
||||||
}
|
|
||||||
return m_isOnGroundInterpolated;
|
|
||||||
}
|
|
||||||
} // namespace
|
} // namespace
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -133,16 +133,6 @@ namespace BlackMisc
|
|||||||
//! Guess the parts
|
//! Guess the parts
|
||||||
void guessParts(const CAircraftSituation &situation);
|
void guessParts(const CAircraftSituation &situation);
|
||||||
|
|
||||||
//! Is aircraft on ground? (Smoothly interpolated between 0 and 1.)
|
|
||||||
//! \remark 1..on ground 0..not on ground
|
|
||||||
//! \deprecated
|
|
||||||
double isOnGroundInterpolated() const;
|
|
||||||
|
|
||||||
//! Set aircraft on ground. (Smoothly interpolated between 0 and 1.)
|
|
||||||
//! \remark 1..on ground 0..not on ground
|
|
||||||
//! \deprecated
|
|
||||||
void setOnGroundInterpolated(double onGround) { m_isOnGroundInterpolated = onGround; }
|
|
||||||
|
|
||||||
//! \copydoc BlackMisc::Mixin::String::toQString
|
//! \copydoc BlackMisc::Mixin::String::toQString
|
||||||
QString convertToQString(bool i18n = false) const;
|
QString convertToQString(bool i18n = false) const;
|
||||||
|
|
||||||
@@ -159,7 +149,6 @@ namespace BlackMisc
|
|||||||
bool m_gearDown = false;
|
bool m_gearDown = false;
|
||||||
bool m_spoilersOut = false;
|
bool m_spoilersOut = false;
|
||||||
bool m_isOnGround = false;
|
bool m_isOnGround = false;
|
||||||
double m_isOnGroundInterpolated = -1;
|
|
||||||
|
|
||||||
BLACK_METACLASS(
|
BLACK_METACLASS(
|
||||||
CAircraftParts,
|
CAircraftParts,
|
||||||
@@ -169,7 +158,6 @@ namespace BlackMisc
|
|||||||
BLACK_METAMEMBER_NAMED(spoilersOut, "spoilers_out"),
|
BLACK_METAMEMBER_NAMED(spoilersOut, "spoilers_out"),
|
||||||
BLACK_METAMEMBER_NAMED(engines, "engines"),
|
BLACK_METAMEMBER_NAMED(engines, "engines"),
|
||||||
BLACK_METAMEMBER_NAMED(isOnGround, "on_ground"),
|
BLACK_METAMEMBER_NAMED(isOnGround, "on_ground"),
|
||||||
BLACK_METAMEMBER(isOnGroundInterpolated, 0, DisabledForJson | DisabledForComparison),
|
|
||||||
BLACK_METAMEMBER(timestampMSecsSinceEpoch, 0, DisabledForJson | DisabledForComparison),
|
BLACK_METAMEMBER(timestampMSecsSinceEpoch, 0, DisabledForJson | DisabledForComparison),
|
||||||
BLACK_METAMEMBER(timeOffsetMs, 0, DisabledForJson | DisabledForComparison)
|
BLACK_METAMEMBER(timeOffsetMs, 0, DisabledForJson | DisabledForComparison)
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user