From c17d1a6d881333f196bd8272d2346cc062c98f71 Mon Sep 17 00:00:00 2001 From: humbletim Date: Thu, 4 May 2017 19:21:32 -0400 Subject: [PATCH] manually promote glm values to double when stringifying (to prevent -Wdouble-promotion "error") --- libraries/script-engine/src/Mat4.cpp | 2 +- libraries/script-engine/src/Quat.cpp | 4 ++-- libraries/script-engine/src/Vec3.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/script-engine/src/Mat4.cpp b/libraries/script-engine/src/Mat4.cpp index 2d26a66823..6965f43b32 100644 --- a/libraries/script-engine/src/Mat4.cpp +++ b/libraries/script-engine/src/Mat4.cpp @@ -69,7 +69,7 @@ glm::vec3 Mat4::getUp(const glm::mat4& m) const { } void Mat4::print(const QString& label, const glm::mat4& m, bool transpose) const { - glm::mat4 out = transpose ? glm::transpose(m) : m; + glm::dmat4 out = transpose ? glm::transpose(m) : m; QString message = QString("%1 %2").arg(qPrintable(label)); message = message.arg(glm::to_string(out).c_str()); qCDebug(scriptengine) << message; diff --git a/libraries/script-engine/src/Quat.cpp b/libraries/script-engine/src/Quat.cpp index 8d84b45b90..a6f7acffc8 100644 --- a/libraries/script-engine/src/Quat.cpp +++ b/libraries/script-engine/src/Quat.cpp @@ -119,9 +119,9 @@ float Quat::dot(const glm::quat& q1, const glm::quat& q2) { void Quat::print(const QString& label, const glm::quat& q, bool asDegrees) { QString message = QString("%1 %2").arg(qPrintable(label)); if (asDegrees) { - message = message.arg(glm::to_string(safeEulerAngles(q)).c_str()); + message = message.arg(glm::to_string(glm::dvec3(safeEulerAngles(q))).c_str()); } else { - message = message.arg(glm::to_string(q).c_str()); + message = message.arg(glm::to_string(glm::dquat(q)).c_str()); } qCDebug(scriptengine) << message; if (ScriptEngine* scriptEngine = qobject_cast(engine())) { diff --git a/libraries/script-engine/src/Vec3.cpp b/libraries/script-engine/src/Vec3.cpp index f66b99dfa1..a156f56d96 100644 --- a/libraries/script-engine/src/Vec3.cpp +++ b/libraries/script-engine/src/Vec3.cpp @@ -29,7 +29,7 @@ float Vec3::orientedAngle(const glm::vec3& v1, const glm::vec3& v2, const glm::v void Vec3::print(const QString& label, const glm::vec3& v) { QString message = QString("%1 %2").arg(qPrintable(label)); - message = message.arg(glm::to_string(v).c_str()); + message = message.arg(glm::to_string(glm::dvec3(v)).c_str()); qCDebug(scriptengine) << message; if (ScriptEngine* scriptEngine = qobject_cast(engine())) { scriptEngine->print(message);