added tileset_borderadd, aesthetical changes

2 files changed, 89 insertions, 3 deletions

diff --git a/src/tools/tileset_borderadd.cpp b/src/tools/tileset_borderadd.cpp
new file mode 100644
index 00000000..25e2fa5e
--- /dev/null
+++ b/src/tools/tileset_borderadd.cpp
@@ -0,0 +1,86 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/math.h>
+#include <base/system.h>
+#include <engine/external/pnglite/pnglite.h>
+
+typedef struct
+{
+	unsigned char r, g, b, a;
+} CPixel;
+
+static void TilesetBorderadd(int w, int h, CPixel *pSrc, CPixel *pDest)
+{
+	int TileW = w/16;
+	int TileH = h/16;
+
+	for(int tx = 0; tx < 16; tx++)
+	{
+		for(int ty = 0; ty < 16; ty++)
+		{
+			for(int x = 0; x < TileW + 4; x++)
+			{
+				for(int y = 0; y < TileH + 4; y++)
+				{
+					int SourceX = tx * TileW + clamp(x - 2, 0, TileW - 1);
+					int SourceY = ty * TileH + clamp(y - 2, 0, TileH - 1);
+					int DestX = tx * (TileW + 4) + x;
+					int DestY = ty * (TileH + 4) + y;
+
+					int SourceI = SourceY * w + SourceX;
+					int DestI = DestY * (w + 16 * 4) + DestX;
+
+					pDest[DestI] = pSrc[SourceI];
+
+				}
+			}
+		}
+	}
+}
+
+
+int FixFile(const char *pFileName)
+{
+	png_t Png;
+	CPixel *pBuffer[2] = {0,0};
+
+	png_init(0, 0);
+	png_open_file(&Png, pFileName);
+
+	if(Png.color_type != PNG_TRUECOLOR_ALPHA)
+	{
+		dbg_msg("tileset_borderadd", "%s: not an RGBA image", pFileName);
+		return 1;
+	}
+
+	int w = Png.width;
+	int h = Png.height;
+
+	pBuffer[0] = (CPixel*)mem_alloc(w*h*sizeof(CPixel), 1);
+	pBuffer[1] = (CPixel*)mem_alloc((w+16*4)*(h+16*4)*sizeof(CPixel), 1);
+	png_get_data(&Png, (unsigned char *)pBuffer[0]);
+	png_close_file(&Png);
+
+	TilesetBorderadd(w, h, pBuffer[0], pBuffer[1]);
+
+	// save here
+	png_open_file_write(&Png, pFileName);
+	png_set_data(&Png, w + 16 * 4, h + 16 * 4, 8, PNG_TRUECOLOR_ALPHA, (unsigned char *)pBuffer[1]);
+	png_close_file(&Png);
+
+	return 0;
+}
+
+int main(int argc, const char **argv)
+{
+	dbg_logger_stdout();
+	if(argc == 1)
+	{
+		dbg_msg("Usage", "%s FILE1 [ FILE2... ]", argv[0]);
+		return -1;
+	}
+
+	for(int i = 1; i < argc; i++)
+		FixFile(argv[i]);
+	return 0;
+}
diff --git a/src/tools/tileset_bordercopy.cpp b/src/tools/tileset_bordercopy.cpp
index 14b0ed14..b0d9280b 100644
--- a/src/tools/tileset_bordercopy.cpp
+++ b/src/tools/tileset_bordercopy.cpp
@@ -9,7 +9,7 @@ typedef struct
 	unsigned char r, g, b, a;
 } CPixel;
 
-static void TilesetBorderfix(int w, int h, CPixel *pSrc, CPixel *pDest)
+static void TilesetBordercopy(int w, int h, CPixel *pSrc, CPixel *pDest)
 {
 	int TileW = w/16;
 	int TileH = h/16;
@@ -41,7 +41,7 @@ int FixFile(const char *pFileName)
 
 	if(Png.color_type != PNG_TRUECOLOR_ALPHA)
 	{
-		dbg_msg("tileset_borderfix", "%s: not an RGBA image", pFileName);
+		dbg_msg("tileset_bordercopy", "%s: not an RGBA image", pFileName);
 		return 1;
 	}
 
@@ -53,7 +53,7 @@ int FixFile(const char *pFileName)
 	png_get_data(&Png, (unsigned char *)pBuffer[0]);
 	png_close_file(&Png);
 
-	TilesetBorderfix(w, h, pBuffer[0], pBuffer[1]);
+	TilesetBordercopy(w, h, pBuffer[0], pBuffer[1]);
 
 	// save here
 	png_open_file_write(&Png, pFileName);