Changeset 222Tweet

Timestamp:

Jan 18, 2011, 2:04:03 AM (10 years ago)

Author:

sam

Message:

Add support for rotated views and stretched tiles.

Location:

trunk

Files:

• deushax/debugsprite.cpp (modified) (1 diff)
• deushax/game.cpp (modified) (1 diff)
• deushax/mapviewer.cpp (modified) (1 diff)
• monsterz/debugboard.cpp (modified) (3 diffs)
• monsterz/game.cpp (modified) (1 diff)
• src/map.cpp (modified) (2 diffs)
• src/scene.cpp (modified) (3 diffs)
• src/scene.h (modified) (1 diff)
• src/tiler.cpp (modified) (2 diffs)
• src/tiler.h (modified) (1 diff)
• src/tileset.cpp (modified) (5 diffs)
• src/tileset.h (modified) (1 diff)

trunk/deushax/debugsprite.cpp

@@ -37 +37 @@
     data->game = game;
     Ticker::Ref(game);
-    data->tiler = Tiler::Register("art/test/character-dress.png", 32, 32);
+    data->tiler = Tiler::Register("art/test/character-dress.png",
+                                  32, 32, sqrtf(2));
     data->x = 320;
     data->y = 206;

trunk/deushax/game.cpp

@@ -70 +70 @@
 {
     if (!data->scene)
-        data->scene = new Scene();
+        data->scene = new Scene(45.0f);
     return data->scene;
 }

trunk/deushax/mapviewer.cpp

@@ -70 +70 @@
 {
     if (!data->scene)
-        data->scene = new Scene();
+        data->scene = new Scene(45.0f);
     return data->scene;
 }

trunk/monsterz/debugboard.cpp

@@ -41 +41 @@
     data->game = game;
     Ticker::Ref(game);
-    data->background = Tiler::Register("monsterz/background.png", 640, 480);
-    data->board = Tiler::Register("monsterz/board.png", 384, 384);
-    data->tiler = Tiler::Register("monsterz/tiles.png", 48, 48);
+    data->background = Tiler::Register("monsterz/background.png", 640, 480, 1.0f);
+    data->board = Tiler::Register("monsterz/board.png", 384, 384, 1.0f);
+    data->tiler = Tiler::Register("monsterz/tiles.png", 48, 48, 1.0f);
 }
 
@@ -55 +55 @@
     Entity::TickDraw(deltams);
 
-    data->game->GetScene()->AddTile((data->background << 16) | 0, 0, 980, 0, 0);
-    data->game->GetScene()->AddTile((data->board << 16) | 0, 24, 841, 1, 0);
+    data->game->GetScene()->AddTile((data->background << 16) | 0, 0, 1050, 0, 0);
+    data->game->GetScene()->AddTile((data->board << 16) | 0, 24, 912, 1, 0);
 
     for (int j = 0; j < 8; j++)
@@ -64 +64 @@
         id += (id % 5) / 4;
         data->game->GetScene()->AddTile((data->tiler << 16) | id,
-                                        i * 48 + 24, j * 48 + 107, 0, 1);
+                                        i * 48 + 24, j * 48 + 177, 2, 0);
     }
 }

trunk/monsterz/game.cpp

@@ -71 +71 @@
 {
     if (!data->scene)
-        data->scene = new Scene();
+        data->scene = new Scene(0.0f);
     return data->scene;
 }

trunk/src/map.cpp

@@ -16 +16 @@
 #include <cstring>
 #include <cstdlib>
+#include <cmath>
 #include <ctype.h>
 
@@ -127 +128 @@
         {
             /* This is a tileset image file. Associate it with firstgid. */
-            data->tilers[data->ntilers] = Tiler::Register(str, 32, 32);
+            data->tilers[data->ntilers] = Tiler::Register(str, 32, 32,
+                                                          sqrtf(2));
             data->ntilers++;
             //fprintf(stderr, "new tiler %s\n", str);

trunk/src/scene.cpp

@@ -54 +54 @@
     Tile *tiles;
     int ntiles;
+    float angle;
 };
 
@@ -60 +61 @@
  */
 
-Scene::Scene()
+Scene::Scene(float angle)
 {
     data = new SceneData();
     data->tiles = 0;
     data->ntiles = 0;
+    data->angle = angle;
 }
 
@@ -105 +107 @@
     f += 0.05f;
     glTranslatef(320.0f, 240.0f, 0.0f);
-    glRotatef(-45.0f, 1.0f, 0.0f, 0.0f);
+    glRotatef(-data->angle, 1.0f, 0.0f, 0.0f);
 #if 0
     glRotatef(3.0f * sinf(f), 1.0f, 0.0f, 0.0f);

trunk/src/scene.h

@@ -24 +24 @@
 {
 public:
-    Scene();
+    Scene(float angle);
     ~Scene();
 

trunk/src/tiler.cpp

@@ -34 +34 @@
  */
 
-int Tiler::Register(char const *path, int w, int h)
+int Tiler::Register(char const *path, int w, int h, float dilate)
 {
     int id = data->tilesets.MakeSlot(path);
@@ -40 +40 @@
     if (!data->tilesets.GetEntity(id))
     {
-        TileSet *tileset = new TileSet(path, w, h);
+        TileSet *tileset = new TileSet(path, w, h, dilate);
         data->tilesets.SetEntity(id, tileset);
     }

trunk/src/tiler.h

@@ -23 +23 @@
 {
 public:
-    static int Register(char const *path, int w, int h);
+    static int Register(char const *path, int w, int h, float dilate);
     static void Deregister(int id);
 

trunk/src/tileset.cpp

@@ -44 +44 @@
     int *tiles;
     int w, h, nw, nh, ntiles;
-    float tx, ty;
+    float dilate, tx, ty;
 
     SDL_Surface *img;
@@ -54 +54 @@
  */
 
-TileSet::TileSet(char const *path, int w, int h)
+TileSet::TileSet(char const *path, int w, int h, float dilate)
 {
     data = new TileSetData();
@@ -79 +79 @@
     data->w = w;
     data->h = h;
+    data->dilate = dilate;
     /* FIXME: check for non-zero here */
     data->nw = data->img->w / w;
@@ -135 +136 @@
     float tx = data->tx * ((id & 0xffff) % data->nw);
     float ty = data->ty * ((id & 0xffff) / data->nw);
+    float dilate = data->dilate;
 
-    float sqrt2 = sqrtf(2.0f);
     int off = o ? data->h : 0;
     int dx = data->w;
@@ -147 +148 @@
         glBegin(GL_QUADS);
             glTexCoord2f(tx, ty);
-            glVertex3f(x, sqrt2 * (y - dy - off), sqrt2 * (z + off));
+            glVertex3f(x, dilate * (y - dy - off), dilate * (z + off));
             glTexCoord2f(tx + data->tx, ty);
-            glVertex3f(x + dx, sqrt2 * (y - dy - off), sqrt2 * (z + off));
+            glVertex3f(x + dx, dilate * (y - dy - off), dilate * (z + off));
             glTexCoord2f(tx + data->tx, ty + data->ty);
-            glVertex3f(x + dx, sqrt2 * (y - dy2), sqrt2 * z);
+            glVertex3f(x + dx, dilate * (y - dy2), dilate * z);
             glTexCoord2f(tx, ty + data->ty);
-            glVertex3f(x, sqrt2 * (y - dy2), sqrt2 * z);
+            glVertex3f(x, dilate * (y - dy2), dilate * z);
         glEnd();
     }

trunk/src/tileset.h

@@ -29 +29 @@
 {
 public:
-    TileSet(char const *path, int w, int h);
+    TileSet(char const *path, int w, int h, float dilate);
     virtual ~TileSet();