From 3f2113f823f94ca91e93182cc5a2ab6b0ac5cfb6 Mon Sep 17 00:00:00 2001 From: davidovski Date: Tue, 11 Jul 2023 23:24:54 +0100 Subject: tidy saving code --- src/editor.c | 3 --- src/tiledfile.c | 16 ++++++++++++++++ src/tiledfile.h | 4 ++-- 3 files changed, 18 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/editor.c b/src/editor.c index b281300..69162fd 100644 --- a/src/editor.c +++ b/src/editor.c @@ -28,7 +28,6 @@ void modifyTile(Tiled *tiled, int tile) { void setDrawMode(Tiled *tiled, int tile) { mode = tile % tiled->tiledMap.tileCount; if (mode < 0) mode += tiled->tiledMap.tileCount; - printf("mode: %d\n", tiled->tiledMap.tileCount); modifyTile(tiled, mode); } @@ -97,8 +96,6 @@ TiledMap launchEditor(TiledMap tiledMap) { int main() { TiledMap tiledMap = loadTiledMap("map.tiles"); - printf("the top left is %d\n", tiledMap.tilelayout[0]); TiledMap editedTiledMap = launchEditor(tiledMap); - printf("the top left is %d\n", editedTiledMap.tilelayout[0]); saveTiledMap("map.tiles", tiledMap); } diff --git a/src/tiledfile.c b/src/tiledfile.c index 78f9c0e..eaeb814 100644 --- a/src/tiledfile.c +++ b/src/tiledfile.c @@ -111,6 +111,22 @@ TiledMap loadTiledMap(char * filename) { return tiledMap; } +TiledMap newTiledMap(Image atlas, int tileSize, int width, int height) { + TiledMap tiledMap; + tiledMap.width = width; + tiledMap.height = height; + tiledMap.tilelayout = malloc(width * height); + + tiledMap.tileSize = tileSize; + + tiledMap.atlasSize[0] = atlas.width / tileSize; + tiledMap.atlasSize[1] = atlas.height / tileSize; + + tiledMap.atlasData = LoadImageColors(atlas); + + return tiledMap; +} + void saveTiledMap(char * filename, TiledMap tiledMap) { FILE * file; diff --git a/src/tiledfile.h b/src/tiledfile.h index d8c98e9..fb9c789 100644 --- a/src/tiledfile.h +++ b/src/tiledfile.h @@ -12,8 +12,6 @@ typedef struct TiledMap { void textureFromPixels(Texture2D *texOut, Color *pixels, int width, int height); -void renderTilemapTexture(Texture2D *texOut, TiledMap tiledMap); - void setTiledMapTile(TiledMap tiledMap, int pos[2], char tile); char getTiledMapTile(TiledMap tiledMap, int pos[2]); @@ -21,3 +19,5 @@ char getTiledMapTile(TiledMap tiledMap, int pos[2]); TiledMap loadTiledMap(char * filename); void saveTiledMap(char * filename, TiledMap tiledMap); + +TiledMap newTiledMap(Image atlas, int tileSize, int width, int height); -- cgit v1.2.1