From 02b7ec05d5713aec67577cebc18e5906b5a98598 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 22 Mar 2017 13:18:52 +0100 Subject: Be (somewhat more) consistent about the value of pi Use M_PI (and friends), where possible, in favor of hand-coded approximations of various (in)accuracies. Where that's not available (e.g. fragment shaders), use the same value that qmath.h uses for M_PI, for consistency. Replaced math.h with qmath.h in places that defined a fall-back in case math.h omits it (it's not in the C++ standard, although M_PI is in POSIX); or removed this entirely where it wasn't used. Reworked some code to reduce the amount of arithmetic needed, in the process; e.g. pulling common factors out of loops. Revised an example's doc to not waste time talking about using a six-sig-fig value for pi (which we no longer do) - it really wasn't relevant, or anything to be proud of; nor did the doc mention its later use. Task-number: QTBUG-58083 Change-Id: I5a31e3a2b6a823b97a43209bed61a37b9aa6c05f Reviewed-by: Thiago Macieira --- examples/embedded/lightmaps/lightmaps.cpp | 6 ------ examples/embedded/raycasting/raycasting.cpp | 7 +------ 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'examples/embedded') 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 #include -#include - #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/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 #include - -#include - -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif +#include #define WORLD_SIZE 8 int world_map[WORLD_SIZE][WORLD_SIZE] = { -- cgit v1.2.3