Changeset 218Tweet

Timestamp:

Jan 17, 2011, 2:22:07 PM (12 years ago)

Author:

sam

Message:

The Tile size can now be specified upon TileSet load. Add a sample
with the Monsterz tiles.

Location:

trunk

Files:

• . (modified) (1 prop)
• art (modified) (1 prop)
• art/test (modified) (1 prop)
• gfx (modified) (1 prop)
• gfx/font (modified) (1 prop)
• maps (modified) (1 prop)
• src (modified) (1 prop)
• src/Makefile.am (modified) (1 diff)
• src/debugboard.cpp (added)
• src/debugboard.h (added)
• src/debugsprite.cpp (modified) (1 diff)
• src/map.cpp (modified) (1 diff)
• src/test-map.cpp (modified) (4 diffs)
• src/tiler.cpp (modified) (2 diffs)
• src/tiler.h (modified) (1 diff)
• src/tileset.cpp (modified) (5 diffs)
• src/tileset.h (modified) (1 diff)
• tools (modified) (1 prop)

trunk/src/Makefile.am

@@ -12 +12 @@
     debugfps.cpp debugfps.h debugsprite.cpp debugsprite.h \
     debugrecord.cpp debugrecord.h debugstats.cpp debugstats.h \
-    debugsphere.cpp debugsphere.h
+    debugsphere.cpp debugsphere.h debugboard.cpp debugboard.h
 libcommon_a_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image`
 

trunk/src/debugsprite.cpp

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

trunk/src/map.cpp

@@ -122 +122 @@
         {
             /* This is a tileset image file. Associate it with firstgid. */
-            data->tilers[data->ntilers] = Tiler::Register(str);
+            data->tilers[data->ntilers] = Tiler::Register(str, 32);
             data->ntilers++;
             //fprintf(stderr, "new tiler %s\n", str);

trunk/src/test-map.cpp

@@ -10 +10 @@
 #include <cstdio>
 #include <cmath>
+#if defined _WIN32
+#   include <direct.h>
+#endif
 
 #include <SDL.h>
@@ -16 +19 @@
 #include "sdlinput.h"
 #include "debugfps.h"
+#include "debugboard.h"
 #include "debugsprite.h"
 #include "debugsphere.h"
@@ -50 +54 @@
 
     /* Create a game */
+#if defined _WIN32
+    _chdir(".."); /* Temporary Win32 hack */
+#endif
     Game *game = new Game("maps/testmap.tmx");
+    game->SetMouse(160, 96);
 
     /* Register an input driver and some debug stuff */
@@ -56 +64 @@
     new DebugFps();
     new DebugSprite(game);
+    new DebugBoard(game);
     new DebugSphere();
     //new DebugRecord("lolengine.ogg");

trunk/src/tiler.cpp

@@ -29 +29 @@
  */
 
-int Tiler::Register(char const *path)
+int Tiler::Register(char const *path, int size)
 {
     int id = data->tilesets.MakeSlot(path);
@@ -35 +35 @@
     if (!data->tilesets.GetEntity(id))
     {
-        TileSet *tileset = new TileSet(path);
+        TileSet *tileset = new TileSet(path, size);
         data->tilesets.SetEntity(id, tileset);
     }

trunk/src/tiler.h

@@ -18 +18 @@
 {
 public:
-    static int Register(char const *path);
+    static int Register(char const *path, int size);
     static void Deregister(int id);
 

trunk/src/tileset.cpp

@@ -38 +38 @@
     char *name;
     int *tiles;
-    int nw, nh, ntiles;
+    int size, nw, nh, ntiles;
     float tx, ty;
 
@@ -49 +49 @@
  */
 
-TileSet::TileSet(char const *path)
+TileSet::TileSet(char const *path, int size)
 {
     data = new TileSetData();
@@ -67 +67 @@
     }
 
-    data->nw = data->img->w / 32;
-    data->nh = data->img->h / 32;
+    if (size <= 0) 
+        size = 32;
+
+    data->size = size;
+    data->nw = data->img->w / size;
+    data->nh = data->img->h / size;
     data->ntiles = data->nw * data->nh;
-    data->tx = 32.0f / data->img->w;
-    data->ty = 32.0f / data->img->h;
+    data->tx = (float)size / data->img->w;
+    data->ty = (float)size / data->img->h;
 
     drawgroup = DRAWGROUP_BEFORE;
@@ -121 +125 @@
 
     float sqrt2 = sqrtf(2.0f);
-    int off = o ? 32 : 0;
+    int off = o ? data->size : 0;
+    int dx = data->size;
+    int dy = data->size * 38 / 32; /* Magic... fix this one day */
+    int dy2 = data->size * 70 / 32;
 
     if (!data->img)
@@ -128 +135 @@
         glBegin(GL_QUADS);
             glTexCoord2f(tx, ty);
-            glVertex3f(x, sqrt2 * (y - 38 - off), sqrt2 * (z + off));
+            glVertex3f(x, sqrt2 * (y - dy - off), sqrt2 * (z + off));
             glTexCoord2f(tx + data->tx, ty);
-            glVertex3f(x + 32, sqrt2 * (y - 38 - off), sqrt2 * (z + off));
+            glVertex3f(x + dx, sqrt2 * (y - dy - off), sqrt2 * (z + off));
             glTexCoord2f(tx + data->tx, ty + data->ty);
-            glVertex3f(x + 32, sqrt2 * (y - 70), sqrt2 * z);
+            glVertex3f(x + dx, sqrt2 * (y - dy2), sqrt2 * z);
             glTexCoord2f(tx, ty + data->ty);
-            glVertex3f(x, sqrt2 * (y - 70), sqrt2 * z);
+            glVertex3f(x, sqrt2 * (y - dy2), sqrt2 * z);
         glEnd();
     }

trunk/src/tileset.h

@@ -24 +24 @@
 {
 public:
-    TileSet(char const *path);
+    TileSet(char const *path, int size);
     virtual ~TileSet();