Changeset 1314Tweet

Timestamp:

Apr 30, 2012, 12:23:11 PM (9 years ago)

Author:

sam

Message:

math: add quat::fromeuler static constructor for quaternions.

Location:

trunk

Files:

• orbital/orbital.cpp (modified) (3 diffs)
• src/lol/math/vector.h (modified) (1 diff)
• src/math/vector.cpp (modified) (1 diff)

trunk/orbital/orbital.cpp

@@ -114 +114 @@
 
     //Doing the query with actual values, cause I want to stay SDL-free for now.
-    int HMovement = Input::GetButtonState(276 /*SDLK_LEFT*/) - Input::GetButtonState(275 /*SDLK_RIGHT*/);
-    int VMovement = Input::GetButtonState(273 /*SDLK_UP*/) - Input::GetButtonState(274 /*SDLK_DOWN*/);
-    int RMovement = Input::GetButtonState(256 /*SDLK_KP0*/) - Input::GetButtonState(305 /*SDLK_RCTRL*/);
+    int VMovement = Input::GetButtonState(274 /*SDLK_DOWN*/) - Input::GetButtonState(273 /*SDLK_UP*/);
+    int HMovement = Input::GetButtonState(275 /*SDLK_RIGHT*/) - Input::GetButtonState(276 /*SDLK_LEFT*/);
+    int RMovement = Input::GetButtonState(305 /*SDLK_RCTRL*/) - Input::GetButtonState(256 /*SDLK_KP0*/);
 
     vec3 new_angular_velocity = vec3(0.0f);
 
-    if (HMovement != 0 || VMovement != 0 || RMovement != 0)
+    if (VMovement != 0 || HMovement != 0 || RMovement != 0)
     {
-        new_angular_velocity = vec3(HMovement, VMovement, RMovement) * 50.0f;
+        new_angular_velocity = vec3(VMovement, HMovement, RMovement) * 50.0f;
         m_auto_cam_timer = 2.0f;
     }
@@ -128 +128 @@
     {
         /* Order is yaw, pitch, roll */
-        new_angular_velocity = clamp(-m_angle, vec3(40.f, -20.f, -40.f),
-                                               vec3(40.f,  20.f,  40.f));
+        new_angular_velocity = clamp(-m_angle, vec3(-20.f, 40.f, -40.f),
+                                               vec3( 20.f, 40.f,  40.f));
     }
 
@@ -145 +145 @@
     }
 
-    mat4 animH = mat4::rotate(m_angle[0], vec3(0, 1, 0));
-    mat4 animV = mat4::rotate(m_angle[1], vec3(1, 0, 0));
-    mat4 animR = mat4::rotate(m_angle[2], vec3(0, 0, 1));
+    mat4 anim = mat4::rotate(quat::fromeuler(m_angle));
     mat4 model = mat4::translate(vec3(0));
 
-    m_modelview = m_camera->GetViewMatrix() * model * animV * animR * animH;
+    m_modelview = m_camera->GetViewMatrix() * model * anim;
     m_proj = m_camera->GetProjMatrix();
     m_normalmat = transpose(inverse(mat3(m_modelview)));

trunk/src/lol/math/vector.h

@@ -924 +924 @@
     static Quat<T> rotate(T angle, T x, T y, T z);
     static Quat<T> rotate(T angle, Vec3<T> const &v);
+    static Quat<T> fromeuler(T x, T y, T z);
+    static Quat<T> fromeuler(Vec3<T> const &v);
 
     inline Quat<T> operator *(Quat<T> const &val) const

trunk/src/math/vector.cpp

@@ -471 +471 @@
 }
 
+template<> quat quat::fromeuler(vec3 const &v)
+{
+    using std::sin;
+    using std::cos;
+
+    vec3 half_angles = (M_PI / 360.0f) * v;
+    float sx = sin(half_angles.x), cx = cos(half_angles.x);
+    float sy = sin(half_angles.y), cy = cos(half_angles.y);
+    float sz = sin(half_angles.z), cz = cos(half_angles.z);
+
+    return quat(cx * cy * cz + sx * sy * sz,
+                sx * cy * cz - cx * sy * sz,
+                cx * sy * cz + sx * cy * sz,
+                cx * cy * sz - sx * sy * cz);
+}
+
+template<> quat quat::fromeuler(float x, float y, float z)
+{
+    return quat::fromeuler(vec3(x, y, z));
+}
+
 template<> mat4 mat4::lookat(vec3 eye, vec3 center, vec3 up)
 {