fix motion vectors going through gate

[carveJwlIkooP6JGAAIwe30JlM.git] / world.h

diff --git a/world.h b/world.h
index a92591e294963636653dba6f7c294304aeb297ac..240e8dc1a44c77ec2b9be778e25e9d96ec688ccf 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;
@@ -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 );