#include <time.h>
#include "world.h"
#include "world_gate.h"
+#include "font.h"
#if 0
#include "shaders/vblend.h"
#include "shaders/routeui.h"
-VG_STATIC void world_routes_local_set_record( world_instance *world,
- u32 route, double lap_time )
+VG_STATIC
+void world_routes_local_set_record( world_instance *world, ent_route *route,
+ double lap_time )
{
-#if 0
vg_success( " NEW LAP TIME: %f\n", lap_time );
- if( pr->track_id != 0xffffffff )
- {
+ if( route->official_track_id != 0xffffffff ){
double time_centiseconds = lap_time * 100.0;
- if( time_centiseconds > (float)0xfffe )
+ if( time_centiseconds > (float)0xfffe ) /* skill issue */
return;
highscore_record temp;
- temp.trackid = pr->track_id;
+ temp.trackid = route->official_track_id;
temp.datetime = time(NULL);
temp.playerid = 0;
temp.points = 0;
temp.time = time_centiseconds;
+#if 0
highscores_push_record( &temp );
+#endif
- struct track_info *pti = &track_infos[ pr->track_id ];
- pti->push = 1;
+ struct track_info *ti = &track_infos[ route->official_track_id ];
+ ti->push = 1;
- if( pti->achievement_id )
- {
- steam_set_achievement( pti->achievement_id );
+ if( ti->achievement_id ){
+#if 0
+ steam_set_achievement( ti->achievement_id );
steam_store_achievements();
+#endif
}
}
- else
- {
+ else{
vg_warn( "There is no associated track for this record...\n" );
}
-#endif
- vg_warn( "set_record unimplemented\n" );
}
{
for( u32 i=0; i<mdl_arrcount( &world->ent_route ); i++ ){
ent_route *route = mdl_arritm( &world->ent_route, i );
- route->active_checkpoint = 0xffffffff;
+ route->active_checkpoint = 0xffff;
+ }
+
+ for( u32 i=0; i<mdl_arrcount( &world->ent_gate ); i++ ){
+ ent_gate *rg = mdl_arritm( &world->ent_gate, i );
+ rg->timing_version = 0;
+ rg->timing_time = 0.0;
}
world_global.current_run_version += 4;
world_global.last_use = 0.0;
}
+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 start_time = 0.0;
+ u32 last_version=0;
+
+ u32 valid_count=0;
+
+ for( u32 i=0; i<route->checkpoints_count; i++ ){
+ u32 cpid = route->checkpoints_start+(i+route->active_checkpoint);
+ cpid = cpid % route->checkpoints_count;
+
+ 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 == 0 )
+ start_time = rg->timing_time;
+ else{
+ 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 ++;
+ else
+ valid_count = 0;
+
+ vg_info( "%u %f\n", world_global.current_run_version, world_global.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;
+ route->timing_base = start_time;
+
+ vg_info( "valid: %u\n", valid_count );
+ vg_info( "----------------------------\n" );
+}
+
/*
* When going through a gate this is called for bookkeeping purposes
*/
ent_gate *dest = mdl_arritm( &world->ent_gate, rg->target );
world_global.last_use = world_global.time;
- rg->timing_version = world_global.current_run_version;
- rg->timing_time = world_global.time;
for( u32 i=0; i<mdl_arrcount(&world->ent_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 ){
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;
}
}
}
}
}
-
- world_global.current_run_version ++;
dest->timing_version = world_global.current_run_version;
dest->timing_time = world_global.time;
+
world_global.current_run_version ++;
}
0xff5442f5 };
u32 cc = 0xffcccccc;
- if( route->active_checkpoint != 0xffffffff ){
+ if( route->active_checkpoint != 0xffff ){
cc = colours[i%vg_list_size(colours)];
}
}
VG_STATIC void world_routes_place_curve( world_instance *world,
- v4f h[4], v3f n0, v3f n2 )
+ v4f h[3], v3f n0, v3f n2 )
{
float t;
v3f p, pd;
- int last_valid;
+ int last_valid=0;
float total_length = 0.0f,
travel_length = 0.0;
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 && resb ){
+ 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) )
+ {
+ 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( 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;
}
-
- last_valid = world->scene_lines->vertex_count;
+ else
+ last_valid = 0;
}
else
last_valid = 0;
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 )
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
for( u32 i=0; i<mdl_arrcount(&world->ent_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; i<mdl_arrcount(&world->ent_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;
}
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;
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 ++;
- }
}
}
}
}
vg_release_thread_sync();
vg_linear_del( world_global.generic_heap, world->scene_lines );
+
+ world_routes_clear( world );
}
/* load all routes from model header */
for( u32 i=0; i<mdl_arrcount(&world->ent_route); i++ ){
ent_route *route = mdl_arritm(&world->ent_route,i);
+ mdl_transform_m4x3( &route->transform, route->board_transform );
+
+ route->official_track_id = 0xffffffff;
+ for( u32 j=0; j<vg_list_size(track_infos); j ++ ){
+ if( !strcmp(track_infos[j].name,
+ mdl_pstr(&world->meta,route->pstr_name))){
+ route->official_track_id = j;
+ }
+ }
for( u32 j=0; j<route->checkpoints_count; j++ ){
u32 id = route->checkpoints_start + j;
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;
}
}
+ for( u32 i=0; i<mdl_arrcount(&world->ent_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 );
}
for( u32 i=0; i<mdl_arrcount(&world->ent_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 );
}
}
GLuint shader, GLuint location,
int slot );
-VG_STATIC void render_world_routes( world_instance *world, camera *cam )
+VG_STATIC void render_world_routes( world_instance *world, camera *cam,
+ int layer_depth )
{
m4x3f identity_matrix;
m4x3_identity( identity_matrix );
mdl_draw_submesh( &route->sm );
}
+ /* timers
+ * ---------------------------------------------------- */
+ if( layer_depth == 0 ){
+ font3d_bind( &test_font, cam );
+
+ for( u32 i=0; i<mdl_arrcount(&world->ent_route); i++ ){
+ ent_route *route = mdl_arritm( &world->ent_route, i );
+
+ if( route->active_checkpoint != 0xffff ){
+ 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_font_uColour( colour );
+
+ 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 );
+
+
+ u32 j=0;
+ for( ; j<4; j++ ){
+ if( gate->routes[j] == i ){
+ break;
+ }
+ }
+ float h0 = 0.8f,
+ h1 = 1.2f,
+ depth = 0.4f,
+ size = 0.4f;
+
+ char text[256];
+
+ if( route->valid_checkpoints >= route->checkpoints_count ){
+ double lap_time = world_global.time - route->timing_base;
+ snprintf( text, 255, "%.1f", lap_time );
+ }
+ else{
+ snprintf( text, 255, "%hu/%hu", route->valid_checkpoints,
+ route->checkpoints_count );
+ }
+
+ float align_r = font3d_string_width( &test_font, 0, text ) * size;
+
+ v3f positions[] = {
+ { -0.92f, h0, depth },
+ { 0.92f - align_r, h0, depth },
+ { -0.92f, h1, depth },
+ { 0.92f - align_r, h1, depth },
+ };
+
+ ent_gate *dest = mdl_arritm( &world->ent_gate, gate->target );
+
+ if( dest->route_count == 1 ){
+ positions[0][0] = -align_r*0.5f;
+ positions[0][1] = h1;
+ }
+
+ m4x3f model;
+ m3x3_copy( gate->to_world, model );
+ float ratio = v3_length(model[0]) / v3_length(model[1]);
+
+ m3x3_scale( model, (v3f){ size, size*ratio, 0.1f } );
+ m4x3_mulv( gate->to_world, positions[j], model[3] );
+
+ font3d_simple_draw( &test_font, 0, text, cam, model );
+ }
+ }
+ }
+
+ /* gate markers
+ * ---------------------------------------------------- */
+
shader_model_gate_use();
shader_model_gate_uPv( cam->mtx.pv );
shader_model_gate_uCam( cam->pos );
for( u32 i=0; i<mdl_arrcount(&world->ent_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 );
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 );
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff