ahdouaeaiwe

diff --git a/blender_export.py b/blender_export.py
index c520e04251dffd45ad2780106f806b082ef47f00..57bf3663268e59886532494bf8ef4caecb59b4da 100644 (file)
--- a/blender_export.py
+++ b/blender_export.py
@@ -478,7 +478,7 @@ def write_model(name):
 
    header.file_length = fpos
 
-   fp = open(F"/home/harry/Documents/carve/models/{name}.mdl", "wb")
+   fp = open(F"/home/harry/Documents/carve/models_src/{name}.mdl", "wb")
    fp.write( bytearray( header ) )
    
    for node in node_buffer:

diff --git a/main.c b/main.c
index 4610d5288ff09b88247b14901aaa440b13e6bad7..535205c3837715d93cf112a91c91a6ddd0e9a42c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -191,7 +191,6 @@ void vg_start(void)
       physics_test_start();
    }
 
-   world_routes_ui_newseg( 0, 0.0f );
 }
 
 void vg_free(void)
@@ -427,13 +426,18 @@ void vg_ui(void)
 
       render_update_lighting_ub();
    }
+   
+   //glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
+   render_world_routes_ui();
+   //glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
 
+#if 0
    static double last_b_press = 0.0;
 
    double localtime = vg_time - last_b_press;
 
    world_routes_ui_updatetime( 0, localtime );
-   world_routes_ui_draw( 0 );
+   world_routes_ui_draw( 0, (v4f){ 1.0f,0.0f,1.0f,1.0f}, 9.0f );
 
    if( glfwGetKey(vg_window,GLFW_KEY_B) )
       world_routes_ui_notch( 0, localtime );
@@ -442,7 +446,7 @@ void vg_ui(void)
       if( glfwGetKey(vg_window,GLFW_KEY_N) )
       {
          last_b_press = vg_time;
-         world_routes_ui_newseg( 0, localtime );
+         world_routes_ui_newseg( 0 );
       }
 
    static double last_m_press;
@@ -450,6 +454,12 @@ void vg_ui(void)
       if( glfwGetKey( vg_window, GLFW_KEY_M) )
       {
          last_m_press = vg_time;
-         world_routes_ui_popfirst(0);
+
+         vg_info( "start: %u\n",world.routes.routes[0].ui.segment_count );
+         for( int i=0; i<world.routes.routes[0].ui.segment_count; i++ )
+            world_routes_ui_popfirst(0);
+
+         vg_info( "new: %u\n",world.routes.routes[0].ui.segment_count );
       }
+#endif
 }

diff --git a/models_src/mp_dev.mdl b/models_src/mp_dev.mdl
index 4bc73486541d5076e1138e90d1e966771b231ecf..3d5b97fd7019ed9dfe5210eaff340864600a43bf 100644 (file)
Binary files a/models_src/mp_dev.mdl and b/models_src/mp_dev.mdl differ

diff --git a/player.h b/player.h
index 0833e57fc681a8923daf1d417cc7a7017e3e97be..1e667ca777d0b0d95b3c86c95bb24dbee6a0517c 100644 (file)
--- a/player.h
+++ b/player.h
@@ -2001,6 +2001,8 @@ static void player_update(void)
 
       player.mdl.shoes[0] = 1;
       player.mdl.shoes[1] = 1;
+
+      world_routes_notify_reset();
    }
 
    if( vg_get_button_down( "switchmode" ) )

diff --git a/shaders/routeui.fs b/shaders/routeui.fs
index bca76004d98d78f7b22e6a4af47a315b875b5fc1..94fc26fd5d4a223ccba67f8125d75c458806b8ff 100644 (file)
--- a/shaders/routeui.fs
+++ b/shaders/routeui.fs
@@ -1,6 +1,8 @@
 out vec4 FragColor;
 
+uniform vec4 uColour;
+
 void main()
 {
-   FragColor = vec4( 1.0, 1.0, 0.0, 1.0 );
+   FragColor = uColour;
 }

diff --git a/shaders/routeui.h b/shaders/routeui.h
index 659c040f2932670a89704c62a6747fb32c75fd7f..eeb351a7d9f5fc6e9b2c7465c1c3e3ee25727d14 100644 (file)
--- a/shaders/routeui.h
+++ b/shaders/routeui.h
@@ -11,9 +11,15 @@ static struct vg_shader _shader_routeui = {
 .static_src = 
 "layout (location=0) in vec2 a_co;\n"
 "\n"
+"uniform vec4 uOffset;\n"
+"\n"
 "void main()\n"
 "{\n"
-"   gl_Position = vec4(a_co*0.01,0.0,1.0);\n"
+"   float fbarx = (a_co.x+uOffset.x) * uOffset.z;\n"
+"   float fbary = a_co.y*uOffset.w + uOffset.y;\n"
+"\n"
+"   vec2 vpos = vec2( fbarx, fbary );\n"
+"   gl_Position = vec4(vpos,0.0,1.0);\n"
 "}\n"
 ""},
    .fs = 
@@ -22,17 +28,29 @@ static struct vg_shader _shader_routeui = {
 .static_src = 
 "out vec4 FragColor;\n"
 "\n"
+"uniform vec4 uColour;\n"
+"\n"
 "void main()\n"
 "{\n"
-"   FragColor = vec4( 1.0, 0.0, 0.0, 1.0 );\n"
+"   FragColor = uColour;\n"
 "}\n"
 ""},
 };
 
+static GLuint _uniform_routeui_uOffset;
+static GLuint _uniform_routeui_uColour;
+static void shader_routeui_uOffset(v4f v){
+   glUniform4fv( _uniform_routeui_uOffset, 1, v );
+}
+static void shader_routeui_uColour(v4f v){
+   glUniform4fv( _uniform_routeui_uColour, 1, v );
+}
 static void shader_routeui_register(void){
    vg_shader_register( &_shader_routeui );
 }
 static void shader_routeui_use(void){ glUseProgram(_shader_routeui.id); }
 static void shader_routeui_link(void){
+   _uniform_routeui_uOffset = glGetUniformLocation( _shader_routeui.id, "uOffset" );
+   _uniform_routeui_uColour = glGetUniformLocation( _shader_routeui.id, "uColour" );
 }
 #endif /* SHADER_routeui_H */

diff --git a/shaders/routeui.vs b/shaders/routeui.vs
index def0bb61a18b05e72b640f54887cd0c869616767..ba5cbce9bf74340b199c70915c8d9e264d97df17 100644 (file)
--- a/shaders/routeui.vs
+++ b/shaders/routeui.vs
@@ -1,6 +1,12 @@
 layout (location=0) in vec2 a_co;
 
+uniform vec4 uOffset;
+
 void main()
 {
-   gl_Position = vec4(a_co*vec2(0.01,0.1),0.0,1.0);
+   float fbarx = (a_co.x+uOffset.x) * uOffset.z;
+   float fbary = a_co.y*uOffset.w + uOffset.y;
+
+   vec2 vpos = vec2( fbarx, fbary );
+   gl_Position = vec4(vpos,0.0,1.0);
 }

diff --git a/world.h b/world.h
index 73a33c0275208cc9e4312c4c5b6abee059a2319d..c6d07144cbb39215d08cc2ef844d2c9052762912 100644 (file)
--- a/world.h
+++ b/world.h
@@ -511,6 +511,7 @@ static void world_init(void)
 
 static void world_update(void)
 {
+   world_routes_update();
    world_routes_debug();
    sfd_update( &world.sfd.tester );
 

diff --git a/world_routes.h b/world_routes.h
index 93fa2c0ce470eca9e98fba764361d14674afa86a..d714ff3f70ed9e77481eb4fa446b2f2a82490c5f 100644 (file)
--- a/world_routes.h
+++ b/world_routes.h
@@ -45,7 +45,7 @@ struct subworld_routes
       int active;
       float factive;
 
-      double best_lap; /* Session */
+      double best_lap, latest_pass; /* Session */
 
       struct 
       {
@@ -58,14 +58,14 @@ struct subworld_routes
 
          struct route_ui_segment
          {
-            float time;
-
+            float length;
             u32 vertex_start, vertex_count,
                 index_start, index_count;
          }
          segments[k_max_ui_segments];
 
-         u32 segment_start, segment_count;
+         u32 segment_start, segment_count, fade_start, fade_count;
+         double fade_timer_start;
       }
       ui;
    }
@@ -213,6 +213,18 @@ static void world_routes_ui_popfirst( u32 route )
    }
 }
 
+/*
+ * Reset ui bar completely
+ */
+static void world_routes_ui_clear( u32 route )
+{
+   struct subworld_routes *r = subworld_routes();
+   struct route *pr = &r->routes[route];
+   pr->ui.segment_start = (pr->ui.segment_start + pr->ui.segment_count) %
+                              k_max_ui_segments;
+   pr->ui.segment_count = 0;
+}
+
 /*
  * Break a index range into two pieces over the edge of the maximum it can
  * store. s1 is 0 always, so its a ring buffer.
@@ -297,7 +309,7 @@ static struct route_ui_segment *world_routes_ui_curseg( struct route *pr )
  * Start a new segment in the UI bar, will create a split on the last one if
  * there is one active currently. (api)
  */
-static void world_routes_ui_newseg( u32 route, float time )
+static void world_routes_ui_newseg( u32 route )
 {
    struct subworld_routes *r = subworld_routes();
    struct route *pr = &r->routes[route];
@@ -309,10 +321,12 @@ static void world_routes_ui_newseg( u32 route, float time )
    {
       float const k_gap_width = 1.0f;
 
+      struct route_ui_segment *cseg = world_routes_ui_curseg(pr);
+      
       v2f verts[2];
-      verts[0][0] =  time-k_gap_width;
+      verts[0][0] =  cseg->length-k_gap_width;
       verts[0][1] =  0.5f;
-      verts[1][0] =  time-k_gap_width;
+      verts[1][0] =  cseg->length-k_gap_width;
       verts[1][1] = -0.5f;
 
       world_routes_ui_update_verts( pr, verts, 2 );
@@ -367,6 +381,9 @@ static void world_routes_ui_updatetime( u32 route, float time )
 
    glBindVertexArray( pr->ui.vao );
    world_routes_ui_update_verts( pr, verts, 2 );
+
+   struct route_ui_segment *cseg = world_routes_ui_curseg(pr);
+   cseg->length = time;
 }
 
 /*
@@ -443,16 +460,57 @@ static void world_routes_ui_notch( u32 route, float time )
    }
 }
 
-static void world_routes_ui_draw( u32 route )
+static void world_routes_ui_draw( u32 route, v4f colour, float offset )
 {
-   //glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
-
    struct subworld_routes *r = subworld_routes();
    struct route *pr = &r->routes[route];
 
+   float cx = 0.0f;
+
    shader_routeui_use();
    glBindVertexArray( pr->ui.vao );
 
+   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;
+   for( u32 i=0; i<pr->ui.fade_count; i++ )
+   {
+      u32 j = (pr->ui.fade_start + i) % k_max_ui_segments;
+      struct route_ui_segment *segment = &pr->ui.segments[j];
+
+      fade_block_size += segment->length;
+   }
+
+   cx -= fade_block_size * fade_amt;
+
+   v4f fade_colour;
+   v4_copy( colour, fade_colour );
+   fade_colour[3] *= 1.0f-fade_amt;
+
+   float height = pr->factive*0.1f;
+
+   shader_routeui_uColour( fade_colour );
+   for( u32 i=0; i<pr->ui.fade_count; i++ )
+   {
+      u32 j = (pr->ui.fade_start + i) % k_max_ui_segments;
+      struct route_ui_segment *segment = &pr->ui.segments[j];
+
+      u32 c0, c1;
+      world_routes_ui_split_indices( segment->index_start, 
+            segment->index_count, &c0, &c1 );
+
+      shader_routeui_uOffset( (v4f){ cx, offset, 0.005f, height } );
+      if( c0 )
+         glDrawElements( GL_TRIANGLES, c0, GL_UNSIGNED_SHORT,
+                           (void *)(segment->index_start*sizeof(u16)));
+      if( c1 )
+         glDrawElements( GL_TRIANGLES, c1, GL_UNSIGNED_SHORT, (void *)(0) );
+
+      cx += segment->length;
+   }
+
+   shader_routeui_uColour( colour );
    for( u32 i=0; i<pr->ui.segment_count; i++ )
    {
       u32 j = (pr->ui.segment_start + i) % k_max_ui_segments;
@@ -462,14 +520,15 @@ static void world_routes_ui_draw( u32 route )
       world_routes_ui_split_indices( segment->index_start, 
             segment->index_count, &c0, &c1 );
 
+      shader_routeui_uOffset( (v4f){ cx, offset, 0.005f, height } );
       if( c0 )
          glDrawElements( GL_TRIANGLES, c0, GL_UNSIGNED_SHORT,
                            (void *)(segment->index_start*sizeof(u16)));
       if( c1 )
          glDrawElements( GL_TRIANGLES, c1, GL_UNSIGNED_SHORT, (void *)(0) );
-   }
 
-   //glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
+      cx += segment->length;
+   }
 }
 
 /* 
@@ -481,6 +540,7 @@ static void world_routes_ui_draw( u32 route )
 static void world_routes_verify_run( u32 route )
 {
    struct subworld_routes *r = subworld_routes();
+   struct route *pr = &r->routes[route];
 
    u32 stack[64];
    u32 si = world_routes_get_path( r->routes[route].start, stack );
@@ -514,6 +574,8 @@ static void world_routes_verify_run( u32 route )
    if( timings[begin]->version == r->current_run_version )
       verified = 1;
 
+   int valid_segment_count = 0;
+
    double lap_time = 0.0;
 
    for( u32 i=0; i<sj; i++ )
@@ -530,6 +592,8 @@ static void world_routes_verify_run( u32 route )
          {
             diff = timings[j1]->time - timings[j]->time;
             lap_time += diff;
+
+            if( verified && diff > 0.0 ) valid_segment_count ++;
          }
          else
             verified = 0;
@@ -542,10 +606,32 @@ static void world_routes_verify_run( u32 route )
          vg_warn( " [ %u %f ]\n", timings[j1]->time, timings[j1]->version );
    }
 
+   pr->ui.fade_start = pr->ui.segment_start;
+   pr->ui.fade_count = 0;
+   pr->ui.fade_timer_start = vg_time;
+
+   int orig_seg_count = pr->ui.segment_count;
+
+   world_routes_ui_newseg( route );
+
    if( verified )
+   {
       vg_success( "  NEW LAP TIME: %f\n", lap_time );
+      world_routes_ui_popfirst(route);
+      pr->ui.fade_count ++;
+   }
    else
       vg_info( "  ctime: %f\n", lap_time );
+
+   /* remove any excess we had from previous runs */
+   int to_remove = orig_seg_count-valid_segment_count;
+   for( int i=0; i<to_remove; i++ )
+   {
+      world_routes_ui_popfirst(route);
+      pr->ui.fade_count ++;
+   }
+
+   r->routes[route].latest_pass = vg_time;
 }
 
 /*
@@ -566,6 +652,8 @@ static void world_routes_activate_gate( u32 id )
    for( u32 i=0; i<r->route_count; i++ )
    {
       struct route *route = &r->routes[i];
+      
+      int was_active = route->active;
 
       route->active = 0;
       for( u32 j=0; j<pdest->ref_count; j++ )
@@ -577,6 +665,17 @@ static void world_routes_activate_gate( u32 id )
             break;
          }
       }
+
+      if( was_active && !route->active )
+      {
+         route->ui.fade_start = route->ui.segment_start;
+         route->ui.fade_count = route->ui.segment_count;
+         route->ui.fade_timer_start = vg_time;
+         world_routes_ui_clear(i);
+
+         vg_success( "CLEARING -> %u %u \n", route->ui.fade_start,
+                                             route->ui.fade_count );
+      }
    }
    
    r->current_run_version ++;
@@ -586,6 +685,22 @@ static void world_routes_activate_gate( u32 id )
    r->current_run_version ++;
 }
 
+/*
+ * Notify the UI system that we've reset the player
+ */
+static void world_routes_notify_reset(void)
+{
+   struct subworld_routes *r = subworld_routes();
+
+   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 );
+   }
+}
+
 static void world_routes_debug(void)
 {
    struct subworld_routes *r = subworld_routes();
@@ -783,6 +898,22 @@ static void world_routes_gen_meshes(void)
    scene_free_offline_buffers( &r->scene_lines );
 }
 
+static void world_routes_update(void)
+{
+   struct subworld_routes *r = subworld_routes();
+
+   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 );
+
+      if( route->active )
+      {
+         world_routes_ui_updatetime( i, vg_time - route->latest_pass );
+      }
+   }
+}
+
 static void bind_terrain_textures(void);
 static void render_world_routes( m4x4f projection, v3f camera )
 {
@@ -805,7 +936,6 @@ static void render_world_routes( m4x4f projection, v3f camera )
    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 );
 
       v4f colour;
       v3_lerp( (v3f){0.7f,0.7f,0.7f}, route->colour, route->factive, colour );
@@ -816,6 +946,25 @@ static void render_world_routes( m4x4f projection, v3f camera )
    }
 }
 
+static void render_world_routes_ui(void)
+{
+   glEnable(GL_BLEND);
+   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+   glBlendEquation(GL_FUNC_ADD);
+
+   struct subworld_routes *r = subworld_routes();
+
+   float active_offset = 0.0f;
+   for( int i=0; i<r->route_count; i++ )
+   {
+      struct route *route = &r->routes[i];
+      world_routes_ui_draw( i, route->colour, active_offset*0.1f );
+      active_offset += route->factive;
+   }
+
+   glDisable(GL_BLEND);
+}
+
 static void world_routes_register(void)
 {
    struct subworld_routes *r = subworld_routes();
@@ -971,6 +1120,9 @@ static void world_routes_loadfrom( mdl_header *mdl )
          route->ui.segment_start = 0;
          route->ui.segment_count = 0;
          route->ui.last_notch = 0.0;
+         route->ui.fade_start = 0;
+         route->ui.fade_count = 0;
+         route->ui.fade_timer_start = 0.0;
 
          r->route_count ++;
       }