X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_routes.h;h=792b7e8dc89ccdbe8a1bf1aa7476101291d106d4;hb=e5dfbef890431a69291a9f0a9ca4a88ea8d0705a;hp=d866cb7c543d7291f190ab057bd3426f01c4c5fe;hpb=72c40f1bc7a732f6a628dbf8a4135ac0bf3efa4e;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_routes.h b/world_routes.h
index d866cb7..792b7e8 100644
--- a/world_routes.h
+++ b/world_routes.h
@@ -8,6 +8,7 @@
 #include <time.h>
 #include "world.h"
 #include "world_gate.h"
+#include "font.h"
 
 #if 0
 #include "shaders/vblend.h"
@@ -59,7 +60,7 @@ VG_STATIC void world_routes_clear( world_instance *world )
 {
    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++ ){
@@ -77,9 +78,10 @@ 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; i<route->checkpoints_count; i++ ){
       u32 cpid  = route->checkpoints_start+(i+route->active_checkpoint);
@@ -90,22 +92,30 @@ VG_STATIC void world_routes_time_lap( world_instance *world, ent_route *route )
                 rg = mdl_arritm( &world->ent_gate, rg->target );
 
       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 ++;
+   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;
+   route->timing_base = start_time;
+
+   vg_info( "valid: %u\n", valid_count );
    vg_info( "----------------------------\n" );
 }
 
@@ -123,7 +133,7 @@ VG_STATIC void world_routes_activate_entry_gate( world_instance *world,
       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 ){
@@ -165,7 +175,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)];
       }
 
@@ -205,7 +215,7 @@ VG_STATIC void world_routes_place_curve( world_instance *world,
 {
    float t;
    v3f p, pd;
-   int last_valid;
+   int last_valid=0;
 
    float total_length = 0.0f,
          travel_length = 0.0;
@@ -337,7 +347,7 @@ VG_STATIC void world_routes_create_mesh( world_instance *world, u32 route_id )
 
       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 )
@@ -401,7 +411,7 @@ VG_STATIC void world_routes_create_mesh( world_instance *world, u32 route_id )
             if( i == route->checkpoints_count-1)
                p[2][3] -= 1.0f;
 
-            p[2][3] -= (float)collector->ref_total * 0.5f;
+            p[2][3] -= (float)collector->route_count * 0.5f;
             //collector->ref_count ++;
          }
 
@@ -441,7 +451,7 @@ VG_STATIC void world_routes_generate( world_instance *world )
    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++ ){
@@ -462,7 +472,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 );
-         start_gate->ref_total ++;
+         start_gate->route_count ++;
 
          if( !c0->path_count )
             continue;
@@ -579,7 +589,7 @@ VG_STATIC void world_routes_update( world_instance *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 );
    }
 }
@@ -592,6 +602,132 @@ VG_STATIC void world_bind_light_index( world_instance *world,
                                        GLuint shader, GLuint location, 
                                        int slot );
 
+VG_STATIC void world_routes_update_timer_texts( world_instance *world )
+{
+   world_global.timer_text_count = 0;
+
+   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 ){
+         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 )
+{
+   world_global.text_particle_count = 0;
+   
+   for( u32 i=0; i<world_global.timer_text_count; i++ ){
+      struct timer_text *text = &world_global.timer_texts[i];
+
+      if( text->gate == gate ){
+         v3f co, s;
+         v4f q;
+         m4x3_decompose( text->transform, co, q, s );
+
+         for( u32 j=0;; j++ ){
+            char c = text->text[j];
+            if( !c ) break;
+
+            if( c < '0' || c > '9' ) continue;
+            
+            struct text_particle *particle = 
+               &world_global.text_particles[world_global.text_particle_count++];
+
+         }
+      }
+   }
+}
+
 VG_STATIC void render_world_routes( world_instance *world, camera *cam, 
                                     int layer_depth )
 {
@@ -629,6 +765,28 @@ 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; i<world_global.timer_text_count; i++ ){
+         struct timer_text *text = &world_global.timer_texts[i];
+
+         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;
+
+         shader_model_font_uColour( colour );
+         font3d_simple_draw( &world_global.font, 0, text->text, 
+                             cam, text->transform );
+      }
+   }
+
+   /* gate markers 
+    * ---------------------------------------------------- */
+
    shader_model_gate_use();
    shader_model_gate_uPv( cam->mtx.pv );
    shader_model_gate_uCam( cam->pos );
@@ -645,7 +803,7 @@ VG_STATIC void render_world_routes( world_instance *world, camera *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 != 0xffffffff ){
+      if( route->active_checkpoint != 0xffff ){
          v4f colour;
          float brightness = 0.3f + world->ub_lighting.g_day_phase;
          v3_muls( route->colour, brightness, colour );