Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-08 15:28:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

warning fixes

Browse source
This commit is contained in:
Anthony Thibault 2019-02-07 11:33:44 -08:00
parent 5c7e81584c
commit f8608464fa
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/animation/src/AnimPose.h
View file

@ -21,9 +21,9 @@ class AnimPose {
public: public:
AnimPose() {} AnimPose() {}
explicit AnimPose(const glm::mat4& mat); explicit AnimPose(const glm::mat4& mat);
explicit AnimPose(const glm::quat& rotIn) : _scale(1.0f), _rot(rotIn), _trans(0.0f) {} explicit AnimPose(const glm::quat& rotIn) : _rot(rotIn), _trans(0.0f), _scale(1.0f) {}
AnimPose(const glm::quat& rotIn, const glm::vec3& transIn) : _scale(1.0f), _rot(rotIn), _trans(transIn) {} 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) : _scale(scaleIn), _rot(rotIn), _trans(transIn) {} AnimPose(float scaleIn, const glm::quat& rotIn, const glm::vec3& transIn) : _rot(rotIn), _trans(transIn), _scale(scaleIn) {}
static const AnimPose identity; static const AnimPose identity;
glm::vec3 xformPoint(const glm::vec3& rhs) const; glm::vec3 xformPoint(const glm::vec3& rhs) const;
@ -36,7 +36,7 @@ public:
AnimPose mirror() const; AnimPose mirror() const;
operator glm::mat4() const; operator glm::mat4() const;
const float scale() const { return _scale; } float scale() const { return _scale; }
float& scale() { return _scale; } float& scale() { return _scale; }
const glm::quat& rot() const { return _rot; } const glm::quat& rot() const { return _rot; }