From a021bd87755ccfbe49e132f942ded935c9719b00 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Thu, 12 Jan 2017 18:02:45 +0100
Subject: Be (somewhat more) consistent about the value of pi

Use M_PI in C++ and Math.PI in JavaScript (including QML).
Use qmath.h's value for M_PI where we can't avoid an explicit value.

Task-number: QTBUG-58083
Change-Id: Iabe938aff62ceac27b939ec33c6ee5e854aac15e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 examples/quick/scenegraph/graph/shaders/line.fsh       | 2 +-
 examples/quick/scenegraph/graph/shaders/noisy.fsh      | 2 +-
 examples/quick/scenegraph/shared/logorenderer.cpp      | 4 ++--
 examples/quick/scenegraph/textureinsgnode/main.qml     | 2 +-
 examples/quick/scenegraph/textureinthread/main.qml     | 2 +-
 examples/quick/scenegraph/twotextureproviders/main.qml | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'examples/quick/scenegraph')

diff --git a/examples/quick/scenegraph/graph/shaders/line.fsh b/examples/quick/scenegraph/graph/shaders/line.fsh
index 5d38c46d4d..41c0ee3c00 100644
--- a/examples/quick/scenegraph/graph/shaders/line.fsh
+++ b/examples/quick/scenegraph/graph/shaders/line.fsh
@@ -44,7 +44,7 @@ uniform lowp float spread;
 
 varying lowp float vT;
 
-#define PI 3.14159265359
+#define PI 3.14159265358979323846
 
 void main(void)
 {
diff --git a/examples/quick/scenegraph/graph/shaders/noisy.fsh b/examples/quick/scenegraph/graph/shaders/noisy.fsh
index 30b0def932..c217e635ef 100644
--- a/examples/quick/scenegraph/graph/shaders/noisy.fsh
+++ b/examples/quick/scenegraph/graph/shaders/noisy.fsh
@@ -45,7 +45,7 @@ uniform lowp vec4 color;
 varying highp vec2 vTexCoord;
 varying lowp vec2 vShadeCoord;
 
-#define PI 3.14159265359
+#define PI 3.14159265358979323846
 
 void main()
 {
diff --git a/examples/quick/scenegraph/shared/logorenderer.cpp b/examples/quick/scenegraph/shared/logorenderer.cpp
index 8eb2d44c1e..5c3a770f54 100644
--- a/examples/quick/scenegraph/shared/logorenderer.cpp
+++ b/examples/quick/scenegraph/shared/logorenderer.cpp
@@ -41,7 +41,7 @@
 #include "logorenderer.h"
 #include <QPainter>
 #include <QPaintEngine>
-#include <math.h>
+#include <qmath.h>
 
 LogoRenderer::LogoRenderer()
 {
@@ -166,7 +166,7 @@ void LogoRenderer::createGeometry()
     extrude(x4, y4, y4, x4);
     extrude(y4, x4, y3, x3);
 
-    const qreal Pi = 3.14159f;
+    const qreal Pi = M_PI;
     const int NumSectors = 100;
 
     for (int i = 0; i < NumSectors; ++i) {
diff --git a/examples/quick/scenegraph/textureinsgnode/main.qml b/examples/quick/scenegraph/textureinsgnode/main.qml
index fe145b0f05..ba110a278d 100644
--- a/examples/quick/scenegraph/textureinsgnode/main.qml
+++ b/examples/quick/scenegraph/textureinsgnode/main.qml
@@ -64,7 +64,7 @@ Item {
             uniform highp vec2 pixelSize;
             varying highp vec2 qt_TexCoord0;
             void main() {
-                highp vec2 tc = sign(sin(3.14152 * qt_TexCoord0 * pixelSize));
+                highp vec2 tc = sign(sin(3.14159265358979323846 * qt_TexCoord0 * pixelSize));
                 if (tc.x != tc.y)
                     gl_FragColor = color1;
                 else
diff --git a/examples/quick/scenegraph/textureinthread/main.qml b/examples/quick/scenegraph/textureinthread/main.qml
index 9108f0281d..2d61488e85 100644
--- a/examples/quick/scenegraph/textureinthread/main.qml
+++ b/examples/quick/scenegraph/textureinthread/main.qml
@@ -64,7 +64,7 @@ Item {
             uniform highp vec2 pixelSize;
             varying highp vec2 qt_TexCoord0;
             void main() {
-                highp vec2 tc = sign(sin(3.14152 * qt_TexCoord0 * pixelSize));
+                highp vec2 tc = sign(sin(3.14159265358979323846 * qt_TexCoord0 * pixelSize));
                 if (tc.x != tc.y)
                     gl_FragColor = color1;
                 else
diff --git a/examples/quick/scenegraph/twotextureproviders/main.qml b/examples/quick/scenegraph/twotextureproviders/main.qml
index af07f9badd..a6202b5a09 100644
--- a/examples/quick/scenegraph/twotextureproviders/main.qml
+++ b/examples/quick/scenegraph/twotextureproviders/main.qml
@@ -61,7 +61,7 @@ Item {
         uniform highp vec2 pixelSize;
         varying highp vec2 qt_TexCoord0;
         void main() {
-            highp vec2 tc = sign(sin(3.14152 * qt_TexCoord0 * pixelSize));
+            highp vec2 tc = sign(sin(3.14159265358979323846 * qt_TexCoord0 * pixelSize));
             if (tc.x != tc.y)
                 gl_FragColor = color1;
             else
-- 
cgit v1.2.3