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

Ref T709, style

Browse Source
This commit is contained in:
Klaus Basan
2019-07-31 16:48:21 +02:00
committed by Mat Sutcliffe
parent cd06c52cb7
commit 917d9bb3e7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xswiftbus/traffic.cpp
View File

@@ -216,7 +216,7 @@ namespace XSwiftBus
{ {
if (strcmp(section, "planes") == 0 && strcmp(name, "max_full_count") == 0) if (strcmp(section, "planes") == 0 && strcmp(name, "max_full_count") == 0)
{ {
return s_settingsProvider->getSettings().getMaxPlanes(); return CTraffic::s_settingsProvider->getSettings().getMaxPlanes(); // preferences
} }
else if (strcmp(section, "debug") == 0 && strcmp(name, "allow_obj8_async_load") == 0) else if (strcmp(section, "debug") == 0 && strcmp(name, "allow_obj8_async_load") == 0)
{ {
@@ -231,7 +231,7 @@ namespace XSwiftBus
{ {
if (strcmp(section, "planes") == 0 && strcmp(name, "full_distance") == 0) if (strcmp(section, "planes") == 0 && strcmp(name, "full_distance") == 0)
{ {
return static_cast<float>(s_settingsProvider->getSettings().getMaxDrawDistanceNM()); return static_cast<float>(CTraffic::s_settingsProvider->getSettings().getMaxDrawDistanceNM()); // preferences
} }
return def; return def;
} }
@@ -906,7 +906,7 @@ namespace XSwiftBus
// Now calculate where the camera should be positioned to be x // Now calculate where the camera should be positioned to be x
// meters from the plane and pointing at the plane at the pitch and // meters from the plane and pointing at the plane at the pitch and
// heading we wanted above. // heading we wanted above.
const double distanceMeterM = static_cast<double>(std::max(10, s_settingsProvider->getSettings().getFollowAircraftDistanceM())); const double distanceMeterM = static_cast<double>(std::max(10, traffic->getSettings().getFollowAircraftDistanceM()));
static const double PI = std::acos(-1); static const double PI = std::acos(-1);
traffic->m_deltaCameraPosition.dx = -distanceMeterM * sin(traffic->m_deltaCameraPosition.heading * PI / 180.0); traffic->m_deltaCameraPosition.dx = -distanceMeterM * sin(traffic->m_deltaCameraPosition.heading * PI / 180.0);
traffic->m_deltaCameraPosition.dz = distanceMeterM * cos(traffic->m_deltaCameraPosition.heading * PI / 180.0); traffic->m_deltaCameraPosition.dz = distanceMeterM * cos(traffic->m_deltaCameraPosition.heading * PI / 180.0);