From a38c1c82d1a165fd2c26bd0250fcad68f1b22f07 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 10 Aug 2015 23:08:36 -0700 Subject: [PATCH] use glm::clamp() instead if std::max() and min() --- libraries/animation/src/ElbowConstraint.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/animation/src/ElbowConstraint.cpp b/libraries/animation/src/ElbowConstraint.cpp index e575b3f8b7..8c7fec7b6f 100644 --- a/libraries/animation/src/ElbowConstraint.cpp +++ b/libraries/animation/src/ElbowConstraint.cpp @@ -62,7 +62,7 @@ bool ElbowConstraint::apply(glm::quat& rotation) const { twistAngle *= copysignf(1.0f, glm::dot(glm::cross(_perpAxis, twisted), _axis)); // clamp twistAngle - float clampedTwistAngle = std::max(_minAngle, std::min(twistAngle, _maxAngle)); + float clampedTwistAngle = glm::clamp(twistAngle, _minAngle, _maxAngle); bool twistWasClamped = (twistAngle != clampedTwistAngle); // update rotation