diff --git a/Makefile b/Makefile index 57e4fb7..b11ad57 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ build: clean .PHONY: texturepacker texturepacker: - $(CC) $(CFLAGS) $(LDLIBS) $(INCLUDES) $(OBJECTS) tools/texturepacker.c -o texturepacker + $(CC) $(CFLAGS) -lSDL2 -lm -lcyaml -L objs/ $(INCLUDES) tools/texturepacker.c -o texturepacker .PHONY: run run: build diff --git a/assets/character_sprites.yaml b/assets/character_sprites.yaml new file mode 100644 index 0000000..37f0e2e --- /dev/null +++ b/assets/character_sprites.yaml @@ -0,0 +1,8 @@ +animations: + - name: run_cycle + x_pos: 0 + y_pos: 0 + rows: 1 + cols: 8 + width: 384 + height: 48 diff --git a/assets/idle.png b/assets/idle.png deleted file mode 100644 index 4cf0c43..0000000 Binary files a/assets/idle.png and /dev/null differ diff --git a/assets/jump.png b/assets/jump.png deleted file mode 100644 index dff105c..0000000 Binary files a/assets/jump.png and /dev/null differ diff --git a/assets/land.png b/assets/land.png deleted file mode 100644 index 2c24d6f..0000000 Binary files a/assets/land.png and /dev/null differ diff --git a/assets/run.png b/assets/run.png deleted file mode 100644 index 615b222..0000000 Binary files a/assets/run.png and /dev/null differ diff --git a/assets/walk.png b/assets/walk.png deleted file mode 100644 index 653bd2f..0000000 Binary files a/assets/walk.png and /dev/null differ diff --git a/imports/sprites/player/run_cycle/1.png b/imports/sprites/player/run_cycle/1.png new file mode 100644 index 0000000..e1d6052 Binary files /dev/null and b/imports/sprites/player/run_cycle/1.png differ diff --git a/imports/sprites/player/run_cycle/2.png b/imports/sprites/player/run_cycle/2.png new file mode 100644 index 0000000..d160a54 Binary files /dev/null and b/imports/sprites/player/run_cycle/2.png differ diff --git a/imports/sprites/player/run_cycle/3.png b/imports/sprites/player/run_cycle/3.png new file mode 100644 index 0000000..de09fed Binary files /dev/null and b/imports/sprites/player/run_cycle/3.png differ diff --git a/imports/sprites/player/run_cycle/4.png b/imports/sprites/player/run_cycle/4.png new file mode 100644 index 0000000..01b6e9b Binary files /dev/null and b/imports/sprites/player/run_cycle/4.png differ diff --git a/imports/sprites/player/run_cycle/5.png b/imports/sprites/player/run_cycle/5.png new file mode 100644 index 0000000..639d03d Binary files /dev/null and b/imports/sprites/player/run_cycle/5.png differ diff --git a/imports/sprites/player/run_cycle/6.png b/imports/sprites/player/run_cycle/6.png new file mode 100644 index 0000000..73bae58 Binary files /dev/null and b/imports/sprites/player/run_cycle/6.png differ diff --git a/imports/sprites/player/run_cycle/7.png b/imports/sprites/player/run_cycle/7.png new file mode 100644 index 0000000..f34bfdb Binary files /dev/null and b/imports/sprites/player/run_cycle/7.png differ diff --git a/imports/sprites/player/run_cycle/8.png b/imports/sprites/player/run_cycle/8.png new file mode 100644 index 0000000..737279e Binary files /dev/null and b/imports/sprites/player/run_cycle/8.png differ diff --git a/lib.h b/lib.h index 3190371..31744fa 100644 --- a/lib.h +++ b/lib.h @@ -17,6 +17,16 @@ typedef char byte; typedef ptrdiff_t size; typedef size_t usize; +typedef struct Animation { + char* name; + u16 x_pos; + u16 y_pos; + u16 rows; + u16 cols; + u16 width; + u16 height; +} SpriteSheet; + void checkCode(int code, char* errorMsg) { if (code < 0) { fprintf(stderr, "Application Error %i: %s\n", code, errorMsg); diff --git a/main.c b/main.c index 1f405c1..be1f7e5 100644 --- a/main.c +++ b/main.c @@ -6,6 +6,7 @@ #include "cglm/cglm.h" #include "lib.h" #include "stb_image.h" +#include "libcyaml/include/cyaml/cyaml.h" #define PI 3.14159f diff --git a/tools/texturepacker.c b/tools/texturepacker.c index 61d3606..94aef4c 100644 --- a/tools/texturepacker.c +++ b/tools/texturepacker.c @@ -13,6 +13,8 @@ #define STB_IMAGE_WRITE_IMPLEMENTATION #include "stb_image_write.h" +#include "../libs/libcyaml/include/cyaml/cyaml.h" + typedef struct image_t { char* filename; unsigned char* image_data; @@ -219,7 +221,8 @@ int main(int argc, char* argv[]) { //------------------------------------- tex_rect_t* tex_rects = calloc(image_count, sizeof(tex_rect_t)); int size, totalh, maxw; - int max = pack_textures(images, tex_rects, image_count, &size, &totalh, &maxw); + // int max = pack_textures(images, tex_rects, image_count, &size, &totalh, &maxw); + pack_textures(images, tex_rects, image_count, &size, &totalh, &maxw); //------------------------------------- // Now load the data into memory, for now, let's just load all images in one go,