X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_load.c;h=586b804bdab166092747c428bbfd0c78ac3e331f;hb=c0e4a67ba2f001179df6e2cde97370a946669c22;hp=78bd332a472a507e2a7c4e54532554677b349dcd;hpb=6e96ba64e805ea8a39ca46171e28426c6bc86ab6;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_load.c b/world_load.c index 78bd332..586b804 100644 --- a/world_load.c +++ b/world_load.c @@ -45,33 +45,33 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){ mdl_load_animation_block( meta, world->heap ); mdl_load_mesh_block( meta, world->heap ); - /* TODO: Make this a table? */ - mdl_load_array( meta, &world->ent_gate, "ent_gate", heap ); - mdl_load_array( meta, &world->ent_camera, "ent_camera", heap ); - mdl_load_array( meta, &world->ent_spawn, "ent_spawn", heap ); - mdl_load_array( meta, &world->ent_light, "ent_light", heap ); - mdl_load_array( meta, &world->ent_route_node,"ent_route_node", heap ); - mdl_load_array( meta, &world->ent_path_index,"ent_path_index", heap ); - mdl_load_array( meta, &world->ent_checkpoint,"ent_checkpoint", heap ); - mdl_load_array( meta, &world->ent_route, "ent_route", heap ); - mdl_load_array( meta, &world->ent_water, "ent_water", heap ); - mdl_load_array( meta, &world->ent_audio_clip,"ent_audio_clip", heap ); - mdl_load_array( meta, &world->ent_audio, "ent_audio", heap ); - mdl_load_array( meta, &world->ent_volume, "ent_volume", heap ); - mdl_load_array( meta, &world->ent_traffic, "ent_traffic", heap ); - mdl_load_array( meta, &world->ent_marker, "ent_marker", heap ); - mdl_load_array( meta, &world->ent_skateshop, "ent_skateshop", heap ); - mdl_load_array( meta, &world->ent_swspreview,"ent_swspreview", heap ); - mdl_load_array( meta, &world->ent_ccmd, "ent_ccmd", heap ); - mdl_load_array( meta, &world->ent_objective, "ent_objective", heap ); - mdl_load_array( meta, &world->ent_challenge, "ent_challenge", heap ); - mdl_load_array( meta, &world->ent_relay, "ent_relay", heap ); - mdl_load_array( meta, &world->ent_cubemap, "ent_cubemap", heap ); - mdl_load_array( meta, &world->ent_miniworld, "ent_miniworld", heap ); - mdl_load_array( meta, &world->ent_prop, "ent_prop", heap ); + MDL_LOAD_ARRAY( meta, &world->ent_gate, ent_gate, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_camera, ent_camera, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_spawn, ent_spawn, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_light, ent_light, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_route_node,ent_route_node, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_path_index,ent_path_index, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_checkpoint,ent_checkpoint, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_route, ent_route, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_water, ent_water, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_audio_clip,ent_audio_clip, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_audio, ent_audio, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_volume, ent_volume, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_traffic, ent_traffic, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_marker, ent_marker, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_skateshop, ent_skateshop, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_swspreview,ent_swspreview, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_ccmd, ent_ccmd, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_objective, ent_objective, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_challenge, ent_challenge, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_relay, ent_relay, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_cubemap, ent_cubemap, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_miniworld, ent_miniworld, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_prop, ent_prop, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_region, ent_region, heap ); mdl_array_ptr infos; - mdl_load_array( meta, &infos, "ent_worldinfo", vg_mem.scratch ); + MDL_LOAD_ARRAY( meta, &infos, ent_worldinfo, vg_mem.scratch ); world->skybox = k_skybox_default; if( mdl_arrcount(&infos) ){ @@ -109,10 +109,13 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){ * - this is overriden by the save state when(if) it loads */ ent_spawn *rp = world_find_spawn_by_name( world, "start" ); if( !rp ) rp = world_find_closest_spawn( world, (v3f){0.0f,0.0f,0.0f} ); - - /* TODO: fallback to searching for a safe location using raycasts */ - assert(rp); - v3_copy( rp->transform.co, world->player_co ); + if( rp ) + v3_copy( rp->transform.co, world->player_co ); + else{ + /* FIXME: we need to find a safe place to put the player_co using + * raycasts. */ + v3_zero( world->player_co ); + } /* allocate leaderboard buffers */ u32 bs = mdl_arrcount(&world->ent_route)*sizeof(struct leaderboard_cache); @@ -126,6 +129,9 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){ board->data_len = 0; } + world->routes_ui = vg_linear_alloc( heap, + sizeof(struct route_ui)*mdl_arrcount(&world->ent_route) ); + vg_async_call( async_world_postprocess, world, 0 ); vg_async_stall(); } @@ -177,7 +183,7 @@ static void skaterift_world_load_thread( void *_args ){ vg_strnull( &path, path_buf, 4096 ); assert( reg ); - addon_get_content_folder( reg, &path ); + addon_get_content_folder( reg, &path, 1 ); vg_str folder = path; if( !vg_strgood( &folder ) ) { @@ -326,7 +332,7 @@ static int skaterift_load_world_command( int argc, const char *argv[] ){ u32 reg_id = addon_match( &q ); if( reg_id != 0xffffffff ){ - addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id ); + addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id, 0 ); skaterift_change_world_start( reg ); } else { @@ -336,12 +342,16 @@ static int skaterift_load_world_command( int argc, const char *argv[] ){ else { vg_info( "worlds availible to load:\n" ); - for( int i=0; ialias, buf ); - vg_info( " %s\n", buf ); + + if( w->flags & ADDON_REG_HIDDEN ) + vg_info( " %s [hidden]\n", buf ); + else + vg_info( " %s\n", buf ); } }