diff options
Diffstat (limited to 'examples/embedded')
-rw-r--r-- | examples/embedded/lightmaps/lightmaps.cpp | 6 | ||||
-rw-r--r-- | examples/embedded/lightmaps/slippymap.cpp | 14 | ||||
-rw-r--r-- | examples/embedded/raycasting/raycasting.cpp | 7 |
3 files changed, 5 insertions, 22 deletions
diff --git a/examples/embedded/lightmaps/lightmaps.cpp b/examples/embedded/lightmaps/lightmaps.cpp index a8bc13beaf..6334530c3a 100644 --- a/examples/embedded/lightmaps/lightmaps.cpp +++ b/examples/embedded/lightmaps/lightmaps.cpp @@ -52,15 +52,9 @@ #include <QtWidgets> #include <QtNetwork> -#include <math.h> - #include "lightmaps.h" #include "slippymap.h" -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif - // how long (milliseconds) the user need to hold (after a tap on the screen) // before triggering the magnifying glass feature // 701, a prime number, is the sum of 229, 233, 239 diff --git a/examples/embedded/lightmaps/slippymap.cpp b/examples/embedded/lightmaps/slippymap.cpp index 7e847c2501..ff43261700 100644 --- a/examples/embedded/lightmaps/slippymap.cpp +++ b/examples/embedded/lightmaps/slippymap.cpp @@ -48,15 +48,10 @@ ** ****************************************************************************/ -#include <math.h> - #include <QtWidgets> #include <QtNetwork> #include "slippymap.h" - -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif +#include "qmath.h" uint qHash(const QPoint& p) { @@ -68,10 +63,10 @@ const int tdim = 256; QPointF tileForCoordinate(qreal lat, qreal lng, int zoom) { + qreal radianLat = qDegreesToRadians(lat); qreal zn = static_cast<qreal>(1 << zoom); qreal tx = (lng + 180.0) / 360.0; - qreal ty = (1.0 - log(tan(lat * M_PI / 180.0) + - 1.0 / cos(lat * M_PI / 180.0)) / M_PI) / 2.0; + qreal ty = 0.5 - log(tan(radianLat) + 1.0 / cos(radianLat)) / M_PI / 2.0; return QPointF(tx * zn, ty * zn); } @@ -86,8 +81,7 @@ qreal latitudeFromTile(qreal ty, int zoom) { qreal zn = static_cast<qreal>(1 << zoom); qreal n = M_PI - 2 * M_PI * ty / zn; - qreal lng = 180.0 / M_PI * atan(0.5 * (exp(n) - exp(-n))); - return lng; + return qRadiansToDegrees(atan(sinh(n))); } diff --git a/examples/embedded/raycasting/raycasting.cpp b/examples/embedded/raycasting/raycasting.cpp index 992c383db1..d37b9f5d2e 100644 --- a/examples/embedded/raycasting/raycasting.cpp +++ b/examples/embedded/raycasting/raycasting.cpp @@ -50,12 +50,7 @@ #include <QtCore> #include <QtWidgets> - -#include <math.h> - -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif +#include <qmath.h> #define WORLD_SIZE 8 int world_map[WORLD_SIZE][WORLD_SIZE] = { |