X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_routes.h;h=d714ff3f70ed9e77481eb4fa446b2f2a82490c5f;hb=4f4458d229e40a852708319861224b7cc48ad0b9;hp=93fa2c0ce470eca9e98fba764361d14674afa86a;hpb=60b0d8af679396c857f8c5f9a7a518b092a2f416;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_routes.h b/world_routes.h index 93fa2c0..d714ff3 100644 --- a/world_routes.h +++ b/world_routes.h @@ -45,7 +45,7 @@ struct subworld_routes int active; float factive; - double best_lap; /* Session */ + double best_lap, latest_pass; /* Session */ struct { @@ -58,14 +58,14 @@ struct subworld_routes struct route_ui_segment { - float time; - + float length; u32 vertex_start, vertex_count, index_start, index_count; } segments[k_max_ui_segments]; - u32 segment_start, segment_count; + u32 segment_start, segment_count, fade_start, fade_count; + double fade_timer_start; } ui; } @@ -213,6 +213,18 @@ static void world_routes_ui_popfirst( u32 route ) } } +/* + * Reset ui bar completely + */ +static void world_routes_ui_clear( u32 route ) +{ + struct subworld_routes *r = subworld_routes(); + struct route *pr = &r->routes[route]; + pr->ui.segment_start = (pr->ui.segment_start + pr->ui.segment_count) % + k_max_ui_segments; + pr->ui.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. @@ -297,7 +309,7 @@ static struct route_ui_segment *world_routes_ui_curseg( struct route *pr ) * Start a new segment in the UI bar, will create a split on the last one if * there is one active currently. (api) */ -static void world_routes_ui_newseg( u32 route, float time ) +static void world_routes_ui_newseg( u32 route ) { struct subworld_routes *r = subworld_routes(); struct route *pr = &r->routes[route]; @@ -309,10 +321,12 @@ static void world_routes_ui_newseg( u32 route, float time ) { float const k_gap_width = 1.0f; + struct route_ui_segment *cseg = world_routes_ui_curseg(pr); + v2f verts[2]; - verts[0][0] = time-k_gap_width; + verts[0][0] = cseg->length-k_gap_width; verts[0][1] = 0.5f; - verts[1][0] = time-k_gap_width; + verts[1][0] = cseg->length-k_gap_width; verts[1][1] = -0.5f; world_routes_ui_update_verts( pr, verts, 2 ); @@ -367,6 +381,9 @@ static void world_routes_ui_updatetime( u32 route, float time ) glBindVertexArray( pr->ui.vao ); world_routes_ui_update_verts( pr, verts, 2 ); + + struct route_ui_segment *cseg = world_routes_ui_curseg(pr); + cseg->length = time; } /* @@ -443,16 +460,57 @@ static void world_routes_ui_notch( u32 route, float time ) } } -static void world_routes_ui_draw( u32 route ) +static void world_routes_ui_draw( u32 route, v4f colour, float offset ) { - //glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); - struct subworld_routes *r = subworld_routes(); struct route *pr = &r->routes[route]; + float cx = 0.0f; + shader_routeui_use(); glBindVertexArray( pr->ui.vao ); + float fade_amt = vg_time - pr->ui.fade_timer_start; + fade_amt = vg_clampf( fade_amt / 1.0f, 0.0f, 1.0f ); + + float fade_block_size = 0.0f; + for( u32 i=0; iui.fade_count; i++ ) + { + u32 j = (pr->ui.fade_start + i) % k_max_ui_segments; + struct route_ui_segment *segment = &pr->ui.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; + + float height = pr->factive*0.1f; + + shader_routeui_uColour( fade_colour ); + for( u32 i=0; iui.fade_count; i++ ) + { + u32 j = (pr->ui.fade_start + i) % k_max_ui_segments; + struct route_ui_segment *segment = &pr->ui.segments[j]; + + u32 c0, c1; + world_routes_ui_split_indices( segment->index_start, + segment->index_count, &c0, &c1 ); + + shader_routeui_uOffset( (v4f){ cx, offset, 0.005f, height } ); + 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) ); + + cx += segment->length; + } + + shader_routeui_uColour( colour ); for( u32 i=0; iui.segment_count; i++ ) { u32 j = (pr->ui.segment_start + i) % k_max_ui_segments; @@ -462,14 +520,15 @@ static void world_routes_ui_draw( u32 route ) world_routes_ui_split_indices( segment->index_start, segment->index_count, &c0, &c1 ); + shader_routeui_uOffset( (v4f){ cx, offset, 0.005f, height } ); 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) ); - } - //glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); + cx += segment->length; + } } /* @@ -481,6 +540,7 @@ static void world_routes_ui_draw( u32 route ) static void world_routes_verify_run( u32 route ) { struct subworld_routes *r = subworld_routes(); + struct route *pr = &r->routes[route]; u32 stack[64]; u32 si = world_routes_get_path( r->routes[route].start, stack ); @@ -514,6 +574,8 @@ static void world_routes_verify_run( u32 route ) if( timings[begin]->version == r->current_run_version ) verified = 1; + int valid_segment_count = 0; + double lap_time = 0.0; for( u32 i=0; itime - timings[j]->time; lap_time += diff; + + if( verified && diff > 0.0 ) valid_segment_count ++; } else verified = 0; @@ -542,10 +606,32 @@ static void world_routes_verify_run( u32 route ) vg_warn( " [ %u %f ]\n", timings[j1]->time, timings[j1]->version ); } + pr->ui.fade_start = pr->ui.segment_start; + pr->ui.fade_count = 0; + pr->ui.fade_timer_start = vg_time; + + int orig_seg_count = pr->ui.segment_count; + + world_routes_ui_newseg( route ); + if( verified ) + { vg_success( " NEW LAP TIME: %f\n", lap_time ); + world_routes_ui_popfirst(route); + pr->ui.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; iui.fade_count ++; + } + + r->routes[route].latest_pass = vg_time; } /* @@ -566,6 +652,8 @@ static void world_routes_activate_gate( u32 id ) for( u32 i=0; iroute_count; i++ ) { struct route *route = &r->routes[i]; + + int was_active = route->active; route->active = 0; for( u32 j=0; jref_count; j++ ) @@ -577,6 +665,17 @@ static void world_routes_activate_gate( u32 id ) break; } } + + if( was_active && !route->active ) + { + route->ui.fade_start = route->ui.segment_start; + route->ui.fade_count = route->ui.segment_count; + route->ui.fade_timer_start = vg_time; + world_routes_ui_clear(i); + + vg_success( "CLEARING -> %u %u \n", route->ui.fade_start, + route->ui.fade_count ); + } } r->current_run_version ++; @@ -586,6 +685,22 @@ static void world_routes_activate_gate( u32 id ) r->current_run_version ++; } +/* + * Notify the UI system that we've reset the player + */ +static void world_routes_notify_reset(void) +{ + struct subworld_routes *r = subworld_routes(); + + for( int i=0; iroute_count; i++ ) + { + struct route *route = &r->routes[i]; + + if( route->active ) + world_routes_ui_notch( i, vg_time - route->latest_pass ); + } +} + static void world_routes_debug(void) { struct subworld_routes *r = subworld_routes(); @@ -783,6 +898,22 @@ static void world_routes_gen_meshes(void) scene_free_offline_buffers( &r->scene_lines ); } +static void world_routes_update(void) +{ + struct subworld_routes *r = subworld_routes(); + + for( int i=0; iroute_count; i++ ) + { + struct route *route = &r->routes[i]; + route->factive = vg_lerpf( route->factive, route->active, 0.01f ); + + if( route->active ) + { + world_routes_ui_updatetime( i, vg_time - route->latest_pass ); + } + } +} + static void bind_terrain_textures(void); static void render_world_routes( m4x4f projection, v3f camera ) { @@ -805,7 +936,6 @@ static void render_world_routes( m4x4f projection, v3f camera ) for( int i=0; iroute_count; i++ ) { struct route *route = &r->routes[i]; - route->factive = vg_lerpf( route->factive, route->active, 0.01f ); v4f colour; v3_lerp( (v3f){0.7f,0.7f,0.7f}, route->colour, route->factive, colour ); @@ -816,6 +946,25 @@ static void render_world_routes( m4x4f projection, v3f camera ) } } +static void render_world_routes_ui(void) +{ + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glBlendEquation(GL_FUNC_ADD); + + struct subworld_routes *r = subworld_routes(); + + float active_offset = 0.0f; + for( int i=0; iroute_count; i++ ) + { + struct route *route = &r->routes[i]; + world_routes_ui_draw( i, route->colour, active_offset*0.1f ); + active_offset += route->factive; + } + + glDisable(GL_BLEND); +} + static void world_routes_register(void) { struct subworld_routes *r = subworld_routes(); @@ -971,6 +1120,9 @@ static void world_routes_loadfrom( mdl_header *mdl ) route->ui.segment_start = 0; route->ui.segment_count = 0; route->ui.last_notch = 0.0; + route->ui.fade_start = 0; + route->ui.fade_count = 0; + route->ui.fade_timer_start = 0.0; r->route_count ++; }