Changeset 1378Tweet

Timestamp:

May 12, 2012, 9:56:02 PM (11 years ago)

Author:

touky

Message:

Tweaked Player movement.
Camera follows player : mostly debug.

Location:

trunk/orbital

Files:

• orbital.cpp (modified) (1 diff)
• player.h (modified) (8 diffs)

trunk/orbital/orbital.cpp

@@ -187 +187 @@
 #endif
 
+        vec3 new_camera_pos = vec3(0,0,0);
+        for (int i = 0; i < m_players.Count(); i++)
+                new_camera_pos += m_players[i]->m_position;
+        new_camera_pos /= (float)m_players.Count();
+        new_camera_pos += vec3(0.f, 0.f, -50.f);
+
+        new_camera_pos = m_camera->GetTarget() + (new_camera_pos - m_camera->GetTarget()) * (seconds / (seconds + 0.15f));
+        m_camera->SetPosition(new_camera_pos + vec3(0.f, 600.f, 0.f));
+        m_camera->SetTarget(new_camera_pos);
+
     m_model = mat4(1.f);
 }

trunk/orbital/player.h

@@ -21 +21 @@
                           vec4(0.1f,0.1f,0.6f,1.0f) };
 
+                //Red Mesh
         if (type == 0)
         {
@@ -29 +30 @@
             m_ship_mesh.SendCommand("scb1,1,1,1,ac4,15,.2,.6,1,1,tz-2,ac4,15,.2,.6,1,1,rx90,t0,-2,-7,fl");
 
-            m_exhaust_mesh.SendCommand("sc0,1,1,1,scb0,0,0,1,ac5,15,0,1.5,0,1,ac7,35,1.1,4,0,1,rx90,t-3,0,27,mx,fl");
-        }
+            m_exhaust_mesh.SendCommand("sc0,1,1,1,scb0,0,0,1,ac5,15,0,1.5,0,1,ac7,35,1.1,4,0,1,rx90,t0,0,27,fl");
+        }
+                //Blue Mesh
         else
         {
@@ -37 +39 @@
             m_ship_mesh.SendCommand("afcb3,4,7,.4,t4,0,0,mx,fl,afcb3,6,5,.4,sc1,1,1,1,afcb2,3,9,.4");
 
-            m_exhaust_mesh.SendCommand("sc0,1,1,1,scb0,0,0,1,ac5,10,0,1.5,0,1,ac7,25,1.1,4,0,1,rx90,t0,0,25");
+            m_exhaust_mesh.SendCommand("sc0,1,1,1,scb0,0,0,1,ac5,10,0,1.5,0,1,ac7,25,1.1,4,0,1,rx90,t0,0,19");
         }
 
@@ -49 +51 @@
         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;
     }
 
@@ -120 +124 @@
                         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)
+                        if (damped_stick.x < 0.3f && damped_stick.x > -0.3f)
                                 m_options[i].m2[2] += seconds * (i & 1 ? 600.f : -600.f);
                         else
@@ -126 +130 @@
         }
 
+                if (damped_stick.x > 0.5f || damped_stick.x < -0.5f)
+                {
+                        if (move_rotation_timer > 0.8f)
+                                move_rotation.z += damped_stick.x * -220.f * seconds;
+                        else
+                                move_rotation_timer += seconds;
+                }
+                else
+                {
+                        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_position += vec3(rightleft, 0.f, -updown) * 200.f * seconds;
     }
@@ -142 +172 @@
 
         mat4 model = mat4::translate(m_position) * mat4(m_rotation);
-        m_ship_mesh.Render(model);
-        m_exhaust_mesh.Render(model);
+
+                m_ship_mesh.Render(model);
+
+                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));
 
         for (int i = 0; i < m_options.Count(); i++)
@@ -162 +200 @@
 
         vec3 damped_stick;
+        vec3 move_rotation;
+        vec3 exhaust_rotation;
+        float move_rotation_timer;
 
     bool m_ready;