Changeset 311Tweet

Timestamp:

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

Author:

sam

Message:

Add idle animations.

Location:

trunk/monsterz

Files:

• board.cpp (modified) (3 diffs)
• gfx/tiles.png (modified) (previous)
• monsterz.h (modified) (1 diff)
• piece.cpp (modified) (6 diffs)

trunk/monsterz/board.cpp

@@ -218 +218 @@
         for (int j = 0; j < 8; j++)
             for (int i = 0; i < 8; i++)
-                data->pairs[i][j].id = 1 + rand() % 8;
+                data->pairs[i][j].id = 1 + rand() % 9;
     } while (ListMashes(list) || !(data->nmoves = ListMoves(list)));
 
@@ -312 +312 @@
             {
                 Piece *old = data->pairs[i][j].piece;
-                int id = 1 + rand() % 8;
+                int id = 1 + rand() % 9;
                 data->pairs[i][j].id = id;
                 data->pairs[i][j].piece = new Piece(data->emitter, int2(i, j), 80 + 20 * id);
@@ -337 +337 @@
                  * the board. */
                 int2 newpos = int2(i * 48, below->GetPos().y + 48);
-                int id = 1 + rand() % 8;
+                int id = 1 + rand() % 9;
                 data->pairs[i][7].id = id;
                 data->pairs[i][7].piece = new Piece(data->emitter, int2(i, 7), 80 + 20 * id);

trunk/monsterz/monsterz.h

@@ -18 +18 @@
 static char const * const WAV_WHIP = "monsterz/sound/whip.wav";
 
+/* Duration of the idle loop */
+static int const DELAY_IDLE = 300;
 /* Duration of a blink */
-static int const DELAY_BLINK = 400;
+static int const DELAY_BLINK = 200;
 /* Wait time until the next whip sound is allowed */
 static int const DELAY_WHIP = 300;

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;
     }