Changeset 1370Tweet

Timestamp:

May 12, 2012, 1:51:46 PM (9 years ago)

Author:

sam

Message:

orbital: the snake is now destructible.

Location:

trunk/orbital

Files:

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

trunk/orbital/orbital.cpp

@@ -113 +113 @@
     }
 
-    m_snakes.Push(new Snake(3));
-    Ticker::Ref(m_snakes.Last());
-    m_snakes.Push(new Snake(8));
-    Ticker::Ref(m_snakes.Last());
-    m_snakes.Push(new Snake(25));
+    //m_snakes.Push(new Snake(3));
+    //Ticker::Ref(m_snakes.Last());
+    //m_snakes.Push(new Snake(8));
+    //Ticker::Ref(m_snakes.Last());
+    m_snakes.Push(new Snake(33));
     Ticker::Ref(m_snakes.Last());
 

trunk/orbital/snake.h

@@ -55 +55 @@
 
         m_steer += 2.f * seconds;
-        float test = sinf(m_steer) * 100.f + 20.f;
+
+        /* Destruction test */
+        if (m_nodes.Count() >= 3 && m_steer > 30
+             && (int)m_steer / 6 != (int)(m_steer - 2.f * seconds) / 6)
+        {
+            int todelete = (int)RandF(m_nodes.Count() - 2);
+            m_nodes[todelete + 1].m1 += m_nodes[todelete].m1;
+            m_nodes.Remove(todelete);
+            m_nodes[todelete + 1].m1 += m_nodes[todelete].m1;
+            m_nodes.Remove(todelete);
+        }
+
+        float test = sinf(m_steer) * 100.f + 30.f;
         m_rotation *= quat::rotate(seconds * test, vec3(0, 1, 0));
 
@@ -65 +77 @@
         {
             /* The current node is dragged by the previous one */
-            vec3 newdelta = m_nodes[i].m1 - deltapos;
-            if (dot(newdelta, newdelta) > 12.f * 12.f)
-                newdelta = 12.f * normalize(newdelta);
-            deltapos = newdelta + deltapos - m_nodes[i].m1;
-            m_nodes[i].m1 = newdelta;
+            vec3 new_delta = m_nodes[i].m1 - deltapos;
+            float new_distance = length(new_delta);
+            if (new_distance > 12.f)
+            {
+                new_delta /= new_distance;
+                new_distance = std::max(12.f, new_distance - seconds * 80.f);
+                new_delta *= new_distance;
+            }
+            deltapos = new_delta + deltapos - m_nodes[i].m1;
+            m_nodes[i].m1 = new_delta;
 
             /* If the current node is not the tail, rotate */