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

Ref T778, turn XCSL models offset NULL into 0 (zero)

Browse Source
This commit is contained in:
Klaus Basan
2020-04-11 04:51:40 +02:00
committed by Mat Sutcliffe
parent 6ceb91ac4f
commit 70f487cd01
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -1151,12 +1151,12 @@ namespace BlackSimPlugin
}
const double cgValue = verticalOffsetsMeters[i]; // XP offset is swift CG
const CLength cg = std::isnan(cgValue) ?
CLength::null() :
CLength(cgValue, CLengthUnit::m(), CLengthUnit::ft());
CLength cg = std::isnan(cgValue) ?
CLength::null() :
CLength(cgValue, CLengthUnit::m(), CLengthUnit::ft());
cg = fixSimulatorCg(cg, xpAircraft.getAircraftModel());
// if we knew "on ground" here we could set it as parameter of rememberElevationAndSimulatorCG
// this->rememberElevationAndSimulatorCG(cs, xpAircraft.getAircraftModel(), false, elevation, cg);
// with T778 we do NOT use this function for elevation here if "isSuspicious"
const bool waterFlag = waterFlags[i];
const bool useElevation = this->handleProbeValue(elevation, cs, waterFlag, hint, true);
@@ -1170,6 +1170,18 @@ namespace BlackSimPlugin
}
}
CLength CSimulatorXPlane::fixSimulatorCg(const CLength &cg, const CAircraftModel &model)
{
//! \todo KB 2020-04 hardcoded fix for XCSL
// For XCSL null means no offset => 0
// so not to override it with some DB value in X mode, we set it to "0"
if (model.getDistributor().matchesKeyOrAlias(CDistributor::xplaneXcsl()) && cg.isNull())
{
return CLength(0.0, CLengthUnit::ft());
}
return cg;
}
void CSimulatorXPlane::disconnectFromDBus()
{
if (m_dBusConnection.isConnected())