Changeset 1354 for trunk/orbital/player.hTweet

Timestamp:

May 9, 2012, 3:13:26 AM (11 years ago)

Author:

sam

Message:

orbital: add second player, option drone meshes, and animate the drones.

File:

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

trunk/orbital/player.h

@@ -13 +13 @@
 {
 public:
-    Player()
+    Player(int type)
       : m_stick(0),
         m_ready(false)
     {
-        /* FIXME: this is the orange ship; add code for the other one later */
-        m_ship_mesh.SendCommand("sc1,.5,0,1");
-        m_ship_mesh.SendCommand("afcb5,1,3,0.6,fl,sc1,1,1,1,afcb1,5,3,0.6,tz-1,irb");
-        m_ship_mesh.SendCommand("sc1,.5,0,1");
-        m_ship_mesh.SendCommand("afcb3,6,7,.4,t0,0,7,sc1,1,1,1,afcb3,4,4,.4,t4,0,-4,mx,fl");
-        m_ship_mesh.SendCommand("sc1,.5,0,1");
-        m_ship_mesh.SendCommand("afcb3,6,5,.4,sc1,1,1,1,afcb2,3,9,.4,fl");
-        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");
+        vec4 color[2] = { vec4(0.8f,0.2f,0.1f,1.0f),
+                          vec4(0.1f,0.1f,0.6f,1.0f) };
 
-        m_exhaust_mesh.SendCommand("sc0,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");
+        if (type == 0)
+        {
+            m_ship_mesh.SetCurColor(color[type]);
+            m_ship_mesh.SendCommand("afcb3,6,7,.4,t0,0,7,sc1,1,1,1,afcb3,4,4,.4,t4,0,-4,mx,fl");
+            m_ship_mesh.SetCurColor(color[type]);
+            m_ship_mesh.SendCommand("afcb3,6,5,.4,sc1,1,1,1,afcb2,3,9,.4,fl");
+            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_drone_mesh.SendCommand("sc0.2,0.7,0,1,afcb3,6,10,0.4,tx-8,afcb3,6,10,0.4,tx4,ty13,fl,sc1,1,1,1,afcb3,6,10,0.4,rx-30,ty13,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");
+        }
+        else
+        {
+            m_ship_mesh.SendCommand("sc1,1,1,1,scb1,1,1,1,ac4,15,.2,.6,1,1,t0,0,-4,ac4,1.5,.2,.6,1,1,rx90,t1.3,-2,-6,afcb3,6,5,.4,t0,0,-7");
+            m_ship_mesh.SetCurColor(color[type]);
+            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_position = vec3(0.f, 3.5f + 50.f, 0.f);
+            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_option_mesh.SetCurColor(color[type]);
+        m_option_mesh.SendCommand("afcb5,1,3,0.6,fl,sc1,1,1,1,afcb1,5,3,0.6,tz-1,fl");
+
+        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));
     }
 
@@ -59 +76 @@
         }
 
+        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) };
+            /* 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);
+        }
+
         m_position += vec3(rightleft, 0.f, -updown) * 200.f * seconds;
     }
@@ -70 +99 @@
             m_ship_mesh.SendCommand("irb");
             m_exhaust_mesh.SendCommand("irb");
-            m_drone_mesh.SendCommand("irb");
+            m_option_mesh.SendCommand("irb");
             m_ready = true;
         }
@@ -78 +107 @@
         m_exhaust_mesh.Render(model);
 
-        for (int i = 0; i < m_drones.Count(); i++)
+        for (int i = 0; i < m_options.Count(); i++)
         {
-            m_drone_mesh.Render(model * mat4::translate(m_drones[i]));
+            mat4 t = mat4::translate(m_options[i].m1)
+                   * mat4::fromeuler_yxz(m_options[i].m2);
+
+            m_option_mesh.Render(t);
         }
     }
 
 private:
-    Mesh m_ship_mesh, m_drone_mesh, m_exhaust_mesh;
+    Mesh m_ship_mesh, m_option_mesh, m_exhaust_mesh;
     Stick *m_stick;
 
-    Array<vec3> m_drones;
+    Array<vec3, vec3> m_options;
+
     bool m_ready;
 };