From 57f72f4081953f0297404d128abb23065ae8489c Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Fri, 25 Mar 2005 14:48:29 +0000 Subject: Small fix for the following warning: ../include/MT_Quaternion.h:62: warning: declaration of 'angle' shadows a member of 'this' Kent --- intern/moto/include/MT_Quaternion.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'intern/moto') diff --git a/intern/moto/include/MT_Quaternion.h b/intern/moto/include/MT_Quaternion.h index 03b52efe600..98046292982 100644 --- a/intern/moto/include/MT_Quaternion.h +++ b/intern/moto/include/MT_Quaternion.h @@ -59,19 +59,19 @@ public: MT_Quaternion(const double v[4]) : MT_Vector4(v) {} MT_Quaternion(MT_Scalar xx, MT_Scalar yy, MT_Scalar zz, MT_Scalar ww) : MT_Vector4(xx, yy, zz, ww) {} - MT_Quaternion(const MT_Vector3& axis, MT_Scalar angle) { - setRotation(axis, angle); + MT_Quaternion(const MT_Vector3& axis, MT_Scalar mt_angle) { + setRotation(axis, mt_angle); } MT_Quaternion(MT_Scalar yaw, MT_Scalar pitch, MT_Scalar roll) { setEuler(yaw, pitch, roll); } - void setRotation(const MT_Vector3& axis, MT_Scalar angle) { + void setRotation(const MT_Vector3& axis, MT_Scalar mt_angle) { MT_Scalar d = axis.length(); MT_assert(!MT_fuzzyZero(d)); - MT_Scalar s = sin(angle * MT_Scalar(0.5)) / d; + MT_Scalar s = sin(mt_angle * MT_Scalar(0.5)) / d; setValue(axis[0] * s, axis[1] * s, axis[2] * s, - cos(angle * MT_Scalar(0.5))); + cos(mt_angle * MT_Scalar(0.5))); } void setEuler(MT_Scalar yaw, MT_Scalar pitch, MT_Scalar roll) { -- cgit v1.2.3