X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_routes.h;h=7d4ef7c7778b8fd53cf17622595d9371aea05dd8;hb=f7db507815e2822d971031c30f25e02b45e9c914;hp=312429579a0fcd021d9b3cfe966d85424f9e4919;hpb=47941822dae18a018c985847b052e70214a3ccc6;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_routes.h b/world_routes.h
index 3124295..7d4ef7c 100644
--- a/world_routes.h
+++ b/world_routes.h
@@ -5,6 +5,7 @@
 #ifndef ROUTES_H
 #define ROUTES_H
 
+#include <time.h>
 #include "world.h"
 #include "world_gate.h"
 
@@ -221,8 +222,6 @@ VG_STATIC struct route_ui_segment *world_routes_ui_curseg(
 VG_STATIC void world_routes_ui_newseg( u32 route )
 {
    struct route_ui_bar *pui = &world.ui_bars[route];
-
-   pui->last_notch = 0.0;
    
    glBindVertexArray( pui->vao );
    if( pui->segment_count )
@@ -532,6 +531,17 @@ VG_STATIC void world_routes_verify_run( u32 route )
    world.routes[route].latest_pass = world.time;
 }
 
+VG_STATIC void world_routes_clear(void)
+{
+   for( u32 i=0; i<world.route_count; i++ )
+   {
+      struct route *route = &world.routes[i];
+      route->active = 0;
+   }
+   world.current_run_version += 4;
+   world.last_use = 0.0;
+}
+
 /*
  * When going through a gate this is called for bookkeeping purposes
  */
@@ -996,7 +1006,6 @@ VG_STATIC void world_routes_create_route( mdl_node *pnode )
    pui->vertex_head = k_route_ui_max_verts - 200;
    pui->segment_start = 0;
    pui->segment_count = 0;
-   pui->last_notch = 0.0;
    pui->fade_start = 0;
    pui->fade_count = 0;
    pui->fade_timer_start = 0.0;
@@ -1122,8 +1131,8 @@ VG_STATIC void world_routes_update(void)
    }
 }
 
-VG_STATIC void bind_terrain_textures(void);
-VG_STATIC void render_world_routes( m4x4f projection, v3f camera )
+VG_STATIC void bind_terrain_noise(void);
+VG_STATIC void render_world_routes( camera *cam )
 {
    m4x3f identity_matrix;
    m4x3_identity( identity_matrix );
@@ -1131,11 +1140,12 @@ VG_STATIC void render_world_routes( m4x4f projection, v3f camera )
    shader_route_use();
    shader_route_uTexGarbage(0);
    shader_link_standard_ub( _shader_route.id, 2 );
-   bind_terrain_textures();
+   bind_terrain_noise();
 
-   shader_route_uPv( projection );
+   shader_route_uPv( cam->mtx.pv );
+   shader_route_uPvmPrev( cam->mtx_prev.pv );
    shader_route_uMdl( identity_matrix );
-   shader_route_uCamera( camera );
+   shader_route_uCamera( cam->transform[3] );
 
    mesh_bind( &world.mesh_route_lines );