From 26e855369d90ece30a45f651f21be35270a7307b Mon Sep 17 00:00:00 2001 From: asrael Date: Wed, 15 Apr 2026 00:27:16 -0500 Subject: [PATCH] some more cleanup --- demo3d/client/bsp/demo3d_bsp.c | 17 +---------------- demo3d/client/bsp/demo3d_bsp.h | 13 ++++++++++++- demo3d/client/bsp/demo3d_bsp_render.h | 3 +-- demo3d/client/net/demo3d_net.h | 2 +- src/asset/pxl8_ase.c | 1 + src/core/pxl8_io.c | 1 + src/core/pxl8_io.h | 3 --- src/gfx/pxl8_anim.c | 1 - src/gfx/pxl8_font.c | 1 - src/gfx/pxl8_gfx.h | 1 - src/gfx/pxl8_glows.c | 2 -- src/gfx/pxl8_lightmap.c | 1 - src/gfx/pxl8_lights.c | 2 -- src/gfx/pxl8_mesh.c | 2 +- src/gfx/pxl8_particles.c | 2 -- src/gfx/pxl8_particles.h | 2 +- src/gfx/pxl8_tilemap.c | 1 - src/gfx/pxl8_tilesheet.c | 1 - src/gfx/pxl8_transition.c | 1 - src/gui/pxl8_gui.h | 6 +++--- 20 files changed, 22 insertions(+), 41 deletions(-) diff --git a/demo3d/client/bsp/demo3d_bsp.c b/demo3d/client/bsp/demo3d_bsp.c index 3b9fff7..4d274f9 100644 --- a/demo3d/client/bsp/demo3d_bsp.c +++ b/demo3d/client/bsp/demo3d_bsp.c @@ -2,6 +2,7 @@ #include +#include "pxl8_bytes.h" #include "pxl8_color.h" #include "pxl8_io.h" #include "pxl8_log.h" @@ -328,22 +329,6 @@ void demo3d_bsp_destroy(demo3d_bsp* bsp) { memset(bsp, 0, sizeof(*bsp)); } -i32 demo3d_bsp_find_leaf(const demo3d_bsp* bsp, pxl8_vec3 pos) { - if (!bsp || bsp->num_nodes == 0) return -1; - - i32 node_id = 0; - - while (node_id >= 0) { - const demo3d_bsp_node* node = &bsp->nodes[node_id]; - const demo3d_bsp_plane* plane = &bsp->planes[node->plane_id]; - - f32 dist = pxl8_vec3_dot(pos, plane->normal) - plane->dist; - node_id = node->children[dist < 0 ? 1 : 0]; - } - - return -(node_id + 1); -} - bool demo3d_bsp_is_leaf_visible(const demo3d_bsp* bsp, i32 leaf_from, i32 leaf_to) { if (!bsp || !bsp->visdata || bsp->visdata_size == 0) return true; diff --git a/demo3d/client/bsp/demo3d_bsp.h b/demo3d/client/bsp/demo3d_bsp.h index 8d24259..81ada27 100644 --- a/demo3d/client/bsp/demo3d_bsp.h +++ b/demo3d/client/bsp/demo3d_bsp.h @@ -157,6 +157,18 @@ static inline bool demo3d_bsp_get_edge_vertex(const demo3d_bsp* bsp, i32 surfedg return *out_vert_idx < bsp->num_vertices; } +static inline i32 demo3d_bsp_find_leaf(const demo3d_bsp* bsp, pxl8_vec3 pos) { + if (!bsp || bsp->num_nodes == 0) return -1; + i32 node_id = 0; + while (node_id >= 0) { + const demo3d_bsp_node* node = &bsp->nodes[node_id]; + const demo3d_bsp_plane* plane = &bsp->planes[node->plane_id]; + f32 dist = pxl8_vec3_dot(pos, plane->normal) - plane->dist; + node_id = node->children[dist < 0 ? 1 : 0]; + } + return -(node_id + 1); +} + #ifdef __cplusplus extern "C" { #endif @@ -166,7 +178,6 @@ void demo3d_bsp_destroy(demo3d_bsp* bsp); u32 demo3d_bsp_face_count(const demo3d_bsp* bsp); pxl8_vec3 demo3d_bsp_face_normal(const demo3d_bsp* bsp, u32 face_id); void demo3d_bsp_face_set_material(demo3d_bsp* bsp, u32 face_id, u16 material_id); -i32 demo3d_bsp_find_leaf(const demo3d_bsp* bsp, pxl8_vec3 pos); bool demo3d_bsp_is_leaf_visible(const demo3d_bsp* bsp, i32 leaf_from, i32 leaf_to); demo3d_bsp_lightmap demo3d_bsp_lightmap_mapped(u8 width, u8 height, u32 offset); demo3d_bsp_lightmap demo3d_bsp_lightmap_uniform(u8 r, u8 g, u8 b); diff --git a/demo3d/client/bsp/demo3d_bsp_render.h b/demo3d/client/bsp/demo3d_bsp_render.h index 5af235b..9e19e65 100644 --- a/demo3d/client/bsp/demo3d_bsp_render.h +++ b/demo3d/client/bsp/demo3d_bsp_render.h @@ -2,13 +2,12 @@ #include "demo3d_bsp.h" #include "pxl8_gfx.h" +#include "pxl8_mesh.h" #ifdef __cplusplus extern "C" { #endif -#include "pxl8_mesh.h" - typedef struct demo3d_bsp_render_state { pxl8_gfx_material* materials; pxl8_mesh* mesh; diff --git a/demo3d/client/net/demo3d_net.h b/demo3d/client/net/demo3d_net.h index 60dc312..df180a3 100644 --- a/demo3d/client/net/demo3d_net.h +++ b/demo3d/client/net/demo3d_net.h @@ -1,6 +1,7 @@ #pragma once #include "pxl8_net.h" +#include "demo3d_chunk_cache.h" #include "demo3d_protocol.h" #include "pxl8_types.h" @@ -9,7 +10,6 @@ #define DEMO3D_NET_TICK_RATE 30.0f typedef struct demo3d_world demo3d_world; -typedef struct demo3d_chunk_cache demo3d_chunk_cache; typedef struct demo3d_net { pxl8_net* transport; diff --git a/src/asset/pxl8_ase.c b/src/asset/pxl8_ase.c index dc01cf4..e426f8d 100644 --- a/src/asset/pxl8_ase.c +++ b/src/asset/pxl8_ase.c @@ -11,6 +11,7 @@ #include +#include "pxl8_bytes.h" #include "pxl8_color.h" #include "pxl8_io.h" #include "pxl8_log.h" diff --git a/src/core/pxl8_io.c b/src/core/pxl8_io.c index 47db00b..10ebc3c 100644 --- a/src/core/pxl8_io.c +++ b/src/core/pxl8_io.c @@ -1,6 +1,7 @@ #include "pxl8_io.h" #include "pxl8_mem.h" +#include #include #include diff --git a/src/core/pxl8_io.h b/src/core/pxl8_io.h index 04bf6bd..6c1d5f4 100644 --- a/src/core/pxl8_io.h +++ b/src/core/pxl8_io.h @@ -1,8 +1,5 @@ #pragma once -#include - -#include "pxl8_bytes.h" #include "pxl8_types.h" #ifdef __cplusplus diff --git a/src/gfx/pxl8_anim.c b/src/gfx/pxl8_anim.c index 638848e..41cb589 100644 --- a/src/gfx/pxl8_anim.c +++ b/src/gfx/pxl8_anim.c @@ -1,6 +1,5 @@ #include "pxl8_anim.h" -#include #include #include "pxl8_ase.h" diff --git a/src/gfx/pxl8_font.c b/src/gfx/pxl8_font.c index 3d8ad7b..fd94df2 100644 --- a/src/gfx/pxl8_font.c +++ b/src/gfx/pxl8_font.c @@ -1,7 +1,6 @@ #include "pxl8_font.h" #include "pxl8_mem.h" -#include #include pxl8_result pxl8_font_create_atlas(const pxl8_font* font, u8** atlas_data, i32* atlas_width, i32* atlas_height) { diff --git a/src/gfx/pxl8_gfx.h b/src/gfx/pxl8_gfx.h index 7c74fa1..2786ad1 100644 --- a/src/gfx/pxl8_gfx.h +++ b/src/gfx/pxl8_gfx.h @@ -2,7 +2,6 @@ #include "pxl8_gfx2d.h" #include "pxl8_gfx3d.h" -#include "pxl8_glows.h" #include "pxl8_platform.h" #include "pxl8_colormap.h" #include "pxl8_palette.h" diff --git a/src/gfx/pxl8_glows.c b/src/gfx/pxl8_glows.c index a817bc9..e28e6c0 100644 --- a/src/gfx/pxl8_glows.c +++ b/src/gfx/pxl8_glows.c @@ -3,8 +3,6 @@ #include "pxl8_gfx.h" #include "pxl8_mem.h" -#include - struct pxl8_glows { pxl8_glow* data; u32 capacity; diff --git a/src/gfx/pxl8_lightmap.c b/src/gfx/pxl8_lightmap.c index 4a4ccf8..8b7f340 100644 --- a/src/gfx/pxl8_lightmap.c +++ b/src/gfx/pxl8_lightmap.c @@ -1,7 +1,6 @@ #include "pxl8_lightmap.h" #include "pxl8_mem.h" -#include #include pxl8_lightmap* pxl8_lightmap_create(u32 width, u32 height, u32 scale) { diff --git a/src/gfx/pxl8_lights.c b/src/gfx/pxl8_lights.c index de3d304..c37b5aa 100644 --- a/src/gfx/pxl8_lights.c +++ b/src/gfx/pxl8_lights.c @@ -1,8 +1,6 @@ #include "pxl8_lights.h" #include "pxl8_mem.h" -#include - struct pxl8_lights { pxl8_light* data; u32 capacity; diff --git a/src/gfx/pxl8_mesh.c b/src/gfx/pxl8_mesh.c index 05698ec..3ad0926 100644 --- a/src/gfx/pxl8_mesh.c +++ b/src/gfx/pxl8_mesh.c @@ -1,6 +1,6 @@ #include "pxl8_mem.h" #include "pxl8_mesh.h" -#include + #include pxl8_mesh* pxl8_mesh_create(u32 vertex_capacity, u32 index_capacity) { diff --git a/src/gfx/pxl8_particles.c b/src/gfx/pxl8_particles.c index 5448625..9b2e5e7 100644 --- a/src/gfx/pxl8_particles.c +++ b/src/gfx/pxl8_particles.c @@ -1,7 +1,5 @@ #include "pxl8_particles.h" -#include - #include "pxl8_gfx.h" #include "pxl8_mem.h" #include "pxl8_gfx2d.h" diff --git a/src/gfx/pxl8_particles.h b/src/gfx/pxl8_particles.h index 881b277..95fc5d4 100644 --- a/src/gfx/pxl8_particles.h +++ b/src/gfx/pxl8_particles.h @@ -4,8 +4,8 @@ typedef struct pxl8_gfx pxl8_gfx; typedef struct pxl8_palette pxl8_palette; -typedef struct pxl8_particles pxl8_particles; typedef struct pxl8_rng pxl8_rng; +typedef struct pxl8_particles pxl8_particles; typedef struct pxl8_particle { f32 angle; diff --git a/src/gfx/pxl8_tilemap.c b/src/gfx/pxl8_tilemap.c index 33ceef2..ea25e09 100644 --- a/src/gfx/pxl8_tilemap.c +++ b/src/gfx/pxl8_tilemap.c @@ -1,6 +1,5 @@ #include "pxl8_tilemap.h" -#include #include #include "pxl8_ase.h" diff --git a/src/gfx/pxl8_tilesheet.c b/src/gfx/pxl8_tilesheet.c index 1782220..dc9b89b 100644 --- a/src/gfx/pxl8_tilesheet.c +++ b/src/gfx/pxl8_tilesheet.c @@ -1,6 +1,5 @@ #include "pxl8_tilesheet.h" -#include #include #include "pxl8_ase.h" diff --git a/src/gfx/pxl8_transition.c b/src/gfx/pxl8_transition.c index 5c16266..aca7696 100644 --- a/src/gfx/pxl8_transition.c +++ b/src/gfx/pxl8_transition.c @@ -1,7 +1,6 @@ #include "pxl8_transition.h" #include -#include #include "pxl8_gfx.h" #include "pxl8_log.h" diff --git a/src/gui/pxl8_gui.h b/src/gui/pxl8_gui.h index 4d1180f..56e1fa6 100644 --- a/src/gui/pxl8_gui.h +++ b/src/gui/pxl8_gui.h @@ -4,12 +4,12 @@ #include "pxl8_types.h" typedef struct { + u32 active_id; + bool cursor_clicked; + bool cursor_down; i32 cursor_x; i32 cursor_y; - bool cursor_down; - bool cursor_clicked; u32 hot_id; - u32 active_id; } pxl8_gui_state; #ifdef __cplusplus