X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_routes.h;h=e53f0920537bea10fe3eebcfd66c9855fcac5e21;hb=4f96bd0040e35ecb21d353ee2b895129682d22c1;hp=2b85f877e3bc8ebf0d5ee70f837f613fbfa1328b;hpb=0c3ef87e654d436e0cad5f5b40f3631ae26ab649;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_routes.h b/world_routes.h
index 2b85f87..e53f092 100644
--- a/world_routes.h
+++ b/world_routes.h
@@ -1,24 +1,24 @@
+/*
+ * 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"
 #include "shaders/routeui.h"
 
+
 enum route_special_type
 {
    k_route_special_type_gate = 1,
    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 )
 {
@@ -50,7 +50,6 @@ static void debug_sbpath( struct route_node *rna, struct route_node *rnb,
  */
 static u32 world_routes_get_path( u32 starter, u32 stack[64] )
 {
-   struct subworld_routes *r = &world.routes;
    u32 stack_i[64];
 
    stack[0] = starter;
@@ -67,7 +66,7 @@ static u32 world_routes_get_path( u32 starter, u32 stack[64] )
          continue;
       }
 
-      struct route_node *rn = &r->nodes[stack[si-1]];
+      struct route_node *rn = &world_routes.nodes[stack[si-1]];
       u32 nextid = rn->next[stack_i[si-1]];
       stack_i[si-1] ++;
 
@@ -110,8 +109,7 @@ static u32 world_routes_get_path( u32 starter, u32 stack[64] )
  */
 static void world_routes_ui_popfirst( u32 route )
 {
-   struct subworld_routes *r = &world.routes;
-   struct route *pr = &r->routes[route];
+   struct route *pr = &world_routes.routes[route];
 
    if( pr->ui.segment_count )
    {
@@ -129,8 +127,7 @@ static void world_routes_ui_popfirst( u32 route )
  */
 static void world_routes_ui_clear( u32 route )
 {
-   struct subworld_routes *r = &world.routes;
-   struct route *pr = &r->routes[route];
+   struct route *pr = &world_routes.routes[route];
    pr->ui.segment_start = (pr->ui.segment_start + pr->ui.segment_count) %
                               k_max_ui_segments;
    pr->ui.segment_count = 0;
@@ -222,8 +219,7 @@ static struct route_ui_segment *world_routes_ui_curseg( struct route *pr )
  */
 static void world_routes_ui_newseg( u32 route )
 {
-   struct subworld_routes *r = &world.routes;
-   struct route *pr = &r->routes[route];
+   struct route *pr = &world_routes.routes[route];
 
    pr->ui.last_notch = 0.0;
    
@@ -280,8 +276,7 @@ static void world_routes_ui_newseg( u32 route )
  */
 static void world_routes_ui_updatetime( u32 route, float time )
 {
-   struct subworld_routes *r = &world.routes;
-   struct route *pr = &r->routes[route];
+   struct route *pr = &world_routes.routes[route];
 
    v2f verts[2];
    verts[0][0] =  time;
@@ -303,8 +298,9 @@ static void world_routes_ui_updatetime( u32 route, float time )
  */
 static void world_routes_ui_notch( u32 route, float time )
 {
-   struct subworld_routes *r = &world.routes;
-   struct route *pr = &r->routes[route];
+   return; /* FIXME: Temporarily disabled */
+
+   struct route *pr = &world_routes.routes[route];
 
    if( (time - pr->ui.last_notch) > 1.0 )
    {
@@ -397,15 +393,14 @@ static void world_routes_ui_draw( u32 route, v4f colour, float offset )
    float const k_bar_height = 0.05f,
                k_bar_scale_x = 0.005f;
 
-   struct subworld_routes *r = &world.routes;
-   struct route *pr = &r->routes[route];
+   struct route *pr = &world_routes.routes[route];
 
    float cx = pr->ui.xpos;
 
    shader_routeui_use();
    glBindVertexArray( pr->ui.vao );
 
-   float fade_amt = vg_time - pr->ui.fade_timer_start;
+   float fade_amt = world_routes.time - pr->ui.fade_timer_start;
    fade_amt = vg_clampf( fade_amt / 1.0f, 0.0f, 1.0f );
    
    float fade_block_size = 0.0f,
@@ -425,7 +420,8 @@ static void world_routes_ui_draw( u32 route, v4f colour, float offset )
    v4_copy( colour, fade_colour );
    fade_colour[3] *= 1.0f-fade_amt;
 
-   float timer_delta = (vg_time - world.routes.last_interaction) * (1.0/60.0),
+   /* 1 minute timer */
+   float timer_delta = (world_routes.time - world_routes.last_use) * (1.0/45.0),
          timer_scale = 1.0f - vg_minf( timer_delta, 1.0f );
 
    /* 
@@ -473,8 +469,7 @@ static void world_routes_local_set_record( u32 route, double lap_time )
 {
    vg_success( "  NEW LAP TIME: %f\n", lap_time );
 
-   struct subworld_routes *r = &world.routes;
-   struct route *pr = &r->routes[route];
+   struct route *pr = &world_routes.routes[route];
 
    if( pr->track_id != 0xffffffff )
    {
@@ -490,7 +485,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
    {
@@ -506,11 +509,10 @@ static void world_routes_local_set_record( u32 route, double lap_time )
  */
 static void world_routes_verify_run( u32 route )
 {
-   struct subworld_routes *r = &world.routes;
-   struct route *pr = &r->routes[route];
+   struct route *pr = &world_routes.routes[route];
 
    u32 stack[64];
-   u32 si = world_routes_get_path( r->routes[route].start, stack );
+   u32 si = world_routes_get_path( world_routes.routes[route].start, stack );
 
    /* 
     * we only care about gates that ref gates, so shuffle down the array
@@ -519,10 +521,16 @@ static void world_routes_verify_run( u32 route )
    u32 sj = 0, maxv = 0, begin = 0;
    for( u32 i=0; i<si; i++ )
    {
-      if( r->nodes[stack[i]].special_type == k_route_special_type_collector )
-         timings[sj ++] = &r->collectors[r->nodes[stack[i]].special_id].timing;
-      else if( r->nodes[stack[i]].special_type == k_route_special_type_gate )
-         timings[sj ++] = &r->gates[r->nodes[stack[i]].special_id].timing;
+      struct route_node *inode = &world_routes.nodes[stack[i]];
+
+      if( inode->special_type == k_route_special_type_collector )
+      {
+         timings[sj ++] = &world_routes.collectors[ inode->special_id ].timing;
+      }
+      else if( inode->special_type == k_route_special_type_gate )
+      {
+         timings[sj ++] = &world_routes.gates[inode->special_id].timing;
+      }
    }
    
    for( u32 i=0; i<sj; i++ )
@@ -535,10 +543,10 @@ static void world_routes_verify_run( u32 route )
    }
 
    vg_info( "== begin verification (%u) ==\n", route );
-   vg_info( "  current version: %u\n", r->current_run_version );
+   vg_info( "  current version: %u\n", world_routes.current_run_version );
 
    int verified = 0;
-   if( timings[begin]->version == r->current_run_version )
+   if( timings[begin]->version == world_routes.current_run_version )
       verified = 1;
 
    int valid_segment_count = 0;
@@ -575,7 +583,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 = world_routes.time;
 
    int orig_seg_count = pr->ui.segment_count;
 
@@ -598,7 +606,7 @@ static void world_routes_verify_run( u32 route )
       pr->ui.fade_count ++;
    }
 
-   r->routes[route].latest_pass = vg_time;
+   world_routes.routes[route].latest_pass = world_routes.time;
 }
 
 /*
@@ -606,21 +614,20 @@ static void world_routes_verify_run( u32 route )
  */
 static void world_routes_activate_gate( u32 id )
 {
-   world_routes_interact();
+   struct route_gate *rg = &world_routes.gates[id];
+   struct route_node *pnode = &world_routes.nodes[rg->node_id],
+                     *pdest = &world_routes.nodes[pnode->next[0]];
 
-   struct subworld_routes *r = &world.routes;
-   struct route_gate *rg = &r->gates[id];
-   struct route_node *pnode = &r->nodes[rg->node_id],
-                     *pdest = &r->nodes[pnode->next[0]];
+   world_routes.last_use = world_routes.time;
 
-   struct route_collector *rc = &r->collectors[ pdest->special_id ];
+   struct route_collector *rc = &world_routes.collectors[ pdest->special_id ];
 
-   r->active_gate = id;
-   rg->timing.version = r->current_run_version;
-   rg->timing.time = vg_time;
-   for( u32 i=0; i<r->route_count; i++ )
+   world_routes.active_gate = id;
+   rg->timing.version = world_routes.current_run_version;
+   rg->timing.time = world_routes.time;
+   for( u32 i=0; i<world_routes.route_count; i++ )
    {
-      struct route *route = &r->routes[i];
+      struct route *route = &world_routes.routes[i];
       
       int was_active = route->active;
 
@@ -639,7 +646,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 = world_routes.time;
          world_routes_ui_clear(i);
 
          vg_success( "CLEARING -> %u %u \n", route->ui.fade_start,
@@ -647,11 +654,11 @@ static void world_routes_activate_gate( u32 id )
       }
    }
    
-   r->current_run_version ++;
+   world_routes.current_run_version ++;
 
-   rc->timing.version = r->current_run_version;
-   rc->timing.time = vg_time;
-   r->current_run_version ++;
+   rc->timing.version = world_routes.current_run_version;
+   rc->timing.time = world_routes.time;
+   world_routes.current_run_version ++;
 }
 
 /*
@@ -659,31 +666,40 @@ static void world_routes_activate_gate( u32 id )
  */
 static void world_routes_notify_reset(void)
 {
-   struct subworld_routes *r = &world.routes;
-   world_routes_interact();
+   world_routes.rewind_from = world_routes.time;
+   world_routes.rewind_to = world_routes.last_use;
 
+#if 0
    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, r->time - route->latest_pass );
    }
+#endif
 }
 
+/* Rewind between the saved points in time */
+static void world_routes_rollback_time( double t )
+{
+   world_routes.time = 
+      vg_lerp( world_routes.rewind_to, world_routes.rewind_from, t );
+}
+
+/* draw lines along the paths */
 static void world_routes_debug(void)
 {
-   struct subworld_routes *r = &world.routes;
 
-   for( int i=0; i<r->node_count; i++ )
+   for( int i=0; i<world_routes.node_count; i++ )
    {
-      struct route_node *rn = &r->nodes[i];
+      struct route_node *rn = &world_routes.nodes[i];
       vg_line_pt3( rn->co, 1.0f, rn->special_type? 0xffffff00: 0xff00b2ff );
    }
 
-   for( int i=0; i<r->route_count; i++ )
+   for( int i=0; i<world_routes.route_count; i++ )
    {
-      struct route *route = &r->routes[i];
+      struct route *route = &world_routes.routes[i];
 
       u32 stack[64];
       u32 si = world_routes_get_path( route->start, stack );
@@ -696,21 +712,23 @@ static void world_routes_debug(void)
       for( int sj=0; sj<si; sj++ )
       {
          int sk = (sj+1)%si;
-         debug_sbpath( &r->nodes[stack[sj]], &r->nodes[stack[sk]], cc,
-               (float)i );
+
+         struct route_node *pj = &world_routes.nodes[stack[sj]],
+                           *pk = &world_routes.nodes[stack[sk]];
+         debug_sbpath( pj, pk, cc, (float)i );
       }
    }
 
-   for( int i=0; i<r->node_count; i++ )
+   for( int i=0; i<world_routes.node_count; i++ )
    {
-      struct route_node *ri = &r->nodes[i],
+      struct route_node *ri = &world_routes.nodes[i],
                         *rj = NULL;
       
       for( int j=0; j<2; j++ )
       {
          if( ri->next[j] != 0xffffffff )
          {
-            rj = &r->nodes[ri->next[j]];
+            rj = &world_routes.nodes[ri->next[j]];
             vg_line( ri->co, rj->co, 0x20ffffff );
          }
       }
@@ -725,152 +743,192 @@ 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 = &world_routes.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 = &world_routes.nodes[ stack[sj] ],
+                        *rnk = &world_routes.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 )
       {
-         int sk=(sj+1)%si;
+         rnl = &world_routes.nodes[ rnk->next[0] ];
+         base_x1 = (float)rnl->ref_count*-0.5f + (float)rnl->current_refs;
+      }
 
-         struct route_node *rnj = &r->nodes[ stack[sj] ],
-                           *rnk = &r->nodes[ stack[sk] ],
-                           *rnl;
+      if( sk == 0 )
+      {
+         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 );
+
+         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 );
          
-         if( rnj->special_type && rnk->special_type )
+         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( &world_routes.scene_lines, &va );
+            scene_push_vert( &world_routes.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( &world_routes.scene_lines, (u32[3]){ 
+                     last_valid+0-2, last_valid+1-2, last_valid+2-2} );
+               scene_push_tri( &world_routes.scene_lines, (u32[3]){ 
+                     last_valid+1-2, last_valid+3-2, last_valid+2-2} );
+            }
+            
+            last_valid = world_routes.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( &world_routes.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 );
+   scene_init( &world_routes.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<world_routes.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( &world_routes.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<world_routes.route_count; i++ )
+      {
+         /* OpenGL strips */
+         struct route *route = &world_routes.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 );
+   scene_free_offline_buffers( &world_routes.scene_lines );
+   return 1;
 }
 
 
 static void world_routes_loadfrom( mdl_header *mdl )
 {
-   struct subworld_routes *r = &world.routes;
-   r->nodes = 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;
-
+   vg_info( "Initializing routes\n" );
+
+   world_routes.nodes = NULL;
+   world_routes.node_count = 0; 
+   world_routes.node_cap = 0; 
+   world_routes.routes = NULL;
+   world_routes.route_count = 0;
+   world_routes.route_cap = 0;
+   world_routes.gates = NULL;
+   world_routes.gate_count = 0;
+   world_routes.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);
@@ -880,12 +938,14 @@ static void world_routes_loadfrom( mdl_header *mdl )
           pnode->classtype == k_classtype_gate )
       {
          mdl_node_transform( pnode, transform );
-         pnode->sub_uid = r->node_count;
+         pnode->sub_uid = world_routes.node_count;
          
-         r->nodes = buffer_reserve( r->nodes, r->node_count, &r->node_cap, 1,
-                                    sizeof( struct route_node ) );
+         world_routes.nodes = buffer_reserve( world_routes.nodes, 
+                                              world_routes.node_count, 
+                                              &world_routes.node_cap, 1,
+                                                sizeof( struct route_node ) );
 
-         struct route_node *rn = &r->nodes[r->node_count];
+         struct route_node *rn = &world_routes.nodes[world_routes.node_count];
 
          v3_copy( transform[0], rn->right );
          v3_normalize( rn->right );
@@ -914,12 +974,15 @@ static void world_routes_loadfrom( mdl_header *mdl )
                
                if( pother->classtype == k_classtype_gate )
                {
-                  r->gates = buffer_reserve( r->gates, r->gate_count, 
-                                             &r->gate_cap,
+                  world_routes.gates = buffer_reserve( world_routes.gates, 
+                                                       world_routes.gate_count, 
+                                             &world_routes.gate_cap,
                                              1, sizeof( struct route_gate ) );
 
-                  struct route_gate *rg = &r->gates[r->gate_count];
-                  rg->node_id = r->node_count;
+                  struct route_gate *rg = 
+                     &world_routes.gates[world_routes.gate_count];
+
+                  rg->node_id = world_routes.node_count;
                   rg->timing.time = 0.0;
                   rg->timing.version = 0;
 
@@ -931,26 +994,29 @@ static void world_routes_loadfrom( mdl_header *mdl )
 
                   gate_transform_update( &rg->gate );
                   rn->special_type = k_route_special_type_gate;
-                  rn->special_id = r->gate_count;
+                  rn->special_id = world_routes.gate_count;
 
-                  r->gate_count ++;
+                  world_routes.gate_count ++;
                }
             }
 
             if( rn->special_type == 0 )
             {
-               r->collectors = buffer_reserve( 
-                     r->collectors, r->collector_count, &r->collector_cap,
+               world_routes.collectors = buffer_reserve( 
+                     world_routes.collectors, 
+                     world_routes.collector_count, 
+                     &world_routes.collector_cap,
                                           1, sizeof( struct route_collector ));
 
-               struct route_collector *rc = &r->collectors[r->collector_count];
+               struct route_collector *rc = 
+                  &world_routes.collectors[world_routes.collector_count];
                rc->timing.time = 0.0;
                rc->timing.version = 0;
 
                rn->special_type = k_route_special_type_collector;
-               rn->special_id = r->collector_count;
+               rn->special_id = world_routes.collector_count;
 
-               r->collector_count ++;
+               world_routes.collector_count ++;
             }
          }
          else
@@ -960,15 +1026,18 @@ static void world_routes_loadfrom( mdl_header *mdl )
             rn->next[1] = inf->target1;
          }
 
-         r->node_count ++;
+         world_routes.node_count ++;
       }
       else if( pnode->classtype == k_classtype_route )
       {
          struct classtype_route *inf = mdl_get_entdata( mdl, pnode );
-         r->routes = buffer_reserve( r->routes, r->route_count, &r->route_cap,
+         world_routes.routes = buffer_reserve( world_routes.routes, 
+                                               world_routes.route_count, 
+                                               &world_routes.route_cap,
                                      1, sizeof( struct route ) );
 
-         struct route *route = &r->routes[r->route_count];
+         struct route *route = &world_routes.routes[world_routes.route_count];
+         memset( route, 0, sizeof(struct route) );
 
          v3_copy( inf->colour, route->colour );
          route->colour[3] = 1.0f;
@@ -989,27 +1058,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;
@@ -1019,40 +1067,40 @@ static void world_routes_loadfrom( mdl_header *mdl )
          route->ui.fade_count = 0;
          route->ui.fade_timer_start = 0.0;
 
-         r->route_count ++;
+         world_routes.route_count ++;
       }
    }
 
    /* 
     * Apply correct system-local ids
     */
-   for( int i=0; i<r->node_count; i++ )
+   for( int i=0; i<world_routes.node_count; i++ )
    {
-      struct route_node *rn = &r->nodes[i];
+      struct route_node *rn = &world_routes.nodes[i];
       
       for( int j=0; j<2; j++ )
          world_id_fixup( &rn->next[j], mdl );
    }
 
-   for( int i=0; i<r->route_count; i++ )
+   for( int i=0; i<world_routes.route_count; i++ )
    {
-      struct route *route = &r->routes[i];
+      struct route *route = &world_routes.routes[i];
       world_id_fixup( &route->start, mdl );
    }
 
    /*
     * Gather references
     */
-   for( int i=0; i<r->route_count; i++ )
+   for( int i=0; i<world_routes.route_count; i++ )
    {
-      struct route *route = &r->routes[i];
+      struct route *route = &world_routes.routes[i];
 
       u32 stack[64];
       u32 si = world_routes_get_path( route->start, stack );
 
       for( int sj=0; sj<si; sj++ )
       {
-         struct route_node *rn = &r->nodes[ stack[sj] ];
+         struct route_node *rn = &world_routes.nodes[ stack[sj] ];
          rn->route_ids[ rn->ref_count ++ ] = i;
 
          if( rn->ref_count > 4 )
@@ -1060,7 +1108,7 @@ static void world_routes_loadfrom( mdl_header *mdl )
       }
    }
 
-   world_routes_gen_meshes();
+   world_routes_create_all_meshes();
 }
 
 /* 
@@ -1069,36 +1117,36 @@ 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;
+   world_routes.current_run_version = 2;
+   world_routes.time = RESET_MAX_TIME*2.0;
+   world_routes.last_use = 0.0;
 
    shader_route_register();
    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( world_routes.nodes );
+   vg_free( world_routes.routes );
+   vg_free( world_routes.gates );
 }
 
 static void world_routes_update(void)
 {
-   struct subworld_routes *r = &world.routes;
+   world_routes.time += vg.time_delta;
 
-   for( int i=0; i<r->route_count; i++ )
+   for( int i=0; i<world_routes.route_count; i++ )
    {
-      struct route *route = &r->routes[i];
-      route->factive = vg_lerpf( route->factive, route->active, 0.01f );
+      struct route *route = &world_routes.routes[i];
+      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, world_routes.time - route->latest_pass );
       }
    }
 }
@@ -1106,8 +1154,6 @@ static void world_routes_update(void)
 static void bind_terrain_textures(void);
 static void render_world_routes( m4x4f projection, v3f camera )
 {
-   struct subworld_routes *r = &world.routes;
-
    m4x3f identity_matrix;
    m4x3_identity( identity_matrix );
 
@@ -1120,11 +1166,11 @@ static void render_world_routes( m4x4f projection, v3f camera )
    shader_route_uMdl( identity_matrix );
    shader_route_uCamera( camera );
 
-   scene_bind( &r->scene_lines );
+   scene_bind( &world_routes.scene_lines );
 
-   for( int i=0; i<r->route_count; i++ )
+   for( int i=0; i<world_routes.route_count; i++ )
    {
-      struct route *route = &r->routes[i];
+      struct route *route = &world_routes.routes[i];
 
       v4f colour;
       v3_lerp( (v3f){0.7f,0.7f,0.7f}, route->colour, route->factive, colour );
@@ -1141,12 +1187,10 @@ static void render_world_routes_ui(void)
    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
    glBlendEquation(GL_FUNC_ADD);
 
-   struct subworld_routes *r = &world.routes;
-
    float active_offset = 0.0f;
-   for( int i=0; i<r->route_count; i++ )
+   for( int i=0; i<world_routes.route_count; i++ )
    {
-      struct route *route = &r->routes[i];
+      struct route *route = &world_routes.routes[i];
       world_routes_ui_draw( i, route->colour, active_offset );
       active_offset += route->factive;
    }