Changeset 1377Tweet

Timestamp:

May 12, 2012, 8:12:12 PM (11 years ago)

Author:

touky

Message:

Tweaked options movement.

File:

• trunk/orbital/player.h (modified) (3 diffs)

trunk/orbital/player.h

@@ -45 +45 @@
         m_position = vec3(0.f + type * 80.f, 3.5f + 50.f, 0.f);
 
-        m_options.Push(vec3(0.f), vec3(20.f, 0.f, 0.f));
-        m_options.Push(vec3(0.f), vec3(-20.f, 0.f, 0.f));
-        m_options.Push(vec3(0.f), vec3(20.f, 0.f, 0.f));
-        m_options.Push(vec3(0.f), vec3(-20.f, 0.f, 0.f));
+        m_options.Push(m_position, vec3(0.f, 0.f, 0.f));
+        m_options.Push(m_position, vec3(0.f, 0.f, 0.f));
+        m_options.Push(m_position, vec3(0.f, 0.f, 0.f));
+        m_options.Push(m_position, vec3(0.f, 0.f, 0.f));
     }
 
@@ -90 +90 @@
         }
 
+                damped_stick.x = damped_stick.x + (seconds / (seconds + 0.18f)) * (rightleft - damped_stick.x);
+                damped_stick.z = damped_stick.z + (seconds / (seconds + 0.18f)) * (updown - damped_stick.z);
+                vec3 applied_stick = vec3(abs(damped_stick.x), 0.0f, damped_stick.z);
+                vec3 offset = vec3(((damped_stick.x < 0.0f)?(abs(damped_stick.x) * 30.f):(0.f)), 0.0f, 0.0f);
+
         for (int i = 0; i < m_options.Count(); i++)
         {
-            vec3 pos[4] = { vec3(11.f, 0.f, 0.f),
-                            vec3(-11.f, 0.f, 0.f),
-                            vec3(21.f, 0.f, 0.f),
-                            vec3(-21.f, 0.f, 0.f) };
+                        vec3 rot[4] = {
+                                vec3(20.f, 0.f, 0.f),
+                                vec3(-20.f, 0.f, 0.f),
+                                vec3(20.f, 0.f, 0.f),
+                                vec3(-20.f, 0.f, 0.f) };
+
+                        vec3 pos[4] = {
+                                vec3(11.f, 0.f, 0.f),
+                                vec3(-11.f, 0.f, 0.f),
+                                vec3(21.f, 0.f, 0.f),
+                                vec3(-21.f, 0.f, 0.f) };
+
+                        vec3 move_pos[4] = {
+                                vec3( -8.f, 0.f, -5.f),
+                                vec3(-19.f, 0.f, -5.f),
+                                vec3(  3.f, 0.f, 5.f),
+                                vec3(-30.f, 0.f, 5.f) };
+
             /* FIXME: this is not delta-timed */
-            m_options[i].m1 = 0.1f * (m_position + pos[i])
-                            + 0.9f * m_options[i].m1;
-            m_options[i].m2[2] += seconds * (i & 1 ? 600.f : -600.f);
+                        vec3 target_pos = m_position + pos[i] + (move_pos[i] - pos[i]) * applied_stick + offset;
+            m_options[i].m1 = m_options[i].m1 + (seconds / (seconds + 0.1f)) * (target_pos - m_options[i].m1);
+                        m_options[i].m2[0] = rot[i][0] + (((damped_stick.x < 0.0f)?(20.0f):(-20.0f)) - rot[i][0]) * abs(damped_stick.x);
+
+                        if (damped_stick.x < 0.00001f && damped_stick.x > -0.00001f)
+                                m_options[i].m2[2] += seconds * (i & 1 ? 600.f : -600.f);
+                        else
+                                m_options[i].m2[2] += seconds * ((damped_stick.x < 0.0f)?(600.0f):(-600.0f));
         }
 
@@ -137 +161 @@
     Array<vec3, vec3> m_options;
 
+        vec3 damped_stick;
+
     bool m_ready;
 };