walk stability

[carveJwlIkooP6JGAAIwe30JlM.git] / world.h

diff --git a/world.h b/world.h
index 5f297d0c68e8d6a5bd0908bcc85e05f201875145..e158e184e4b9f89193d0552842c75fde21e2082a 100644 (file)
--- a/world.h
+++ b/world.h
@@ -21,11 +21,10 @@ VG_STATIC int ray_world( v3f pos, v3f dir, ray_hit *hit );
 
 #include "shaders/terrain.h"
 #include "shaders/sky.h"
-#include "shaders/planeinf.h"
 #include "shaders/standard.h"
 #include "shaders/vblend.h"
 #include "shaders/gpos.h"
-#include "shaders/fscolour.h"
+#include "shaders/blitcolour.h"
 #include "shaders/alphatest.h"
 
 typedef struct teleport_gate teleport_gate;
@@ -306,10 +305,18 @@ VG_STATIC struct gworld
          *scene_no_collide,
          *scene_lines;
 
+   struct grind_edge
+   {
+      v3f p0, p1;
+   }
+   *grind_edges;
+   u32 grind_edge_count;
+
    /* spacial mappings */
    bh_tree *audio_bh,
            *trigger_bh,
-           *geo_bh;
+           *geo_bh,
+           *grind_bh;
 
    /* graphics */
    glmesh mesh_route_lines;
@@ -393,10 +400,10 @@ VG_STATIC int world_change_world( int argc, const char *argv[] )
 
 VG_STATIC void world_init(void)
 {
-   vg_convar_push( (struct vg_convar){
+   vg_var_push( (struct vg_var){
       .name = "water_enable",
       .data = &world.water.enabled,
-      .data_type = k_convar_dtype_i32,
+      .data_type = k_var_dtype_i32,
       .opt_i32 = { .min=0, .max=1, .clamp=1 },
       .persistent = 0
    });
@@ -418,9 +425,8 @@ VG_STATIC void world_init(void)
 
    shader_terrain_register();
    shader_sky_register();
-   shader_planeinf_register();
    shader_gpos_register();
-   shader_fscolour_register();
+   shader_blitcolour_register();
    shader_alphatest_register();
 
    vg_info( "Loading world resources\n" );
@@ -428,10 +434,7 @@ VG_STATIC void world_init(void)
    vg_linear_clear( vg_mem.scratch );
    mdl_context *msky = mdl_load_full( vg_mem.scratch, "models/rs_skydome.mdl" );
 
-   mdl_node *nlower = mdl_node_from_name( msky, "dome_lower" ),
-            *nupper = mdl_node_from_name( msky, "dome_upper" );
-   
-   world.dome_lower = *mdl_node_submesh( msky, nlower, 0 );
+   mdl_node *nupper = mdl_node_from_name( msky, "dome_complete" );
    world.dome_upper = *mdl_node_submesh( msky, nupper, 0 );
 
    vg_acquire_thread_sync();
@@ -443,11 +446,11 @@ VG_STATIC void world_init(void)
    /* Other systems */
    vg_info( "Loading other world systems\n" );
 
-   vg_loader_highwater( world_render_init, NULL, NULL );
-   vg_loader_highwater( world_sfd_init, NULL, NULL );
-   vg_loader_highwater( world_water_init, NULL, NULL );
-   vg_loader_highwater( world_gates_init, NULL, NULL );
-   vg_loader_highwater( world_routes_init, NULL, NULL );
+   vg_loader_step( world_render_init, NULL );
+   vg_loader_step( world_sfd_init, NULL );
+   vg_loader_step( world_water_init, NULL );
+   vg_loader_step( world_gates_init, NULL );
+   vg_loader_step( world_routes_init, NULL );
 
    /* Allocate dynamic world memory arena */
    u32 max_size = 76*1024*1024;
@@ -549,11 +552,11 @@ VG_STATIC void world_update( v3f pos )
       {
          world.switching_to_new_world = 0;
          world_unload();
-         world_load();
+         vg_loader_start( world_load );
+         return;
       }
    }
 
-
    world.sky_time += world.sky_rate * vg.time_delta;
    world.sky_rate = vg_lerp( world.sky_rate, world.sky_target_rate, 
                                  vg.time_delta * 5.0 );
@@ -563,36 +566,40 @@ VG_STATIC void world_update( v3f pos )
    world_routes_debug();
 #endif
    
-   int closest = 0;
-   float min_dist = INFINITY;
-
-   for( int i=0; i<world.route_count; i++ )
+   if( world.route_count > 0 )
    {
-      float d = v3_dist2( world.routes[i].scoreboard_transform[3], pos );
+      int closest = 0;
+      float min_dist = INFINITY;
 
-      if( d < min_dist )
+      for( int i=0; i<world.route_count; i++ )
       {
-         min_dist = d;
-         closest = i;
-      }
-   }
+         float d = v3_dist2( world.routes[i].scoreboard_transform[3], pos );
 
-   if( (world.active_route_board != closest) || network_scores_updated )
-   {
-      network_scores_updated = 0;
-      world.active_route_board = closest;
+         if( d < min_dist )
+         {
+            min_dist = d;
+            closest = i;
+         }
+      }
 
-      struct route *route = &world.routes[closest];
+      if( (world.active_route_board != closest) || network_scores_updated )
+      {
+         network_scores_updated = 0;
+         world.active_route_board = closest;
 
-      u32 id = route->track_id;
+         struct route *route = &world.routes[closest];
 
-      if( id != 0xffffffff )
-      {
-         struct netmsg_board *local_board = &scoreboard_client_data.boards[id];
+         u32 id = route->track_id;
 
-         for( int i=0; i<13; i++ )
+         if( id != 0xffffffff )
          {
-            sfd_encode( i, &local_board->data[27*i] );
+            struct netmsg_board *local_board = 
+               &scoreboard_client_data.boards[id];
+
+            for( int i=0; i<13; i++ )
+            {
+               sfd_encode( i, &local_board->data[27*i] );
+            }
          }
       }
    }