Use float throughout the Qt3D module for consistency and performance

This commit changes the API of all classes in this module to use float
rather than qreal. This makes the API consistent across platforms and
improves floating point performance.

Change-Id: I95ae65cb31428748e066d5efca059ce24087fafa
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Sarah Jane Smith <sez@storybridge.org>

8 files changed, 57 insertions, 57 deletions

diff --git a/examples/qt3d/basket/basketview.h b/examples/qt3d/basket/basketview.h
index 1069652ed..182345e14 100644
--- a/examples/qt3d/basket/basketview.h
+++ b/examples/qt3d/basket/basketview.h
@@ -52,10 +52,10 @@ QT_END_NAMESPACE
 class BasketView : public QGLView
 {
     Q_OBJECT
-    Q_PROPERTY(qreal angle READ angle WRITE setAngle)
+    Q_PROPERTY(float angle READ angle WRITE setAngle)
 public:
-    qreal angle() const { return m_angle; }
-    void setAngle(qreal angle) { m_angle = angle; update(); }
+    float angle() const { return m_angle; }
+    void setAngle(float angle) { m_angle = angle; update(); }
 //! [1]
 
     BasketView(QWindow *parent = 0);
@@ -66,7 +66,7 @@ protected:
 
 private:
     QGLSceneNode *basket;
-    qreal m_angle;
+    float m_angle;
 };
 
 #endif
diff --git a/examples/qt3d/builder/builder.cpp b/examples/qt3d/builder/builder.cpp
index 2e1db9842..8d3af543a 100644
--- a/examples/qt3d/builder/builder.cpp
+++ b/examples/qt3d/builder/builder.cpp
@@ -141,8 +141,8 @@ QGLSceneNode *BuilderView::buildGeometry()
     //! [2]
 
     // size data for can
-    const qreal canRadius = 1.0f;
-    const qreal canHeight = 2.5f;
+    const float canRadius = 1.0f;
+    const float canHeight = 2.5f;
     const int numSlices = 32;
 
     QGeometryData canRim;
@@ -151,9 +151,9 @@ QGLSceneNode *BuilderView::buildGeometry()
     // do the math for the defining points
     for (int i = 0; i < numSlices; ++i)
     {
-        qreal angle = (qreal(i) * 2.0 * M_PI) / numSlices;
-        canRim.appendVertex(QVector3D(canRadius * qCos(angle),
-                                      canRadius * qSin(angle),
+        float angle = (float(i) * 2.0 * M_PI) / numSlices;
+        canRim.appendVertex(QVector3D(canRadius * cosf(angle),
+                                      canRadius * sinf(angle),
                                       canHeight / 2.0f));
     }
 
diff --git a/examples/qt3d/geometry/quadplane.cpp b/examples/qt3d/geometry/quadplane.cpp
index 60429e10b..1737b286a 100644
--- a/examples/qt3d/geometry/quadplane.cpp
+++ b/examples/qt3d/geometry/quadplane.cpp
@@ -72,12 +72,12 @@ QuadPlane::QuadPlane(QObject *parent, QSizeF size, int level)
     QGeometryData zip2;
     for (int yy = 0; yy <= divisions; ++yy)
     {
-        qreal y = half.height() - float(yy) * div.height();
-        qreal texY = float(yy) / divisions;
+        float y = half.height() - float(yy) * div.height();
+        float texY = float(yy) / divisions;
         for (int xx = 0; xx <= divisions; ++xx)
         {
-            qreal x = half.width() - float(xx) * div.width();
-            qreal texX = float(xx) / divisions;
+            float x = half.width() - float(xx) * div.width();
+            float texX = float(xx) / divisions;
             zip.appendVertex(QVector3D(x, y, 0));
             zip.appendTexCoord(QVector2D(1.0f - texX, 1.0f - texY));
         }
diff --git a/examples/qt3d/load_model/load_model.h b/examples/qt3d/load_model/load_model.h
index eae7442e0..16b01bef5 100644
--- a/examples/qt3d/load_model/load_model.h
+++ b/examples/qt3d/load_model/load_model.h
@@ -51,21 +51,21 @@ QT_END_NAMESPACE
 class LoadModelView : public QGLView
 {
     Q_OBJECT
-    Q_PROPERTY(qreal angleTeapot READ angleTeapot WRITE setAngleTeapot)
-    Q_PROPERTY(qreal angleTeapotOrbit READ angleTeapotOrbit WRITE setAngleTeapotOrbit)
-    Q_PROPERTY(qreal angleLander READ angleLander WRITE setAngleLander)
+    Q_PROPERTY(float angleTeapot READ angleTeapot WRITE setAngleTeapot)
+    Q_PROPERTY(float angleTeapotOrbit READ angleTeapotOrbit WRITE setAngleTeapotOrbit)
+    Q_PROPERTY(float angleLander READ angleLander WRITE setAngleLander)
 public:
     LoadModelView(QWindow *parent = 0);
     ~LoadModelView();
 
-    qreal angleTeapot() const { return m_AngleTeapot; }
-    void setAngleTeapot(qreal angle) { m_AngleTeapot = angle; update(); }
+    float angleTeapot() const { return m_AngleTeapot; }
+    void setAngleTeapot(float angle) { m_AngleTeapot = angle; update(); }
 
-    qreal angleTeapotOrbit() const { return m_AngleTeapotOrbit; }
-    void setAngleTeapotOrbit(qreal angle) { m_AngleTeapotOrbit = angle; update(); }
+    float angleTeapotOrbit() const { return m_AngleTeapotOrbit; }
+    void setAngleTeapotOrbit(float angle) { m_AngleTeapotOrbit = angle; update(); }
 
-    qreal angleLander() const { return m_AngleLander; }
-    void setAngleLander(qreal angle) { m_AngleLander = angle; update(); }
+    float angleLander() const { return m_AngleLander; }
+    void setAngleLander(float angle) { m_AngleLander = angle; update(); }
 
 protected:
     void paintGL(QGLPainter *painter);
@@ -75,12 +75,12 @@ private:
 
     QGLAbstractScene*   m_pTeapotScene;
     QGLTexture2D*       m_pTeapotTexture;
-    qreal               m_AngleTeapot;
-    qreal               m_AngleTeapotOrbit;
+    float               m_AngleTeapot;
+    float               m_AngleTeapotOrbit;
 
     QGLAbstractScene*   m_pLanderScene;
     QGLTexture2D*       m_pLanderTexture;
-    qreal               m_AngleLander;
+    float               m_AngleLander;
 };
 
 #endif
diff --git a/examples/qt3d/nesting/cubeview.h b/examples/qt3d/nesting/cubeview.h
index a128a0dac..c4c0057e7 100644
--- a/examples/qt3d/nesting/cubeview.h
+++ b/examples/qt3d/nesting/cubeview.h
@@ -53,21 +53,21 @@ QT_END_NAMESPACE
 class CubeView : public QGLView
 {
     Q_OBJECT
-    Q_PROPERTY(qreal teapotAngle READ teapotAngle WRITE setTeapotAngle)
-    Q_PROPERTY(qreal cubeAngle READ cubeAngle WRITE setCubeAngle)
-    Q_PROPERTY(qreal orbitAngle READ orbitAngle WRITE setOrbitAngle)
+    Q_PROPERTY(float teapotAngle READ teapotAngle WRITE setTeapotAngle)
+    Q_PROPERTY(float cubeAngle READ cubeAngle WRITE setCubeAngle)
+    Q_PROPERTY(float orbitAngle READ orbitAngle WRITE setOrbitAngle)
 public:
     CubeView(QWindow *parent = 0);
     ~CubeView();
 
-    qreal teapotAngle() const { return tangle; }
-    void setTeapotAngle(qreal angle) { tangle = angle; update(); }
+    float teapotAngle() const { return tangle; }
+    void setTeapotAngle(float angle) { tangle = angle; update(); }
 
-    qreal cubeAngle() const { return cangle; }
-    void setCubeAngle(qreal angle) { cangle = angle; update(); }
+    float cubeAngle() const { return cangle; }
+    void setCubeAngle(float angle) { cangle = angle; update(); }
 
-    qreal orbitAngle() const { return oangle; }
-    void setOrbitAngle(qreal angle) { oangle = angle; update(); }
+    float orbitAngle() const { return oangle; }
+    void setOrbitAngle(float angle) { oangle = angle; update(); }
 
 protected:
     void initializeGL(QGLPainter *painter);
@@ -81,9 +81,9 @@ private:
     QOpenGLFramebufferObject *fbo;
     QGLFramebufferObjectSurface fboSurface;
     QGLCamera *innerCamera;
-    qreal tangle;
-    qreal cangle;
-    qreal oangle;
+    float tangle;
+    float cangle;
+    float oangle;
 
     void drawCube1(QGLPainter *painter, const QVector3D &posn);
     void drawCube2(QGLPainter *painter, const QVector3D &posn);
diff --git a/examples/qt3d/solarsystem/solarsystem.h b/examples/qt3d/solarsystem/solarsystem.h
index 53c89674a..572e3d0cc 100644
--- a/examples/qt3d/solarsystem/solarsystem.h
+++ b/examples/qt3d/solarsystem/solarsystem.h
@@ -53,34 +53,34 @@ QT_END_NAMESPACE
 class SolarSystemView : public QGLView
 {
     Q_OBJECT
-    Q_PROPERTY(qreal angle1 READ angle1 WRITE setAngle1)
-    Q_PROPERTY(qreal angle2 READ angle2 WRITE setAngle2)
-    Q_PROPERTY(qreal angle3 READ angle3 WRITE setAngle3)
-    Q_PROPERTY(qreal glowFactor READ glowFactor WRITE setGlowFactor)
+    Q_PROPERTY(float angle1 READ angle1 WRITE setAngle1)
+    Q_PROPERTY(float angle2 READ angle2 WRITE setAngle2)
+    Q_PROPERTY(float angle3 READ angle3 WRITE setAngle3)
+    Q_PROPERTY(float glowFactor READ glowFactor WRITE setGlowFactor)
 public:
     SolarSystemView(QWindow *parent = 0);
     ~SolarSystemView();
 
-    qreal angle1() const { return m_angle1; }
-    void setAngle1(qreal angle) { m_angle1 = angle; update(); }
+    float angle1() const { return m_angle1; }
+    void setAngle1(float angle) { m_angle1 = angle; update(); }
 
-    qreal angle2() const { return m_angle2; }
-    void setAngle2(qreal angle) { m_angle2 = angle; update(); }
+    float angle2() const { return m_angle2; }
+    void setAngle2(float angle) { m_angle2 = angle; update(); }
 
-    qreal angle3() const { return m_angle3; }
-    void setAngle3(qreal angle) { m_angle3 = angle; update(); }
+    float angle3() const { return m_angle3; }
+    void setAngle3(float angle) { m_angle3 = angle; update(); }
 
-    qreal glowFactor() const { return m_glowFactor; }
-    void setGlowFactor(qreal arg) { m_glowFactor = arg; update(); }
+    float glowFactor() const { return m_glowFactor; }
+    void setGlowFactor(float arg) { m_glowFactor = arg; update(); }
 
 protected:
     void initializeGL(QGLPainter *painter);
     void paintGL(QGLPainter *painter);
 
 private:
-    qreal m_angle1;
-    qreal m_angle2;
-    qreal m_angle3;
+    float m_angle1;
+    float m_angle2;
+    float m_angle3;
     float m_glowFactor;
     QGraphicsRotation3D *sunRotation;
     QGraphicsRotation3D *planetRotation;
diff --git a/examples/qt3d/tank/quadplane.cpp b/examples/qt3d/tank/quadplane.cpp
index 16935c912..f8aea0a9a 100644
--- a/examples/qt3d/tank/quadplane.cpp
+++ b/examples/qt3d/tank/quadplane.cpp
@@ -86,12 +86,12 @@ QuadPlane::QuadPlane(QObject *parent, QSizeF size, int level)
     QGeometryData zip2;
     for (int yy = 0; yy <= divisions; ++yy)
     {
-        qreal y = half.height() - float(yy) * div.height();
-        qreal texY = float(yy) / divisions;
+        float y = half.height() - float(yy) * div.height();
+        float texY = float(yy) / divisions;
         for (int xx = 0; xx <= divisions; ++xx)
         {
-            qreal x = half.width() - float(xx) * div.width();
-            qreal texX = float(xx) / divisions;
+            float x = half.width() - float(xx) * div.width();
+            float texX = float(xx) / divisions;
             zip.appendVertex(QVector3D(x, y, 0));
             zip.appendTexCoord(QVector2D(1.0f - texX, 1.0f - texY));
         }
diff --git a/examples/qt3d/tank/tank.cpp b/examples/qt3d/tank/tank.cpp
index f10daee42..39158afca 100644
--- a/examples/qt3d/tank/tank.cpp
+++ b/examples/qt3d/tank/tank.cpp
@@ -61,7 +61,7 @@
 static inline int rval()
 {
     // return an int 64 <--> 192 inclusive
-    return (qreal(qrand()) / qreal(RAND_MAX)) * 128 + 64;
+    return (float(qrand()) / float(RAND_MAX)) * 128 + 64;
 }
 
 static QGLMaterial *qCreateFluid()