X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_routes.h;h=bb344ed4383db7416dfcfdde84660ba821e1f6a0;hb=38e07d851915d4ea3d25eeb28a3ace78fb0d1c12;hp=05ef3c9586a8094634ed20e448ca6236d4b5b72a;hpb=dd5c7c307f156768189af84603ec6f1f3b887bb4;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_routes.h b/world_routes.h index 05ef3c9..bb344ed 100644 --- a/world_routes.h +++ b/world_routes.h @@ -8,6 +8,8 @@ #include #include "world.h" #include "world_gate.h" +#include "font.h" +#include "pointcloud.h" #if 0 #include "shaders/vblend.h" @@ -35,14 +37,18 @@ void world_routes_local_set_record( world_instance *world, ent_route *route, temp.points = 0; temp.time = time_centiseconds; +#if 0 highscores_push_record( &temp ); +#endif struct track_info *ti = &track_infos[ route->official_track_id ]; ti->push = 1; if( ti->achievement_id ){ +#if 0 steam_set_achievement( ti->achievement_id ); steam_store_achievements(); +#endif } } else{ @@ -55,7 +61,7 @@ VG_STATIC void world_routes_clear( world_instance *world ) { for( u32 i=0; ient_route ); i++ ){ ent_route *route = mdl_arritm( &world->ent_route, i ); - route->active_checkpoint = 0xffffffff; + route->active_checkpoint = 0xffff; } for( u32 i=0; ient_gate ); i++ ){ @@ -73,35 +79,53 @@ VG_STATIC void world_routes_time_lap( world_instance *world, ent_route *route ) vg_info( "------- time lap %s -------\n", mdl_pstr(&world->meta,route->pstr_name) ); - double total_time = 0.0; - u32 last_version; - int validated = 1; + double start_time = 0.0; + u32 last_version=0; + + 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 ) - total_time = rg->timing_time; + start_time = rg->timing_time; else{ - if( last_version+1 != rg->timing_version ) - validated = 0; + if( last_version+1 == rg->timing_version ) valid_count ++; + else valid_count = 0; } last_version = rg->timing_version; vg_info( "%u %f\n", rg->timing_version, rg->timing_time ); } + 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 ); - if( validated && (world_global.current_run_version == last_version+1)){ - total_time = world_global.time - total_time; - world_routes_local_set_record( world, route, total_time ); + if( valid_count==route->checkpoints_count ){ + double lap_time = world_global.time - start_time; + world_routes_local_set_record( world, route, lap_time ); } + + route->valid_checkpoints = valid_count+1; + + vg_info( "valid: %u\n", valid_count ); vg_info( "----------------------------\n" ); } @@ -111,15 +135,24 @@ 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 ); u32 active_prev = route->active_checkpoint; - route->active_checkpoint = 0xffffffff; + route->active_checkpoint = 0xffff; for( u32 j=0; j<4; j++ ){ if( dest->routes[j] == i ){ @@ -128,7 +161,8 @@ VG_STATIC void world_routes_activate_entry_gate( world_instance *world, route->checkpoints_start+k ); ent_gate *gk = mdl_arritm( &world->ent_gate, cp->gate_index ); - if( gk == rg ){ + gk = mdl_arritm( &world->ent_gate, gk->target ); + if( gk == dest ){ route->active_checkpoint = k; world_routes_time_lap( world, route ); break; @@ -160,7 +194,7 @@ VG_STATIC void world_routes_debug( world_instance *world ) 0xff5442f5 }; u32 cc = 0xffcccccc; - if( route->active_checkpoint != 0xffffffff ){ + if( route->active_checkpoint != 0xffff ){ cc = colours[i%vg_list_size(colours)]; } @@ -195,12 +229,53 @@ VG_STATIC void world_routes_debug( world_instance *world ) } } -VG_STATIC void world_routes_place_curve( world_instance *world, - v4f h[4], v3f n0, v3f n2 ) +VG_STATIC +void world_routes_pointcloud_spot( world_instance *world, + pointcloud_buffer *pcbuf, + v3f co, f32 radius, u32 samples, v4f colour ) +{ + v3f inv_ext; + v3_sub( pcbuf->boundary[1], pcbuf->boundary[0], inv_ext ); + v3_div( (v3f){1.0f,1.0f,1.0f}, inv_ext, inv_ext ); + + for( u32 j=0; jcount >= pcbuf->max ) + return; + + pointcloud_vert *vert = &pcbuf->buf[ pcbuf->count ++ ]; + + v3f sample, jitter, point; + vg_rand_sphere( jitter ); + v3_muladds( co, jitter, radius, sample ); + + if( bh_closest_point( world->geo_bh, sample, point, radius*1.5f ) == -1 ){ + v3_copy( sample, point ); + } + + v3f pos; + v3_sub( point, pcbuf->boundary[0], pos ); + v3_mul( pos, inv_ext, pos ); + + for( u32 i=0; i<3; i++ ){ + vert->pos[i] = (pos[i]-0.5f) * 32767.0f; + } + + float dist = 1.0f-(v3_length(jitter)); + + for( u32 i=0; i<4; i++ ){ + vert->colour[i] = colour[i] * 255.0f * dist*dist; + } + } +} + +VG_STATIC +void world_routes_place_curve( world_instance *world, ent_route *route, + v4f h[3], v3f n0, v3f n2, scene_context *scene, + pointcloud_buffer *pcbuf ) { float t; v3f p, pd; - int last_valid; + int last_valid=0; float total_length = 0.0f, travel_length = 0.0; @@ -253,35 +328,53 @@ VG_STATIC void world_routes_place_curve( world_instance *world, ray_hit ha, hb; ha.dist = 8.0f; hb.dist = 8.0f; - if( ray_world( world, sa, down, &ha ) && - ray_world( world, sb, down, &hb )) - { - scene_vert va, vb; - - v3_muladds( ha.pos, up, 0.06f, va.co ); - v3_muladds( hb.pos, up, 0.06f, vb.co ); - - scene_vert_pack_norm( &va, up ); - scene_vert_pack_norm( &vb, up ); - - float t1 = (travel_length / total_length) * patch_count; - va.uv[0] = t1; - va.uv[1] = 0.0f; - vb.uv[0] = t1; - vb.uv[1] = 1.0f; - - scene_push_vert( world->scene_lines, &va ); - scene_push_vert( world->scene_lines, &vb ); - - if( last_valid ){ - /* Connect them with triangles */ - scene_push_tri( world->scene_lines, (u32[3]){ - last_valid+0-2, last_valid+1-2, last_valid+2-2} ); - scene_push_tri( world->scene_lines, (u32[3]){ - last_valid+1-2, last_valid+3-2, last_valid+2-2} ); + + int resa = ray_world( world, sa, down, &ha ), + resb = ray_world( world, sb, down, &hb ); + + if( resa ){ + world_routes_pointcloud_spot( world, pcbuf, ha.pos, + 12.0f, 10, route->colour ); + } + + if( resa && resb ){ + struct world_surface *surfa = ray_hit_surface( world, &ha ), + *surfb = ray_hit_surface( world, &hb ); + + if( (surfa->info.flags & k_material_flag_skate_target) && + (surfb->info.flags & k_material_flag_skate_target) ) + { + scene_vert va, vb; + + float gap = vg_fractf(cur_x*0.5f)*0.02f; + + v3_muladds( ha.pos, up, 0.06f+gap, va.co ); + v3_muladds( hb.pos, up, 0.06f+gap, vb.co ); + + scene_vert_pack_norm( &va, up ); + scene_vert_pack_norm( &vb, up ); + + float t1 = (travel_length / total_length) * patch_count; + va.uv[0] = t1; + va.uv[1] = 0.0f; + vb.uv[0] = t1; + vb.uv[1] = 1.0f; + + scene_push_vert( scene, &va ); + scene_push_vert( scene, &vb ); + + if( last_valid ){ + /* Connect them with triangles */ + scene_push_tri( scene, (u32[3]){ + last_valid+0-2, last_valid+1-2, last_valid+2-2} ); + scene_push_tri( scene, (u32[3]){ + last_valid+1-2, last_valid+3-2, last_valid+2-2} ); + } + + last_valid = scene->vertex_count; } - - last_valid = world->scene_lines->vertex_count; + else + last_valid = 0; } else last_valid = 0; @@ -297,9 +390,17 @@ 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_gen_meshes( world_instance *world, u32 route_id, + scene_context *sc, + pointcloud_buffer *pcbuf ) { ent_route *route = mdl_arritm( &world->ent_route, route_id ); + u8 colour[4]; + colour[0] = route->colour[0] * 255.0f; + colour[1] = route->colour[1] * 255.0f; + colour[2] = route->colour[2] * 255.0f; + colour[3] = route->colour[3] * 255.0f; + u32 last_valid = 0; for( int i=0; icheckpoints_count; i++ ){ @@ -312,13 +413,14 @@ VG_STATIC void world_routes_create_mesh( world_instance *world, u32 route_id ) ent_gate *start_gate = mdl_arritm( &world->ent_gate, c0->gate_index ); start_gate = mdl_arritm( &world->ent_gate, start_gate->target ); - ent_gate *end_gate = mdl_arritm( &world->ent_gate, c1->gate_index ); + ent_gate *end_gate = mdl_arritm( &world->ent_gate, c1->gate_index ), + *collector = mdl_arritm( &world->ent_gate, end_gate->target ); v4f p[3]; v3_add( (v3f){0.0f,0.1f,0.0f}, start_gate->co[0], p[0] ); p[0][3] = start_gate->ref_count; - p[0][3] -= (float)start_gate->ref_total * 0.5f; + p[0][3] -= (float)start_gate->route_count * 0.5f; start_gate->ref_count ++; if( !c0->path_count ) @@ -377,9 +479,13 @@ VG_STATIC void world_routes_create_mesh( world_instance *world, u32 route_id ) else{ v3_copy( end_gate->co[0], p[2] ); v3_add( (v3f){0.0f,0.1f,0.0f}, p[2], p[2] ); - p[2][3] = end_gate->ref_count; - p[2][3] -= (float)end_gate->ref_total * 0.5f; - end_gate->ref_count ++; + p[2][3] = collector->ref_count; + + if( i == route->checkpoints_count-1) + p[2][3] -= 1.0f; + + p[2][3] -= (float)collector->route_count * 0.5f; + //collector->ref_count ++; } /* p0,p1,p2 bezier patch is complete @@ -397,14 +503,206 @@ 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, route, p, n0, n2, sc, pcbuf ); /* --- */ v4_copy( p[2], p[0] ); } } - scene_copy_slice( world->scene_lines, &route->sm ); + scene_copy_slice( sc, &route->sm ); +} + +VG_STATIC +struct world_surface *world_tri_index_surface( world_instance *world, + u32 index ); + +VG_STATIC f64 world_routes_scatter_surface_points( world_instance *world, + pointcloud_buffer *pcbuf, + f32 rate ) +{ + static f32 densities[] = { + [k_surface_prop_concrete] = 2.0f, + [k_surface_prop_grass] = 0.8f, + [k_surface_prop_metal] = 1.0f, + [k_surface_prop_wood] = 2.5f, + [k_surface_prop_tiles] = 4.0f + }; + + /* calculate total area */ + f64 total_area = 0.0f; + for( u32 i=0; iscene_geo.indice_count/3; i++ ){ + u32 *tri = &world->scene_geo.arrindices[i*3]; + struct world_surface *surf = world_tri_index_surface( world, tri[0] ); + + if( surf->info.shader == k_shader_boundary || + surf->info.shader == k_shader_invisible ) continue; + + if( !(surf->info.flags & k_material_flag_preview_visibile) ) continue; + + scene_vert *va = &world->scene_geo.arrvertices[tri[0]], + *vb = &world->scene_geo.arrvertices[tri[1]], + *vc = &world->scene_geo.arrvertices[tri[2]]; + + v3f v0, v1, vn; + v3_sub( vb->co, va->co, v0 ); + v3_sub( vc->co, va->co, v1 ); + v3_cross( v0, v1, vn ); + if( vn[1] < 0.0f ) continue; + + f32 density = 1.0f; + if( surf->info.surface_prop < vg_list_size(densities) ) + density = densities[surf->info.surface_prop]; + total_area += v3_length(vn)*0.5f*density; + } + + f32 accum = 0.0f; + + u8 colour[] = { 80,80,80,255 }; + v3f light_dir = {0.3f,0.8f,0.1f}; + v3_normalize( light_dir ); + + v3f inv_ext; + v3_sub( pcbuf->boundary[1], pcbuf->boundary[0], inv_ext ); + v3_div( (v3f){1.0f,1.0f,1.0f}, inv_ext, inv_ext ); + + for( u32 i=0; iscene_geo.indice_count/3; i++ ){ + u32 *tri = &world->scene_geo.arrindices[i*3]; + struct world_surface *surf = world_tri_index_surface( world, tri[0] ); + + if( surf->info.shader == k_shader_boundary || + surf->info.shader == k_shader_invisible ) continue; + + if( !(surf->info.flags & k_material_flag_preview_visibile) ) continue; + + scene_vert *va = &world->scene_geo.arrvertices[tri[0]], + *vb = &world->scene_geo.arrvertices[tri[1]], + *vc = &world->scene_geo.arrvertices[tri[2]]; + + v3f v0, v1, vn; + v3_sub( vb->co, va->co, v0 ); + v3_sub( vc->co, va->co, v1 ); + v3_cross( v0, v1, vn ); + if( vn[1] < 0.0f ) continue; + + f32 density = 1.0f; + if( surf->info.surface_prop < vg_list_size(densities) ) + density = densities[surf->info.surface_prop]; + + f32 area = v3_length(vn)*0.5f*density; + accum += area; + + v3_normalize( vn ); + + while( accum > rate ){ + accum -= rate; + + if( pcbuf->count >= pcbuf->max ) return total_area; + + v2f co = { vg_randf64(), vg_randf64() }; + if( v2_length2(co) > 0.5f ){ + co[0] = 1.0f-co[0]; + co[1] = 1.0f-co[1]; + } + + v3f pt; + v3_muls( v0, co[0], pt ); + v3_muladds( pt, v1, co[1], pt ); + v3_add( va->co, pt, pt ); + + if( pt[1] < world->water.height ) continue; + pointcloud_vert *vert = &pcbuf->buf[ pcbuf->count ++ ]; + + v3f pos; + v3_sub( pt, pcbuf->boundary[0], pos ); + v3_mul( pos, inv_ext, pos ); + + for( u32 i=0; i<3; i++ ){ + vert->pos[i] = (pos[i]-0.5f) * 32767.0f; + } + + static v4f colours[] = { + [k_surface_prop_concrete] = { 0.13, 0.15, 0.17, 1.0 }, + [k_surface_prop_grass] = { 0.07, 0.1, 0.14, 1.0 }, + [k_surface_prop_metal] = { 0.15, 0.19, 0.22, 1.0 }, + [k_surface_prop_wood] = { 0.1, 0.13, 0.17, 1.0 }, + [k_surface_prop_tiles] = { 0.05, 0.06, 0.07, 1.0 }, + }; + + v4f col = {0.0f,0.0f,0.0f,0.0f}; + if( surf->info.surface_prop < vg_list_size(colours) ){ + v4_copy( colours[surf->info.surface_prop], col ); + } + + f32 brightness = v3_dot(vn,light_dir)*0.5f+0.5f; + v3_muls( col, brightness, col ); + + for( u32 j=0; j<4; j++ ){ + vert->colour[j] = col[j] * 255.0f; + } + } + } + + return total_area; +} + +VG_STATIC void world_routes_surface_grid( world_instance *world, + pointcloud_buffer *pcbuf ) +{ + i32 const k_gridlines = 63, + k_gridres = 255; + + v3f inv_ext; + v3_sub( pcbuf->boundary[1], pcbuf->boundary[0], inv_ext ); + v3_div( (v3f){1.0f,1.0f,1.0f}, inv_ext, inv_ext ); + v4f colour = {0.2f,0.2f,0.2f,1.0f}; + + for( u32 k=0; k<2; k++ ){ + u32 a = k*2, + b = (k^0x1)*2; + + for( i32 x=0; x<=k_gridlines; x++ ){ + f32 t = (float)x / (float)k_gridlines, + px = vg_lerpf( pcbuf->boundary[0][a], pcbuf->boundary[1][a], t ); + + for( i32 z=0; z<=k_gridres; z++ ){ + f32 tz = (float)z / (float)k_gridres, + pz = vg_lerpf(pcbuf->boundary[0][b],pcbuf->boundary[1][b], tz); + + v3f ro; + ro[a] = px; + ro[1] = 1000.0f; + ro[b] = pz; + + ray_hit hit; + hit.dist = INFINITY; + + if( ray_world( world, ro, (v3f){0.0f,-1.0f,0.0f}, &hit )){ + struct world_surface *m1 = ray_hit_surface( world, &hit ); + + if( world->water.enabled ) + if( hit.pos[1] < world->water.height ) + continue; + + if( pcbuf->count >= pcbuf->max ) return; + + pointcloud_vert *vert = &pcbuf->buf[ pcbuf->count ++ ]; + + v3f co; + v3_sub( hit.pos, pcbuf->boundary[0], co ); + v3_mul( co, inv_ext, co ); + + for( u32 i=0; i<3; i++ ){ + vert->pos[i] = (co[i]-0.5f) * 32767.0f; + } + + for( u32 i=0; i<4; i++ ){ + vert->colour[i] = colour[i] * 255.0f; + } + } + } + } + } } /* @@ -413,16 +711,36 @@ 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_stall(); + + vg_rand_seed( 2000 ); + vg_async_item *call_scene = scene_alloc_async( &world->scene_lines, + &world->mesh_route_lines, + 200000, 300000 ); + vg_async_item *call_pointcloud = vg_async_alloc( + sizeof(pointcloud_buffer) + + sizeof(pointcloud_vert)*POINTCLOUD_POINTS ); + pointcloud_buffer *pcbuf = call_pointcloud->payload; + pcbuf->count = 0; + pcbuf->max = POINTCLOUD_POINTS; + pcbuf->op = k_pointcloud_op_clear; + + v3f ext, mid, v0; + v3_sub( world->scene_geo.bbx[1], world->scene_geo.bbx[0], ext ); + f32 maxe = v3_maxf( ext ); + v3_fill( v0, maxe * 0.5f ); + v3_muladds( world->scene_geo.bbx[0], ext, 0.5f, mid ); + v3_add( mid, v0, pcbuf->boundary[1] ); + v3_sub( mid, v0, pcbuf->boundary[0] ); for( u32 i=0; ient_gate); i++ ){ ent_gate *gate = mdl_arritm( &world->ent_gate, i ); gate->ref_count = 0; - gate->ref_total = 0; + gate->route_count = 0; } for( u32 i=0; ient_route_node); i++ ){ - ent_route_node *rn = mdl_arritm( &world->ent_route, i ); + ent_route_node *rn = mdl_arritm( &world->ent_route_node, i ); rn->ref_count = 0; rn->ref_total = 0; } @@ -439,9 +757,7 @@ VG_STATIC void world_routes_generate( world_instance *world ) ent_gate *start_gate = mdl_arritm( &world->ent_gate, c0->gate_index ); start_gate = mdl_arritm( &world->ent_gate, start_gate->target ); - - ent_gate *end_gate = mdl_arritm( &world->ent_gate, c1->gate_index ); - start_gate->ref_total ++; + start_gate->route_count ++; if( !c0->path_count ) continue; @@ -452,25 +768,21 @@ VG_STATIC void world_routes_generate( world_instance *world ) ent_route_node *rn = mdl_arritm( &world->ent_route_node, index->index ); rn->ref_total ++; - - if( j+1 < c0->path_count ){ - } - else{ - end_gate->ref_total ++; - } } } } - 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 ); + for( u32 i=0; ient_route); i++ ){ + world_routes_gen_meshes( world, i, &world->scene_lines, pcbuf ); } - vg_release_thread_sync(); - vg_linear_del( world_global.generic_heap, world->scene_lines ); + + f64 area = 0.0; + area = world_routes_scatter_surface_points( world, pcbuf, 16.0f ); + world_routes_surface_grid( world, pcbuf ); + vg_info( "Distrubuted %u points over %fkm^2!\n", pcbuf->count, area/1e6f ); + + vg_async_dispatch( call_scene, async_scene_upload ); + vg_async_dispatch( call_pointcloud, async_pointcloud_sub ); world_routes_clear( world ); } @@ -516,6 +828,10 @@ VG_STATIC void world_routes_ent_init( world_instance *world ) gate = mdl_arritm(&world->ent_gate, gate->target ); for( u32 k=0; k<4; k++ ){ + if( gate->routes[k] == i ){ + vg_error( "already assigned route to gate\n" ); + break; + } if( gate->routes[k] == 0xffff ){ gate->routes[k] = i; break; @@ -525,6 +841,10 @@ 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 ); + } + world_routes_clear( world ); } @@ -537,7 +857,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(); @@ -551,9 +871,58 @@ VG_STATIC void world_routes_update( world_instance *world ) for( u32 i=0; ient_route); i++ ){ ent_route *route = mdl_arritm( &world->ent_route, i ); - int target = route->active_checkpoint == 0xffffffff? 0: 1; + int target = route->active_checkpoint == 0xffff? 0: 1; route->factive = vg_lerpf( route->factive, target, 0.6f*vg.time_delta ); } + + for( u32 i=0; iobj, VG__RED ); + } +} + +VG_STATIC void world_routes_fixedupdate( world_instance *world ) +{ + rb_solver_reset(); + + for( u32 i=0; iobj.rb.to_world, + &particle->obj.inf.sphere, + NULL, &world->rb_geo.inf.scene, buf ); + + for( int j=0; jobj.rb; + buf[j].rbb = &world->rb_geo.rb; + } + + rb_contact_count += l; + } + } + + rb_presolve_contacts( rb_contact_buffer, rb_contact_count ); + + for( int i=0; iobj.rb ); + } + + for( u32 i=0; iobj.rb ); + } } VG_STATIC void bind_terrain_noise(void); @@ -564,7 +933,182 @@ VG_STATIC void world_bind_light_index( world_instance *world, GLuint shader, GLuint location, int slot ); -VG_STATIC void render_world_routes( world_instance *world, camera *cam ) +VG_STATIC void world_routes_update_timer_texts( world_instance *world ) +{ + world_global.timer_text_count = 0; + + for( u32 i=0; ient_route); i++ ){ + ent_route *route = mdl_arritm( &world->ent_route, i ); + + if( route->active_checkpoint != 0xffff ){ + u32 next = route->active_checkpoint+1; + next = next % route->checkpoints_count; + next += route->checkpoints_start; + + ent_checkpoint *cp = mdl_arritm( &world->ent_checkpoint, next ); + ent_gate *gate = mdl_arritm( &world->ent_gate, cp->gate_index ); + ent_gate *dest = mdl_arritm( &world->ent_gate, gate->target ); + + u32 j=0; + for( ; j<4; j++ ){ + if( dest->routes[j] == i ){ + break; + } + } + + float h0 = 0.8f, + h1 = 1.2f, + depth = 0.4f, + size = 0.4f; + + struct timer_text *text = + &world_global.timer_texts[ world_global.timer_text_count ++ ]; + + text->gate = gate; + text->route = route; + + if( route->valid_checkpoints >= route->checkpoints_count ){ + double lap_time = world_global.time - route->timing_base, + time_centiseconds = lap_time * 100.0; + + if( time_centiseconds > (float)0xfffe ) time_centiseconds = 0.0; + + u16 centiseconds = time_centiseconds, + seconds = centiseconds / 100, + minutes = seconds / 60; + + centiseconds %= 100; + seconds %= 60; + minutes %= 60; + + if( minutes > 9 ) minutes = 9; + + int j=0; + if( minutes ){ + highscore_intr( text->text, minutes, 1, ' ' ); j++; + text->text[j++] = ':'; + } + + if( seconds >= 10 || minutes ){ + highscore_intr( text->text+j, seconds, 2, '0' ); j+=2; + } + else{ + highscore_intr( text->text+j, seconds, 1, '0' ); j++; + } + + text->text[j++] = '.'; + highscore_intr( text->text+j, centiseconds, 1, '0' ); j++; + text->text[j] = '\0'; + } + else{ + highscore_intr( text->text, route->valid_checkpoints, 1, ' ' ); + text->text[1] = '/'; + highscore_intr( text->text+2, route->checkpoints_count+1, 1, ' ' ); + text->text[3] = '\0'; + } + + float align_r = font3d_string_width( &world_global.font, 0, + text->text ); + align_r *= size; + + v3f positions[] = { + { -0.92f, h0, depth }, + { 0.92f - align_r, h0, depth }, + { -0.92f, h1, depth }, + { 0.92f - align_r, h1, depth }, + }; + + if( dest->route_count == 1 ){ + positions[0][0] = -align_r*0.5f; + positions[0][1] = h1; + } + + m3x3_copy( gate->to_world, text->transform ); + float ratio = v3_length(text->transform[0]) / + v3_length(text->transform[1]); + + m3x3_scale( text->transform, (v3f){ size, size*ratio, 0.1f } ); + m4x3_mulv( gate->to_world, positions[j], text->transform[3] ); + } + } +} + +VG_STATIC void world_routes_fracture( world_instance *world, ent_gate *gate, + v3f imp_co, v3f imp_v ) +{ + world_global.text_particle_count = 0; + + for( u32 i=0; igate != gate ) continue; + + m4x3f transform; + m4x3_mul( gate->transport, text->transform, transform ); + + v3f co, s; + v4f q; + m4x3_decompose( transform, co, q, s ); + + v3f offset; + v3_zero( offset ); + + v4f colour; + float brightness = 0.3f + world->ub_lighting.g_day_phase; + v3_muls( text->route->colour, brightness, colour ); + colour[3] = 1.0f-text->route->factive; + + for( u32 j=0;; j++ ){ + char c = text->text[j]; + if( !c ) break; + + ent_glyph *glyph = font3d_glyph( &world_global.font, 0, c ); + if( !glyph ) continue; + + if( c >= (u32)'0' && c <= (u32)'9' && glyph->indice_count ){ + struct text_particle *particle = + &world_global.text_particles[world_global.text_particle_count++]; + + particle->glyph = glyph; + v4_copy( colour, particle->colour ); + + v3f origin; + v2_muls( glyph->size, 0.5f, origin ); + origin[2] = -0.5f; + + v3f world_co; + + v3_add( offset, origin, world_co ); + m4x3_mulv( transform, world_co, world_co ); + + float r = vg_maxf( s[0]*glyph->size[0], s[1]*glyph->size[1] )*0.5f; + + m3x3_identity( particle->mlocal ); + m3x3_scale( particle->mlocal, s ); + origin[2] *= s[2]; + v3_muls( origin, -1.0f, particle->mlocal[3] ); + + v3_copy( world_co, particle->obj.rb.co ); + v3_muls( imp_v, 1.0f+vg_randf64(), particle->obj.rb.v ); + particle->obj.rb.v[1] += 2.0f; + + v4_copy( q, particle->obj.rb.q ); + particle->obj.rb.w[0] = vg_randf64()*2.0f-1.0f; + particle->obj.rb.w[1] = vg_randf64()*2.0f-1.0f; + particle->obj.rb.w[2] = vg_randf64()*2.0f-1.0f; + + particle->obj.type = k_rb_shape_sphere; + particle->obj.inf.sphere.radius = r*0.6f; + + rb_init_object( &particle->obj ); + } + offset[0] += glyph->size[0]; + } + } +} + +VG_STATIC void render_world_routes( world_instance *world, camera *cam, + int layer_depth ) { m4x3f identity_matrix; m4x3_identity( identity_matrix ); @@ -584,8 +1128,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 ); @@ -600,6 +1142,53 @@ VG_STATIC void render_world_routes( world_instance *world, camera *cam ) mdl_draw_submesh( &route->sm ); } + /* timers + * ---------------------------------------------------- */ + if( layer_depth == 0 ){ + font3d_bind( &world_global.font, cam ); + + for( u32 i=0; iub_lighting.g_day_phase; + v3_muls( text->route->colour, brightness, colour ); + colour[3] = 1.0f-text->route->factive; + + shader_model_font_uColour( colour ); + font3d_simple_draw( &world_global.font, 0, text->text, + cam, text->transform ); + } + + shader_model_font_uOffset( (v4f){0.0f,0.0f,0.0f,1.0f} ); + + for( u32 i=0; imdl, prev_mtx ); + m4x4_mul( cam->mtx_prev.pv, prev_mtx, prev_mtx ); + + shader_model_font_uPvmPrev( prev_mtx ); + + v4f q; + m4x3f model; + rb_extrapolate( &particle->obj.rb, model[3], q ); + q_m3x3( q, model ); + + m4x3_mul( model, particle->mlocal, particle->mdl ); + shader_model_font_uMdl( particle->mdl ); + shader_model_font_uColour( particle->colour ); + + mesh_drawn( particle->glyph->indice_start, + particle->glyph->indice_count ); + } + } + + /* gate markers + * ---------------------------------------------------- */ + shader_model_gate_use(); shader_model_gate_uPv( cam->mtx.pv ); shader_model_gate_uCam( cam->pos ); @@ -611,14 +1200,12 @@ VG_STATIC void render_world_routes( world_instance *world, camera *cam ) mesh_bind( &world_global.mesh_gate ); /* skip writing into the motion vectors for this */ - /* TODO: draw future gate if the one we're looking through is to be passed, - * instead of current gate */ glDrawBuffers( 1, (GLenum[]){ GL_COLOR_ATTACHMENT0 } ); for( u32 i=0; ient_route); i++ ){ ent_route *route = mdl_arritm( &world->ent_route, i ); - if( route->active_checkpoint != 0xffffffff ){ + if( route->active_checkpoint != 0xffff ){ v4f colour; float brightness = 0.3f + world->ub_lighting.g_day_phase; v3_muls( route->colour, brightness, colour ); @@ -626,8 +1213,9 @@ VG_STATIC void render_world_routes( world_instance *world, camera *cam ) shader_model_gate_uColour( colour ); - u32 next = route->checkpoints_start + - (route->active_checkpoint+1) % route->checkpoints_count; + u32 next = route->active_checkpoint+1+layer_depth; + next = next % route->checkpoints_count; + next += route->checkpoints_start; ent_checkpoint *cp = mdl_arritm( &world->ent_checkpoint, next ); ent_gate *gate = mdl_arritm( &world->ent_gate, cp->gate_index );