diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-02-05 14:29:05 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-02-06 11:27:57 +0000 |
| commit | faa8fc18bfeca06de6c4a7bdbb14e1be9eb96f54 (patch) | |
| tree | 2fd61b31234725d29d69bdc39135bcf2538596a2 | |
| parent | 40c9ddabbc4c776adeb9ad440777505d7cb0f262 (diff) | |
Fix double -> float conversion warnings
Change-Id: I7eac42f170de92bb34b69e72855e0b5de514de8c
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| -rw-r--r-- | tests/auto/render/graphicshelpergl2/tst_graphicshelpergl2.cpp | 2 | ||||
| -rw-r--r-- | tests/manual/custom-mesh-update-data-cpp/main.cpp | 2 | ||||
| -rw-r--r-- | tools/qgltf/qgltf.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/render/graphicshelpergl2/tst_graphicshelpergl2.cpp b/tests/auto/render/graphicshelpergl2/tst_graphicshelpergl2.cpp index 9bc234c50..58e2373f5 100644 --- a/tests/auto/render/graphicshelpergl2/tst_graphicshelpergl2.cpp +++ b/tests/auto/render/graphicshelpergl2/tst_graphicshelpergl2.cpp @@ -1302,7 +1302,7 @@ private Q_SLOTS: // WHEN m_func->glUseProgram(shaderProgram.programId()); - GLfloat values[16] = { 454.0f, 350.0f, 883.0f, 355.0f, 1340.0f, 1584.0f, 1200.0f, 427.0f, 396.0f, 1603.0f, 55.0f, 5.7, 383.0f, 6.2f, 5.3f, 327.0f }; + GLfloat values[16] = { 454.0f, 350.0f, 883.0f, 355.0f, 1340.0f, 1584.0f, 1200.0f, 427.0f, 396.0f, 1603.0f, 55.0f, 5.7f, 383.0f, 6.2f, 5.3f, 327.0f }; const GLint location = shaderProgram.uniformLocation("m4"); m_glHelper.glUniformMatrix4fv(location, 1, values); diff --git a/tests/manual/custom-mesh-update-data-cpp/main.cpp b/tests/manual/custom-mesh-update-data-cpp/main.cpp index 7485dbec5..c7f5742dc 100644 --- a/tests/manual/custom-mesh-update-data-cpp/main.cpp +++ b/tests/manual/custom-mesh-update-data-cpp/main.cpp @@ -277,7 +277,7 @@ int main(int argc, char* argv[]) void TimerObject::timeout() { - angle += M_PI / 360.0f; + angle += float(M_PI / 360.0); QByteArray updateData; updateData.resize(3*sizeof(float)); diff --git a/tools/qgltf/qgltf.cpp b/tools/qgltf/qgltf.cpp index 788f3cef5..bc011eaa7 100644 --- a/tools/qgltf/qgltf.cpp +++ b/tools/qgltf/qgltf.cpp @@ -1016,7 +1016,7 @@ void AssimpImporter::parseCameras() c.aspectRatio = qFuzzyIsNull(cam->mAspect) ? 1.5f : cam->mAspect; c.yfov = cam->mHorizontalFOV; if (c.yfov < (M_PI / 10.0)) // this can't be right (probably orthographic source camera) - c.yfov = M_PI / 4.0; + c.yfov = float(M_PI / 4.0); c.znear = cam->mClipPlaneNear; c.zfar = cam->mClipPlaneFar; |