Merge branch 'master' of harrygodden.com:/home/carveJwlIkooP6JGAAIwe30JlM

[carveJwlIkooP6JGAAIwe30JlM.git] / world_routes.c

diff --git a/world_routes.c b/world_routes.c
index 4deccaa754308cbc8566123243b05ee3c0e32d6e..ca072e62985290569c6a7d780e2ed0b588efea99 100644 (file)
--- a/world_routes.c
+++ b/world_routes.c
@@ -21,6 +21,7 @@
 
 #include "shaders/scene_route.h"
 #include "shaders/routeui.h"
+#include "ent_region.h"
 
 static void world_routes_clear( world_instance *world )
 {
@@ -45,6 +46,8 @@ static void world_routes_time_lap( world_instance *world, ent_route *route ){
 
    double start_time = 0.0;
    u32 last_version=0;
+   f64 last_time = 0.0;
+   ent_checkpoint *last_cp = NULL;
 
    u32 valid_sections=0;
    int clean = !localplayer.rewinded_since_last_gate;
@@ -68,14 +71,16 @@ static void world_routes_time_lap( world_instance *world, ent_route *route ){
          else valid_sections = 0;
       }
 
-      last_version = rg->timing_version;
-
       vg_info( "%u %f [%s]\n", rg->timing_version, rg->timing_time,
             i? ((rg->flags & k_ent_gate_clean_pass)? "CLEAN": "     "):
                 " N/A ");
 
       if( !(rg->flags & k_ent_gate_clean_pass) )
          clean = 0;
+
+      last_version = rg->timing_version;
+      last_time = rg->timing_time;
+      last_cp = cp;
    }
 
    if( world_static.current_run_version == last_version+1 ){
@@ -84,6 +89,11 @@ static void world_routes_time_lap( world_instance *world, ent_route *route ){
       if( route->checkpoints_count == 1 ){
          route->timing_base = world_static.time;
       }
+
+      f32 section = world_static.time - last_time;
+      if( (section < last_cp->best_time) || (last_cp->best_time == 0.0f) ){
+         last_cp->best_time = section;
+      }
    }
    else valid_sections = 0;
 
@@ -96,12 +106,12 @@ static void world_routes_time_lap( world_instance *world, ent_route *route ){
 
       if( (route->best_laptime == 0.0) || (lap_time < route->best_laptime) ){
          route->best_laptime = lap_time;
-         route->achievment_status |= 0x1;
-
-         if( clean )
-            route->achievment_status |= 0x2;
       }
 
+      route->flags |= k_ent_route_flag_achieve_silver;
+      if( clean ) route->flags |= k_ent_route_flag_achieve_gold;
+      ent_region_re_eval( world );
+
       /* for steam achievements. */
       if( route->anon.official_track_id != 0xffffffff ){
          struct track_info *ti = &track_infos[ route->anon.official_track_id ];
@@ -125,6 +135,9 @@ static void world_routes_time_lap( world_instance *world, ent_route *route ){
 
    vg_info( "valid sections: %u\n", valid_sections );
    vg_info( "----------------------------\n" );
+
+   route->ui_residual = 1.0f;
+   route->ui_residual_block_w = route->ui_first_block_width;
 }
 
 /*
@@ -302,8 +315,8 @@ void world_routes_place_curve( world_instance *world, ent_route *route,
             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 );
+            scene_vert_pack_norm( &va, up, 0.0f );
+            scene_vert_pack_norm( &vb, up, 0.0f );
 
             float t1 = (travel_length / total_length) * patch_count;
             va.uv[0] = t1;
@@ -475,7 +488,6 @@ static void world_gen_routes_generate( u32 instance_id ){
    vg_info( "Generating route meshes\n" );
    vg_async_stall();
 
-   vg_rand_seed( 2000 );
    vg_async_item *call_scene = scene_alloc_async( &world->scene_lines, 
                                                   &world->mesh_route_lines,
                                                   200000, 300000 );
@@ -542,6 +554,14 @@ static void world_gen_routes_ent_init( world_instance *world ){
       ent_route *route = mdl_arritm(&world->ent_route,i);
       mdl_transform_m4x3( &route->anon.transform, route->board_transform );
 
+      route->flags = 0x00;
+      route->best_laptime = 0.0;
+      route->ui_stopper = 0.0f;
+      route->ui_residual = 0.0f;
+      
+      if( mdl_arrcount(&world->ent_region) )
+         route->flags |= k_ent_route_flag_out_of_zone;
+
       route->anon.official_track_id = 0xffffffff;
       for( u32 j=0; j<vg_list_size(track_infos); j ++ ){
          if( !strcmp(track_infos[j].name, 
@@ -585,6 +605,11 @@ static void world_gen_routes_ent_init( world_instance *world ){
       ent_gate *gate = mdl_arritm( &world->ent_gate, i );
    }
 
+   for( u32 i=0; i<mdl_arrcount(&world->ent_checkpoint); i++ ){
+      ent_checkpoint *cp = mdl_arritm( &world->ent_checkpoint, i );
+      cp->best_time = 0.0;
+   }
+
    world_routes_clear( world );
 }
 
@@ -672,7 +697,7 @@ static void world_routes_fixedupdate( world_instance *world ){
    rb_presolve_contacts( rb_contact_buffer, rb_contact_count );
 
    for( int i=0; i<rb_contact_count; i++ ){
-      rb_contact_restitution( rb_contact_buffer+i, vg_randf64() );
+      rb_contact_restitution( rb_contact_buffer+i, vg_randf64(&vg.rand) );
    }
 
    for( int i=0; i<6; i++ ){
@@ -856,13 +881,13 @@ static void world_routes_fracture( world_instance *world, ent_gate *gate,
             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 );
+            v3_muls( imp_v, 1.0f+vg_randf64(&vg.rand), 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.rb.w[0] = vg_randf64(&vg.rand)*2.0f-1.0f;
+            particle->obj.rb.w[1] = vg_randf64(&vg.rand)*2.0f-1.0f;
+            particle->obj.rb.w[2] = vg_randf64(&vg.rand)*2.0f-1.0f;
 
             particle->obj.type = k_rb_shape_sphere;
             particle->obj.inf.sphere.radius = r*0.6f;
@@ -878,7 +903,10 @@ static void render_gate_markers( m4x3f world_mmdl, int run_id, ent_gate *gate ){
    for( u32 j=0; j<4; j++ ){
       if( gate->routes[j] == run_id ){
          m4x3f mmdl;
-         ent_gate_get_mdl_mtx( gate, mmdl );
+         m4x3_copy( gate->to_world, mmdl );
+         m3x3_scale( mmdl, (v3f){ gate->dimensions[0], 
+                                  gate->dimensions[1], 1.0f } );
+
          m4x3_mul( world_mmdl, mmdl, mmdl );
          shader_model_gate_uMdl( mmdl );
          mdl_draw_submesh( &world_gates.sm_marker[j] );