diff --git a/demo/main.fnl b/demo/main.fnl index c6c8d41..3290ac1 100644 --- a/demo/main.fnl +++ b/demo/main.fnl @@ -15,8 +15,8 @@ (global init (fn [] (pxl8.load_palette "palettes/gruvbox.ase") + (set logo-sprite (pxl8.load_sprite "sprites/pxl8_logo.ase")))) (set particles (pxl8.particles_new 1000)) - (set logo-sprite (pxl8.load_sprite "sprites/pxl8.ase")))) (global update (fn [dt] (set time (+ time dt)) @@ -52,13 +52,11 @@ (pxl8.particles_update particles dt)))) (global draw (fn [] - (match current-effect + (case current-effect 1 (do (pxl8.clr 0) (when logo-sprite - (pxl8.sprite logo-sprite logo-x logo-y 128 64)) - (pxl8.text "Bouncing Logo" 200 10 15) - (pxl8.text "Press 1-7 for effects" 10 150 7)) + (pxl8.sprite logo-sprite logo-x logo-y 128 64))) 2 (pxl8.vfx_plasma time 0.10 0.04 0) @@ -69,8 +67,7 @@ (local bars [{:base_y 40 :amplitude 20 :height 16 :speed 2.0 :phase 0 :color 14 :fade_color 11} {:base_y 80 :amplitude 15 :height 16 :speed 2.5 :phase 1.5 :color 20 :fade_color 11} {:base_y 120 :amplitude 25 :height 16 :speed 1.8 :phase 3.0 :color 26 :fade_color 11}]) - (pxl8.vfx_raster_bars bars time) - (pxl8.text "Raster Bars" 200 10 15)) + (pxl8.vfx_raster_bars bars time)) 5 (do (pxl8.clr 0) @@ -79,8 +76,7 @@ (pxl8.particles_clear particles) (pxl8.vfx_fire particles 160 140 100 12) (set fire-init true)) - (pxl8.particles_render particles)) - (pxl8.text "Fire Effect Test" 200 10 15)) + (pxl8.particles_render particles))) 6 (do (pxl8.clr 0) @@ -89,8 +85,7 @@ (pxl8.particles_clear particles) (pxl8.vfx_rain particles 320 10.0) (set rain-init true)) - (pxl8.particles_render particles)) - (pxl8.text "Rain" 200 10 15)) + (pxl8.particles_render particles))) 7 (do (pxl8.clr 0) @@ -99,7 +94,6 @@ (pxl8.particles_clear particles) (pxl8.vfx_snow particles 320 5.0) (set snow-init true)) - (pxl8.particles_render particles)) - (pxl8.text "Snow" 200 10 15)) + (pxl8.particles_render particles))) _ (pxl8.clr 0)))) diff --git a/demo/sprites/pxl8_icon.ase b/demo/sprites/pxl8_icon.ase new file mode 100644 index 0000000..03b5a24 Binary files /dev/null and b/demo/sprites/pxl8_icon.ase differ diff --git a/demo/sprites/pxl8.ase b/demo/sprites/pxl8_logo.ase similarity index 100% rename from demo/sprites/pxl8.ase rename to demo/sprites/pxl8_logo.ase diff --git a/src/pxl8.c b/src/pxl8.c index f3bb754..846fc0e 100644 --- a/src/pxl8.c +++ b/src/pxl8.c @@ -8,7 +8,7 @@ #include #include -#include "linenoise.h" +#include #define SDL_MAIN_USE_CALLBACKS #include #include diff --git a/src/pxl8_ase.c b/src/pxl8_ase.c index 359b6e4..c1fb9c0 100644 --- a/src/pxl8_ase.c +++ b/src/pxl8_ase.c @@ -1,4 +1,3 @@ -#include #include #include @@ -7,7 +6,9 @@ #define MINIZ_NO_ARCHIVE_APIS #define MINIZ_NO_ARCHIVE_WRITING_APIS #define MINIZ_NO_DEFLATE_APIS -#include "miniz.h" + +#include +#include #include "pxl8_ase.h" #include "pxl8_io.h" diff --git a/src/pxl8_ase.h b/src/pxl8_ase.h index efaf9ed..2ff3460 100644 --- a/src/pxl8_ase.h +++ b/src/pxl8_ase.h @@ -1,4 +1,5 @@ #pragma once + #include "pxl8_types.h" #define PXL8_ASE_MAGIC 0xA5E0 diff --git a/src/pxl8_blit.h b/src/pxl8_blit.h index 26576a8..fc2b4e3 100644 --- a/src/pxl8_blit.h +++ b/src/pxl8_blit.h @@ -1,7 +1,7 @@ #pragma once -#include "pxl8_types.h" #include "pxl8_simd.h" +#include "pxl8_types.h" static inline bool pxl8_is_simd_aligned(u32 w) { return w >= PXL8_SIMD_WIDTH_U8 && (w % PXL8_SIMD_WIDTH_U8 == 0); diff --git a/src/pxl8_cart.c b/src/pxl8_cart.c index c7bf437..9fefeea 100644 --- a/src/pxl8_cart.c +++ b/src/pxl8_cart.c @@ -1,12 +1,15 @@ -#include "pxl8_cart.h" -#include "pxl8_macros.h" #include #include #include #include #include #include -#include "../lib/miniz/miniz.h" + +#include + +#include "pxl8_cart.h" +#include "pxl8_macros.h" + static pxl8_cart* __pxl8_current_cart = NULL; static char* __pxl8_original_cwd = NULL; diff --git a/src/pxl8_font.c b/src/pxl8_font.c index 5ae5466..08f26ba 100644 --- a/src/pxl8_font.c +++ b/src/pxl8_font.c @@ -1,7 +1,9 @@ -#include "pxl8_font.h" -#include #include +#include + +#include "pxl8_font.h" + pxl8_result pxl8_font_create_atlas(const pxl8_font* font, u8** atlas_data, i32* atlas_width, i32* atlas_height) { if (!font || !atlas_data || !atlas_width || !atlas_height) { return PXL8_ERROR_NULL_POINTER; diff --git a/src/pxl8_gfx.c b/src/pxl8_gfx.c index ab0cf62..9c3b522 100644 --- a/src/pxl8_gfx.c +++ b/src/pxl8_gfx.c @@ -1,9 +1,10 @@ -#include "pxl8_gfx.h" +#include + #include "pxl8_ase.h" +#include "pxl8_blit.h" +#include "pxl8_gfx.h" #include "pxl8_macros.h" #include "pxl8_types.h" -#include "pxl8_blit.h" -#include static u32 pxl8_get_palette_size(pxl8_color_mode mode) { switch (mode) { diff --git a/src/pxl8_gfx.h b/src/pxl8_gfx.h index 5b33ab2..2fe9ac0 100644 --- a/src/pxl8_gfx.h +++ b/src/pxl8_gfx.h @@ -1,10 +1,11 @@ #pragma once #include + #include -#include "pxl8_types.h" #include "pxl8_blit.h" +#include "pxl8_types.h" typedef struct pxl8_atlas_entry { char path[256]; diff --git a/src/pxl8_io.c b/src/pxl8_io.c index 05485c7..8292c17 100644 --- a/src/pxl8_io.c +++ b/src/pxl8_io.c @@ -1,3 +1,5 @@ +#include + #include "pxl8_io.h" pxl8_result pxl8_io_read_file(const char* path, char** content, size_t* size) { diff --git a/src/pxl8_io.h b/src/pxl8_io.h index c15045c..4c0aca4 100644 --- a/src/pxl8_io.h +++ b/src/pxl8_io.h @@ -3,8 +3,6 @@ #include #include -#include - #include "pxl8_types.h" #ifdef __cplusplus diff --git a/src/pxl8_lua.c b/src/pxl8_lua.c index 8a18ac2..c99de63 100644 --- a/src/pxl8_lua.c +++ b/src/pxl8_lua.c @@ -1,8 +1,9 @@ -#include "pxl8_lua.h" -#include "pxl8_vfx.h" -#include "pxl8_macros.h" #include +#include "pxl8_lua.h" +#include "pxl8_macros.h" +#include "pxl8_vfx.h" + static const char* pxl8_ffi_cdefs = "typedef uint8_t u8;\n" "typedef uint16_t u16;\n" diff --git a/src/pxl8_lua.h b/src/pxl8_lua.h index 90a3667..f9ca315 100644 --- a/src/pxl8_lua.h +++ b/src/pxl8_lua.h @@ -4,8 +4,8 @@ #include #include -#include "pxl8_gfx.h" #include "pxl8_types.h" +#include "pxl8_gfx.h" #ifdef __cplusplus extern "C" { diff --git a/src/pxl8_tilemap.c b/src/pxl8_tilemap.c index ced7c65..89323bd 100644 --- a/src/pxl8_tilemap.c +++ b/src/pxl8_tilemap.c @@ -1,9 +1,10 @@ -#include "pxl8_tilemap.h" -#include "pxl8_tilesheet.h" -#include "pxl8_macros.h" #include #include +#include "pxl8_macros.h" +#include "pxl8_tilemap.h" +#include "pxl8_tilesheet.h" + static inline u32 pxl8_chunk_index(u32 x, u32 y, u32 chunks_wide) { return (y >> 4) * chunks_wide + (x >> 4); } diff --git a/src/pxl8_tilemap.h b/src/pxl8_tilemap.h index 2bc08b5..fea4659 100644 --- a/src/pxl8_tilemap.h +++ b/src/pxl8_tilemap.h @@ -1,8 +1,8 @@ #pragma once -#include "pxl8_types.h" #include "pxl8_gfx.h" #include "pxl8_tilesheet.h" +#include "pxl8_types.h" #define PXL8_TILE_SIZE 16 #define PXL8_MAX_TILEMAP_WIDTH 256 diff --git a/src/pxl8_tilesheet.c b/src/pxl8_tilesheet.c index 1bbc686..0b11e30 100644 --- a/src/pxl8_tilesheet.c +++ b/src/pxl8_tilesheet.c @@ -1,10 +1,11 @@ -#include "pxl8_tilesheet.h" -#include "pxl8_tilemap.h" -#include "pxl8_ase.h" -#include "pxl8_macros.h" #include #include +#include "pxl8_ase.h" +#include "pxl8_macros.h" +#include "pxl8_tilesheet.h" +#include "pxl8_tilemap.h" + void pxl8_tilesheet_free(pxl8_tilesheet* tilesheet) { if (!tilesheet) return; diff --git a/src/pxl8_types.h b/src/pxl8_types.h index 60d4022..41dbf58 100644 --- a/src/pxl8_types.h +++ b/src/pxl8_types.h @@ -1,7 +1,7 @@ #pragma once -#include #include +#include #include typedef uint8_t u8; diff --git a/src/pxl8_vfx.c b/src/pxl8_vfx.c index 2b598a6..31cfc6f 100644 --- a/src/pxl8_vfx.c +++ b/src/pxl8_vfx.c @@ -1,9 +1,11 @@ -#include "pxl8_vfx.h" -#include "pxl8_macros.h" #include #include + #include +#include "pxl8_macros.h" +#include "pxl8_vfx.h" + void pxl8_vfx_plasma(pxl8_gfx_ctx* ctx, f32 time, f32 scale1, f32 scale2, u8 palette_offset) { if (!ctx || !ctx->framebuffer) return; diff --git a/src/pxl8_vfx.h b/src/pxl8_vfx.h index ab870a4..79c0061 100644 --- a/src/pxl8_vfx.h +++ b/src/pxl8_vfx.h @@ -1,7 +1,7 @@ #pragma once -#include "pxl8_types.h" #include "pxl8_gfx.h" +#include "pxl8_types.h" typedef struct pxl8_particle { f32 x, y, z;