Changeset 1368Tweet

Timestamp:

May 12, 2012, 11:36:39 AM (7 years ago)

Author:

sam

Message:

orbital: more snakes, with tails!

Location:

trunk/orbital

Files:

• orbital.cpp (modified) (1 diff)
• snake.h (modified) (7 diffs)

trunk/orbital/orbital.cpp

@@ -115 +115 @@
     m_snakes.Push(new Snake(3));
     Ticker::Ref(m_snakes.Last());
-    m_snakes.Push(new Snake(15));
+    m_snakes.Push(new Snake(8));
+    Ticker::Ref(m_snakes.Last());
+    m_snakes.Push(new Snake(25));
     Ticker::Ref(m_snakes.Last());
 

trunk/orbital/snake.h

@@ -26 +26 @@
         m_body.SendCommand("sc1,1,1,1,afcb.4,.4,7,.4,tx8,mx,fl");
 
-        m_position = vec3(RandF(-250.f, -350.f), 20.f, RandF(250.f, 350.f));
+        m_tail.SendCommand("sc1,1,1,1,afcb6,6,10,1,tz-1,fl");
+        m_tail.SendCommand("sc.9,.6,.1,1,afcb3,15,3,.8,ty8,fl");
+        m_tail.SendCommand("sc1,1,1,1,afcb.4,.4,8,.4,tz-1,ty8,fl");
+        m_tail.SendCommand("sc1,1,1,1,afcb.4,.4,8,.4,tz-1,ty12,fl");
+        m_tail.SendCommand("sc.9,.6,.1,1,afcb15,3,3,.8,tx8,fl");
+        m_tail.SendCommand("sc1,1,1,1,afcb.4,.4,8,.4,tz-1,tx8,fl");
+        m_tail.SendCommand("sc1,1,1,1,afcb.4,.4,8,.4,tz-1,tx12,fl");
+
+        m_position = vec3(RandF(0.f, 100.f), 20.f, RandF(150.f, 250.f));
         m_rotation = quat::rotate(RandF(30.f, 70.f), 0.f, 1.f, 0.f);;
 
+        /* The last node is actually the tail */
         for (int i = 0; i < nodes; i++)
             m_nodes.Push(vec3(0.f, 0.f, 0.f), 0.f);
+        m_nodes.Push(vec3(0.f, 0.f, 0.f), 45.f);
     }
 
@@ -45 +55 @@
 
         m_steer += 2.f * seconds;
-        float test = sinf(m_steer) * 120.f;
+        float test = sinf(m_steer) * 100.f + 20.f;
         m_rotation *= quat::rotate(seconds * test, vec3(0, 1, 0));
 
@@ -54 +64 @@
         for (int i = 0; i < m_nodes.Count(); i++)
         {
+            /* The current node is dragged by the previous one */
             vec3 newdelta = m_nodes[i].m1 - deltapos;
             if (dot(newdelta, newdelta) > 12.f * 12.f)
@@ -59 +70 @@
             deltapos = newdelta + deltapos - m_nodes[i].m1;
             m_nodes[i].m1 = newdelta;
-            m_nodes[i].m2 += seconds * ((i & 1) ? 200.f : -200.f);
+
+            /* If the current node is not the tail, rotate */
+            if (i != m_nodes.Count() - 1)
+                m_nodes[i].m2 += seconds * ((i & 1) ? 200.f : -200.f);
         }
     }
@@ -71 +85 @@
             m_head.SendCommand("irb");
             m_body.SendCommand("irb");
+            m_tail.SendCommand("irb");
             m_ready = true;
         }
@@ -76 +91 @@
         vec3 pos = m_position;
         quat rot = m_rotation;
+        float y_angle = 0.f;
         mat4 model = mat4::translate(pos) * mat4(rot);
         m_head.Render(model);
@@ -82 +98 @@
         {
             pos += m_nodes[i].m1;
-            float angle = (180.f / M_PI) * atan2(m_nodes[i].m1.x, m_nodes[i].m1.z);
-            rot = quat::rotate(angle, 0.f, 1.f, 0.f)
+            y_angle = (180.f / M_PI) * atan2(m_nodes[i].m1.x, m_nodes[i].m1.z);
+            rot = quat::rotate(y_angle, 0.f, 1.f, 0.f)
                 * quat::rotate(m_nodes[i].m2, 0.f, 0.f, 1.f);
             model = mat4::translate(pos) * mat4(rot);
-            m_body.Render(model);
+            if (i != m_nodes.Count() - 1)
+                m_body.Render(model);
+            else
+                m_tail.Render(model);
         }
     }
 
 private:
-    Mesh m_head, m_body;
+    Mesh m_head, m_body, m_tail;
     float m_steer;
     /* List of nodes (position, self-rotation angle) */