diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2017-01-12 18:02:45 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2017-06-14 08:19:47 +0000 |
commit | a021bd87755ccfbe49e132f942ded935c9719b00 (patch) | |
tree | 1fe242bfb77cd4723ed01d4fdd1815ab6338c706 /src/quick/doc/snippets | |
parent | 784ea8c09d448a418b3128be8bee14d9535e36c9 (diff) |
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>
Diffstat (limited to 'src/quick/doc/snippets')
-rw-r--r-- | src/quick/doc/snippets/qml/layerblending.qml | 2 | ||||
-rw-r--r-- | src/quick/doc/snippets/qml/opacitymask.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/doc/snippets/qml/layerblending.qml b/src/quick/doc/snippets/qml/layerblending.qml index a922f7896c..3e75a607a6 100644 --- a/src/quick/doc/snippets/qml/layerblending.qml +++ b/src/quick/doc/snippets/qml/layerblending.qml @@ -62,7 +62,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/src/quick/doc/snippets/qml/opacitymask.qml b/src/quick/doc/snippets/qml/opacitymask.qml index beffb633d6..beb5cc6f67 100644 --- a/src/quick/doc/snippets/qml/opacitymask.qml +++ b/src/quick/doc/snippets/qml/opacitymask.qml @@ -63,7 +63,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 |