X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_routes.h;h=99edf267254b51a9896c28eb4761e7bf7b704a65;hb=5f34184cad016aa2f8ea530b3be009703459e981;hp=e47ebe2739f6b0dabc6744fbd3864788b600d95a;hpb=610907ae753bdda202236d52a6fcf77d14d63193;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_routes.h b/world_routes.h index e47ebe2..99edf26 100644 --- a/world_routes.h +++ b/world_routes.h @@ -84,13 +84,17 @@ VG_STATIC void world_routes_time_lap( world_instance *world, ent_route *route ) u32 valid_count=0; for( u32 i=0; icheckpoints_count; i++ ){ - u32 cpid = route->checkpoints_start+(i+route->active_checkpoint); - cpid = cpid % route->checkpoints_count; + u32 cpid = (i+route->active_checkpoint) % route->checkpoints_count; + cpid += route->checkpoints_start; ent_checkpoint *cp = mdl_arritm( &world->ent_checkpoint, cpid ); ent_gate *rg = mdl_arritm( &world->ent_gate, cp->gate_index ); rg = mdl_arritm( &world->ent_gate, rg->target ); + if( i == 1 ){ + route->timing_base = rg->timing_time; + } + if( i == 0 ) start_time = rg->timing_time; else{ @@ -102,7 +106,13 @@ VG_STATIC void world_routes_time_lap( world_instance *world, ent_route *route ) vg_info( "%u %f\n", rg->timing_version, rg->timing_time ); } - if( world_global.current_run_version == last_version+1 ) valid_count ++; + if( world_global.current_run_version == last_version+1 ){ + valid_count ++; + + if( route->checkpoints_count == 1 ){ + route->timing_base = world_global.time; + } + } else valid_count = 0; vg_info( "%u %f\n", world_global.current_run_version, world_global.time ); @@ -113,7 +123,6 @@ VG_STATIC void world_routes_time_lap( world_instance *world, ent_route *route ) } route->valid_checkpoints = valid_count+1; - route->timing_base = start_time; vg_info( "valid: %u\n", valid_count ); vg_info( "----------------------------\n" ); @@ -125,10 +134,19 @@ VG_STATIC void world_routes_time_lap( world_instance *world, ent_route *route ) VG_STATIC void world_routes_activate_entry_gate( world_instance *world, ent_gate *rg ) { - ent_gate *dest = mdl_arritm( &world->ent_gate, rg->target ); - world_global.last_use = world_global.time; + /* disable all routes and leave the world */ + if( rg->type == k_gate_type_nonlocel ){ + for( u32 i=0; ient_route); i++ ){ + ent_route *route = mdl_arritm( &world->ent_route, i ); + route->active_checkpoint = 0xffff; + } + return; + } + + ent_gate *dest = mdl_arritm( &world->ent_gate, rg->target ); + for( u32 i=0; ient_route); i++ ){ ent_route *route = mdl_arritm( &world->ent_route, i ); @@ -210,8 +228,9 @@ VG_STATIC void world_routes_debug( world_instance *world ) } } -VG_STATIC void world_routes_place_curve( world_instance *world, - v4f h[3], v3f n0, v3f n2 ) +VG_STATIC +void world_routes_place_curve( world_instance *world, + v4f h[3], v3f n0, v3f n2, scene_context *scene ) { float t; v3f p, pd; @@ -276,8 +295,8 @@ VG_STATIC void world_routes_place_curve( world_instance *world, struct world_surface *surfa = ray_hit_surface( world, &ha ), *surfb = ray_hit_surface( world, &hb ); - if( (surfa->info.flags & k_material_flag_skate_surface) && - (surfb->info.flags & k_material_flag_skate_surface) ) + if( (surfa->info.flags & k_material_flag_skate_target) && + (surfb->info.flags & k_material_flag_skate_target) ) { scene_vert va, vb; @@ -295,18 +314,18 @@ VG_STATIC void world_routes_place_curve( world_instance *world, vb.uv[0] = t1; vb.uv[1] = 1.0f; - scene_push_vert( world->scene_lines, &va ); - scene_push_vert( world->scene_lines, &vb ); + scene_push_vert( scene, &va ); + scene_push_vert( scene, &vb ); if( last_valid ){ /* Connect them with triangles */ - scene_push_tri( world->scene_lines, (u32[3]){ + scene_push_tri( scene, (u32[3]){ last_valid+0-2, last_valid+1-2, last_valid+2-2} ); - scene_push_tri( world->scene_lines, (u32[3]){ + scene_push_tri( scene, (u32[3]){ last_valid+1-2, last_valid+3-2, last_valid+2-2} ); } - last_valid = world->scene_lines->vertex_count; + last_valid = scene->vertex_count; } else last_valid = 0; @@ -325,7 +344,9 @@ VG_STATIC void world_routes_place_curve( world_instance *world, } } -VG_STATIC void world_routes_create_mesh( world_instance *world, u32 route_id ) +VG_STATIC +void world_routes_create_mesh( world_instance *world, u32 route_id, + scene_context *sc ) { ent_route *route = mdl_arritm( &world->ent_route, route_id ); u32 last_valid = 0; @@ -430,14 +451,14 @@ VG_STATIC void world_routes_create_mesh( world_instance *world, u32 route_id ) v3_normalize( n0 ); v3_normalize( n2 ); - world_routes_place_curve( world, p, n0, n2 ); + world_routes_place_curve( world, p, n0, n2, sc ); /* --- */ v4_copy( p[2], p[0] ); } } - scene_copy_slice( world->scene_lines, &route->sm ); + scene_copy_slice( sc, &route->sm ); } /* @@ -446,7 +467,9 @@ VG_STATIC void world_routes_create_mesh( world_instance *world, u32 route_id ) VG_STATIC void world_routes_generate( world_instance *world ) { vg_info( "Generating route meshes\n" ); - world->scene_lines = scene_init( world_global.generic_heap, 200000, 300000 ); + vg_async_item *call = scene_alloc_async( &world->scene_lines, + &world->mesh_route_lines, + 200000, 300000 ); for( u32 i=0; ient_gate); i++ ){ ent_gate *gate = mdl_arritm( &world->ent_gate, i ); @@ -488,15 +511,9 @@ VG_STATIC void world_routes_generate( world_instance *world ) } for( u32 i=0; ient_route); i++ ) - world_routes_create_mesh( world, i ); - - vg_acquire_thread_sync(); - { - scene_upload( world->scene_lines, &world->mesh_route_lines ); - } - vg_release_thread_sync(); - vg_linear_del( world_global.generic_heap, world->scene_lines ); + world_routes_create_mesh( world, i, &world->scene_lines ); + vg_async_dispatch( call, async_scene_upload ); world_routes_clear( world ); } @@ -556,11 +573,6 @@ VG_STATIC void world_routes_ent_init( world_instance *world ) for( u32 i=0; ient_gate); i++ ){ ent_gate *gate = mdl_arritm( &world->ent_gate, i ); - - vg_info( "ROUTES :: %hu %hu %hu %hu\n", gate->routes[0], - gate->routes[1], - gate->routes[2], - gate->routes[3] ); } world_routes_clear( world ); @@ -575,7 +587,7 @@ VG_STATIC void world_routes_ent_init( world_instance *world ) VG_STATIC void world_routes_init(void) { world_global.current_run_version = 200; - world_global.time = RESET_MAX_TIME*2.0; + world_global.time = 300.0; world_global.last_use = 0.0; shader_scene_route_register(); @@ -846,8 +858,6 @@ VG_STATIC void render_world_routes( world_instance *world, camera *cam, shader_scene_route_uPvmPrev( cam->mtx_prev.pv ); shader_scene_route_uMdl( identity_matrix ); shader_scene_route_uCamera( cam->transform[3] ); - shader_scene_route_uBoard0( TEMP_BOARD_0 ); - shader_scene_route_uBoard1( TEMP_BOARD_1 ); mesh_bind( &world->mesh_route_lines );