X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_routes.h;h=b43ec0ee1fe63762acd9103971002f2e70906490;hb=a1056ed8198f0f5be0e0f341da8bd49aa6c47198;hp=501915a0643859d812a41dd31d87a6cffd110ddc;hpb=2e4531dfd7bd0d9a0776fda1a62653806d85eb3b;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_routes.h b/world_routes.h index 501915a..b43ec0e 100644 --- a/world_routes.h +++ b/world_routes.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved + * Copyright (C) 2021-2023 Mt.ZERO Software, Harry Godden - All Rights Reserved */ #ifndef ROUTES_H @@ -17,389 +17,12 @@ #include "shaders/routeui.h" -enum route_special_type -{ - k_route_special_type_none = 0, - k_route_special_type_gate = 1, - k_route_special_type_collector = 2 -}; - -VG_STATIC void debug_sbpath( struct route_node *rna, struct route_node *rnb, - u32 colour, float xoffset ) -{ - v3f p0, h0, p1, h1, l, p; - - v3_copy( rna->co, p0 ); - v3_muladds( rna->co, rna->h, 1.0f, h0 ); - v3_copy( rnb->co, p1 ); - v3_muladds( rnb->co, rnb->h, -1.0f, h1 ); - - v3_muladds( p0, rna->right, xoffset, p0 ); - v3_muladds( h0, rna->right, xoffset, h0 ); - v3_muladds( p1, rnb->right, xoffset, p1 ); - v3_muladds( h1, rnb->right, xoffset, h1 ); - - v3_copy( p0, l ); - - for( int i=0; i<5; i++ ) - { - float t = (float)(i+1)/5.0f; - eval_bezier_time( p0, p1, h0, h1, t, p ); - vg_line( p, l, colour ); - v3_copy( p, l ); - } -} - -/* - * Get a list of node ids in stack, and return how many there is - */ -VG_STATIC u32 world_routes_get_path( world_instance *world, - u32 starter, u32 stack[64] ) -{ - u32 stack_i[64]; - - stack[0] = starter; - stack_i[0] = 0; - - u32 si = 1; - int loop_complete = 0; - - while( si ) - { - if( stack_i[si-1] == 2 ) - { - si --; - continue; - } - - struct route_node *rn = &world->nodes[stack[si-1]]; - u32 nextid = rn->next[stack_i[si-1]]; - stack_i[si-1] ++; - - if( nextid != 0xffffffff ) - { - if( nextid == stack[0] ) - { - loop_complete = 1; - break; - } - - int valid = 1; - for( int sj=0; sjsegment_count ) - { - pui->segment_start ++; - - if( pui->segment_start == 32 ) - pui->segment_start = 0; - - pui->segment_count --; - } -} - -/* - * Reset ui bar completely - */ -VG_STATIC void world_routes_ui_clear( struct route_ui_bar *pui ) -{ - pui->segment_start = (pui->segment_start + pui->segment_count) % - k_max_ui_segments; - pui->segment_count = 0; -} - -/* - * Break a index range into two pieces over the edge of the maximum it can - * store. s1 is 0 always, so its a ring buffer. - */ -VG_STATIC void world_routes_ui_split_indices( u32 s0, u32 count, - u32 *c0, u32 *c1 ) -{ - *c0 = (VG_MIN( s0+count, k_route_ui_max_indices )) - s0; - *c1 = count-(*c0); -} - -/* - * Place a set of indices into gpu array automatically splits - * across bounds - */ -VG_STATIC void world_routes_ui_set_indices( struct route_ui_bar *pui, - u16 *indices, u32 count ) -{ - u32 c0, c1; - world_routes_ui_split_indices( pui->indices_head, count, &c0, &c1 ); - - glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, pui->ebo ); - - if( c0 ) - { - glBufferSubData( GL_ELEMENT_ARRAY_BUFFER, pui->indices_head*sizeof(u16), - c0*sizeof(u16), indices ); - } - - if( c1 ) - { - glBufferSubData( GL_ELEMENT_ARRAY_BUFFER, 0, c1*sizeof(u16), indices+c0 ); - pui->indices_head = c1; - } - else - pui->indices_head += c0; -} - -/* - * Place a set of vertices into gpu array - */ -VG_STATIC u32 world_routes_ui_set_verts( struct route_ui_bar *pui, - v2f *verts, u32 count ) -{ - if( pui->vertex_head + count >= k_route_ui_max_verts ) - pui->vertex_head = 0; - - u32 vert_start = pui->vertex_head; - pui->vertex_head += count; - - glBindBuffer( GL_ARRAY_BUFFER, pui->vbo ); - glBufferSubData( GL_ARRAY_BUFFER, (GLintptr)(vert_start*sizeof(v2f)), - sizeof(v2f)*count, verts ); - - return vert_start; -} - -/* - * Update the last (count) vertices positions, does not add any. - * Data must already be written to, and not cross either array boundaries. - */ -VG_STATIC u32 world_routes_ui_update_verts( struct route_ui_bar *pui, - v2f *verts, u32 count ) -{ - u32 vert_start = pui->vertex_head-count; - - glBindBuffer( GL_ARRAY_BUFFER, pui->vbo ); - glBufferSubData( GL_ARRAY_BUFFER, (GLintptr)(vert_start*sizeof(v2f)), - sizeof(v2f)*count, verts ); - - return vert_start; -} - -/* - * Current/active segment of this UI bar - */ -VG_STATIC struct route_ui_segment *world_routes_ui_curseg( - struct route_ui_bar *pui ) -{ - u32 index = (pui->segment_start+pui->segment_count-1)%k_max_ui_segments; - return &pui->segments[ index ]; -} - -/* - * Start a new segment in the UI bar, will create a split on the last one if - * there is one active currently. (api) - */ -VG_STATIC void world_routes_ui_newseg( u32 route ) -{ - struct route_ui_bar *pui = &world_global.ui_bars[route]; - - glBindVertexArray( pui->vao ); - if( pui->segment_count ) - { - float const k_gap_width = 1.0f; - - struct route_ui_segment *cseg = world_routes_ui_curseg( pui ); - - v2f verts[2]; - verts[0][0] = cseg->length-k_gap_width; - verts[0][1] = 0.5f; - verts[1][0] = cseg->length-k_gap_width; - verts[1][1] = -0.5f; - - world_routes_ui_update_verts( pui, verts, 2 ); - } - - pui->segment_count ++; - struct route_ui_segment *segment = world_routes_ui_curseg( pui ); - - v2f verts[4]; - verts[0][0] = 0.0f; - verts[0][1] = 0.5f; - verts[1][0] = 0.0f; - verts[1][1] = -0.5f; - verts[2][0] = 0.0f; - verts[2][1] = 0.5f; - verts[3][0] = 0.0f; - verts[3][1] = -0.5f; - - u32 vert_start = world_routes_ui_set_verts( pui, verts, 4 ); - - u16 indices[6]; - indices[0] = vert_start + 0; - indices[1] = vert_start + 1; - indices[2] = vert_start + 3; - indices[3] = vert_start + 0; - indices[4] = vert_start + 3; - indices[5] = vert_start + 2; - - segment->vertex_start = vert_start; - segment->vertex_count = 4; - segment->index_start = pui->indices_head; - segment->index_count = 6; - segment->notches = 0; - - world_routes_ui_set_indices( pui, indices, 6 ); -} - -/* - * Extend the end of the bar - */ -VG_STATIC void world_routes_ui_updatetime( u32 route, float time ) -{ - struct route_ui_bar *pui = &world_global.ui_bars[route]; - - v2f verts[2]; - verts[0][0] = time; - verts[0][1] = 0.5f; - verts[1][0] = time; - verts[1][1] = -0.5f; - - u32 vert_start = pui->vertex_head-2; - - glBindVertexArray( pui->vao ); - world_routes_ui_update_verts( pui, verts, 2 ); - - struct route_ui_segment *cseg = world_routes_ui_curseg( pui ); - cseg->length = time; -} - -VG_STATIC void world_routes_ui_draw_segment( struct route_ui_segment *segment ) -{ - u32 c0, c1; - world_routes_ui_split_indices( segment->index_start, - segment->index_count, &c0, &c1 ); - if( c0 ) - glDrawElements( GL_TRIANGLES, c0, GL_UNSIGNED_SHORT, - (void *)(segment->index_start*sizeof(u16))); - if( c1 ) - glDrawElements( GL_TRIANGLES, c1, GL_UNSIGNED_SHORT, (void *)(0) ); -} - -/* - * Draws full bar at Y offset(offset). - */ -VG_STATIC void world_routes_ui_draw( world_instance *world, - u32 route, v4f colour, float offset ) -{ - float const k_bar_height = 0.05f, - k_bar_scale_x = 0.005f; - - /* FIXME(10) ID mishmatch */ - struct route *pr = &world->routes[route]; - struct route_ui_bar *pui = &world_global.ui_bars[route]; - - float cx = pui->xpos; - - shader_routeui_use(); - glBindVertexArray( pui->vao ); - - float fade_amt = world_global.time - pui->fade_timer_start; - fade_amt = vg_clampf( fade_amt / 1.0f, 0.0f, 1.0f ); - - float fade_block_size = 0.0f, - main_block_size = 0.0f; - - for( u32 i=0; ifade_count; i++ ) - { - u32 j = (pui->fade_start + i) % k_max_ui_segments; - struct route_ui_segment *segment = &pui->segments[j]; - - fade_block_size += segment->length; - } - - cx -= fade_block_size * fade_amt; - - v4f fade_colour; - v4_copy( colour, fade_colour ); - fade_colour[3] *= 1.0f-fade_amt; - - /* 1 minute timer */ - float timer_delta = (world_global.time - world_global.last_use) * (1.0/45.0), - timer_scale = 1.0f - vg_minf( timer_delta, 1.0f ); - - /* - * Draw fadeout bar - */ - - float height = pr->factive*k_bar_height * timer_scale, - base = -1.0f + (offset+0.5f)*k_bar_height * timer_scale; - - shader_routeui_uColour( fade_colour ); - for( u32 i=0; ifade_count; i++ ) - { - u32 j = (pui->fade_start + i) % k_max_ui_segments; - struct route_ui_segment *segment = &pui->segments[j]; - - shader_routeui_uOffset( (v4f){ cx*k_bar_scale_x, base, - k_bar_scale_x, height } ); - - world_routes_ui_draw_segment( segment ); - cx += segment->length; - } - - /* - * Draw main bar - */ - shader_routeui_uColour( colour ); - for( u32 i=0; isegment_count; i++ ) - { - u32 j = (pui->segment_start + i) % k_max_ui_segments; - struct route_ui_segment *segment = &pui->segments[j]; - - shader_routeui_uOffset( (v4f){ cx*k_bar_scale_x, base, - k_bar_scale_x, height } ); - - world_routes_ui_draw_segment( segment ); - cx += segment->length; - - main_block_size += segment->length; - } - - pui->xpos = vg_lerpf( pui->xpos, -main_block_size * 0.5f, 0.03f ); -} - VG_STATIC void world_routes_local_set_record( world_instance *world, u32 route, double lap_time ) { +#if 0 vg_success( " NEW LAP TIME: %f\n", lap_time ); - /* FIXME(10): ID mishmatch */ - struct route *pr = &world->routes[route]; - if( pr->track_id != 0xffffffff ) { double time_centiseconds = lap_time * 100.0; @@ -428,125 +51,18 @@ VG_STATIC void world_routes_local_set_record( world_instance *world, { vg_warn( "There is no associated track for this record...\n" ); } +#endif + vg_warn( "set_record unimplemented\n" ); } -/* - * Will scan the whole run for two things; - * 1: we set a new record for the total, complete loop around the course - * 2: the time of each segment will be recorded into the data buffer - * (not implemented: TODO) - */ -VG_STATIC void world_routes_verify_run( world_instance *world, u32 route ) -{ - /* FIXME(10): ID mishmatch */ - struct route *pr = &world->routes[route]; - struct route_ui_bar *pui = &world_global.ui_bars[route]; - - u32 stack[64]; - u32 si = world_routes_get_path( world, world->routes[route].start, stack ); - - /* - * we only care about gates that ref gates, so shuffle down the array - */ - struct route_timing *timings[64]; - u32 sj = 0, maxv = 0, begin = 0; - for( u32 i=0; inodes[stack[i]]; - - if( inode->special_type == k_route_special_type_collector ) - { - timings[sj ++] = &world->collectors[ inode->special_id ].timing; - } - else if( inode->special_type == k_route_special_type_gate ) - { - timings[sj ++] = &world->gates[inode->special_id].timing; - } - } - - for( u32 i=0; iversion > maxv ) - { - maxv = timings[i]->version; - begin = i; - } - } - - vg_info( "== begin verification (%u) ==\n", route ); - vg_info( " current version: %u\n", world_global.current_run_version ); - - int verified = 0; - if( timings[begin]->version == world_global.current_run_version ) - verified = 1; - - int valid_segment_count = 0; - - double lap_time = 0.0; - - for( u32 i=0; iversion == timings[j]->version+1 ) - { - diff = timings[j1]->time - timings[j]->time; - lap_time += diff; - - if( verified && diff > 0.0 ) valid_segment_count ++; - } - else - verified = 0; - } - - if( verified ) - vg_success( " [ %u %f ] %f\n", timings[j1]->time, - timings[j1]->version, diff ); - else - vg_warn( " [ %u %f ]\n", timings[j1]->time, timings[j1]->version ); - } - - pui->fade_start = pui->segment_start; - pui->fade_count = 0; - pui->fade_timer_start = world_global.time; - - int orig_seg_count = pui->segment_count; - - world_routes_ui_newseg( route ); - - if( verified ) - { - world_routes_local_set_record( world, route, lap_time ); - world_routes_ui_popfirst( pui ); - pui->fade_count ++; - } - else - vg_info( " ctime: %f\n", lap_time ); - - /* remove any excess we had from previous runs */ - int to_remove = orig_seg_count-valid_segment_count; - for( int i=0; ifade_count ++; - } - - world->routes[route].latest_pass = world_global.time; -} VG_STATIC void world_routes_clear( world_instance *world ) { - for( u32 i=0; iroute_count; i++ ) - { - struct route *route = &world->routes[i]; - route->active = 0; + for( u32 i=0; ient_route ); i++ ){ + ent_route *route = mdl_arritm( &world->ent_route, i ); + route->active_checkpoint = 0xffffffff; } + world_global.current_run_version += 4; world_global.last_use = 0.0; } @@ -554,522 +70,415 @@ VG_STATIC void world_routes_clear( world_instance *world ) /* * When going through a gate this is called for bookkeeping purposes */ -VG_STATIC void world_routes_activate_gate( world_instance *world, u32 id ) +VG_STATIC void world_routes_activate_entry_gate( world_instance *world, + ent_gate *rg ) { - struct route_gate *rg = &world->gates[id]; - struct route_node *pnode = &world->nodes[rg->node_id], - *pdest = &world->nodes[pnode->next[0]]; + ent_gate *dest = mdl_arritm( &world->ent_gate, rg->target ); world_global.last_use = world_global.time; - - struct route_collector *rc = &world->collectors[ pdest->special_id ]; - - world_global.active_gate = id; - rg->timing.version = world_global.current_run_version; - rg->timing.time = world_global.time; - - for( u32 i=0; iroute_count; i++ ) - { - struct route *route = &world->routes[i]; - - int was_active = route->active; - - route->active = 0; - for( u32 j=0; jref_count; j++ ) - { - if( pdest->route_ids[j] == i ) - { - world_routes_verify_run( world, i ); - route->active = 1; + rg->timing_version = world_global.current_run_version; + rg->timing_time = world_global.time; + + 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; + + for( u32 j=0; j<4; j++ ){ + if( dest->routes[j] == i ){ + for( u32 k=0; kcheckpoints_count; k++ ){ + ent_checkpoint *cp = mdl_arritm( &world->ent_checkpoint, + route->checkpoints_start+k ); + + ent_gate *gk = mdl_arritm( &world->ent_gate, cp->gate_index ); + if( gk == rg ){ + route->active_checkpoint = k; + break; + } + } break; } } - - if( was_active && !route->active ) - { - struct route_ui_bar *pui = &world_global.ui_bars[i]; - pui->fade_start = pui->segment_start; - pui->fade_count = pui->segment_count; - pui->fade_timer_start = world_global.time; - - world_routes_ui_clear( pui ); - vg_success( "CLEARING -> %u %u \n", pui->fade_start, - pui->fade_count ); - } } world_global.current_run_version ++; - rc->timing.version = world_global.current_run_version; - rc->timing.time = world_global.time; + dest->timing_version = world_global.current_run_version; + dest->timing_time = world_global.time; world_global.current_run_version ++; } -/* - * Notify the UI system that we've reset the player - */ -VG_STATIC void world_routes_notify_reset(void) -{ - world_global.rewind_from = world_global.time; - world_global.rewind_to = world_global.last_use; -} - -/* Rewind between the saved points in time */ -VG_STATIC void world_routes_rollback_time( double t ) -{ - world_global.time = vg_lerp( world_global.rewind_to, - world_global.rewind_from, t ); -} - /* draw lines along the paths */ VG_STATIC void world_routes_debug( world_instance *world ) { - for( int i=0; inode_count; i++ ) - { - struct route_node *rn = &world->nodes[i]; - vg_line_pt3( rn->co, 1.0f, rn->special_type? 0xffffff00: 0xff00b2ff ); + for( u32 i=0; ient_route_node); i++ ){ + ent_route_node *rn = mdl_arritm(&world->ent_route_node,i); + vg_line_pt3( rn->co, 0.25f, VG__WHITE ); } - for( int i=0; iroute_count; i++ ) - { - struct route *route = &world->routes[i]; - - u32 stack[64]; - u32 si = world_routes_get_path( world, route->start, stack ); + for( u32 i=0; ient_route); i++ ){ + ent_route *route = mdl_arritm(&world->ent_route, i); u32 colours[] = { 0xfff58142, 0xff42cbf5, 0xff42f56c, 0xfff542b3, 0xff5442f5 }; - u32 cc = colours[i%vg_list_size(colours)]; + u32 cc = 0xffcccccc; + if( route->active_checkpoint != 0xffffffff ){ + cc = colours[i%vg_list_size(colours)]; + } - for( int sj=0; sjcheckpoints_count; i++ ){ + int i0 = route->checkpoints_start+i, + i1 = route->checkpoints_start+((i+1)%route->checkpoints_count); - struct route_node *pj = &world->nodes[stack[sj]], - *pk = &world->nodes[stack[sk]]; - debug_sbpath( pj, pk, cc, (float)i ); - } - } + ent_checkpoint *c0 = mdl_arritm(&world->ent_checkpoint, i0), + *c1 = mdl_arritm(&world->ent_checkpoint, i1); - for( int i=0; inode_count; i++ ) - { - struct route_node *ri = &world->nodes[i], - *rj = NULL; - - for( int j=0; j<2; j++ ) - { - if( ri->next[j] != 0xffffffff ) - { - rj = &world->nodes[ri->next[j]]; - vg_line( ri->co, rj->co, 0x20ffffff ); + ent_gate *start_gate = mdl_arritm( &world->ent_gate, c0->gate_index ); + ent_gate *end_gate = mdl_arritm( &world->ent_gate, c1->gate_index ); + + v3f p0, p1; + v3_copy( start_gate->co[1], p0 ); + + for( int j=0; jpath_count; j ++ ){ + ent_path_index *index = mdl_arritm( &world->ent_path_index, + c0->path_start+j ); + + ent_route_node *rn = mdl_arritm( &world->ent_route_node, + index->index ); + + v3_copy( rn->co, p1 ); + vg_line( p0, p1, cc ); + v3_copy( p1, p0 ); } + + v3_copy( end_gate->co[0], p1 ); + vg_line( p0, p1, cc ); } } } -VG_STATIC void world_routes_create_mesh( world_instance *world, u32 route_id ) +VG_STATIC void world_routes_place_curve( world_instance *world, + v4f h[4], v3f n0, v3f n2 ) { - struct route *route = &world->routes[ route_id ]; + float t; + v3f p, pd; + int last_valid; - u32 stack[64]; - u32 si = world_routes_get_path( world, route->start, stack ); + float total_length = 0.0f, + travel_length = 0.0; - u32 last_valid = 0; - - for( int sj=0; sjnodes[ stack[sj] ], - *rnk = &world->nodes[ stack[sk] ], - *rnl; - - if( rnj->special_type && rnk->special_type ) - { - last_valid = 0; - continue; - } + v3f last; + v3_copy( h[0], last ); + for( int it=0; it<128; it ++ ){ + t = (float)(it+1) * (1.0f/128.0f); + eval_bezier3( h[0], h[1], h[2], t, p ); + total_length += v3_dist( p, last ); + v3_copy( p, last ); + } - float base_x0 = (float)rnj->ref_count*-0.5f + (float)rnj->current_refs, - base_x1 = (float)rnk->ref_count*-0.5f + (float)rnk->current_refs; + float patch_size = 4.0f, + patch_count = ceilf( total_length / patch_size ); - if( rnk->special_type ) - { - rnl = &world->nodes[ rnk->next[0] ]; - base_x1 = (float)rnl->ref_count*-0.5f + (float)rnl->current_refs; - } + t = 0.0f; + v3_copy( h[0], last ); - if( sk == 0 ) - { - base_x1 -= 1.0f; - } + for( int it=0; it<128; it ++ ){ + float const k_sample_dist = 0.0025f, + k_line_width = 1.5f; - v3f p0, h0, p1, h1, p, pd; - - v3_copy( rnj->co, p0 ); - v3_muladds( rnj->co, rnj->h, 1.0f, h0 ); - v3_copy( rnk->co, p1 ); - v3_muladds( rnk->co, rnk->h, -1.0f, h1 ); + eval_bezier3( h[0], h[1], h[2], t, p ); + eval_bezier3( h[0], h[1], h[2], t+k_sample_dist, pd ); - float t=0.0f; - int it = 0; + travel_length += v3_dist( p, last ); - for( int it=0; it<256; it ++ ) - { - float const k_sample_dist = 0.02f; - eval_bezier_time( p0,p1,h0,h1, t,p ); - eval_bezier_time( p0,p1,h0,h1, t+k_sample_dist,pd ); + float mod = k_sample_dist / v3_dist( p, pd ); - float mod = k_sample_dist / v3_dist( p, pd ); + v3f v0,up, right; - v3f v0,up, right; - v3_muls( rnj->up, 1.0f-t, up ); - v3_muladds( up, rnk->up, t, up ); + v3_muls( n0, -(1.0f-t), up ); + v3_muladds( up, n2, -t, up ); + v3_normalize( up ); - v3_sub( pd,p,v0 ); - v3_cross( up, v0, right ); - v3_normalize( right ); + v3_sub( pd,p,v0 ); + v3_cross( up, v0, right ); + v3_normalize( right ); - float cur_x = (1.0f-t)*base_x0 + t*base_x1; - - v3f sc, sa, sb, down; - v3_muladds( p, right, cur_x, sc ); - v3_muladds( sc, up, 1.5f, sc ); - v3_muladds( sc, right, 0.45f, sa ); - v3_muladds( sc, right, -0.45f, sb ); - v3_muls( up, -1.0f, down ); + float cur_x = (1.0f-t)*h[0][3] + t*h[2][3]; + + v3f sc, sa, sb, down; + v3_muladds( p, right, cur_x * k_line_width, sc ); + v3_muladds( sc, up, 1.5f, sc ); + v3_muladds( sc, right, k_line_width*0.95f, sa ); + v3_muladds( sc, right, 0.0f, sb ); + v3_muls( up, -1.0f, down ); + + 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; - 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 ); - v2_zero( va.uv ); - v2_zero( vb.uv ); - - 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} ); - } - - last_valid = world->scene_lines->vertex_count; + 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} ); } - else - last_valid = 0; + + last_valid = world->scene_lines->vertex_count; + } + else + last_valid = 0; - t += 1.0f*mod; + if( t == 1.0f ) + return; - if( t >= 1.0f ) - { - /* TODO special case for end of loop, need to add triangles - * between first and last rungs */ - break; - } - } + t += 1.0f*mod; + if( t > 1.0f ) + t = 1.0f; - rnj->current_refs ++; + v3_copy( p, last ); } - - scene_copy_slice( world->scene_lines, &route->sm ); } -/* - * Create the strips of colour that run through the world along course paths - */ -VG_STATIC void world_routes_generate( world_instance *world ) +VG_STATIC void world_routes_create_mesh( world_instance *world, u32 route_id ) { - vg_info( "Generating route meshes\n" ); - world->scene_lines = scene_init( world_global.generic_heap, 200000, 300000 ); + ent_route *route = mdl_arritm( &world->ent_route, route_id ); + u32 last_valid = 0; - for( u32 i=0; iroute_count; i++ ) - world_routes_create_mesh( world, i ); + for( int i=0; icheckpoints_count; i++ ){ + int i0 = route->checkpoints_start+i, + i1 = route->checkpoints_start+((i+1)%route->checkpoints_count); - 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 ); -} - -/* determine if special type is required for this gate */ -VG_STATIC enum route_special_type world_route_node_type( world_instance *world, - mdl_node *pnode ) -{ - if( pnode->classtype == k_classtype_gate ) - { - struct classtype_gate *inf = mdl_get_entdata( world->meta, pnode ); + ent_checkpoint *c0 = mdl_arritm(&world->ent_checkpoint, i0), + *c1 = mdl_arritm(&world->ent_checkpoint, i1); - if( inf->target ) - { - mdl_node *pother = mdl_node_from_id( world->meta, inf->target ); - - if( pother->classtype == k_classtype_gate ) - { - return k_route_special_type_gate; - } - } + ent_gate *start_gate = mdl_arritm( &world->ent_gate, c0->gate_index ); + start_gate = mdl_arritm( &world->ent_gate, start_gate->target ); - return k_route_special_type_collector; - } + ent_gate *end_gate = mdl_arritm( &world->ent_gate, c1->gate_index ); - return k_route_special_type_none; -} + v4f p[3]; -/* count entities and allocate correct amount of memory in advance */ -VG_STATIC void world_routes_allocate( world_instance *world ) -{ - vg_info( "Allocating routes\n" ); + 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; + start_gate->ref_count ++; - /* count */ - u32 node_count = 0, - route_count = 0, - gate_count = 0, - collector_count = 0; - - for( int i=0; imeta->info.node_count; i++ ) - { - mdl_node *pnode = mdl_node_from_id( world->meta, i ); + if( !c0->path_count ) + continue; - if( pnode->classtype == k_classtype_route_node || - pnode->classtype == k_classtype_gate ) - { - pnode->sub_uid = node_count; + /* this is so that we get nice flow through the gates */ + v3f temp_alignments[2]; + ent_gate *both[] = { start_gate, end_gate }; - enum route_special_type type = world_route_node_type( world, pnode ); + for( int j=0; j<2; j++ ){ + int pi = c0->path_start + ((j==1)? c0->path_count-1: 0); - if( type == k_route_special_type_gate ) - gate_count ++; - else if( type == k_route_special_type_collector ) - collector_count ++; + ent_path_index *index = mdl_arritm( &world->ent_path_index, pi ); + ent_route_node *rn = mdl_arritm( &world->ent_route_node, + index->index ); + v3f v0; + v3_sub( rn->co, both[j]->co[0], v0 ); + float d = v3_dot( v0, both[j]->to_world[2] ); - node_count ++; + v3_muladds( both[j]->co[0], both[j]->to_world[2], d, + temp_alignments[j] ); + v3_add( (v3f){0.0f,0.1f,0.0f}, temp_alignments[j], temp_alignments[j]); } - else if( pnode->classtype == k_classtype_route ) - { - route_count ++; - } - } - /* allocate */ - u32 node_size = node_count * sizeof(struct route_node), - route_size = route_count * sizeof(struct route), - gate_size = gate_count * sizeof(struct route_gate), - collector_size = collector_count * sizeof(struct route_collector); - - world->nodes = vg_linear_alloc( world_global.generic_heap, node_size ); - world->routes = vg_linear_alloc( world_global.generic_heap, route_size ); - world->gates = vg_linear_alloc( world_global.generic_heap, gate_size ); - world->collectors = vg_linear_alloc( world_global.generic_heap, - collector_size ); -} - -/* create node from mdl node */ -VG_STATIC struct route_node *world_routes_create_node( world_instance *world, - mdl_node *pnode ) -{ - struct route_node *rn = &world->nodes[ world->node_count ++ ]; - m4x3f transform; - mdl_node_transform( pnode, transform ); + for( int j=0; jpath_count; j ++ ){ + ent_path_index *index = mdl_arritm( &world->ent_path_index, + c0->path_start+j ); + ent_route_node *rn = mdl_arritm( &world->ent_route_node, + index->index ); + if( j==0 || j==c0->path_count-1 ) + if( j == 0 ) + v3_copy( temp_alignments[0], p[1] ); + else + v3_copy( temp_alignments[1], p[1] ); + else + v3_copy( rn->co, p[1] ); - v3_copy( transform[3], rn->co ); - v3_copy( transform[0], rn->right ); - v3_copy( transform[1], rn->up ); - v3_muls( transform[2], -1.0f, rn->h ); - v3_normalize( rn->right ); - v3_normalize( rn->up ); + p[1][3] = rn->ref_count; + p[1][3] -= (float)rn->ref_total * 0.5f; + rn->ref_count ++; - rn->next[0] = 0xffffffff; - rn->next[1] = 0xffffffff; + if( j+1 < c0->path_count ){ + index = mdl_arritm( &world->ent_path_index, + c0->path_start+j+1 ); + rn = mdl_arritm( &world->ent_route_node, index->index ); - rn->special_type = 0; - rn->special_id = 0; - rn->current_refs = 0; - rn->ref_count = 0; + if( j+1 == c0->path_count-1 ) + v3_lerp( p[1], temp_alignments[1], 0.5f, p[2] ); + else + v3_lerp( p[1], rn->co, 0.5f, p[2] ); - return rn; -} + p[2][3] = rn->ref_count; + p[2][3] -= (float)rn->ref_total * 0.5f; + } + 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 ++; + } -/* retrieve the correct node id from mdl subuid */ -VG_STATIC u32 world_routes_get_subuid( world_instance *world, u32 target ) -{ - if( target == 0 ) - return 0xffffffff; - else - return mdl_node_from_id( world->meta, target )->sub_uid; -} + /* p0,p1,p2 bezier patch is complete + * --------------------------------------*/ + v3f surf0, surf2, n0, n2; -#if 0 -VG_STATIC void world_id_fixup( u32 *uid, mdl_context *mdl ) -{ - if( *uid ) - *uid = mdl_node_from_id( mdl, *uid )->sub_uid; - else - *uid = 0xffffffff; -} -#endif + if( bh_closest_point( world->geo_bh, p[0], surf0, 5.0f ) == -1 ) + v3_add( (v3f){0.0f,-0.1f,0.0f}, p[0], surf0 ); -/* process gate attachement onto node */ -VG_STATIC void world_routes_process_gate( world_instance *world, - struct route_node *rn, - mdl_node *pnode ) -{ - struct classtype_gate *inf = mdl_get_entdata( world->meta, pnode ); + if( bh_closest_point( world->geo_bh, p[2], surf2, 5.0f ) == -1 ) + v3_add( (v3f){0.0f,-0.1f,0.0f}, p[2], surf2 ); - /* H is later scaled based on link distance */ - v3_normalize( rn->h ); + v3_sub( surf0, p[0], n0 ); + v3_sub( surf2, p[2], n2 ); + v3_normalize( n0 ); + v3_normalize( n2 ); - rn->next[0] = world_routes_get_subuid( world, inf->target ); - rn->next[1] = 0xffffffff; - rn->special_type = world_route_node_type( world, pnode ); + world_routes_place_curve( world, p, n0, n2 ); - /* process gate type */ - if( rn->special_type == k_route_special_type_gate ) - { - mdl_node *pother = mdl_node_from_id( world->meta, inf->target ); - - struct route_gate *rg = &world->gates[ world->gate_count ]; + /* --- */ + v4_copy( p[2], p[0] ); + } + } - rg->node_id = world->node_count-1; - rg->timing.time = 0.0; - rg->timing.version = 0; + scene_copy_slice( world->scene_lines, &route->sm ); +} - v3_copy( pnode->co, rg->gate.co[0] ); - v3_copy( pother->co, rg->gate.co[1] ); - v4_copy( pnode->q, rg->gate.q[0] ); - v4_copy( pother->q, rg->gate.q[1] ); - v2_copy( inf->dims, rg->gate.dims ); +/* + * Create the strips of colour that run through the world along course paths + */ +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 ); - gate_transform_update( &rg->gate ); - rn->special_id = world->gate_count; + for( u32 i=0; ient_gate); i++ ){ + ent_gate *gate = mdl_arritm( &world->ent_gate, i ); + gate->ref_count = 0; + gate->ref_total = 0; + } - world->gate_count ++; + for( u32 i=0; ient_route_node); i++ ){ + ent_route_node *rn = mdl_arritm( &world->ent_route, i ); + rn->ref_count = 0; + rn->ref_total = 0; } - /* process collector type */ - else if( rn->special_type == k_route_special_type_collector ) - { - struct route_collector *rc = - &world->collectors[ world->collector_count ]; + for( u32 k=0; kent_route); k++ ){ + ent_route *route = mdl_arritm( &world->ent_route, k ); - rc->timing.time = 0.0; - rc->timing.version = 0; + for( int i=0; icheckpoints_count; i++ ){ + int i0 = route->checkpoints_start+i, + i1 = route->checkpoints_start+((i+1)%route->checkpoints_count); - rn->special_id = world->collector_count; - world->collector_count ++; - } - else - vg_fatal_exit_loop( "Invalid state" ); -} + ent_checkpoint *c0 = mdl_arritm(&world->ent_checkpoint, i0), + *c1 = mdl_arritm(&world->ent_checkpoint, i1); -/* create route from node description */ -VG_STATIC void world_routes_create_route( world_instance *world, - mdl_node *pnode ) -{ - mdl_context *mdl = world->meta; + ent_gate *start_gate = mdl_arritm( &world->ent_gate, c0->gate_index ); + start_gate = mdl_arritm( &world->ent_gate, start_gate->target ); - struct classtype_route *inf = mdl_get_entdata( mdl, pnode ); - struct route *route = &world->routes[ world->route_count ]; - memset( route, 0, sizeof(struct route) ); + ent_gate *end_gate = mdl_arritm( &world->ent_gate, c1->gate_index ); + start_gate->ref_total ++; - v3_copy( inf->colour, route->colour ); - route->colour[3] = 1.0f; - route->track_id = 0xffffffff; + if( !c0->path_count ) + continue; - for( u32 j=0; jpstr_name), track_infos[j].name )) - { - route->track_id = j; - break; + for( int j=0; jpath_count; j ++ ){ + ent_path_index *index = mdl_arritm( &world->ent_path_index, + c0->path_start+j ); + 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 ++; + } + } } } - route->start = world_routes_get_subuid( world, inf->id_start ); - route->active = 0; - route->factive = 0.0f; - mdl_node_transform( pnode, route->scoreboard_transform ); - - struct route_ui_bar *pui = &world_global.ui_bars[ world->route_count ]; - pui->indices_head = k_route_ui_max_indices - 9; - pui->vertex_head = k_route_ui_max_verts - 200; - pui->segment_start = 0; - pui->segment_count = 0; - pui->fade_start = 0; - pui->fade_count = 0; - pui->fade_timer_start = 0.0; - - world->route_count ++; + 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 ); } /* load all routes from model header */ -VG_STATIC void world_routes_process( world_instance *world ) +VG_STATIC void world_routes_ent_init( world_instance *world ) { vg_info( "Initializing routes\n" ); - mdl_context *mdl = world->meta; - for( int i=0; iinfo.node_count; i++ ) - { - mdl_node *pnode = mdl_node_from_id(mdl,i); - - if( pnode->classtype == k_classtype_route_node || - pnode->classtype == k_classtype_gate ) - { - struct route_node *rn = world_routes_create_node( world, pnode ); - - if( pnode->classtype == k_classtype_gate ) - { - world_routes_process_gate( world, rn, pnode ); - } - else - { - struct classtype_route_node *inf = mdl_get_entdata( mdl, pnode ); - rn->next[0] = world_routes_get_subuid( world, inf->target ); - rn->next[1] = world_routes_get_subuid( world, inf->target1 ); - } - } - else if( pnode->classtype == k_classtype_route ) - { - world_routes_create_route( world, pnode ); + for( u32 i=0; ient_gate); i++ ){ + ent_gate *gate = mdl_arritm( &world->ent_gate, i ); + for( u32 j=0; j<4; j++ ){ + gate->routes[j] = 0xffff; } } - /* - * Gather references - */ - for( int i=0; iroute_count; i++ ) - { - struct route *route = &world->routes[i]; + for( u32 i=0; ient_route); i++ ){ + ent_route *route = mdl_arritm(&world->ent_route,i); - u32 stack[64]; - u32 si = world_routes_get_path( world, route->start, stack ); + for( u32 j=0; jcheckpoints_count; j++ ){ + u32 id = route->checkpoints_start + j; + ent_checkpoint *cp = mdl_arritm(&world->ent_checkpoint,id); + + ent_gate *gate = mdl_arritm( &world->ent_gate, cp->gate_index ); - for( int sj=0; sjnodes[ stack[sj] ]; - rn->route_ids[ rn->ref_count ++ ] = i; + for( u32 k=0; k<4; k++ ){ + if( gate->routes[k] == 0xffff ){ + gate->routes[k] = i; + break; + } + } + + if( gate->type == k_gate_type_teleport ){ + gate = mdl_arritm(&world->ent_gate, gate->target ); - if( rn->ref_count > 4 ) - vg_warn( "Too many references on route node %i\n", i ); + for( u32 k=0; k<4; k++ ){ + if( gate->routes[k] == 0xffff ){ + gate->routes[k] = i; + break; + } + } + } } } + + world_routes_clear( world ); } /* @@ -1080,60 +489,23 @@ VG_STATIC void world_routes_process( world_instance *world ) VG_STATIC void world_routes_init(void) { - world_global.current_run_version = 2; + world_global.current_run_version = 200; world_global.time = RESET_MAX_TIME*2.0; world_global.last_use = 0.0; shader_scene_route_register(); shader_routeui_register(); - - vg_acquire_thread_sync(); - { - /* UI buffers */ - for( int i=0; ivao ); - glGenBuffers( 1, &pui->vbo ); - glGenBuffers( 1, &pui->ebo ); - glBindVertexArray( pui->vao ); - - size_t stride = sizeof(v2f); - - glBindBuffer( GL_ARRAY_BUFFER, pui->vbo ); - glBufferData( GL_ARRAY_BUFFER, k_route_ui_max_verts*stride, - NULL, GL_DYNAMIC_DRAW ); - - glBindVertexArray( pui->vao ); - glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, pui->ebo ); - glBufferData( GL_ELEMENT_ARRAY_BUFFER, - k_route_ui_max_indices*sizeof(u16), NULL, - GL_DYNAMIC_DRAW ); - - glVertexAttribPointer( 0, 2, GL_FLOAT, GL_FALSE, stride, (void *)0 ); - glEnableVertexAttribArray( 0 ); - VG_CHECK_GL_ERR(); - } - } - vg_release_thread_sync(); } VG_STATIC void world_routes_update( world_instance *world ) { world_global.time += vg.time_delta; - for( int i=0; iroute_count; i++ ) - { - struct route *route = &world->routes[i]; - route->factive = vg_lerpf( route->factive, route->active, - 0.6f*vg.time_delta ); - - if( route->active ) - { - world_routes_ui_updatetime(i, world_global.time - route->latest_pass ); - } + for( u32 i=0; ient_route); i++ ){ + ent_route *route = mdl_arritm( &world->ent_route, i ); + + int target = route->active_checkpoint == 0xffffffff? 0: 1; + route->factive = vg_lerpf( route->factive, target, 0.6f*vg.time_delta ); } } @@ -1170,34 +542,57 @@ VG_STATIC void render_world_routes( world_instance *world, camera *cam ) mesh_bind( &world->mesh_route_lines ); - for( int i=0; iroute_count; i++ ) - { - struct route *route = &world->routes[i]; + for( u32 i=0; ient_route); i++ ){ + ent_route *route = mdl_arritm( &world->ent_route, i ); v4f colour; v3_lerp( (v3f){0.7f,0.7f,0.7f}, route->colour, route->factive, colour ); - colour[3] = 1.0f; + colour[3] = route->factive*0.2f; shader_scene_route_uColour( colour ); mdl_draw_submesh( &route->sm ); } -} -VG_STATIC void render_world_routes_ui( world_instance *world ) -{ - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glBlendEquation(GL_FUNC_ADD); + shader_model_gate_use(); + shader_model_gate_uPv( cam->mtx.pv ); + shader_model_gate_uCam( cam->pos ); + shader_model_gate_uTime( vg.time*0.25f ); + shader_model_gate_uInvRes( (v2f){ + 1.0f / (float)vg.window_x, + 1.0f / (float)vg.window_y }); - float active_offset = 0.0f; - for( int i=0; iroute_count; i++ ) - { - struct route *route = &world->routes[i]; - world_routes_ui_draw( world, i, route->colour, active_offset ); - active_offset += route->factive; - } + mesh_bind( &world_global.mesh_gate ); + + /* skip writing into the motion vectors for this */ + 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 ){ + v4f colour; + float brightness = 0.3f + world->ub_lighting.g_day_phase; + v3_muls( route->colour, brightness, colour ); + colour[3] = 1.0f-route->factive; + + shader_model_gate_uColour( colour ); + + u32 next = route->checkpoints_start + + (route->active_checkpoint+1) % route->checkpoints_count; - glDisable(GL_BLEND); + ent_checkpoint *cp = mdl_arritm( &world->ent_checkpoint, next ); + ent_gate *gate = mdl_arritm( &world->ent_gate, cp->gate_index ); + shader_model_gate_uMdl( gate->to_world ); + + for( u32 j=0; j<4; j++ ){ + if( gate->routes[j] == i ){ + mdl_draw_submesh( &world_global.sm_gate_marker[j] ); + break; + } + } + } + } + glDrawBuffers( 2, (GLenum[]){ GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 } ); } #endif /* ROUTES_H */