Changeset 340 for trunk/monsterzTweet

Timestamp:

Feb 3, 2011, 2:28:47 AM (11 years ago)

Author:

sam

Message:

Add a Thumbs class to display the sidebar thumbnail icons.

Location:

trunk/monsterz

Files:

• Makefile.am (modified) (1 diff)
• board.cpp (modified) (11 diffs)
• thumbs.cpp (added)
• thumbs.h (added)

trunk/monsterz/Makefile.am

@@ -4 +4 @@
 monsterz_SOURCES = \
     monsterz.cpp monsterz.h title.cpp title.h interface.cpp interface.h \
-    fusion.cpp fusion.h board.cpp board.h piece.cpp piece.h mash.cpp mash.h
+    fusion.cpp fusion.h board.cpp board.h piece.cpp piece.h mash.cpp mash.h \
+    thumbs.cpp thumbs.h
 monsterz_CXXFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
 monsterz_LDADD = $(top_builddir)/src/liblol.a

trunk/monsterz/board.cpp

@@ -21 +21 @@
 #include "board.h"
 #include "piece.h"
+#include "thumbs.h"
 #include "mash.h"
 #include "monsterz.h"
@@ -35 +36 @@
     int2 dim;
     int npieces;
-    int board, tiles, icons;
+    int board, tiles;
     int click, whip;
 
@@ -46 +47 @@
     int nmoves;
 
-    Text *counticons[MAX_PIECES];
-    int counts[MAX_PIECES];
-
     Text *scoretext;
     int score;
@@ -54 +52 @@
     Mash *mashes;
     Emitter *emitter;
+    Thumbs *thumbs;
     int2 src_cell, dst_cell;
 
@@ -80 +79 @@
     data->board = Tiler::Register(PNG_BOARD, 384, 384, 1.0f);
     data->tiles = Tiler::Register(PNG_TILES, 48, 48, 1.0f);
-    data->icons = Tiler::Register(PNG_ICONS, 24, 24, 1.0f);
     data->click = Sampler::Register(WAV_CLICK);
     data->whip = Sampler::Register(WAV_WHIP);
@@ -94 +92 @@
     data->state = BoardData::IDLE;
 
-    for (int n = 0; n < MAX_PIECES; n++)
-    {
-        data->counts[n] = 0;
-        data->counticons[n] = new Text(NULL, "monsterz/gfx/font1.png");
-        Ticker::Ref(data->counticons[n]);
-        int3 p = int3(476, 383 - 28 * n, 1);
-        data->counticons[n]->SetPos(p);
-    }
+    data->thumbs = new Thumbs(MAX_PIECES);
+    Ticker::Ref(data->thumbs);
 
     data->scoretext = new Text(NULL, "monsterz/gfx/font2.png");
@@ -145 +137 @@
     }
 
-    /* Update statistics and score */
+    /* Update score */
     data->scoretext->SetInt(data->score);
-    for (int n = 0; n < MAX_PIECES; n++)
-        data->counticons[n]->SetInt(data->counts[n]);
 
     switch (data->state)
@@ -225 +215 @@
     Scene::GetDefault()->AddTile((data->board << 16) | 0,
                                  position.x, position.y, 1, 0);
-
-    /* Mini monsterz */
-    for (int n = 0; n < MAX_PIECES; n++)
-    {
-        int2 p = int2(444, 380 - 28 * n);
-        Scene::GetDefault()->AddTile((data->icons << 16) | n, p.x, p.y, 11, 0);
-    }
 }
 
@@ -334 +317 @@
             /* The mash becomes the new owner of the disappearing piece */
             mash->AddPiece(data->pairs[i][j].piece);
-            data->counts[data->pairs[i][j].id - 1]++;
+            data->thumbs->AddCount(data->pairs[i][j].id - 1, 1);
 
 #if 0 // Test for piece creation
@@ -529 +512 @@
             Ticker::Unref(data->pairs[i][j].piece);
         }
-    for (int n = 0; n < MAX_PIECES; n++)
-        Ticker::Unref(data->counticons[n]);
+    Ticker::Unref(data->thumbs);
     Ticker::Unref(data->scoretext);
     while (data->mashes)
@@ -543 +525 @@
     Tiler::Deregister(data->board);
     Tiler::Deregister(data->tiles);
-    Tiler::Deregister(data->icons);
     Sampler::Deregister(data->click);
     Sampler::Deregister(data->whip);