flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 12:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

[xswiftbus] getElevationAtPosition also returns latitude and longitude

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-02-25 19:50:07 +00:00
parent 74d5afd123
commit f4f34341e6
6 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/xswiftbus/terrainprobe.cpp
View File

@@ -10,6 +10,7 @@
#include "utils.h"
#include <XPLM/XPLMGraphics.h>
#include <limits>
#include <cmath>
namespace XSwiftBus
{
@@ -17,7 +18,7 @@ namespace XSwiftBus
CTerrainProbe::~CTerrainProbe() { XPLMDestroyProbe(m_ref); }
double CTerrainProbe::getElevation(double degreesLatitude, double degreesLongitude, double metersAltitude, const std::string &callsign) const
std::array<double, 3> CTerrainProbe::getElevation(double degreesLatitude, double degreesLongitude, double metersAltitude, const std::string &callsign) const
{
double x, y, z;
XPLMWorldToLocal(degreesLatitude, degreesLongitude, metersAltitude, &x, &y, &z);
@@ -37,15 +38,20 @@ namespace XSwiftBus
WARNING_LOG(callsign + " " + error + " at " + std::to_string(degreesLatitude) + ", " + std::to_string(degreesLongitude) + ", " + std::to_string(metersAltitude));
}
return std::numeric_limits<double>::quiet_NaN();
return {{ std::numeric_limits<double>::quiet_NaN(), degreesLatitude, degreesLongitude }};
}
XPLMLocalToWorld(probe.locationX, probe.locationY, probe.locationZ, &degreesLatitude, &degreesLongitude, &metersAltitude);
if (probe.is_wet && m_logMessageCount < 100)
{
m_logMessageCount++;
DEBUG_LOG(callsign + " probe hit water at " + std::to_string(degreesLatitude) + ", " + std::to_string(degreesLongitude) + ", " + std::to_string(metersAltitude));
}
XPLMLocalToWorld(probe.locationX, probe.locationY, probe.locationZ, &degreesLatitude, &degreesLongitude, &metersAltitude);
return metersAltitude;
if (std::isnan(metersAltitude) && m_logMessageCount < 100)
{
m_logMessageCount++;
DEBUG_LOG(callsign + " probe returned NaN at " + std::to_string(degreesLatitude) + ", " + std::to_string(degreesLongitude) + ", " + std::to_string(metersAltitude));
}
return {{ metersAltitude, degreesLatitude, degreesLongitude }};
}
} // ns