From 9fce0cbc46098e0172b137b2027a4a9a77f96920 Mon Sep 17 00:00:00 2001 From: hgn Date: Sat, 5 Jul 2025 20:45:00 +0100 Subject: [PATCH] buggssss --- build.c | 18 ++++++++++++++++++ src/board_maker.c | 2 +- src/font.h | 1 + src/gui.h | 1 + src/player_glide.c | 1 + src/world_entity.c | 2 ++ src/world_gate.c | 1 + src/world_gen.c | 1 + src/world_map.c | 2 +- src/world_render.c | 1 + src/world_sfd.c | 1 + 11 files changed, 29 insertions(+), 2 deletions(-) diff --git a/build.c b/build.c index d219024..731bc10 100644 --- a/build.c +++ b/build.c @@ -505,6 +505,24 @@ void s_dbtest_build(void) int main( int argc, const char *argv[] ) { vg_log_init(); + +#if 0 + vg_stack_allocator s0; + vg_stack_init( &s0, NULL, VG_MB(2), NULL ); + u32 size0; + void *buf0 = vg_file_read( &s0, "content_skaterift/textures/prem.qoi", &size0, 0 ); + vg_mem_dumphex( stdout, buf0, 0, 1024 ); + + vg_stack_allocator s1; + vg_stack_init( &s1, NULL, VG_MB(2), NULL ); + u32 size1; + void *buf1 = vg_file_read( &s1, "content_skaterift/textures/guide_pump.qoi", &size1, 0 ); + + vg_mem_dumphex( stdout, buf1, 0, 1024 ); + + return 0; +#endif + _vg_opt_init( argc, argv ); const char *arg; diff --git a/src/board_maker.c b/src/board_maker.c index e53e803..2a211af 100644 --- a/src/board_maker.c +++ b/src/board_maker.c @@ -112,7 +112,7 @@ const char *_board_maker_template_paths[] = static void _board_maker_load_template( void *_ ) { THREAD_1; - vg_stack_free( &_board_maker.template_stack ); + vg_stack_clear( &_board_maker.template_stack ); mdl_context *mdl = &_board_maker.template_mdl; mdl_open( mdl, _board_maker_template_paths[_board_maker.template_selection], &_board_maker.template_stack ); diff --git a/src/font.h b/src/font.h index c5504c7..c1da41c 100644 --- a/src/font.h +++ b/src/font.h @@ -83,6 +83,7 @@ struct font3d{ static void font3d_load( font3d *font, const char *mdl_path, void *alloc ) { + THREAD_1; mdl_context *mdl = &font->mdl; mdl_open( mdl, mdl_path, alloc ); mdl_load_metadata_block( mdl, alloc ); diff --git a/src/gui.h b/src/gui.h index cf506b2..51ef911 100644 --- a/src/gui.h +++ b/src/gui.h @@ -354,6 +354,7 @@ void gui_register(void) static void gui_init(void) { + THREAD_1; font3d_load( &gui.font, "models/rs_font.mdl", &vg.rtmem ); /* load icons */ diff --git a/src/player_glide.c b/src/player_glide.c index 6c077c3..2063040 100644 --- a/src/player_glide.c +++ b/src/player_glide.c @@ -401,6 +401,7 @@ void player_glide_register(void) void player_glide_bind(void) { + THREAD_1; f32 mass = 0.0f,k_density = 8.0f; m3x3f I; m3x3_zero( I ); diff --git a/src/world_entity.c b/src/world_entity.c index a25d176..18d36ca 100644 --- a/src/world_entity.c +++ b/src/world_entity.c @@ -45,6 +45,8 @@ static void _event_trigger( ent_event *event ); void world_gen_entities_init( world_instance *world ) { + THREAD_1; + /* lights */ for( u32 j=0; jent_light); j ++ ) { diff --git a/src/world_gate.c b/src/world_gate.c index 9e673d2..493ea33 100644 --- a/src/world_gate.c +++ b/src/world_gate.c @@ -48,6 +48,7 @@ void gate_transform_update( ent_gate *gate ) void world_gates_init(void) { + THREAD_1; vg_info( "world_gates_init\n" ); vg_stack_clear( &vg.scratch ); diff --git a/src/world_gen.c b/src/world_gen.c index 5ba4b68..314ef32 100644 --- a/src/world_gen.c +++ b/src/world_gen.c @@ -731,6 +731,7 @@ void async_world_postprocess( void *userdata ) /* Loads textures from the pack file */ void world_gen_load_surfaces( world_instance *world ) { + THREAD_1; if( _world.loader_preview_mode ) { world->texture_count = 0; diff --git a/src/world_map.c b/src/world_map.c index 4488dca..7e9f5bc 100644 --- a/src/world_map.c +++ b/src/world_map.c @@ -391,7 +391,7 @@ void render_world_map(void) v4_copy( route->colour, colour ); v3_muls( colour, 1.6666f, colour ); gui_icon_setcolour( colour ); - respawn_map_draw_icon( &world_map.final_cam, k_gui_icon_rift_run_2d, route->anon.transform.co, 0.5f ); + respawn_map_draw_icon( &world_map.final_cam, k_gui_icon_run, route->anon.transform.co, 0.5f ); } } } diff --git a/src/world_render.c b/src/world_render.c index cc08328..8023f0b 100644 --- a/src/world_render.c +++ b/src/world_render.c @@ -54,6 +54,7 @@ void world_render_register(void) void world_render_init(void) { + THREAD_1; vg_info( "Loading world resources\n" ); vg_stack_clear( &vg.scratch ); diff --git a/src/world_sfd.c b/src/world_sfd.c index 9a39a9a..04a0585 100644 --- a/src/world_sfd.c +++ b/src/world_sfd.c @@ -310,6 +310,7 @@ void sfd_render( world_instance *world, vg_camera *cam, m4x3f transform ) void world_sfd_init(void) { + THREAD_1; vg_info( "world_sfd_init\n" ); vg_stack_clear( &vg.scratch ); -- 2.25.1