Changeset 1322Tweet

Timestamp:

Apr 30, 2012, 8:41:00 PM (9 years ago)

Author:

sam

Message:

math: fix a bug in mat3::fromeuler().

Location:

trunk

Files:

• orbital/orbital.cpp (modified) (4 diffs)
• 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(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*/);
+    int RMovement = Input::GetButtonState(256 /*SDLK_KP0*/) - Input::GetButtonState(305 /*SDLK_RCTRL*/);
 
     vec3 new_angular_velocity = vec3(0.0f);
@@ -122 +122 @@
     if (VMovement != 0 || HMovement != 0 || RMovement != 0)
     {
-        new_angular_velocity = vec3(VMovement, HMovement, RMovement) * 50.0f;
+        new_angular_velocity = vec3(HMovement, VMovement, RMovement) * 50.0f;
         m_auto_cam_timer = 2.0f;
     }
@@ -128 +128 @@
     {
         /* Order is yaw, pitch, roll */
-        new_angular_velocity = clamp(-m_angle, vec3(-20.f, 40.f, -40.f),
-                                               vec3( 20.f, 40.f,  40.f));
+        new_angular_velocity = clamp(-m_angle, vec3(40.f, -20.f, -40.f),
+                                               vec3(40.f,  20.f,  40.f));
     }
 
@@ -145 +145 @@
     }
 
-    mat4 anim = mat4::rotate(quat::fromeuler(m_angle));
+    quat q = quat::rotate(-90.f, 0.f, 0.f, 1.f);
+    mat4 anim = mat4(~q * quat::fromeuler(m_angle) * q);
     mat4 model = mat4::translate(vec3(0));
 

trunk/src/math/vector.cpp

@@ -520 +520 @@
 
     ret[0][0] =   cy * cz;
-    ret[1][0] =   cx * sz - sx * sy * sz;
-    ret[2][0] =   sx * sz - cx * sy * cz;
-
-    ret[0][1] = - cy * sz;
-    ret[1][1] =   cx * cz - sx * sy * sz;
-    ret[2][1] =   sx * cz + cx * sy * sz;
-
-    ret[0][2] =   sy;
-    ret[1][2] = - sx * cy;
+    ret[1][0] = - cx * sz + sx * sy * cz;
+    ret[2][0] =   sx * sz + cx * sy * cz;
+
+    ret[0][1] =   cy * sz;
+    ret[1][1] =   cx * cz + sx * sy * sz;
+    ret[2][1] = - sx * cz + cx * sy * sz;
+
+    ret[0][2] = - sy;
+    ret[1][2] =   sx * cy;
     ret[2][2] =   cx * cy;