Changeset 330Tweet

Timestamp:

Feb 1, 2011, 11:07:12 PM (10 years ago)

Author:

sam

Message:

First implementation of the mouse tracker.

Location:

trunk

Files:

• monsterz/board.cpp (modified) (9 diffs)
• src/input.cpp (modified) (1 diff)

trunk/monsterz/board.cpp

@@ -56 +56 @@
     int2 src_cell, dst_cell;
 
-    int2 mouse;
-    int3 buttons;
+    int2 oldmouse;
+    int3 oldbuttons;
     float nextblink, whipdelay;
 
@@ -109 +109 @@
     Ticker::Ref(data->scoretext);
     data->score = 0;
+
+    position = int3(24, 72, 1);
+    bbox[0] = position;
+    bbox[1] = bbox[0] + int3(384, 384, 0);
+
+    Input::TrackMouse(this);
 }
 
@@ -115 +121 @@
     Entity::TickGame(deltams);
 
-    int2 mouse = Input::GetMousePos();
     int3 buttons = Input::GetMouseButtons();
 
@@ -150 +155 @@
     case BoardData::IDLE:
         /* Should we start dragging something? */
-        if (buttons[0] && !data->buttons[0])
-        {
-            int x = mouse.x - 24;
-            int y = mouse.y - 72;
-            if (x >= 0 && x < data->dim.i * 48
-                 && y >= 0 && y < data->dim.j * 48)
-            {
-                if (data->pairs[x / 48][y / 48].piece->Grab(int2(0, 0)))
-                {
-                    Sampler::PlaySample(data->click);
-                    data->grabbed = data->pairs[x / 48][y / 48];
-                    data->src_cell = int2(x / 48, y / 48);
-                    data->dst_cell = int2(-1);
-                    data->state = BoardData::GRAB;
-                }
-                else
-                    data->state = BoardData::BADCLICK;
+        if (buttons[0] && !data->oldbuttons[0] && mousepos.x != -1)
+        {
+            int2 cell = mousepos / 48;
+            if (data->pairs[cell.x][cell.y].piece->Grab(int2(0, 0)))
+            {
+                Sampler::PlaySample(data->click);
+                data->grabbed = data->pairs[cell.x][cell.y];
+                data->src_cell = mousepos / 48;
+                data->dst_cell = int2(-1);
+                data->state = BoardData::GRAB;
             }
             else
@@ -173 +171 @@
         break;
     case BoardData::GRAB:
-        if (mouse.x >= 0 && mouse.y >= 0)
+        if (mousepos.x != -1)
         {
             /* Mouse is still in the window, keep grabbing */
-            data->grabbed.piece->Grab(mouse - data->mouse);
+            data->grabbed.piece->Grab(mousepos - data->oldmouse);
             int2 cur_pos = data->grabbed.piece->GetPos();
             int2 cur_cell = (cur_pos + 24) / 48;
@@ -201 +199 @@
             }
         }
-        if (!buttons[0] || mouse.x < 0 || mouse.y < 0
+        if (!buttons[0] || mousepos.x == -1
              || (data->src_cell * 48
                   - data->grabbed.piece->GetPos()).sqlen() > 100 * 100)
@@ -218 +216 @@
     }
 
-    data->mouse = mouse;
-    data->buttons = buttons;
+    data->oldmouse = mousepos;
+    data->oldbuttons = buttons;
 }
 
@@ -237 +235 @@
 
     /* Mouse pointer */
-    if (data->mouse.x >= 0 && data->mouse.y >= 0)
-    {
-        int2 m = data->mouse + int2(-6, 6 - 48);
+    if (data->oldmouse.x >= 0 && data->oldmouse.y >= 0)
+    {
+        int2 m = data->oldmouse + (int2)(float2)position + int2(-6, 6 - 48);
         Scene::GetDefault()->AddTile((data->tiles << 16) | 22, m.x, m.y, 20, 0);
     }
@@ -531 +529 @@
 Board::~Board()
 {
+    Input::UntrackMouse(this);
+
     for (int j = 0; j < data->dim.j; j++)
         for (int i = 0; i < data->dim.i; i++)

trunk/src/input.cpp

@@ -104 +104 @@
     data->mouse = coord;
 
-    /* FIXME: parse all subscribed entities and update them */
+    WorldEntity *best = NULL;
+
+    for (int n = 0; n < data->nentities; n++)
+    {
+        if (coord.x < data->entities[n]->bbox[0].x
+             || coord.x >= data->entities[n]->bbox[1].x
+             || coord.y < data->entities[n]->bbox[0].y
+             || coord.y >= data->entities[n]->bbox[1].y)
+            continue;
+
+        if (!best || best->bbox[1].z < data->entities[n]->bbox[1].z)
+            best = data->entities[n];
+    }
+
+    for (int n = 0; n < data->nentities; n++)
+    {
+        if (data->entities[n] == best)
+            data->entities[n]->mousepos = (int2)((int3)coord - best->bbox[0]);
+        else
+            data->entities[n]->mousepos = int2(-1);
+    }
 }