Changeset 2348 for trunkTweet

Timestamp:

Feb 4, 2013, 10:24:20 PM (7 years ago)

Author:

sam

Message:

math: use "degrees" as the variable name for rotations for clarity.

Location:

trunk/src

Files:

• lol/math/vector.h (modified) (6 diffs)
• math/vector.cpp (modified) (4 diffs)

trunk/src/lol/math/vector.h

@@ -937 +937 @@
     LOL_MEMBER_OPS(Quat, w)
 
-    //Angle in degree
-    static Quat<T> rotate(T angle, T x, T y, T z);
-    static Quat<T> rotate(T angle, Vec3<T> const &v);
+    /* Create a unit quaternion representing a rotation around an axis. */
+    static Quat<T> rotate(T degrees, T x, T y, T z);
+    static Quat<T> rotate(T degrees, Vec3<T> const &v);
 
     /* Convert from Euler angles. The axes in fromeuler_xyx are
      * x, then y', then x", ie. the axes are attached to the model.
      * If you want to rotate around static axes, just reverse the order
-     * of the arguments. */
+     * of the arguments. Angle values are in degrees. */
     static Quat<T> fromeuler_xyx(Vec3<T> const &v);
     static Quat<T> fromeuler_xzx(Vec3<T> const &v);
@@ -962 +962 @@
      * x, then y', then z", ie. the axes are attached to the model.
      * If you want to apply yaw around x, pitch around y, and roll
-     * around z, use fromeuler_xyz.
+     * around z, use fromeuler_xyz. Angle values are in degrees.
      * If you want to rotate around static axes, reverse the order in
      * the function name (_zyx instead of _xyz) AND reverse the order
@@ -1481 +1481 @@
 
     /* Helpers for transformation matrices */
-    //Angle in degree
-    static Mat2<T> rotate(T angle);
-    static inline Mat2<T> rotate(Mat2<T> mat, T angle)
-    {
-        return rotate(angle) * mat;
+    static Mat2<T> rotate(T degrees);
+    static inline Mat2<T> rotate(Mat2<T> mat, T degrees)
+    {
+        return rotate(degrees) * mat;
     }
 
@@ -1578 +1577 @@
     static Mat3<T> scale(T x, T y, T z);
     static Mat3<T> scale(Vec3<T> v);
-    //Angle in degree
-    static Mat3<T> rotate(T angle, T x, T y, T z);
-    static Mat3<T> rotate(T angle, Vec3<T> v);
+    static Mat3<T> rotate(T degrees, T x, T y, T z);
+    static Mat3<T> rotate(T degrees, Vec3<T> v);
 
     static Mat3<T> fromeuler_xyz(Vec3<T> const &v);
@@ -1608 +1606 @@
     static Mat3<T> fromeuler_zyz(T phi, T theta, T psi);
 
-    //Angle in degree
-    static inline Mat3<T> rotate(Mat3<T> mat, T angle, Vec3<T> v)
-    {
-        return rotate(angle, v) * mat;
+    static inline Mat3<T> rotate(Mat3<T> mat, T degrees, Vec3<T> v)
+    {
+        return rotate(degrees, v) * mat;
     }
 
@@ -1734 +1731 @@
     }
 
-    //Angle in degree
-    static inline Mat4<T> rotate(T angle, T x, T y, T z)
-    {
-        return Mat4<T>(Mat3<T>::rotate(angle, x, y, z), (T)1);
-    }
-
-    //Angle in degree
-    static inline Mat4<T> rotate(T angle, Vec3<T> v)
-    {
-        return Mat4<T>(Mat3<T>::rotate(angle, v), (T)1);
-    }
-
-    //Angle in degree
-    static inline Mat4<T> rotate(Mat4<T> &mat, T angle, Vec3<T> v)
-    {
-        return rotate(angle, v) * mat;
+    static inline Mat4<T> rotate(T degrees, T x, T y, T z)
+    {
+        return Mat4<T>(Mat3<T>::rotate(degrees, x, y, z), (T)1);
+    }
+
+    static inline Mat4<T> rotate(T degrees, Vec3<T> v)
+    {
+        return Mat4<T>(Mat3<T>::rotate(degrees, v), (T)1);
+    }
+
+    static inline Mat4<T> rotate(Mat4<T> &mat, T degrees, Vec3<T> v)
+    {
+        return rotate(degrees, v) * mat;
     }
 

trunk/src/math/vector.cpp

@@ -347 +347 @@
 }
 
-template<> mat2 mat2::rotate(float angle)
-{
-    angle *= (M_PI / 180.0f);
-
-    float st = sin(angle);
-    float ct = cos(angle);
+template<> mat2 mat2::rotate(float degrees)
+{
+    degrees *= (M_PI / 180.0f);
+
+    float st = sin(degrees);
+    float ct = cos(degrees);
 
     mat2 ret;
@@ -365 +365 @@
 }
 
-template<> mat3 mat3::rotate(float angle, float x, float y, float z)
-{
-    angle *= (M_PI / 180.0f);
-
-    float st = sin(angle);
-    float ct = cos(angle);
+template<> mat3 mat3::rotate(float degrees, float x, float y, float z)
+{
+    degrees *= (M_PI / 180.0f);
+
+    float st = sin(degrees);
+    float ct = cos(degrees);
 
     float len = std::sqrt(x * x + y * y + z * z);
@@ -399 +399 @@
 }
 
-template<> mat3 mat3::rotate(float angle, vec3 v)
-{
-    return rotate(angle, v.x, v.y, v.z);
+template<> mat3 mat3::rotate(float degrees, vec3 v)
+{
+    return rotate(degrees, v.x, v.y, v.z);
 }
 
@@ -484 +484 @@
 }
 
-template<> quat quat::rotate(float angle, vec3 const &v)
-{
-    angle *= (M_PI / 360.0f);
-
-    vec3 tmp = normalize(v) * sin(angle);
-
-    return quat(cos(angle), tmp.x, tmp.y, tmp.z);
-}
-
-template<> quat quat::rotate(float angle, float x, float y, float z)
-{
-    return quat::rotate(angle, vec3(x, y, z));
+template<> quat quat::rotate(float degrees, vec3 const &v)
+{
+    degrees *= (M_PI / 360.0f);
+
+    vec3 tmp = normalize(v) * sin(degrees);
+
+    return quat(cos(degrees), tmp.x, tmp.y, tmp.z);
+}
+
+template<> quat quat::rotate(float degrees, float x, float y, float z)
+{
+    return quat::rotate(degrees, vec3(x, y, z));
 }