Changeset 311 for trunk/monsterz/piece.cppTweet

Timestamp:

Jan 30, 2011, 6:31:14 PM (12 years ago)

Author:

sam

Message:

Add idle animations.

File:

• trunk/monsterz/piece.cpp (modified) (6 diffs)

trunk/monsterz/piece.cpp

@@ -65 +65 @@
     data->id = id;
     data->state = PieceData::IDLE;
+    data->timer = RandF(DELAY_IDLE);
 }
 
@@ -237 +238 @@
     {
     case PieceData::IDLE:
-        break;
-    case PieceData::BLINK:
         data->timer -= deltams;
         if (data->timer < 0.0f)
+            data->timer = DELAY_IDLE;
+        break;
+    case PieceData::BLINK:
+        data->timer -= deltams;
+        if (data->timer < 0.0f)
+        {
             data->state = PieceData::IDLE;
+            data->timer = RandF(DELAY_IDLE);
+        }
         break;
     case PieceData::GRAB:
@@ -265 +272 @@
         }
         if (data->timer > moving_time + 200.0f)
+        {
             data->state = PieceData::IDLE;
+            data->timer = RandF(DELAY_IDLE);
+        }
         break;
     }
@@ -273 +283 @@
         {
             float3 pos(data->pos.x + 24, data->pos.y + 177, 5);
-            int start = data->id + 10;
-            int stop = data->id + 13;
+            int start = data->id + 12;
+            int stop = data->id + 15;
             for (int id = start; id < stop; id++)
             {
-                float3 vel(RandF(-0.3f, 0.3f), RandF(0.2f, 0.3f), 0.0f);
+                float angle = RandF(-1.2f, 1.2f);
+                float speed = RandF(0.3f, 0.5f);
+                float3 vel(speed * sinf(angle), speed * cosf(angle), 0.0f);
                 data->emitter->AddParticle(id, pos, vel);
             }
@@ -303 +315 @@
     {
     case PieceData::IDLE:
-        break;
-    case PieceData::BLINK:
-        id = data->id + 1;
-        break;
-    case PieceData::GRAB:
-        id = data->id + 1;
+    {
+        int off = data->timer * 3 / DELAY_IDLE;
+        if (off < 0) off = 0;
+        if (off > 2) off = 2;
+        id = data->id + off;
+        break;
+    }
+    case PieceData::BLINK:
+        id = data->id + 3;
+        break;
+    case PieceData::GRAB:
+        id = data->id + 3;
         z = 4;
         break;
     case PieceData::UNGRAB:
         if ((data->cell * 48 - data->src).sqlen() > 24 * 24)
-            id = data->id + 5;
+            id = data->id + 7;
         z = 4;
         break;
@@ -324 +342 @@
         if (off < 0) off = 0;
         if (off > 4) off = 4;
-        id = data->id + 5 + off;
+        id = data->id + 7 + off;
         break;
     }