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

[xplane] Allow disabling terrain probe for diagnosing performance issues

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-01-24 21:25:06 +00:00
parent 0017df0bb3
commit de037af702
6 changed files with 98 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackmisc/simulation/settings/xswiftbussettings.h
View File

@@ -105,6 +105,7 @@ namespace BlackMisc
BLACK_METAMEMBER(followAircraftDistanceM),
BLACK_METAMEMBER(logRenderPhases),
BLACK_METAMEMBER(tcasEnabled),
BLACK_METAMEMBER(terrainProbeEnabled),
BLACK_METAMEMBER(timestampMSecsSinceEpoch, 0, DisabledForComparison | DisabledForHashing)
);
};

8
src/blackmisc/simulation/settings/xswiftbussettingsqtfree.h
View File

@@ -133,6 +133,12 @@ namespace BlackMisc
//! TCAS functionality?
void setTcasEnabled(bool tcas) { m_tcasEnabled = tcas; }
//! Terrain probe to establish ground elevation?
bool isTerrainProbeEnabled() const { return m_terrainProbeEnabled; }
//! Terrain probe to establish ground elevation?
void setTerrainProbeEnabled(bool enabled) { m_terrainProbeEnabled = enabled; }
//! Load and parse config file
bool parseXSwiftBusString(const std::string &json);
@@ -159,6 +165,7 @@ namespace BlackMisc
static constexpr char JsonDrawingLabels[] = "drawinglabels";
static constexpr char JsonLogRenderPhases[] = "renderPhases";
static constexpr char JsonTcas[] = "tcas";
static constexpr char JsonTerrainProbe[] = "terrainProbe";
static constexpr char JsonMaxPlanes[] = "maxplanes";
static constexpr char JsonMaxDrawDistance[] = "maxDrawDistance";
static constexpr char JsonNightTextureMode[] = "nighttexture";
@@ -180,6 +187,7 @@ namespace BlackMisc
bool m_bundleTaxiLandingLights = true; //!< bundle taxi and landing lights
bool m_logRenderPhases = false; //!< render phases debug messages
bool m_tcasEnabled = true; //!< TCAS functionality
bool m_terrainProbeEnabled = true; //!< terrain probe to establish ground elevation
double m_maxDrawDistanceNM = 50.0; //!< distance in XPlane
int64_t m_msSinceEpochQtFree = 0; //!< timestamp
};

10
src/blackmisc/simulation/settings/xswiftbussettingsqtfree.inc
View File

@@ -30,6 +30,7 @@ constexpr char BlackMisc::Simulation::Settings::CXSwiftBusSettingsQtFree::JsonMe
constexpr char BlackMisc::Simulation::Settings::CXSwiftBusSettingsQtFree::JsonBundleTaxiLandingLights[];
constexpr char BlackMisc::Simulation::Settings::CXSwiftBusSettingsQtFree::JsonTimestamp[];
constexpr char BlackMisc::Simulation::Settings::CXSwiftBusSettingsQtFree::JsonTcas[];
constexpr char BlackMisc::Simulation::Settings::CXSwiftBusSettingsQtFree::JsonTerrainProbe[];
constexpr char BlackMisc::Simulation::Settings::CXSwiftBusSettingsQtFree::JsonLogRenderPhases[];
//! @endcond
@@ -73,6 +74,10 @@ namespace BlackMisc
{
m_tcasEnabled = settingsDoc[CXSwiftBusSettingsQtFree::JsonTcas].GetBool(); c++;
}
if (settingsDoc.HasMember(CXSwiftBusSettingsQtFree::JsonTerrainProbe) && settingsDoc[CXSwiftBusSettingsQtFree::JsonTerrainProbe].IsBool())
{
m_terrainProbeEnabled = settingsDoc[CXSwiftBusSettingsQtFree::JsonTerrainProbe].GetBool(); c++;
}
if (settingsDoc.HasMember(CXSwiftBusSettingsQtFree::JsonLogRenderPhases) && settingsDoc[CXSwiftBusSettingsQtFree::JsonLogRenderPhases].IsBool())
{
m_logRenderPhases = settingsDoc[CXSwiftBusSettingsQtFree::JsonLogRenderPhases].GetBool(); c++;
@@ -94,7 +99,7 @@ namespace BlackMisc
m_msSinceEpochQtFree = settingsDoc[CXSwiftBusSettingsQtFree::JsonTimestamp].GetInt64(); c++;
}
this->objectUpdated(); // post processing
return c == 11;
return c == 12;
}
std::string CXSwiftBusSettingsQtFree::toXSwiftBusJsonString() const
@@ -118,6 +123,7 @@ namespace BlackMisc
document.AddMember(JsonFollowAircraftDistanceM, m_followAircraftDistanceM, a);
document.AddMember(JsonLogRenderPhases, m_logRenderPhases, a);
document.AddMember(JsonTcas, m_tcasEnabled, a);
document.AddMember(JsonTerrainProbe, m_terrainProbeEnabled, a);
// document[CXSwiftBusSettingsQtFree::JsonDBusServerAddress].SetString(StringRef(m_dBusServerAddress.c_str(), m_dBusServerAddress.size()));
// document[CXSwiftBusSettingsQtFree::JsonDrawingLabels].SetBool(m_drawingLabels);
@@ -138,6 +144,7 @@ namespace BlackMisc
", bundle lights: " + QtFreeUtils::boolToYesNo(m_bundleTaxiLandingLights) +
", phases: " + QtFreeUtils::boolToYesNo(m_logRenderPhases) +
", TCAS: " + QtFreeUtils::boolToYesNo(m_tcasEnabled) +
", terr.probe: " + QtFreeUtils::boolToYesNo(m_terrainProbeEnabled) +
", night t.: " + m_nightTextureMode +
", max planes: " + std::to_string(m_maxPlanes) +
", max distance NM: " + std::to_string(m_maxDrawDistanceNM) +
@@ -155,6 +162,7 @@ namespace BlackMisc
if (m_nightTextureMode != newValues.m_nightTextureMode) { m_nightTextureMode = newValues.m_nightTextureMode; changed++; }
if (m_logRenderPhases != newValues.m_logRenderPhases) { m_logRenderPhases = newValues.m_logRenderPhases; changed++; }
if (m_tcasEnabled != newValues.m_tcasEnabled) { m_tcasEnabled = newValues.m_tcasEnabled; changed++; }
if (m_terrainProbeEnabled != newValues.m_terrainProbeEnabled) { m_terrainProbeEnabled = newValues.m_terrainProbeEnabled; changed++; }
if (m_maxPlanes != newValues.m_maxPlanes) { m_maxPlanes = newValues.m_maxPlanes; changed++; }
if (m_msSinceEpochQtFree != newValues.m_msSinceEpochQtFree) { m_msSinceEpochQtFree = newValues.m_msSinceEpochQtFree; changed++; }
if (m_bundleTaxiLandingLights != newValues.m_bundleTaxiLandingLights) { m_bundleTaxiLandingLights = newValues.m_bundleTaxiLandingLights; changed++; }