diff --git a/.gitignore b/.gitignore index a314921..ea5f7b4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ main /*.png /texturepacker +/texpack diff --git a/Makefile b/Makefile index e32bd9a..39898b2 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ build: clean .PHONY: texpack texpack: - $(CC) $(CFLAGS) -lSDL2 -lm -lcyaml -L objs/ $(INCLUDES) tools/texturepacker.c -o texpack + $(CC) $(CFLAGS) -lSDL2 -lm -L objs/ $(INCLUDES) tools/texturepacker.c -o texpack .PHONY: run run: build diff --git a/imports/sprites/player/idle.png b/imports/sprites/player/idle.png new file mode 100644 index 0000000..4cf0c43 Binary files /dev/null and b/imports/sprites/player/idle.png differ diff --git a/imports/sprites/player/jump.png b/imports/sprites/player/jump.png new file mode 100644 index 0000000..dff105c Binary files /dev/null and b/imports/sprites/player/jump.png differ diff --git a/imports/sprites/player/land.png b/imports/sprites/player/land.png new file mode 100644 index 0000000..2c24d6f Binary files /dev/null and b/imports/sprites/player/land.png differ diff --git a/imports/sprites/player/run.png b/imports/sprites/player/run.png new file mode 100644 index 0000000..615b222 Binary files /dev/null and b/imports/sprites/player/run.png differ diff --git a/imports/sprites/player/run_cycle/1.png b/imports/sprites/player/run_cycle/1.png deleted file mode 100644 index e1d6052..0000000 Binary files a/imports/sprites/player/run_cycle/1.png and /dev/null differ diff --git a/imports/sprites/player/run_cycle/2.png b/imports/sprites/player/run_cycle/2.png deleted file mode 100644 index d160a54..0000000 Binary files a/imports/sprites/player/run_cycle/2.png and /dev/null differ diff --git a/imports/sprites/player/run_cycle/3.png b/imports/sprites/player/run_cycle/3.png deleted file mode 100644 index de09fed..0000000 Binary files a/imports/sprites/player/run_cycle/3.png and /dev/null differ diff --git a/imports/sprites/player/run_cycle/4.png b/imports/sprites/player/run_cycle/4.png deleted file mode 100644 index 01b6e9b..0000000 Binary files a/imports/sprites/player/run_cycle/4.png and /dev/null differ diff --git a/imports/sprites/player/run_cycle/5.png b/imports/sprites/player/run_cycle/5.png deleted file mode 100644 index 639d03d..0000000 Binary files a/imports/sprites/player/run_cycle/5.png and /dev/null differ diff --git a/imports/sprites/player/run_cycle/6.png b/imports/sprites/player/run_cycle/6.png deleted file mode 100644 index 73bae58..0000000 Binary files a/imports/sprites/player/run_cycle/6.png and /dev/null differ diff --git a/imports/sprites/player/run_cycle/7.png b/imports/sprites/player/run_cycle/7.png deleted file mode 100644 index f34bfdb..0000000 Binary files a/imports/sprites/player/run_cycle/7.png and /dev/null differ diff --git a/imports/sprites/player/run_cycle/8.png b/imports/sprites/player/run_cycle/8.png deleted file mode 100644 index 737279e..0000000 Binary files a/imports/sprites/player/run_cycle/8.png and /dev/null differ diff --git a/tools/texturepacker.c b/tools/texturepacker.c index 9594858..fe13b16 100644 --- a/tools/texturepacker.c +++ b/tools/texturepacker.c @@ -13,7 +13,7 @@ #define STB_IMAGE_WRITE_IMPLEMENTATION #include "stb_image_write.h" -#include "../libs/libcyaml/include/cyaml/cyaml.h" +// #include "../libs/libcyaml/include/cyaml/cyaml.h" typedef struct Image { char* filename; @@ -99,11 +99,7 @@ void writeToAtlas(Image images[], int buf_idx = (buf_row * maxw + buf_col) * channels; int img_idx = (img_row * rect.w + img_col) * channels; for (int j = 0; j < channels; j++) { - if (images[i].imageData[img_idx + 3] != 0) { - buf[buf_idx + j] = images[i].imageData[img_idx + j]; - } else { - buf[buf_idx + 3] = 0xFF; - } + buf[buf_idx + j] = images[i].imageData[img_idx + j]; } img_col++; buf_col++; if (img_col >= rect.w) {