sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Small fix for the following warning:

Browse Source 
../include/MT_Quaternion.h:62: warning: declaration of 'angle' shadows a member
of 'this'

Kent
This commit is contained in:
Kent Mein 2005-03-25 14:48:29 +00:00
parent f49d7133d0
commit 57f72f4081
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
intern/moto/include/MT_Quaternion.h
View File

@ -59,19 +59,19 @@ public:
MT_Quaternion(const double v[4]) : MT_Vector4(v) {} MT_Quaternion(const double v[4]) : MT_Vector4(v) {}
MT_Quaternion(MT_Scalar xx, MT_Scalar yy, MT_Scalar zz, MT_Scalar ww) : MT_Quaternion(MT_Scalar xx, MT_Scalar yy, MT_Scalar zz, MT_Scalar ww) :
MT_Vector4(xx, yy, zz, ww) {} MT_Vector4(xx, yy, zz, ww) {}
MT_Quaternion(const MT_Vector3& axis, MT_Scalar angle) { MT_Quaternion(const MT_Vector3& axis, MT_Scalar mt_angle) {
setRotation(axis, angle); setRotation(axis, mt_angle);
} }
MT_Quaternion(MT_Scalar yaw, MT_Scalar pitch, MT_Scalar roll) { MT_Quaternion(MT_Scalar yaw, MT_Scalar pitch, MT_Scalar roll) {
setEuler(yaw, pitch, 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_Scalar d = axis.length();
MT_assert(!MT_fuzzyZero(d)); 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, 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) { void setEuler(MT_Scalar yaw, MT_Scalar pitch, MT_Scalar roll) {