Changeset 1312Tweet

Timestamp:

Apr 30, 2012, 3:12:47 AM (11 years ago)

Author:

sam

Message:

orbital: use newly available vector operations for angular velocity.

Location:

trunk/orbital

Files:

• orbital.cpp (modified) (2 diffs)
• orbital.h (modified) (1 diff)

trunk/orbital/orbital.cpp

@@ -94 +94 @@
     m_auto_cam_timer = 0.0f;
 
-    m_horizontal_angle = 0;
-    m_vertical_angle = 0;
-    m_roll_angle = 0;
-
-    m_horizontal_angle_speed = 0.0f;
-    m_vertical_angle_speed = 0.0f;
-    m_roll_angle_speed = 0.0f;
+    m_angle = vec3(0.f);
+    m_angular_velocity = vec3(0.f);
 
     m_ready = false;
@@ -123 +118 @@
     int RMovement = Input::GetButtonState(256 /*SDLK_KP0*/) - Input::GetButtonState(305 /*SDLK_RCTRL*/);
 
-    float new_horizontal_angle_speed = 0.0f;
-    float new_vertical_angle_speed = 0.0f;
-    float new_roll_angle_speed = 0.0f;
+    vec3 new_angular_velocity = vec3(0.0f);
 
     if (HMovement != 0 || VMovement != 0 || RMovement != 0)
     {
-        new_horizontal_angle_speed = ((float)HMovement) * 50.0f;
-        new_vertical_angle_speed = ((float)VMovement) * 50.0f;
-        new_roll_angle_speed = ((float)RMovement) * 50.0f;
+        new_angular_velocity = vec3(HMovement, VMovement, RMovement) * 50.0f;
         m_auto_cam_timer = 2.0f;
     }
     else if (m_auto_cam_timer <= 0.0f)
     {
-        new_horizontal_angle_speed = 40.0f;
-        new_vertical_angle_speed = max<float>(min<float>(-m_vertical_angle, 20.0f), -20.0f);
-        new_roll_angle_speed = max<float>(min<float>(-m_roll_angle, 40.0f), -40.0f);
+        /* 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));
     }
 
-    m_horizontal_angle_speed += (new_horizontal_angle_speed - m_horizontal_angle_speed) * (seconds / (seconds + 0.3f));
-    m_vertical_angle_speed += (new_vertical_angle_speed - m_vertical_angle_speed) * (seconds / (seconds + 0.3f));
-    m_roll_angle_speed += (new_roll_angle_speed - m_roll_angle_speed) * (seconds / (seconds + 0.3f));
+    m_angular_velocity += (new_angular_velocity - m_angular_velocity)
+                          * (seconds / (seconds + 0.3f));
+    m_angle += m_angular_velocity * seconds;
 
-    m_horizontal_angle += m_horizontal_angle_speed * seconds;
-    m_vertical_angle += new_vertical_angle_speed * seconds;
-    m_roll_angle += new_roll_angle_speed * seconds;
+    /* TODO: implement "vec3 % float" or "fmod(vec3, float)" */
+    for (int n = 0; n < 3; n++)
+    {
+        if (m_angle[n] > 180.f)
+            m_angle[n] -= 360.f;
+        else if (m_angle[n] < -180.f)
+            m_angle[n] += 360.f;
+    }
 
-    if (m_horizontal_angle > 180.0f)
-        m_horizontal_angle -= 360.0f;
-    else if (m_horizontal_angle < -180.0f)
-        m_horizontal_angle += 360.0f;
-    if (m_vertical_angle > 180.0f)
-        m_vertical_angle -= 360.0f;
-    else if (m_vertical_angle < -180.0f)
-        m_vertical_angle += 360.0f;
-    if (m_roll_angle > 180.0f)
-        m_roll_angle -= 360.0f;
-    else if (m_roll_angle < -180.0f)
-        m_roll_angle += 360.0f;
-
-    mat4 animH = mat4::rotate(m_horizontal_angle, vec3(0, 1, 0));
-    mat4 animV = mat4::rotate(m_vertical_angle, vec3(1, 0, 0));
-    mat4 animR = mat4::rotate(m_roll_angle, vec3(0, 0, 1));
+    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 model = mat4::translate(vec3(0));
 

trunk/orbital/orbital.h

@@ -27 +27 @@
     Mesh m;
     float m_auto_cam_timer;
-    float m_horizontal_angle_speed;
-    float m_vertical_angle_speed;
-    float m_roll_angle_speed;
-
-    float m_horizontal_angle;
-    float m_vertical_angle;
-    float m_roll_angle;
+    vec3 m_angle, m_angular_velocity;
 
     mat4 m_modelview, m_proj;