Changeset 303Tweet

Timestamp:

Jan 29, 2011, 1:04:12 AM (8 years ago)

Author:

sam

Message:

Heavily optimise the crappy initial board generation.

Location:

trunk/monsterz

Files:

• board.cpp (modified) (15 diffs)
• piece.cpp (modified) (1 diff)
• piece.h (modified) (1 diff)

trunk/monsterz/board.cpp

@@ -36 +36 @@
     int screen, board, tiles;
     int click, whip;
-    Piece *pieces[8][8];
-    Piece *grabbed;
+
+    struct Pair
+    {
+        int id;
+        Piece *piece;
+    }
+    pairs[8][8], grabbed;
+
     Mash *mashes;
     Emitter *emitter;
@@ -75 +81 @@
     srand(rand() ^ time(NULL));
 
-restart:
+    /* Fill the board with a correct position */
+    int list[8][8];
+    do
+    {
+        for (int j = 0; j < 8; j++)
+            for (int i = 0; i < 8; i++)
+                data->pairs[i][j].id = 1 + rand() % 7;
+    } while (ListMashes(list));
+
+    /* Spawn pieces */
     for (int j = 0; j < 8; j++)
         for (int i = 0; i < 8; i++)
         {
-            int id = 100 + 20 * (rand() % 7);
-            data->pieces[i][j] = new Piece(data->emitter, int2(i, j), id);
+            int2 newpos = int2(i, j + 8) * 48;
+            int id = 80 + 20 * data->pairs[i][j].id;
+            data->pairs[i][j].piece = new Piece(data->emitter, int2(i, j), id);
+            data->pairs[i][j].piece->SetPos(newpos);
+            data->pairs[i][j].piece->Move(int2(i, j) * 48);
             if (j)
-                data->pieces[i][j]->SetBelow(data->pieces[i][j - 1]);
-            Ticker::Ref(data->pieces[i][j]);
-        }
-
-    int list[8][8];
-    if (ListMashes(list))
-    {
-        for (int j = 0; j < 8; j++)
-            for (int i = 0; i < 8; i++)
-            {
-                data->pieces[i][j]->SetBelow(NULL);
-                Ticker::Unref(data->pieces[i][j]);
-            }
-        goto restart;
-    }
+                data->pairs[i][j].piece->SetBelow(data->pairs[i][j - 1].piece);
+            Ticker::Ref(data->pairs[i][j].piece);
+        }
 
     data->mashes = NULL;
@@ -114 +120 @@
     if ((data->nextblink -= deltams) < 0.0f)
     {
-        data->pieces[rand() % 8][rand() % 8]->Blink();
+        data->pairs[rand() % 8][rand() % 8].piece->Blink();
         data->nextblink = (float)(200 + rand() % 500);
     }
@@ -143 +149 @@
             if (x >= 0 && x < 8 * 48 && y >= 0 && y < 8 * 48)
             {
-                if (data->pieces[x / 48][y / 48]->Grab(int2(0, 0)))
+                if (data->pairs[x / 48][y / 48].piece->Grab(int2(0, 0)))
                 {
                     Sampler::PlaySample(data->click);
-                    data->grabbed = data->pieces[x / 48][y / 48];
+                    data->grabbed = data->pairs[x / 48][y / 48];
                     data->src_cell = int2(x / 48, y / 48);
                     data->dst_cell = int2(-1);
@@ -162 +168 @@
         {
             /* Mouse is still in the window, keep grabbing */
-            data->grabbed->Grab(mouse - data->mouse);
-            int2 cur_pos = data->grabbed->GetPos();
+            data->grabbed.piece->Grab(mouse - data->mouse);
+            int2 cur_pos = data->grabbed.piece->GetPos();
             int2 cur_cell = (cur_pos + 24) / 48;
             if (cur_cell.i < 0 || cur_cell.i >= 8
@@ -179 +185 @@
                 }
                 if (data->dst_cell != int2(-1))
-                    data->pieces[data->dst_cell.i]
-                                [data->dst_cell.j]->Ungrab(data->dst_cell * 48);
+                    data->pairs[data->dst_cell.i]
+                               [data->dst_cell.j].piece->Ungrab(data->dst_cell * 48);
                 if (cur_cell != int2(-1))
-                    data->pieces[cur_cell.i]
-                                [cur_cell.j]->Ungrab(data->src_cell * 48);
+                    data->pairs[cur_cell.i]
+                               [cur_cell.j].piece->Ungrab(data->src_cell * 48);
                 data->dst_cell = cur_cell;
             }
@@ -189 +195 @@
         if (!buttons[0] || mouse.x < 0 || mouse.y < 0
              || (data->src_cell * 48
-                  - data->grabbed->GetPos()).sqlen() > 100 * 100)
+                  - data->grabbed.piece->GetPos()).sqlen() > 100 * 100)
         {
             /* Mouse released, or exited window, or dragged too far. */
-            data->grabbed->Ungrab(data->grabbed->GetCell() * 48);
+            data->grabbed.piece->Ungrab(data->grabbed.piece->GetCell() * 48);
             if (data->dst_cell != int2(-1))
                 Switch(data->src_cell, data->dst_cell);
@@ -225 +231 @@
 void Board::Switch(int2 cell_a, int2 cell_b)
 {
-    Piece *a = data->pieces[cell_a.i][cell_a.j];
-    Piece *b = data->pieces[cell_b.i][cell_b.j];
-    data->pieces[cell_a.i][cell_a.j] = b;
-    data->pieces[cell_b.i][cell_b.j] = a;
+    BoardData::Pair a = data->pairs[cell_a.i][cell_a.j];
+    BoardData::Pair b = data->pairs[cell_b.i][cell_b.j];
+    data->pairs[cell_a.i][cell_a.j] = b;
+    data->pairs[cell_b.i][cell_b.j] = a;
 
     /* Check whether this is a valid move by testing all patterns.
@@ -236 +242 @@
     if (!ListMashes(list))
     {
-        data->pieces[cell_a.i][cell_a.j] = a;
-        data->pieces[cell_b.i][cell_b.j] = b;
-        a->Ungrab(cell_a * 48);
-        b->Ungrab(cell_b * 48);
+        data->pairs[cell_a.i][cell_a.j] = a;
+        data->pairs[cell_b.i][cell_b.j] = b;
+        a.piece->Ungrab(cell_a * 48);
+        b.piece->Ungrab(cell_b * 48);
         return;
     }
 
     /* Perform the swap */
-    a->SetCell(cell_b);
-    a->Ungrab(cell_b * 48);
-    b->SetCell(cell_a);
-    b->Ungrab(cell_a * 48);
+    a.piece->SetCell(cell_b);
+    a.piece->Ungrab(cell_b * 48);
+    b.piece->SetCell(cell_a);
+    b.piece->Ungrab(cell_a * 48);
 
     /* Swap above and below cells */
     if (cell_a.i == cell_b.i)
     {
-        Piece *tmpa = a->GetAbove();
-        Piece *tmpb = b->GetAbove();
-        if (tmpb == a)
-        {
-            tmpb = b->GetBelow();
-            b->SetAbove(tmpa);
-            b->SetBelow(a);
-            a->SetBelow(tmpb);
-        }
-        else /* tmpa == b */
-        {
-            tmpa = a->GetBelow();
-            a->SetAbove(tmpb);
-            a->SetBelow(b);
-            b->SetBelow(tmpa);
+        Piece *tmpa = a.piece->GetAbove();
+        Piece *tmpb = b.piece->GetAbove();
+        if (tmpb == a.piece)
+        {
+            tmpb = b.piece->GetBelow();
+            b.piece->SetAbove(tmpa);
+            b.piece->SetBelow(a.piece);
+            a.piece->SetBelow(tmpb);
+        }
+        else /* tmpa == b.piece */
+        {
+            tmpa = a.piece->GetBelow();
+            a.piece->SetAbove(tmpb);
+            a.piece->SetBelow(b.piece);
+            b.piece->SetBelow(tmpa);
         }
     }
     else
     {
-        Piece *tmpa = a->GetAbove();
-        Piece *tmpb = b->GetAbove();
-        a->SetAbove(tmpb);
-        b->SetAbove(tmpa);
-        tmpa = a->GetBelow();
-        tmpb = b->GetBelow();
-        a->SetBelow(tmpb);
-        b->SetBelow(tmpa);
+        Piece *tmpa = a.piece->GetAbove();
+        Piece *tmpb = b.piece->GetAbove();
+        a.piece->SetAbove(tmpb);
+        b.piece->SetAbove(tmpa);
+        tmpa = a.piece->GetBelow();
+        tmpb = b.piece->GetBelow();
+        a.piece->SetBelow(tmpb);
+        b.piece->SetBelow(tmpa);
     }
 
@@ -293 +299 @@
 
             /* The mash becomes the new owner of the disappearing piece */
-            mash->AddPiece(data->pieces[i][j]);
+            mash->AddPiece(data->pairs[i][j].piece);
 
 #if 0 // Test for piece creation
             if (list[i][j] >= 2)
             {
-                Piece *old = data->pieces[i][j];
-                int id = 100 + 20 * (rand() % 7);
-                data->pieces[i][j] = new Piece(data->emitter, int2(i, j), id);
-                data->pieces[i][j]->SetBelow(old->GetBelow());
-                data->pieces[i][j]->SetAbove(old->GetAbove());
-                Ticker::Ref(data->pieces[i][j]);
+                Piece *old = data->pairs[i][j].piece;
+                int id = 1 + rand() % 7;
+                data->pairs[i][j].id = id;
+                data->pairs[i][j].piece = new Piece(data->emitter, int2(i, j), 80 + 20 * id);
+                data->pairs[i][j].piece->SetBelow(old->GetBelow());
+                data->pairs[i][j].piece->SetAbove(old->GetAbove());
+                Ticker::Ref(data->pieces[i][j].piece);
                 list[i][j] = 0;
             }
@@ -309 +316 @@
 #endif
             {
-                Piece *below = data->pieces[i][7];
+                Piece *below = data->pairs[i][7].piece;
 
                 /* Change coordinates for the whole column above */
                 for (int j2 = j + 1; j2 < 8; j2++)
                 {
-                    data->pieces[i][j2 - 1] = data->pieces[i][j2];
-                    data->pieces[i][j2 - 1]->SetCell(int2(i, j2 - 1));
-                    data->pieces[i][j2 - 1]->Move(int2(i, j2 - 1) * 48);
+                    data->pairs[i][j2 - 1] = data->pairs[i][j2];
+                    data->pairs[i][j2 - 1].piece->SetCell(int2(i, j2 - 1));
+                    data->pairs[i][j2 - 1].piece->Move(int2(i, j2 - 1) * 48);
                     list[i][j2 - 1] = list[i][j2];
                 }
@@ -323 +330 @@
                  * the board. */
                 int2 newpos = int2(i * 48, below->GetPos().y + 48);
-                int id = 100 + 20 * (rand() % 7);
-                data->pieces[i][7] = new Piece(data->emitter, int2(i, 7), id);
-                data->pieces[i][7]->SetBelow(below);
-                data->pieces[i][7]->SetPos(newpos);
-                data->pieces[i][7]->Move(int2(i, 7) * 48);
-                Ticker::Ref(data->pieces[i][7]);
+                int id = 1 + rand() % 7;
+                data->pairs[i][7].id = id;
+                data->pairs[i][7].piece = new Piece(data->emitter, int2(i, 7), 80 + 20 * id);
+                data->pairs[i][7].piece->SetBelow(below);
+                data->pairs[i][7].piece->SetPos(newpos);
+                data->pairs[i][7].piece->Move(int2(i, 7) * 48);
+                Ticker::Ref(data->pairs[i][7].piece);
                 list[i][7] = 0;
             }
@@ -350 +358 @@
         for (int i = 0; i < 8; i++)
         {
-            int id = data->pieces[i][j]->GetId();
-
-            if (i + 2 < 8 && data->pieces[i + 1][j]->GetId() == id
-                          && data->pieces[i + 2][j]->GetId() == id)
+            int id = data->pairs[i][j].id;
+
+            if (i + 2 < 8 && data->pairs[i + 1][j].id == id
+                          && data->pairs[i + 2][j].id == id)
             {
                 list[i][j]++;
@@ -361 +369 @@
             }
 
-            if (j + 2 < 8 && data->pieces[i][j + 1]->GetId() == id
-                          && data->pieces[i][j + 2]->GetId() == id)
+            if (j + 2 < 8 && data->pairs[i][j + 1].id == id
+                          && data->pairs[i][j + 2].id == id)
             {
                 list[i][j]++;
@@ -380 +388 @@
         for (int i = 0; i < 8; i++)
         {
-            data->pieces[i][j]->SetBelow(NULL);
-            Ticker::Unref(data->pieces[i][j]);
+            data->pairs[i][j].piece->SetBelow(NULL);
+            Ticker::Unref(data->pairs[i][j].piece);
         }
     while (data->mashes)

trunk/monsterz/piece.cpp

@@ -85 +85 @@
 {
     return data->pos;
-}
-
-int Piece::GetId() const
-{
-    return data->id;
 }
 

trunk/monsterz/piece.h

@@ -26 +26 @@
     void SetPos(int2 pos);
     int2 GetPos() const;
-    int GetId() const;
 
     void SetAbove(Piece *below);