From fd51ef662b235b5e7fb735e2efee4ed333e916df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 24 Mar 2019 12:05:43 +0100 Subject: [PATCH] Math: avoid std::tie() in DualQuaternion sclerp.. It needs #include and that's heavier than I'd like. --- src/Magnum/Math/DualQuaternion.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Magnum/Math/DualQuaternion.h b/src/Magnum/Math/DualQuaternion.h index 2162399df..17ddd83f9 100644 --- a/src/Magnum/Math/DualQuaternion.h +++ b/src/Magnum/Math/DualQuaternion.h @@ -103,9 +103,8 @@ template inline DualQuaternion sclerp(const DualQuaternion& norma const Dual> n{direction, moment}; /* q_ScLERP = q_A*(cos(t*a/2) + n*sin(t*a/2)) */ - Dual sin, cos; - std::tie(sin, cos) = Math::sincos(t*Dual>(aHalf)); - return normalizedA*DualQuaternion{n*sin, cos}; + const std::pair, Dual> sincos = Math::sincos(t*Dual>(aHalf)); + return normalizedA*DualQuaternion{n*sincos.first, sincos.second}; } /** @relatesalso DualQuaternion @@ -170,9 +169,8 @@ template inline DualQuaternion sclerpShortestPath(const DualQuaterni const Dual> n{direction, moment}; /* q_ScLERP = q_A*(cos(t*a/2) + n*sin(t*a/2)) */ - Dual sin, cos; - std::tie(sin, cos) = Math::sincos(t*Dual>(aHalf)); - return normalizedA*DualQuaternion{n*sin, cos}; + const std::pair, Dual> sincos = Math::sincos(t*Dual>(aHalf)); + return normalizedA*DualQuaternion{n*sincos.first, sincos.second}; } /**