Changeset 313Tweet

Timestamp:

Jan 31, 2011, 2:50:49 AM (9 years ago)

Author:

sam

Message:

Rework tile handling. This possibly breaks deushax pretty rudely.

Location:

trunk

Files:

• monsterz/board.cpp (modified) (1 diff)
• monsterz/piece.cpp (modified) (2 diffs)
• src/scene.cpp (modified) (1 diff)
• src/tileset.cpp (modified) (2 diffs)

trunk/monsterz/board.cpp

@@ -196 +196 @@
     Entity::TickDraw(deltams);
 
-    Scene::GetDefault()->AddTile((data->screen << 16) | 0, 0, 1050, 0, 0);
-    Scene::GetDefault()->AddTile((data->board << 16) | 0, 24, 912, 1, 0);
+    Scene::GetDefault()->AddTile((data->screen << 16) | 0, 0, 0, 0, 0);
+    Scene::GetDefault()->AddTile((data->board << 16) | 0, 24, 72, 1, 0);
 
     if (data->mouse.x >= 0 && data->mouse.y >= 0)
     {
-        int x = data->mouse.x - 2;
-        int y = data->mouse.y + 59;
-        Scene::GetDefault()->AddTile((data->tiles << 16) | 22, x, y, 10, 0);
+        int2 m = data->mouse + int2(-6, 6 - 48);
+        Scene::GetDefault()->AddTile((data->tiles << 16) | 22, m.x, m.y, 10, 0);
     }
 }

trunk/monsterz/piece.cpp

@@ -282 +282 @@
         if (data->timer < 0.0f)
         {
-            float3 pos(data->pos.x + 24, data->pos.y + 177, 5);
+            float3 pos(data->pos.x + 24, data->pos.y + 72, 5);
             int start = data->id + 12;
             int stop = data->id + 15;
@@ -308 +308 @@
     int id = data->id;
     int x = data->pos.x + 24;
-    int y = data->pos.y + 177;
+    int y = data->pos.y + 72;
     int z = 2;
 

trunk/src/scene.cpp

@@ -97 +97 @@
         data->tiles = (Tile *)realloc(data->tiles,
                                       (data->ntiles + 1024) * sizeof(Tile));
+    /* FIXME: this sorting only works for a 45-degree camera */
     data->tiles[data->ntiles].prio = -y - 2 * 32 * z + (o ? 0 : 32);
     data->tiles[data->ntiles].code = code;

trunk/src/tileset.cpp

@@ -157 +157 @@
     float dilate = data->dilate;
 
-    int off = o ? data->h : 0;
     int dx = data->w;
-    int dy = data->h * 38 / 32; /* Magic... fix this one day */
-    int dy2 = data->h * 70 / 32;
+    int dy = o ? 0 : data->h;
+    int dz = o ? data->h : 0;
 
     if (!data->img)
@@ -167 +166 @@
         glBegin(GL_QUADS);
             glTexCoord2f(tx, ty);
-            glVertex3f(x, dilate * (y - dy - off), dilate * (z + off));
+            glVertex3f(x, dilate * (y + dy), dilate * (z + dz));
             glTexCoord2f(tx + data->tx, ty);
-            glVertex3f(x + dx, dilate * (y - dy - off), dilate * (z + off));
+            glVertex3f(x + dx, dilate * (y + dy), dilate * (z + dz));
             glTexCoord2f(tx + data->tx, ty + data->ty);
-            glVertex3f(x + dx, dilate * (y - dy2), dilate * z);
+            glVertex3f(x + dx, dilate * y, dilate * z);
             glTexCoord2f(tx, ty + data->ty);
-            glVertex3f(x, dilate * (y - dy2), dilate * z);
+            glVertex3f(x, dilate * y, dilate * z);
         glEnd();
     }