Changeset 1404Tweet

Timestamp:

May 20, 2012, 2:30:46 PM (11 years ago)

Author:

sam

Message:

orbital: fix uninitialised variables and allow to shoot with RCtrl.

Location:

trunk/orbital

Files:

• player.h (modified) (7 diffs)
• snake.h (modified) (2 diffs)

trunk/orbital/player.h

@@ -16 +16 @@
       : m_type(type),
         m_stick(0),
+        m_damped_stick(0),
+        m_move_rotation(0),
+        m_exhaust_rotation(0),
+        move_rotation_timer(0),
         m_ready(false)
     {
@@ -53 +57 @@
         m_options.Push(m_position, vec3(0.f, 0.f, 0.f));
         m_options.Push(m_position, vec3(0.f, 0.f, 0.f));
-
-        move_rotation_timer = 0.0f;
     }
 
@@ -96 +98 @@
         }
 
-        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);
+        m_damped_stick.x = m_damped_stick.x + (seconds / (seconds + 0.18f)) * (rightleft - m_damped_stick.x);
+        m_damped_stick.z = m_damped_stick.z + (seconds / (seconds + 0.18f)) * (updown - m_damped_stick.z);
+        vec3 applied_stick = vec3(abs(m_damped_stick.x), 0.0f, m_damped_stick.z);
+        vec3 offset = vec3(((m_damped_stick.x < 0.0f)?(abs(m_damped_stick.x) * 30.f):(0.f)), 0.0f, 0.0f);
 
         for (int i = 0; i < m_options.Count(); i++)
@@ -124 +126 @@
             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.3f && damped_stick.x > -0.3f)
+            m_options[i].m2[0] = rot[i][0] + (((m_damped_stick.x < 0.0f)?(20.0f):(-20.0f)) - rot[i][0]) * abs(m_damped_stick.x);
+
+            if (m_damped_stick.x < 0.3f && m_damped_stick.x > -0.3f)
                 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));
-        }
-
-        if (damped_stick.x > 0.5f || damped_stick.x < -0.5f)
+                m_options[i].m2[2] += seconds * ((m_damped_stick.x < 0.0f)?(600.0f):(-600.0f));
+        }
+
+        if (m_damped_stick.x > 0.5f || m_damped_stick.x < -0.5f)
         {
             if (move_rotation_timer > 0.8f)
-                move_rotation.z += damped_stick.x * -420.f * seconds;
+                m_move_rotation.z += m_damped_stick.x * -420.f * seconds;
             else
                 move_rotation_timer += seconds;
@@ -142 +144 @@
         {
             move_rotation_timer = 0.0f;
-            move_rotation.z -= move_rotation.z * (seconds / (seconds + 0.2f));
-        }
-
-        exhaust_rotation.z += 600.0f * seconds;
-
-        if (move_rotation.z > 180.f)
-            move_rotation.z -= 360.f;
-        else if (move_rotation.z < -180.f)
-            move_rotation.z += 360.f;
-
-        if (exhaust_rotation.z > 180.f)
-            exhaust_rotation.z -= 360.f;
-        else if (exhaust_rotation.z < -180.f)
-            exhaust_rotation.z += 360.f;
-
-        m_rotation = quat::fromeuler_xyz(vec3(((damped_stick.z <= 0.0f)?(damped_stick.z):(0.0f)) * -60.0f, 0.f, damped_stick.x * -50.0f) + move_rotation);
+            m_move_rotation.z -= m_move_rotation.z * (seconds / (seconds + 0.2f));
+        }
+
+        m_exhaust_rotation.z += 600.0f * seconds;
+
+        if (m_move_rotation.z > 180.f)
+            m_move_rotation.z -= 360.f;
+        else if (m_move_rotation.z < -180.f)
+            m_move_rotation.z += 360.f;
+
+        if (m_exhaust_rotation.z > 180.f)
+            m_exhaust_rotation.z -= 360.f;
+        else if (m_exhaust_rotation.z < -180.f)
+            m_exhaust_rotation.z += 360.f;
+
+        m_rotation = quat::fromeuler_xyz(vec3(((m_damped_stick.z <= 0.0f)?(m_damped_stick.z):(0.0f)) * -60.0f, 0.f, m_damped_stick.x * -50.0f) + m_move_rotation);
 
         if (m_type == 0)
@@ -184 +186 @@
         if (m_type == 0)
         {
-            m_exhaust_mesh.Render(model * mat4::translate(vec3(-4.f,0.f,0.f)) * mat4::fromeuler_xyz(exhaust_rotation * -1.0f));
-            m_exhaust_mesh.Render(model * mat4::translate(vec3( 4.f,0.f,0.f)) * mat4::fromeuler_xyz(exhaust_rotation));
-        }
-        else
-            m_exhaust_mesh.Render(model * mat4::fromeuler_xyz(exhaust_rotation));
+            m_exhaust_mesh.Render(model * mat4::translate(vec3(-4.f,0.f,0.f)) * mat4::fromeuler_xyz(m_exhaust_rotation * -1.0f));
+            m_exhaust_mesh.Render(model * mat4::translate(vec3( 4.f,0.f,0.f)) * mat4::fromeuler_xyz(m_exhaust_rotation));
+        }
+        else
+            m_exhaust_mesh.Render(model * mat4::fromeuler_xyz(m_exhaust_rotation));
 
         for (int i = 0; i < m_options.Count(); i++)
         {
             mat4 t = mat4::translate(m_options[i].m1);
-            if (m_stick && m_stick->GetButtonCount() >= 4
-                 && m_stick->GetButton(12))
+
+            bool fire = m_stick && m_stick->GetButtonCount() >= 4
+                                && m_stick->GetButton(12);
+            fire = fire || Input::GetButtonState(305 /* Right Ctrl */);
+            if (fire)
                 m_laser_mesh.Render(t);
+
             t *= mat4::fromeuler_yxz(m_options[i].m2);
             m_option_mesh.Render(t);
@@ -208 +214 @@
     Array<vec3, vec3> m_options;
 
-    vec3 damped_stick;
-    vec3 move_rotation;
-    vec3 exhaust_rotation;
+    vec3 m_damped_stick;
+    vec3 m_move_rotation;
+    vec3 m_exhaust_rotation;
     float move_rotation_timer;
 

trunk/orbital/snake.h

@@ -73 +73 @@
         if (!m_stick)
             m_stick = Input::TrackStick();
-        if (m_stick && m_stick->GetButtonCount() >= 4
-             && m_stick->GetButton(12)
-             && (int)m_steer != (int)(m_steer - 2.f * seconds))
+        bool fire = m_stick && m_stick->GetButtonCount() >= 4
+                            && m_stick->GetButton(12);
+        fire = fire || Input::GetButtonState(305 /* Right Ctrl */);
+        if (fire && (int)m_steer != (int)(m_steer - 2.f * seconds))
         {
             int tohit = (int)RandF(m_nodes.Count() - 2);
@@ -128 +129 @@
 
             /* Apply damage */
-            float damage = std::min(m_nodes[i].m4, 30.f * seconds);
+            float damage = std::min(m_nodes[i].m4, 80.f * seconds);
             m_nodes[i].m3 -= damage;
             m_nodes[i].m4 -= damage;