X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_routes.h;h=d8d36d210efcccc7dfd8747c7148f039af0664e5;hb=15beb60ade240af4e00b0d204f7e89a4d35dca36;hp=7f108aa88d89463ed12121e8db0de1d4116322ec;hpb=86dbcd5796ed674ca9433cce1ace8bef322cd121;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_routes.h b/world_routes.h
index 7f108aa..d8d36d2 100644
--- a/world_routes.h
+++ b/world_routes.h
@@ -1,8 +1,13 @@
+/*
+ * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved
+ */
+
 #ifndef ROUTES_H
 #define ROUTES_H
 
 #include "world.h"
 #include "world_info.h"
+#include "world_gate.h"
 
 #include "shaders/vblend.h"
 #include "shaders/route.h"
@@ -14,6 +19,11 @@ enum route_special_type
    k_route_special_type_collector = 2
 };
 
+static void world_routes_interact(void)
+{
+   world.routes.last_interaction = vg.time;
+}
+
 static void debug_sbpath( struct route_node *rna, struct route_node *rnb,
                           u32 colour, float xoffset )
 {
@@ -265,6 +275,7 @@ static void world_routes_ui_newseg( u32 route )
    segment->vertex_count = 4;
    segment->index_start  = pr->ui.indices_head;
    segment->index_count  = 6;
+   segment->notches      = 0;
 
    world_routes_ui_set_indices( pr, indices, 6 );
 }
@@ -302,6 +313,12 @@ static void world_routes_ui_notch( u32 route, float time )
 
    if( (time - pr->ui.last_notch) > 1.0 )
    {
+      struct route_ui_segment *segment = world_routes_ui_curseg(pr);
+      if( segment->notches == k_max_ui_splits_per_segment )
+         return;
+
+      segment->notches ++;
+
       v2f verts[8];
       
       float const k_notch_width = 1.0f;
@@ -360,7 +377,6 @@ static void world_routes_ui_notch( u32 route, float time )
 
       pr->ui.last_notch = time;
 
-      struct route_ui_segment *segment = world_routes_ui_curseg(pr);
       segment->vertex_count += 6;
       segment->index_count  += 18;
    }
@@ -394,7 +410,7 @@ static void world_routes_ui_draw( u32 route, v4f colour, float offset )
    shader_routeui_use();
    glBindVertexArray( pr->ui.vao );
 
-   float fade_amt = vg_time - pr->ui.fade_timer_start;
+   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,
@@ -414,12 +430,16 @@ static void world_routes_ui_draw( u32 route, v4f colour, float offset )
    v4_copy( colour, fade_colour );
    fade_colour[3] *= 1.0f-fade_amt;
 
+   /* 1 minute timer */
+   float timer_delta = (vg.time - world.routes.last_interaction) * (1.0/60.0),
+         timer_scale = 1.0f - vg_minf( timer_delta, 1.0f );
+
    /* 
     * Draw fadeout bar
     */
 
-   float height = pr->factive*k_bar_height,
-         base = -1.0f + (offset+0.5f)*k_bar_height;
+   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; i<pr->ui.fade_count; i++ )
@@ -476,7 +496,15 @@ static void world_routes_local_set_record( u32 route, double lap_time )
       temp.time     = time_centiseconds;
 
       highscores_push_record( &temp );
-      track_infos[ pr->track_id ].push = 1;
+
+      struct track_info *pti = &track_infos[ pr->track_id ];
+      pti->push = 1;
+      
+      if( pti->achievement_id )
+      {
+         steam_set_achievement( pti->achievement_id );
+         steam_store_achievements();
+      }
    }
    else
    {
@@ -561,7 +589,7 @@ static void world_routes_verify_run( u32 route )
 
    pr->ui.fade_start = pr->ui.segment_start;
    pr->ui.fade_count = 0;
-   pr->ui.fade_timer_start = vg_time;
+   pr->ui.fade_timer_start = vg.time;
 
    int orig_seg_count = pr->ui.segment_count;
 
@@ -584,7 +612,7 @@ static void world_routes_verify_run( u32 route )
       pr->ui.fade_count ++;
    }
 
-   r->routes[route].latest_pass = vg_time;
+   r->routes[route].latest_pass = vg.time;
 }
 
 /*
@@ -592,6 +620,8 @@ static void world_routes_verify_run( u32 route )
  */
 static void world_routes_activate_gate( u32 id )
 {
+   world_routes_interact();
+
    struct subworld_routes *r = &world.routes;
    struct route_gate *rg = &r->gates[id];
    struct route_node *pnode = &r->nodes[rg->node_id],
@@ -601,7 +631,7 @@ static void world_routes_activate_gate( u32 id )
 
    r->active_gate = id;
    rg->timing.version = r->current_run_version;
-   rg->timing.time = vg_time;
+   rg->timing.time = vg.time;
    for( u32 i=0; i<r->route_count; i++ )
    {
       struct route *route = &r->routes[i];
@@ -623,7 +653,7 @@ static void world_routes_activate_gate( u32 id )
       {
          route->ui.fade_start = route->ui.segment_start;
          route->ui.fade_count = route->ui.segment_count;
-         route->ui.fade_timer_start = vg_time;
+         route->ui.fade_timer_start = vg.time;
          world_routes_ui_clear(i);
 
          vg_success( "CLEARING -> %u %u \n", route->ui.fade_start,
@@ -634,7 +664,7 @@ static void world_routes_activate_gate( u32 id )
    r->current_run_version ++;
 
    rc->timing.version = r->current_run_version;
-   rc->timing.time = vg_time;
+   rc->timing.time = vg.time;
    r->current_run_version ++;
 }
 
@@ -644,13 +674,14 @@ static void world_routes_activate_gate( u32 id )
 static void world_routes_notify_reset(void)
 {
    struct subworld_routes *r = &world.routes;
+   world_routes_interact();
 
    for( int i=0; i<r->route_count; i++ )
    {
       struct route *route = &r->routes[i];
 
       if( route->active )
-         world_routes_ui_notch( i, vg_time - route->latest_pass );
+         world_routes_ui_notch( i, vg.time - route->latest_pass );
    }
 }
 
@@ -708,152 +739,193 @@ static void world_id_fixup( u32 *uid, mdl_header *mdl )
       *uid = 0xffffffff;
 }
 
-/* 
- * Create the strips of colour that run through the world along course paths
- */
-static void world_routes_gen_meshes(void)
+static void world_routes_create_mesh( u32 route_id )
 {
    struct subworld_routes *r = &world.routes;
-   scene_init( &r->scene_lines );
+   struct route *route = &r->routes[ route_id ];
 
-   for( int i=0; i<r->route_count; i++ )
+   u32 stack[64];
+   u32 si = world_routes_get_path( route->start, stack );
+
+   u32 last_valid = 0;
+
+   for( int sj=0; sj<si; sj++ )
    {
-      struct route *route = &r->routes[i];
+      int sk=(sj+1)%si;
 
-      u32 stack[64];
-      u32 si = world_routes_get_path( route->start, stack );
+      struct route_node *rnj = &r->nodes[ stack[sj] ],
+                        *rnk = &r->nodes[ stack[sk] ],
+                        *rnl;
+      
+      if( rnj->special_type && rnk->special_type )
+      {
+         last_valid = 0;
+         continue;
+      }
 
-      u32 last_valid = 0;
+      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;
 
-      for( int sj=0; sj<si; sj++ )
+      if( rnk->special_type )
+      {
+         rnl = &r->nodes[ rnk->next[0] ];
+         base_x1 = (float)rnl->ref_count*-0.5f + (float)rnl->current_refs;
+      }
+
+      if( sk == 0 )
       {
-         int sk=(sj+1)%si;
+         base_x1 -= 1.0f;
+      }
+
+      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 );
+
+      float t=0.0f;
+      int it = 0;
+
+      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 );
+
+         v3f v0,up, right;
+         v3_muls( rnj->up, 1.0f-t, up );
+         v3_muladds( up, rnk->up, t, up );
+
+         v3_sub( pd,p,v0 );
+         v3_cross( up, v0, right );
+         v3_normalize( right );
 
-         struct route_node *rnj = &r->nodes[ stack[sj] ],
-                           *rnk = &r->nodes[ stack[sk] ],
-                           *rnl;
+         float cur_x = (1.0f-t)*base_x0 + t*base_x1;
          
-         if( rnj->special_type && rnk->special_type )
+         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 );
+         
+         ray_hit ha, hb;
+         ha.dist = 8.0f;
+         hb.dist = 8.0f;
+         if( ray_world( sa, down, &ha ) && 
+             ray_world( sb, down, &hb ))
          {
-            last_valid = 0;
-            continue;
-         }
+            mdl_vert va, vb;
+            
+            v3_muladds( ha.pos, up, 0.06f, va.co );
+            v3_muladds( hb.pos, up, 0.06f, vb.co );
+            v3_copy( up, va.norm );
+            v3_copy( up, vb.norm );
+            v2_zero( va.uv );
+            v2_zero( vb.uv );
 
-         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;
+            scene_push_vert( &r->scene_lines, &va );
+            scene_push_vert( &r->scene_lines, &vb );
 
-         if( rnk->special_type )
-         {
-            rnl = &r->nodes[ rnk->next[0] ];
-            base_x1 = (float)rnl->ref_count*-0.5f + (float)rnl->current_refs;
+            if( last_valid )
+            {
+               /* Connect them with triangles */
+               scene_push_tri( &r->scene_lines, (u32[3]){ 
+                     last_valid+0-2, last_valid+1-2, last_valid+2-2} );
+               scene_push_tri( &r->scene_lines, (u32[3]){ 
+                     last_valid+1-2, last_valid+3-2, last_valid+2-2} );
+            }
+            
+            last_valid = r->scene_lines.vertex_count;
          }
+         else
+            last_valid = 0;
+
+         t += 1.0f*mod;
 
-         if( sk == 0 )
+         if( t >= 1.0f )
          {
-            base_x1 -= 1.0f;
+            /* TODO special case for end of loop, need to add triangles
+             *      between first and last rungs */
+            break;
          }
+      }
 
-         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 );
+      rnj->current_refs ++;
+   }
 
-         float t=0.0f;
-         int it = 0;
+   scene_copy_slice( &r->scene_lines, &route->sm );
+}
 
-         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 );
+/* 
+ * Create the strips of colour that run through the world along course paths
+ */
+static int world_routes_create_all_meshes(void)
+{
+   vg_info( "Generating route meshes\n" );
 
-            float mod = k_sample_dist / v3_dist( p, pd );
+   struct subworld_routes *r = &world.routes;
+   scene_init( &r->scene_lines );
 
-            v3f v0,up, right;
-            v3_muls( rnj->up, 1.0f-t, up );
-            v3_muladds( up, rnk->up, t, up );
+   for( u32 i=0; i<r->route_count; i++ )
+      world_routes_create_mesh( i );
 
-            v3_sub( pd,p,v0 );
-            v3_cross( up, v0, right );
-            v3_normalize( right );
+   vg_acquire_thread_sync();
+   {
+      scene_upload( &r->scene_lines );
 
-            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 );
-            
-            ray_hit ha, hb;
-            ha.dist = 8.0f;
-            hb.dist = 8.0f;
-            if(ray_world( sa, down, &ha ) && 
-               ray_world( sb, down, &hb ))
-            {
-               mdl_vert va, vb;
-               
-               v3_muladds( ha.pos, up, 0.06f, va.co );
-               v3_muladds( hb.pos, up, 0.06f, vb.co );
-               v3_copy( up, va.norm );
-               v3_copy( up, vb.norm );
-               v2_zero( va.uv );
-               v2_zero( vb.uv );
+      /* UI buffers */
+      for( int i=0; i<r->route_count; i++ )
+      {
+         /* OpenGL strips */
+         struct route *route = &r->routes[i];
 
-               scene_push_vert( &r->scene_lines, &va );
-               scene_push_vert( &r->scene_lines, &vb );
+         glGenVertexArrays( 1, &route->ui.vao );
+         glGenBuffers( 1, &route->ui.vbo );
+         glGenBuffers( 1, &route->ui.ebo );
+         glBindVertexArray( route->ui.vao );
 
-               if( last_valid )
-               {
-                  /* Connect them with triangles */
-                  scene_push_tri( &r->scene_lines, (u32[3]){ 
-                        last_valid+0-2, last_valid+1-2, last_valid+2-2} );
-                  scene_push_tri( &r->scene_lines, (u32[3]){ 
-                        last_valid+1-2, last_valid+3-2, last_valid+2-2} );
-               }
-               
-               last_valid = r->scene_lines.vertex_count;
-            }
-            else
-               last_valid = 0;
+         size_t stride = sizeof(v2f);
 
-            t += 1.0f*mod;
+         glBindBuffer( GL_ARRAY_BUFFER, route->ui.vbo );
+         glBufferData( GL_ARRAY_BUFFER, k_route_ui_max_verts*stride, 
+                       NULL, GL_DYNAMIC_DRAW );
 
-            if( t >= 1.0f )
-            {
-               /* TODO special case for end of loop, need to add triangles
-                *      between first and last rungs */
-               break;
-            }
-         }
+         glBindVertexArray( route->ui.vao );
+         glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, route->ui.ebo );
+         glBufferData( GL_ELEMENT_ARRAY_BUFFER, 
+               k_route_ui_max_indices*sizeof(u16), NULL,
+               GL_DYNAMIC_DRAW );
 
-         rnj->current_refs ++;
+         glVertexAttribPointer( 0, 2, GL_FLOAT, GL_FALSE, stride, (void *)0 );
+         glEnableVertexAttribArray( 0 );
+         VG_CHECK_GL_ERR();
       }
-
-      scene_copy_slice( &r->scene_lines, &route->sm );
    }
+   vg_release_thread_sync();
 
-   scene_upload( &r->scene_lines );
    scene_free_offline_buffers( &r->scene_lines );
+   return 1;
 }
 
 
 static void world_routes_loadfrom( mdl_header *mdl )
 {
+   vg_info( "Initializing routes\n" );
+
    struct subworld_routes *r = &world.routes;
    r->nodes = NULL;
-   r->node_count = 0;
-   r->node_cap = 0;
-   r->routes = NULL;
+   r->node_count = 0; r->node_cap = 0; r->routes = NULL;
    r->route_count = 0;
    r->route_cap = 0;
    r->gates = NULL;
    r->gate_count = 0;
    r->gate_cap = 0;
 
+   /* TODO Break this up */
    for( int i=0; i<mdl->node_count; i++ )
    {
       mdl_node *pnode = mdl_node_from_id(mdl,i);
@@ -952,6 +1024,7 @@ static void world_routes_loadfrom( mdl_header *mdl )
                                      1, sizeof( struct route ) );
 
          struct route *route = &r->routes[r->route_count];
+         memset( route, 0, sizeof(struct route) );
 
          v3_copy( inf->colour, route->colour );
          route->colour[3] = 1.0f;
@@ -972,27 +1045,6 @@ static void world_routes_loadfrom( mdl_header *mdl )
          route->factive = 0.0f;
          mdl_node_transform( pnode, route->scoreboard_transform );
 
-         /* OpenGL strips */
-         glGenVertexArrays( 1, &route->ui.vao );
-         glGenBuffers( 1, &route->ui.vbo );
-         glGenBuffers( 1, &route->ui.ebo );
-         glBindVertexArray( route->ui.vao );
-
-         size_t stride = sizeof(v2f);
-
-         glBindBuffer( GL_ARRAY_BUFFER, route->ui.vbo );
-         glBufferData( GL_ARRAY_BUFFER, k_route_ui_max_verts*stride, 
-               NULL, GL_DYNAMIC_DRAW );
-         glBindVertexArray( route->ui.vao );
-         glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, route->ui.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();
-
          route->ui.indices_head = k_route_ui_max_indices - 9;
          route->ui.vertex_head = k_route_ui_max_verts - 200;
          route->ui.segment_start = 0;
@@ -1043,7 +1095,7 @@ static void world_routes_loadfrom( mdl_header *mdl )
       }
    }
 
-   world_routes_gen_meshes();
+   world_routes_create_all_meshes();
 }
 
 /* 
@@ -1052,7 +1104,7 @@ static void world_routes_loadfrom( mdl_header *mdl )
  * -----------------------------------------------------------------------------
  */
 
-static void world_routes_register(void)
+static void world_routes_init(void)
 {
    struct subworld_routes *r = &world.routes;
    r->current_run_version = 2;
@@ -1061,13 +1113,13 @@ static void world_routes_register(void)
    shader_routeui_register();
 }
 
-static void world_routes_free(void)
+static void world_routes_free(void*_)
 {
    struct subworld_routes *r = &world.routes;
 
-   free( r->nodes );
-   free( r->routes );
-   free( r->gates );
+   vg_free( r->nodes );
+   vg_free( r->routes );
+   vg_free( r->gates );
 }
 
 static void world_routes_update(void)
@@ -1077,11 +1129,12 @@ static void world_routes_update(void)
    for( int i=0; i<r->route_count; i++ )
    {
       struct route *route = &r->routes[i];
-      route->factive = vg_lerpf( route->factive, route->active, 0.01f );
+      route->factive = vg_lerpf( route->factive, route->active, 
+                                 0.6f*vg.time_delta );
 
       if( route->active )
       {
-         world_routes_ui_updatetime( i, vg_time - route->latest_pass );
+         world_routes_ui_updatetime( i, vg.time - route->latest_pass );
       }
    }
 }