Changeset 238Tweet

Timestamp:

Jan 19, 2011, 9:33:25 PM (12 years ago)

Author:

sam

Message:

Pieces can now be grabbed around.

Location:

trunk

Files:

• monsterz/board.cpp (modified) (5 diffs)
• monsterz/piece.cpp (modified) (5 diffs)
• monsterz/piece.h (modified) (1 diff)
• monsterz/tiles.png (modified) (previous)
• src/sdlinput.cpp (modified) (1 diff)

trunk/monsterz/board.cpp

@@ -34 +34 @@
     int screen, board, tiles;
     Piece *pieces[8][8];
+    Piece *grabbed;
+
+    Int2 mouse;
+    Int3 buttons;
     float nextblink;
+
+    enum
+    {
+        IDLE,
+        BADCLICK,
+        GRAB,
+    }
+    state;
 };
 
@@ -54 +66 @@
         {
             int id = (35 + i + (i ^ (j + 13)) * (2 * j + 711)) % 9;
-            data->pieces[j][i] = new Piece(game, i, j, 25 + 5 * id);
-            Ticker::Ref(data->pieces[j][i]);
+            data->pieces[i][j] = new Piece(game, i, j, 25 + 5 * id);
+            Ticker::Ref(data->pieces[i][j]);
         }
 
     data->nextblink = 0.0f;
+    data->state = BoardData::IDLE;
 }
 
 void Board::TickGame(float deltams)
 {
+    Entity::TickGame(deltams);
+
+    Int2 mouse = Input::GetMousePos();
+    Int3 buttons = Input::GetMouseButtons();
+
+    /* If possible, make a random monster blink */
     if ((data->nextblink -= deltams) < 0.0f)
     {
@@ -68 +87 @@
         data->nextblink = (float)(200 + rand() % 500);
     }
-    Entity::TickGame(deltams);
+
+    /* Should we start dragging something? */
+    switch (data->state)
+    {
+    case BoardData::IDLE:
+        if (buttons[0] && !data->buttons[0])
+        {
+            int x = mouse.x - 24;
+            int y = mouse.y - 72;
+            if (x >= 0 && x < 8 * 48 && y >= 0 && y < 8 * 48)
+            {
+                if (data->pieces[x / 48][y / 48]->Grab(Int2(0, 0)))
+                {
+                    data->grabbed = data->pieces[x / 48][y / 48];
+                    data->state = BoardData::GRAB;
+                }
+                else
+                    data->state = BoardData::BADCLICK;
+            }
+            else
+                data->state = BoardData::BADCLICK;
+        }
+        break;
+    case BoardData::GRAB:
+        if (mouse.x >= 0 && mouse.y >= 0)
+            data->grabbed->Grab(mouse - data->mouse);
+        if (!buttons[0] || mouse.x < 0 || mouse.y < 0)
+        {
+            data->grabbed->Ungrab();
+            data->state = BoardData::IDLE;
+        }
+        break;
+    case BoardData::BADCLICK:
+        if (!buttons[0])
+            data->state = BoardData::IDLE;
+        break;
+    }
+
+    data->mouse = mouse;
+    data->buttons = buttons;
 }
 
@@ -78 +136 @@
     data->game->GetScene()->AddTile((data->board << 16) | 0, 24, 912, 1, 0);
 
-    Int2 tmp = Input::GetMousePos();
-    if (tmp.x >= 0 && tmp.y >= 0)
-        data->game->GetScene()->AddTile((data->tiles << 16) | 4, tmp.x, 536 - tmp.y, 10, 0);
+    if (data->mouse.x >= 0 && data->mouse.y >= 0)
+    {
+        int x = data->mouse.x - 2;
+        int y = data->mouse.y + 59;
+        data->game->GetScene()->AddTile((data->tiles << 16) | 9, x, y, 10, 0);
+    }
 }
 
@@ -88 +149 @@
     for (int j = 0; j < 8; j++)
         for (int i = 0; i < 8; i++)
-            Ticker::Unref(data->pieces[j][i]);
+            Ticker::Unref(data->pieces[i][j]);
     Tiler::Deregister(data->board);
     Tiler::Deregister(data->screen);

trunk/monsterz/piece.cpp

@@ -31 +31 @@
     Game *game;
     int tiler;
-    int i, j, id;
+    int i, j, id, x, y;
     float timer;
 
@@ -38 +38 @@
         IDLE,
         BLINK,
+        GRAB,
+        UNGRAB,
     }
     state;
@@ -54 +56 @@
     data->i = i;
     data->j = j;
+    data->x = i * 48;
+    data->y = j * 48;
     data->id = id;
     data->state = PieceData::IDLE;
 }
 
-void Piece::Blink()
+int Piece::Blink()
 {
-    if (data->state == PieceData::IDLE)
+    switch (data->state)
     {
+    case PieceData::IDLE:
         data->state = PieceData::BLINK;
         data->timer = 400.0f;
+        return 1;
+    default:
+        return 0;
+    }
+}
+
+int Piece::Grab(Int2 dir)
+{
+    switch (data->state)
+    {
+    case PieceData::IDLE:
+    case PieceData::BLINK:
+    case PieceData::GRAB:
+        data->state = PieceData::GRAB;
+        data->x += dir.x;
+        data->y += dir.y;
+        return 1;
+    default:
+        return 0;
+    }
+}
+
+int Piece::Ungrab()
+{
+    switch (data->state)
+    {
+    case PieceData::GRAB:
+        data->state = PieceData::UNGRAB;
+        return 1;
+    default:
+        return 0;
     }
 }
@@ -78 +114 @@
             data->state = PieceData::IDLE;
         break;
+    case PieceData::GRAB:
+        break;
+    case PieceData::UNGRAB:
+        int dx = data->i * 48 - data->x;
+        int dy = data->j * 48 - data->y;
+        dx = dx + 2 / 3;
+        dy = dy + 2 / 3;
+        data->x += dx;
+        data->y += dy;
+        if (dx == 0 && dy == 0)
+            data->state = PieceData::IDLE;
+        break;
     }
     Entity::TickGame(deltams);
@@ -87 +135 @@
 
     int id = data->id;
-    int i = data->i;
-    int j = data->j;
+    int x = data->x + 24;
+    int y = data->y + 177;
+    int z = 2;
     if (data->state == PieceData::BLINK)
-        id++;
-    data->game->GetScene()->AddTile((data->tiler << 16) | id,
-                                    i * 48 + 24, j * 48 + 177, 2, 0);
+        id = data->id + 1;
+    if (data->state == PieceData::GRAB)
+    {
+        id = data->id + 1;
+        z = 4;
+    }
+    data->game->GetScene()->AddTile((data->tiler << 16) | id, x, y, z, 0);
 }
 

trunk/monsterz/piece.h

@@ -23 +23 @@
     virtual ~Piece();
 
-    void Blink();
+    int Blink();
+    int Grab(Int2 dir);
+    int Ungrab();
 
 protected:

trunk/src/sdlinput.cpp

@@ -51 +51 @@
     Int2 mouse;
     if (SDL_GetAppState() & SDL_APPMOUSEFOCUS)
+    {
         SDL_GetMouseState(&mouse.x, &mouse.y);
+        mouse.y = Video::GetHeight() - 1 - mouse.y;
+    }
     else
         mouse.x = mouse.y = -1;