From f8608464fabcfc6c7abffde25e679f58c747cb84 Mon Sep 17 00:00:00 2001 From: Anthony Thibault Date: Thu, 7 Feb 2019 11:33:44 -0800 Subject: [PATCH] warning fixes --- libraries/animation/src/AnimPose.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/animation/src/AnimPose.h b/libraries/animation/src/AnimPose.h index 89dcbaf2ab..4d6dee1987 100644 --- a/libraries/animation/src/AnimPose.h +++ b/libraries/animation/src/AnimPose.h @@ -21,9 +21,9 @@ class AnimPose { public: AnimPose() {} explicit AnimPose(const glm::mat4& mat); - explicit AnimPose(const glm::quat& rotIn) : _scale(1.0f), _rot(rotIn), _trans(0.0f) {} - AnimPose(const glm::quat& rotIn, const glm::vec3& transIn) : _scale(1.0f), _rot(rotIn), _trans(transIn) {} - AnimPose(float scaleIn, const glm::quat& rotIn, const glm::vec3& transIn) : _scale(scaleIn), _rot(rotIn), _trans(transIn) {} + explicit AnimPose(const glm::quat& rotIn) : _rot(rotIn), _trans(0.0f), _scale(1.0f) {} + AnimPose(const glm::quat& rotIn, const glm::vec3& transIn) : _rot(rotIn), _trans(transIn), _scale(1.0f) {} + AnimPose(float scaleIn, const glm::quat& rotIn, const glm::vec3& transIn) : _rot(rotIn), _trans(transIn), _scale(scaleIn) {} static const AnimPose identity; glm::vec3 xformPoint(const glm::vec3& rhs) const; @@ -36,7 +36,7 @@ public: AnimPose mirror() const; operator glm::mat4() const; - const float scale() const { return _scale; } + float scale() const { return _scale; } float& scale() { return _scale; } const glm::quat& rot() const { return _rot; }